From 67fe053a4b2cd800bb0c12f546420fb358b86608 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 19 Apr 2016 19:34:09 +0200 Subject: Remove CIAO/DAnCE here because they are migrated to their own repositories --- CIAO/CIAO-INSTALL.html | 137 - CIAO/CIAO.mwc | 3 - CIAO/CIAO_DAnCE.mwc | 13 - CIAO/CIAO_TAO.mwc | 29 - CIAO/CIAO_TAO_DAnCE.mwc | 23 - CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc | 24 - CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc | 45 - CIAO/CIAO_TAO_OpenDDS.mwc | 30 - CIAO/COPYING | 111 - CIAO/ChangeLogs/CIAO-1_3_1 | 612 - CIAO/ChangeLogs/CIAO-1_3_2 | 255 - CIAO/ChangeLogs/CIAO-1_3_3 | 56 - CIAO/ChangeLogs/ChangeLog-2004a | 5390 -- CIAO/ChangeLogs/ChangeLog-2004b | 2250 - CIAO/ChangeLogs/ChangeLog-2006a | 8579 -- CIAO/ChangeLogs/ChangeLog-2006b | 2752 - CIAO/ChangeLogs/ChangeLog-2007a | 1122 - CIAO/ChangeLogs/ChangeLog-2007b | 2845 - CIAO/ChangeLogs/ChangeLog-2009a | 15360 ---- CIAO/ChangeLogs/ChangeLog-2010a | 9061 -- CIAO/ChangeLogs/ChangeLog-2010b | 11911 --- CIAO/ChangeLogs/ChangeLog-2011a | 11910 --- CIAO/ChangeLogs/ChangeLog-2011b | 2172 - CIAO/ChangeLogs/ChangeLog-2012a | 5821 -- CIAO/ChangeLogs/ChangeLog-2013a | 1259 - CIAO/ChangeLogs/ChangeLog-2014a | 417 - CIAO/ChangeLogs/ChangeLog-2014b | 26 - CIAO/ChangeLogs/ChangeLog-pre_release | 6202 -- CIAO/MPC/config/ami4ccm_lem_stub.mpb | 5 - CIAO/MPC/config/ami4ccm_servant.mpb | 5 - CIAO/MPC/config/ami4ccm_stub.mpb | 6 - CIAO/MPC/config/avoids_ccm_direct_collocation.mpb | 4 - CIAO/MPC/config/avoids_ccm_lw.mpb | 4 - CIAO/MPC/config/avoids_ccm_noevent.mpb | 4 - CIAO/MPC/config/ccm.mpb | 4 - CIAO/MPC/config/ccm_configvalue.mpb | 5 - CIAO/MPC/config/ccm_cookie.mpb | 5 - CIAO/MPC/config/ccm_direct_collocation.mpb | 5 - CIAO/MPC/config/ccm_executor.mpb | 3 - CIAO/MPC/config/ccm_lem_stub.mpb | 5 - CIAO/MPC/config/ccm_lw.mpb | 5 - CIAO/MPC/config/ccm_noevent.mpb | 5 - CIAO/MPC/config/ccm_session_stub.mpb | 5 - CIAO/MPC/config/ccm_stub.mpb | 6 - CIAO/MPC/config/ccm_svnt.mpb | 6 - CIAO/MPC/config/ciao.mpb | 5 - CIAO/MPC/config/ciao_base.mpb | 4 - CIAO/MPC/config/ciao_connector_base.mpb | 4 - CIAO/MPC/config/ciao_container_base_stub.mpb | 5 - CIAO/MPC/config/ciao_deployment_handlers.mpb | 6 - CIAO/MPC/config/ciao_example_output.mpb | 4 - CIAO/MPC/config/ciao_exe.mpb | 4 - CIAO/MPC/config/ciao_executor.mpb | 3 - CIAO/MPC/config/ciao_lib.mpb | 4 - CIAO/MPC/config/ciao_logger.mpb | 5 - CIAO/MPC/config/ciao_output.mpb | 5 - CIAO/MPC/config/ciao_servant.mpb | 7 - CIAO/MPC/config/ciao_session_container.mpb | 6 - CIAO/MPC/config/ciao_session_container_stub.mpb | 5 - CIAO/MPC/config/ciao_vcwarnings.mpb | 18 - CIAO/MPC/config/ciaoexe.mpb | 4 - CIAO/MPC/config/ciaoidldefaults.mpb | 7 - CIAO/MPC/config/ciaolib_with_idl.mpb | 3 - CIAO/MPC/config/componentidldefaults.mpb | 5 - CIAO/MPC/config/connectoridldefaults.mpb | 5 - CIAO/MPC/config/dds4ccm.mpb | 23 - CIAO/MPC/config/dds4ccm_base.mpb | 16 - CIAO/MPC/config/dds4ccm_dcps.mpb | 2 - CIAO/MPC/config/dds4ccm_impl.mpb | 18 - CIAO/MPC/config/dds4ccm_lem_stub.mpb | 5 - CIAO/MPC/config/dds4ccm_logger.mpb | 5 - CIAO/MPC/config/dds4ccm_opendds_lem_stub.mpb | 5 - CIAO/MPC/config/dds4ccm_skel.mpb | 5 - CIAO/MPC/config/dds4ccm_stub.mpb | 5 - CIAO/MPC/config/dds4ccm_ts_default.mpb | 48 - CIAO/MPC/config/ndds_idltocpp.mpb | 14 - CIAO/MPC/config/ndds_idltocpp_impl.mpb | 6 - CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb | 5 - CIAO/MPC/config/ndds_idltocpp_skel.mpb | 5 - CIAO/MPC/config/ndds_idltocpp_stub.mpb | 6 - CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb | 11 - CIAO/MPC/config/taobaseidl3toidl2defaults.mpb | 22 - CIAO/MPC/config/taoidl3toid2_ccm_lw.mpb | 5 - CIAO/MPC/config/taoidl3toidl2defaults.mpb | 3 - CIAO/MPC/config/taoidl3toxmidefaults.mpb | 23 - CIAO/NEWS | 1669 - CIAO/PROBLEM-REPORT-FORM | 92 - CIAO/VERSION | 8 - CIAO/bin/.gitignore | 4 - CIAO/bin/ciao_tests.lst | 188 - CIAO/bin/generate_component_mpc.pl | 366 - CIAO/ccm/.gitignore | 118 - CIAO/ccm/CCM_Base.idl | 14 - CIAO/ccm/CCM_CCMException.idl | 30 - CIAO/ccm/CCM_Configurator.idl | 25 - CIAO/ccm/CCM_Context.idl | 63 - CIAO/ccm/CCM_Cookie.idl | 17 - CIAO/ccm/CCM_EnterpriseComponent.idl | 12 - CIAO/ccm/CCM_Enumeration.idl | 28 - CIAO/ccm/CCM_EventBase.idl | 14 - CIAO/ccm/CCM_EventConsumerBase.idl | 25 - CIAO/ccm/CCM_Events.idl | 114 - CIAO/ccm/CCM_Exceptions.idl | 25 - CIAO/ccm/CCM_ExecutorLocator.idl | 32 - CIAO/ccm/CCM_Home.idl | 37 - CIAO/ccm/CCM_HomeConfiguration.idl | 26 - CIAO/ccm/CCM_HomeExecutorBase.idl | 12 - CIAO/ccm/CCM_HomeFinder.idl | 32 - CIAO/ccm/CCM_Homes.idl | 18 - CIAO/ccm/CCM_KeylessCCMHome.idl | 18 - CIAO/ccm/CCM_Navigation.idl | 52 - CIAO/ccm/CCM_Object.idl | 57 - CIAO/ccm/CCM_PrimaryKeyBase.idl | 18 - CIAO/ccm/CCM_Receptacle.idl | 64 - CIAO/ccm/CCM_StandardConfigurator.idl | 29 - CIAO/ccm/CCM_Transaction.idl | 80 - CIAO/ccm/CCM_lem_stub.mpc | 64 - CIAO/ccm/CCM_stub.mpc | 144 - CIAO/ccm/CCM_svnt.mpc | 64 - CIAO/ccm/Components.idl | 10 - CIAO/ccm/CosPersistentState.idl | 23 - CIAO/ccm/Entity/CCM_ComponentId.idl | 38 - CIAO/ccm/Entity/CCM_Entity2Context.idl | 40 - CIAO/ccm/Entity/CCM_EntityComponent.idl | 43 - CIAO/ccm/Entity/CCM_EntityContext.idl | 27 - CIAO/ccm/Entity/CCM_StateIdFactory.idl | 62 - CIAO/ccm/Entity/CCM_entity_svnt.mpc | 65 - CIAO/ccm/Extended/CCM_BadComponentReference.idl | 25 - CIAO/ccm/Extended/CCM_CCM2Context.idl | 42 - CIAO/ccm/Extended/CCM_HomeRegistration.idl | 23 - CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl | 28 - CIAO/ccm/Security.idl | 26 - CIAO/ccm/Session/.gitignore | 10 - CIAO/ccm/Session/CCM_Session2Context.idl | 33 - CIAO/ccm/Session/CCM_SessionComponent.idl | 32 - CIAO/ccm/Session/CCM_SessionContext.idl | 16 - CIAO/ccm/Session/CCM_SessionSynchronization.idl | 31 - CIAO/ccm/Session/CCM_session.mpc | 54 - CIAO/ciao/Base/.gitignore | 7 - CIAO/ciao/Base/CIAO_Base.mpc | 67 - CIAO/ciao/Base/CIAO_Exceptions.idl | 21 - CIAO/ciao/Base/CIAO_Properties.idl | 34 - CIAO/ciao/Base/Client_init.cpp | 45 - CIAO/ciao/Base/Client_init.h | 54 - CIAO/ciao/Base/Server_init.cpp | 18 - CIAO/ciao/Base/Server_init.h | 48 - CIAO/ciao/Containers/.gitignore | 6 - CIAO/ciao/Containers/Container_Base.idl | 151 - CIAO/ciao/Containers/Container_Base_T.cpp | 1222 - CIAO/ciao/Containers/Container_Base_T.h | 207 - CIAO/ciao/Containers/Containers.mpc | 36 - CIAO/ciao/Containers/Session/.gitignore | 5 - CIAO/ciao/Containers/Session/Session_Container.cpp | 335 - CIAO/ciao/Containers/Session/Session_Container.h | 91 - CIAO/ciao/Containers/Session/Session_Container.idl | 15 - CIAO/ciao/Containers/Session/Session_Container.mpc | 59 - CIAO/ciao/Contexts/Context_Impl_Base_T.cpp | 144 - CIAO/ciao/Contexts/Context_Impl_Base_T.h | 101 - CIAO/ciao/Contexts/Session/Session_Context_T.cpp | 62 - CIAO/ciao/Contexts/Session/Session_Context_T.h | 79 - .../Handlers/CIAO_Deployment_Handlers.mpc | 28 - .../Deployment/Handlers/CIAO_Handler_Common.cpp | 66 - .../ciao/Deployment/Handlers/CIAO_Handler_Common.h | 40 - .../Handlers/CIAO_Locality_Handler_Export.h | 57 - CIAO/ciao/Deployment/Handlers/CIAO_State.cpp | 267 - CIAO/ciao/Deployment/Handlers/CIAO_State.h | 97 - .../ciao/Deployment/Handlers/Component_Handler.cpp | 652 - CIAO/ciao/Deployment/Handlers/Component_Handler.h | 99 - .../Deployment/Handlers/Connection_Handler.cpp | 1296 - CIAO/ciao/Deployment/Handlers/Connection_Handler.h | 122 - .../ciao/Deployment/Handlers/Container_Handler.cpp | 283 - CIAO/ciao/Deployment/Handlers/Container_Handler.h | 97 - CIAO/ciao/Deployment/Handlers/Home_Handler.cpp | 461 - CIAO/ciao/Deployment/Handlers/Home_Handler.h | 98 - .../Handlers/Homed_Component_Handler.cpp | 478 - .../Deployment/Handlers/Homed_Component_Handler.h | 98 - .../Interceptors/CIAO_Deployment_Interceptors.mpc | 18 - .../CIAO_Deployment_Interceptors_export.h | 57 - .../Interceptors/Deployment_Interceptors.cpp | 272 - .../Interceptors/Deployment_Interceptors.h | 88 - .../Deployment/Interceptors/Name_Utilities.cpp | 186 - CIAO/ciao/Deployment/Interceptors/Name_Utilities.h | 39 - CIAO/ciao/Logger/CIAO_Logger_Export.h | 57 - CIAO/ciao/Logger/Log_Macros.cpp | 5 - CIAO/ciao/Logger/Log_Macros.h | 108 - CIAO/ciao/Logger/Logger.mpc | 19 - CIAO/ciao/Logger/Logger_Service.cpp | 166 - CIAO/ciao/Logger/Logger_Service.h | 33 - CIAO/ciao/Servants/.gitignore | 1 - CIAO/ciao/Servants/CIAO_Servant_Impl_export.h | 56 - CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp | 619 - CIAO/ciao/Servants/Connector_Servant_Impl_Base.h | 244 - .../Servants/Connector_Servant_Impl_Utils_T.cpp | 87 - CIAO/ciao/Servants/Facet_Servant_Base_T.cpp | 40 - CIAO/ciao/Servants/Facet_Servant_Base_T.h | 59 - CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp | 35 - CIAO/ciao/Servants/Home_Servant_Impl_Base.h | 65 - CIAO/ciao/Servants/Home_Servant_Impl_T.cpp | 266 - CIAO/ciao/Servants/Home_Servant_Impl_T.h | 106 - CIAO/ciao/Servants/Servant_Impl_Base.cpp | 430 - CIAO/ciao/Servants/Servant_Impl_Base.h | 151 - CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp | 89 - CIAO/ciao/Servants/Servants.mpc | 33 - CIAO/ciao/Servants/Session/Servant_Impl_T.cpp | 197 - CIAO/ciao/Servants/Session/Servant_Impl_T.h | 97 - CIAO/ciao/Servants/StandardConfigurator_Impl.cpp | 32 - CIAO/ciao/Servants/StandardConfigurator_Impl.h | 74 - CIAO/ciao/Valuetype_Factories/ConfigValue.cpp | 35 - CIAO/ciao/Valuetype_Factories/ConfigValue.h | 34 - CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h | 57 - CIAO/ciao/Valuetype_Factories/Cookie_Export.h | 57 - CIAO/ciao/Valuetype_Factories/Cookies.cpp | 62 - CIAO/ciao/Valuetype_Factories/Cookies.h | 66 - CIAO/ciao/Valuetype_Factories/Cookies.inl | 8 - CIAO/ciao/Valuetype_Factories/Factories.mpc | 30 - CIAO/ciao/Version.h | 8 - CIAO/ciao/install_ciao_headers.mpc | 17 - CIAO/connectors/ami4ccm/ami4ccm/.gitignore | 16 - CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp | 22 - CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h | 40 - CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl | 49 - CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc | 125 - CIAO/connectors/ami4ccm/docs/TestCoverage.odt | Bin 16760 -> 0 bytes CIAO/connectors/ami4ccm/examples/Hello/.gitignore | 1 - .../ami4ccm/examples/Hello/Base/.gitignore | 11 - .../ami4ccm/examples/Hello/Base/Hello.idl | 35 - .../ami4ccm/examples/Hello/Base/Hello.mpc | 190 - .../ami4ccm/examples/Hello/Receiver/.gitignore | 5 - .../examples/Hello/Receiver/Hello_Receiver.idl | 16 - .../examples/Hello/Receiver/Hello_Receiver.mpc | 132 - .../Hello/Receiver/Hello_Receiver_exec.cpp | 164 - .../examples/Hello/Receiver/Hello_Receiver_exec.h | 67 - .../ami4ccm/examples/Hello/Sender/.gitignore | 4 - .../ami4ccm/examples/Hello/Sender/Hello_Sender.idl | 19 - .../ami4ccm/examples/Hello/Sender/Hello_Sender.mpc | 133 - .../examples/Hello/Sender/Hello_Sender_exec.cpp | 400 - .../examples/Hello/Sender/Hello_Sender_exec.h | 187 - .../ami4ccm/examples/Hello/descriptors/Plan.cdp | 399 - .../examples/Hello/descriptors/PlanFullBlock.cdp | 447 - .../examples/Hello/descriptors/PlanSyncPort.cdp | 401 - .../Hello/descriptors/run_fullblock_test.pl | 243 - .../ami4ccm/examples/Hello/descriptors/run_test.pl | 259 - .../examples/Hello/models/Hello-complete.xme | 2352 - .../ami4ccm/examples/Hello/models/Hello.xme | 1787 - .../ami4ccm/examples/Quoter/Base/Quoter.idl | 29 - .../ami4ccm/examples/Quoter/Base/Quoter.mpc | 190 - .../examples/Quoter/Client/Quoter_Client.idl | 19 - .../examples/Quoter/Client/Quoter_Client.mpc | 133 - .../examples/Quoter/Client/Quoter_Client_exec.cpp | 303 - .../examples/Quoter/Client/Quoter_Client_exec.h | 177 - .../examples/Quoter/Producer/Quoter_Producer.idl | 16 - .../examples/Quoter/Producer/Quoter_Producer.mpc | 132 - .../Quoter/Producer/Quoter_Producer_exec.cpp | 187 - .../Quoter/Producer/Quoter_Producer_exec.h | 150 - .../ami4ccm/examples/Quoter/descriptors/Plan.cdp | 374 - .../examples/Quoter/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/models/CoSMIC/ami4ccm.xme | 398 - CIAO/connectors/ami4ccm/tests/.gitignore | 1 - CIAO/connectors/ami4ccm/tests/AsynchT/.gitignore | 1 - .../ami4ccm/tests/AsynchT/Base/.gitignore | 11 - .../ami4ccm/tests/AsynchT/Base/AsynchT.idl | 33 - .../ami4ccm/tests/AsynchT/Base/AsynchT.mpc | 192 - .../ami4ccm/tests/AsynchT/Receiver/.gitignore | 5 - .../tests/AsynchT/Receiver/AsynchT_Receiver.idl | 16 - .../tests/AsynchT/Receiver/AsynchT_Receiver.mpc | 132 - .../AsynchT/Receiver/AsynchT_Receiver_exec.cpp | 175 - .../tests/AsynchT/Receiver/AsynchT_Receiver_exec.h | 144 - .../ami4ccm/tests/AsynchT/Sender/.gitignore | 5 - .../tests/AsynchT/Sender/AsynchT_Sender.idl | 19 - .../tests/AsynchT/Sender/AsynchT_Sender.mpc | 133 - .../tests/AsynchT/Sender/AsynchT_Sender_exec.cpp | 359 - .../tests/AsynchT/Sender/AsynchT_Sender_exec.h | 187 - .../ami4ccm/tests/AsynchT/descriptors/Plan.cdp | 374 - .../ami4ccm/tests/AsynchT/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/tests/DelReplyH/.gitignore | 1 - .../ami4ccm/tests/DelReplyH/Base/.gitignore | 11 - .../ami4ccm/tests/DelReplyH/Base/DelReplyH.idl | 35 - .../ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc | 191 - .../ami4ccm/tests/DelReplyH/Receiver/.gitignore | 5 - .../DelReplyH/Receiver/DelReplyH_Receiver.idl | 16 - .../DelReplyH/Receiver/DelReplyH_Receiver.mpc | 132 - .../DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp | 151 - .../DelReplyH/Receiver/DelReplyH_Receiver_exec.h | 127 - .../ami4ccm/tests/DelReplyH/Sender/.gitignore | 5 - .../tests/DelReplyH/Sender/DelReplyH_Sender.idl | 19 - .../tests/DelReplyH/Sender/DelReplyH_Sender.mpc | 132 - .../DelReplyH/Sender/DelReplyH_Sender_exec.cpp | 241 - .../tests/DelReplyH/Sender/DelReplyH_Sender_exec.h | 157 - .../ami4ccm/tests/DelReplyH/descriptors/Plan.cdp | 374 - .../tests/DelReplyH/descriptors/run_test.pl | 243 - .../connectors/ami4ccm/tests/Exceptions/.gitignore | 1 - .../ami4ccm/tests/Exceptions/Base/.gitignore | 11 - .../ami4ccm/tests/Exceptions/Base/ExceptionT.idl | 36 - .../ami4ccm/tests/Exceptions/Base/ExceptionT.mpc | 192 - .../ami4ccm/tests/Exceptions/Receiver/.gitignore | 5 - .../Exceptions/Receiver/ExceptionT_Receiver.idl | 16 - .../Exceptions/Receiver/ExceptionT_Receiver.mpc | 132 - .../Receiver/ExceptionT_Receiver_exec.cpp | 215 - .../Exceptions/Receiver/ExceptionT_Receiver_exec.h | 137 - .../ami4ccm/tests/Exceptions/Sender/.gitignore | 5 - .../tests/Exceptions/Sender/ExceptionT_Sender.idl | 19 - .../tests/Exceptions/Sender/ExceptionT_Sender.mpc | 133 - .../Exceptions/Sender/ExceptionT_Sender_exec.cpp | 390 - .../Exceptions/Sender/ExceptionT_Sender_exec.h | 186 - .../ami4ccm/tests/Exceptions/descriptors/Plan.cdp | 374 - .../tests/Exceptions/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/tests/GetComp/.gitignore | 1 - .../ami4ccm/tests/GetComp/Base/GetComp.idl | 25 - .../ami4ccm/tests/GetComp/Base/GetComp.mpc | 191 - .../tests/GetComp/Receiver/GetComp_Receiver.idl | 16 - .../tests/GetComp/Receiver/GetComp_Receiver.mpc | 132 - .../GetComp/Receiver/GetComp_Receiver_exec.cpp | 142 - .../tests/GetComp/Receiver/GetComp_Receiver_exec.h | 130 - .../tests/GetComp/Sender/GetComp_Sender.idl | 19 - .../tests/GetComp/Sender/GetComp_Sender.mpc | 133 - .../tests/GetComp/Sender/GetComp_Sender_exec.cpp | 206 - .../tests/GetComp/Sender/GetComp_Sender_exec.h | 119 - .../ami4ccm/tests/GetComp/descriptors/Plan.cdp | 374 - .../ami4ccm/tests/GetComp/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/tests/IDL_Test/.gitignore | 12 - .../ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc | 193 - CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl | 127 - .../ami4ccm/tests/IDL_Test/Hello_Component.idl | 50 - .../ami4ccm/tests/IDL_Test/Hello_Component.mpc | 137 - CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl | 25 - .../ami4ccm/tests/InterInArgs/.gitignore | 1 - .../ami4ccm/tests/InterInArgs/Base/.gitignore | 11 - .../tests/InterInArgs/Base/InterInArgsT.idl | 81 - .../tests/InterInArgs/Base/InterInArgsT.mpc | 191 - .../ami4ccm/tests/InterInArgs/Receiver/.gitignore | 5 - .../InterInArgs/Receiver/InterInArgsT_Receiver.idl | 16 - .../InterInArgs/Receiver/InterInArgsT_Receiver.mpc | 132 - .../Receiver/InterInArgsT_Receiver_exec.cpp | 278 - .../Receiver/InterInArgsT_Receiver_exec.h | 151 - .../ami4ccm/tests/InterInArgs/Sender/.gitignore | 5 - .../InterInArgs/Sender/InterInArgsT_Sender.idl | 19 - .../InterInArgs/Sender/InterInArgsT_Sender.mpc | 133 - .../Sender/InterInArgsT_Sender_exec.cpp | 366 - .../InterInArgs/Sender/InterInArgsT_Sender_exec.h | 175 - .../ami4ccm/tests/InterInArgs/descriptors/Plan.cdp | 374 - .../tests/InterInArgs/descriptors/run_test.pl | 243 - .../tests/InterInOutArgs/Base/InterInOutT.idl | 81 - .../tests/InterInOutArgs/Base/InterInOutT.mpc | 191 - .../Receiver/InterInOutT_Receiver.idl | 16 - .../Receiver/InterInOutT_Receiver.mpc | 132 - .../Receiver/InterInOutT_Receiver_exec.cpp | 302 - .../Receiver/InterInOutT_Receiver_exec.h | 151 - .../InterInOutArgs/Sender/InterInOutT_Sender.idl | 19 - .../InterInOutArgs/Sender/InterInOutT_Sender.mpc | 133 - .../Sender/InterInOutT_Sender_exec.cpp | 457 - .../Sender/InterInOutT_Sender_exec.h | 187 - .../tests/InterInOutArgs/descriptors/Plan.cdp | 374 - .../tests/InterInOutArgs/descriptors/run_test.pl | 243 - .../connectors/ami4ccm/tests/InterMulti/.gitignore | 1 - .../ami4ccm/tests/InterMulti/Base/.gitignore | 11 - .../ami4ccm/tests/InterMulti/Base/InterMulti.idl | 39 - .../ami4ccm/tests/InterMulti/Base/InterMulti.mpc | 191 - .../ami4ccm/tests/InterMulti/Receiver/.gitignore | 5 - .../InterMulti/Receiver/InterMulti_Receiver.idl | 18 - .../InterMulti/Receiver/InterMulti_Receiver.mpc | 132 - .../Receiver/InterMulti_Receiver_exec.cpp | 315 - .../InterMulti/Receiver/InterMulti_Receiver_exec.h | 197 - .../ami4ccm/tests/InterMulti/Sender/.gitignore | 5 - .../tests/InterMulti/Sender/InterMulti_Sender.idl | 23 - .../tests/InterMulti/Sender/InterMulti_Sender.mpc | 133 - .../InterMulti/Sender/InterMulti_Sender_exec.cpp | 410 - .../InterMulti/Sender/InterMulti_Sender_exec.h | 261 - .../ami4ccm/tests/InterMulti/descriptors/Plan.cdp | 679 - .../tests/InterMulti/descriptors/PlanSyncPort.cdp | 736 - .../tests/InterMulti/descriptors/run_test.pl | 259 - .../ami4ccm/tests/InterOutArgs/.gitignore | 1 - .../ami4ccm/tests/InterOutArgs/Base/.gitignore | 11 - .../tests/InterOutArgs/Base/InterOutArgsT.idl | 77 - .../tests/InterOutArgs/Base/InterOutArgsT.mpc | 191 - .../ami4ccm/tests/InterOutArgs/Receiver/.gitignore | 5 - .../Receiver/InterOutArgsT_Receiver.idl | 16 - .../Receiver/InterOutArgsT_Receiver.mpc | 132 - .../Receiver/InterOutArgsT_Receiver_exec.cpp | 188 - .../Receiver/InterOutArgsT_Receiver_exec.h | 144 - .../ami4ccm/tests/InterOutArgs/Sender/.gitignore | 5 - .../InterOutArgs/Sender/InterOutArgsT_Sender.idl | 19 - .../InterOutArgs/Sender/InterOutArgsT_Sender.mpc | 133 - .../Sender/InterOutArgsT_Sender_exec.cpp | 379 - .../Sender/InterOutArgsT_Sender_exec.h | 168 - .../tests/InterOutArgs/descriptors/Plan.cdp | 374 - .../tests/InterOutArgs/descriptors/run_test.pl | 243 - .../ami4ccm/tests/InterReturn/.gitignore | 1 - .../ami4ccm/tests/InterReturn/Base/.gitignore | 11 - .../tests/InterReturn/Base/InterReturnT.idl | 80 - .../tests/InterReturn/Base/InterReturnT.mpc | 191 - .../ami4ccm/tests/InterReturn/Receiver/.gitignore | 5 - .../InterReturn/Receiver/InterReturnT_Receiver.idl | 16 - .../InterReturn/Receiver/InterReturnT_Receiver.mpc | 132 - .../Receiver/InterReturnT_Receiver_exec.cpp | 236 - .../Receiver/InterReturnT_Receiver_exec.h | 163 - .../ami4ccm/tests/InterReturn/Sender/.gitignore | 5 - .../InterReturn/Sender/InterReturnT_Sender.idl | 19 - .../InterReturn/Sender/InterReturnT_Sender.mpc | 133 - .../Sender/InterReturnT_Sender_exec.cpp | 533 - .../InterReturn/Sender/InterReturnT_Sender_exec.h | 218 - .../ami4ccm/tests/InterReturn/descriptors/Plan.cdp | 375 - .../tests/InterReturn/descriptors/PlanSyncPort.cdp | 377 - .../tests/InterReturn/descriptors/run_test.pl | 257 - .../ami4ccm/tests/NoConnection/Base/HelloT.idl | 23 - .../ami4ccm/tests/NoConnection/Base/HelloT.mpc | 191 - .../NoConnection/Receiver/HelloT_Receiver.idl | 16 - .../NoConnection/Receiver/HelloT_Receiver.mpc | 132 - .../NoConnection/Receiver/HelloT_Receiver_exec.cpp | 160 - .../NoConnection/Receiver/HelloT_Receiver_exec.h | 132 - .../tests/NoConnection/Sender/HelloT_Sender.idl | 19 - .../tests/NoConnection/Sender/HelloT_Sender.mpc | 133 - .../NoConnection/Sender/HelloT_Sender_exec.cpp | 361 - .../tests/NoConnection/Sender/HelloT_Sender_exec.h | 167 - .../tests/NoConnection/descriptors/Plan.cdp | 376 - .../tests/NoConnection/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/tests/NoReplyH/.gitignore | 1 - .../ami4ccm/tests/NoReplyH/Base/.gitignore | 11 - .../ami4ccm/tests/NoReplyH/Base/NoReplyH.idl | 35 - .../ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc | 191 - .../ami4ccm/tests/NoReplyH/Receiver/.gitignore | 5 - .../tests/NoReplyH/Receiver/NoReplyH_Receiver.idl | 16 - .../tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc | 132 - .../NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp | 210 - .../NoReplyH/Receiver/NoReplyH_Receiver_exec.h | 142 - .../ami4ccm/tests/NoReplyH/Sender/.gitignore | 5 - .../tests/NoReplyH/Sender/NoReplyH_Sender.idl | 19 - .../tests/NoReplyH/Sender/NoReplyH_Sender.mpc | 132 - .../tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp | 325 - .../tests/NoReplyH/Sender/NoReplyH_Sender_exec.h | 181 - .../ami4ccm/tests/NoReplyH/descriptors/Plan.cdp | 374 - .../ami4ccm/tests/NoReplyH/descriptors/run_test.pl | 243 - .../connectors/ami4ccm/tests/OneProcess/.gitignore | 1 - .../ami4ccm/tests/OneProcess/Base/.gitignore | 11 - .../ami4ccm/tests/OneProcess/Base/OneProcess.idl | 25 - .../ami4ccm/tests/OneProcess/Base/OneProcess.mpc | 191 - .../ami4ccm/tests/OneProcess/Receiver/.gitignore | 5 - .../OneProcess/Receiver/OneProcess_Receiver.idl | 16 - .../OneProcess/Receiver/OneProcess_Receiver.mpc | 131 - .../Receiver/OneProcess_Receiver_exec.cpp | 152 - .../OneProcess/Receiver/OneProcess_Receiver_exec.h | 131 - .../ami4ccm/tests/OneProcess/Sender/.gitignore | 5 - .../tests/OneProcess/Sender/OneProcess_Sender.idl | 19 - .../tests/OneProcess/Sender/OneProcess_Sender.mpc | 133 - .../OneProcess/Sender/OneProcess_Sender_exec.cpp | 293 - .../OneProcess/Sender/OneProcess_Sender_exec.h | 148 - .../ami4ccm/tests/OneProcess/descriptors/Plan.cdp | 374 - .../tests/OneProcess/descriptors/run_test.pl | 244 - CIAO/connectors/ami4ccm/tests/OneReplyH/.gitignore | 1 - .../ami4ccm/tests/OneReplyH/Base/.gitignore | 11 - .../ami4ccm/tests/OneReplyH/Base/OneReplyH.idl | 37 - .../ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc | 191 - .../ami4ccm/tests/OneReplyH/Receiver/.gitignore | 5 - .../OneReplyH/Receiver/OneReplyH_Receiver.idl | 16 - .../OneReplyH/Receiver/OneReplyH_Receiver.mpc | 132 - .../OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp | 170 - .../OneReplyH/Receiver/OneReplyH_Receiver_exec.h | 137 - .../ami4ccm/tests/OneReplyH/Sender/.gitignore | 5 - .../tests/OneReplyH/Sender/OneReplyH_Sender.idl | 19 - .../tests/OneReplyH/Sender/OneReplyH_Sender.mpc | 133 - .../OneReplyH/Sender/OneReplyH_Sender_exec.cpp | 340 - .../tests/OneReplyH/Sender/OneReplyH_Sender_exec.h | 170 - .../ami4ccm/tests/OneReplyH/descriptors/Plan.cdp | 374 - .../tests/OneReplyH/descriptors/run_test.pl | 243 - .../ami4ccm/tests/PragmaT/Base/PragmaT.idl | 35 - .../ami4ccm/tests/PragmaT/Base/PragmaT.mpc | 191 - CIAO/connectors/ami4ccm/tests/PragmaT/README | 7 - .../tests/PragmaT/Receiver/PragmaT_Receiver.idl | 16 - .../tests/PragmaT/Receiver/PragmaT_Receiver.mpc | 133 - .../PragmaT/Receiver/PragmaT_Receiver_exec.cpp | 164 - .../tests/PragmaT/Receiver/PragmaT_Receiver_exec.h | 68 - .../tests/PragmaT/Sender/PragmaT_Sender.idl | 19 - .../tests/PragmaT/Sender/PragmaT_Sender.mpc | 134 - .../tests/PragmaT/Sender/PragmaT_Sender_exec.cpp | 400 - .../tests/PragmaT/Sender/PragmaT_Sender_exec.h | 184 - .../ami4ccm/tests/PragmaT/descriptors/Plan.cdp | 374 - .../ami4ccm/tests/PragmaT/descriptors/run_test.pl | 243 - .../ami4ccm/tests/SimplexMulti/.gitignore | 1 - .../ami4ccm/tests/SimplexMulti/Base/UsesSM.idl | 32 - .../ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc | 192 - .../SimplexMulti/Receiver/UsesSM_Receiver.idl | 17 - .../SimplexMulti/Receiver/UsesSM_Receiver.mpc | 132 - .../SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp | 230 - .../SimplexMulti/Receiver/UsesSM_Receiver_exec.h | 167 - .../tests/SimplexMulti/Sender/UsesSM_Sender.idl | 25 - .../tests/SimplexMulti/Sender/UsesSM_Sender.mpc | 133 - .../SimplexMulti/Sender/UsesSM_Sender_exec.cpp | 371 - .../tests/SimplexMulti/Sender/UsesSM_Sender_exec.h | 210 - .../tests/SimplexMulti/descriptors/Plan.cdp | 697 - .../tests/SimplexMulti/descriptors/run_test.pl | 243 - .../ami4ccm/tests/SyncPortConn/Base/Hello.idl | 35 - .../tests/SyncPortConn/Base/SyncPortConn.mpc | 190 - .../tests/SyncPortConn/Receiver/Hello_Receiver.idl | 16 - .../tests/SyncPortConn/Receiver/Hello_Receiver.mpc | 133 - .../SyncPortConn/Receiver/Hello_Receiver_exec.cpp | 142 - .../SyncPortConn/Receiver/Hello_Receiver_exec.h | 66 - .../tests/SyncPortConn/Sender/Hello_Sender.idl | 19 - .../tests/SyncPortConn/Sender/Hello_Sender.mpc | 134 - .../SyncPortConn/Sender/Hello_Sender_exec.cpp | 400 - .../tests/SyncPortConn/Sender/Hello_Sender_exec.h | 186 - .../tests/SyncPortConn/descriptors/Plan.cdp | 394 - .../descriptors/Plan_no_sync_amiconn.cdp | 394 - .../tests/SyncPortConn/descriptors/run_test.pl | 264 - .../ami4ccm/tests/ThreeComp/Base/ThreeComp.idl | 33 - .../ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc | 216 - .../tests/ThreeComp/Base/ThreeComp_no_ami.idl | 15 - .../tests/ThreeComp/Master/ThreeComp_Master.idl | 19 - .../tests/ThreeComp/Master/ThreeComp_Master.mpc | 132 - .../ThreeComp/Master/ThreeComp_Master_exec.cpp | 252 - .../tests/ThreeComp/Master/ThreeComp_Master_exec.h | 152 - CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt | 8 - .../ThreeComp/Receiver/ThreeComp_Receiver.idl | 16 - .../ThreeComp/Receiver/ThreeComp_Receiver.mpc | 132 - .../ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp | 169 - .../ThreeComp/Receiver/ThreeComp_Receiver_exec.h | 133 - .../tests/ThreeComp/Sender/ThreeComp_Sender.idl | 24 - .../tests/ThreeComp/Sender/ThreeComp_Sender.mpc | 133 - .../ThreeComp/Sender/ThreeComp_Sender_exec.cpp | 344 - .../tests/ThreeComp/Sender/ThreeComp_Sender_exec.h | 214 - .../ami4ccm/tests/ThreeComp/descriptors/Plan.cdp | 813 - .../tests/ThreeComp/descriptors/run_test.pl | 243 - CIAO/connectors/ami4ccm/tests/UsesMulti/.gitignore | 1 - .../ami4ccm/tests/UsesMulti/Base/.gitignore | 11 - .../ami4ccm/tests/UsesMulti/Base/UsesMulti.idl | 25 - .../ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc | 192 - .../ami4ccm/tests/UsesMulti/Receiver/.gitignore | 5 - .../UsesMulti/Receiver/UsesMulti_Receiver.idl | 16 - .../UsesMulti/Receiver/UsesMulti_Receiver.mpc | 132 - .../UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp | 173 - .../UsesMulti/Receiver/UsesMulti_Receiver_exec.h | 131 - .../ami4ccm/tests/UsesMulti/Sender/.gitignore | 5 - .../tests/UsesMulti/Sender/UsesMulti_Sender.idl | 19 - .../tests/UsesMulti/Sender/UsesMulti_Sender.mpc | 133 - .../UsesMulti/Sender/UsesMulti_Sender_exec.cpp | 276 - .../tests/UsesMulti/Sender/UsesMulti_Sender_exec.h | 158 - .../ami4ccm/tests/UsesMulti/descriptors/Plan.cdp | 549 - .../tests/UsesMulti/descriptors/PlanSyncPort.cdp | 558 - .../tests/UsesMulti/descriptors/run_test.pl | 257 - .../ami4ccm/tutorials/Hello/Hello_asm/.gitignore | 3 - .../Hello_asm/Deployment/descriptors/Plan.cdp | 374 - .../Hello/Hello_asm/Deployment/scripts/run_test.pl | 243 - .../Receiver_comp/src/Hello_Receiver_comp.idl | 16 - .../Receiver_comp/src/Hello_Receiver_comp.mpc | 162 - .../Receiver_comp/src/Hello_Receiver_comp_exec.cpp | 181 - .../Receiver_comp/src/Hello_Receiver_comp_exec.h | 126 - .../Sender_comp/src/Hello_Sender_comp.idl | 19 - .../Sender_comp/src/Hello_Sender_comp.mpc | 156 - .../Sender_comp/src/Hello_Sender_comp_exec.cpp | 342 - .../Sender_comp/src/Hello_Sender_comp_exec.h | 164 - .../tutorials/Hello/Hello_asm/doc/AMI4CCM.emx | 398 - .../Hello/Hello_asm/doc/AMI4CCM_Hello.jpg | Bin 131253 -> 0 bytes .../Hello/Hello_asm/ports/Hello_Common_defn.idl | 17 - .../Hello/Hello_asm/ports/Hello_Common_defn.mpc | 34 - .../Hello/Hello_asm/ports/Hello_MyFoo_obj.idl | 35 - .../Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc | 204 - .../tutorials/Hello/Tutorial/01_general.html | 94 - .../ami4ccm/tutorials/Hello/Tutorial/02_idl.html | 96 - .../tutorials/Hello/Tutorial/03_executors.html | 54 - .../tutorials/Hello/Tutorial/04_ami4ccm.html | 102 - .../tutorials/Hello/Tutorial/05_compilation.html | 213 - .../Tutorial/Code/Deployment/descriptors/Plan.cdp | 374 - .../Code/Deployment/descriptors/artifacts.cdp | 108 - .../Code/Deployment/descriptors/connections.cdp | 53 - .../Code/Deployment/descriptors/implementation.cdp | 51 - .../Code/Deployment/descriptors/instance.cdp | 55 - .../GeneratedExec/Hello_Receiver_comp_exec.cpp | 168 - .../Code/GeneratedExec/Hello_Receiver_comp_exec.h | 124 - .../Code/GeneratedExec/Hello_Sender_comp_exec.cpp | 175 - .../Code/GeneratedExec/Hello_Sender_comp_exec.h | 150 - .../ImplementedExec/Hello_Receiver_comp_exec.cpp | 181 - .../ImplementedExec/Hello_Receiver_comp_exec.h | 126 - .../ImplementedExec/Hello_Sender_comp_exec.cpp | 338 - .../Code/ImplementedExec/Hello_Sender_comp_exec.h | 164 - .../tutorials/Hello/Tutorial/images/images.png | Bin 5359 -> 0 bytes .../tutorials/Hello/Tutorial/images/system.png | Bin 7264 -> 0 bytes CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html | 199 - .../dds4ccm/docs/DDS4CCM Cheat Sheet.rtf | 331 - CIAO/connectors/dds4ccm/docs/TestCoverage.ods | Bin 19242 -> 0 bytes CIAO/connectors/dds4ccm/docs/details.txt | 5 - CIAO/connectors/dds4ccm/examples/Hello/.gitignore | 1 - .../dds4ccm/examples/Hello/Base/.gitignore | 11 - .../dds4ccm/examples/Hello/Base/Hello_Base.idl | 23 - .../dds4ccm/examples/Hello/Base/Hello_Base.mpc | 24 - .../examples/Hello/Connector/Hello_Connector.idl | 24 - .../examples/Hello/Connector/Hello_Connector.mpc | 149 - .../examples/Hello/DDS_Receiver/DDS_Receiver.mpc | 9 - .../examples/Hello/DDS_Receiver/Hello_Receiver.cpp | 167 - .../examples/Hello/DDS_Sender/DDS_Sender.mpc | 9 - .../examples/Hello/DDS_Sender/Hello_Sender.cpp | 150 - .../dds4ccm/examples/Hello/Receiver/.gitignore | 7 - .../examples/Hello/Receiver/Hello_Receiver.idl | 23 - .../examples/Hello/Receiver/Hello_Receiver.mpc | 141 - .../Hello/Receiver/Hello_Receiver_exec.cpp | 376 - .../examples/Hello/Receiver/Hello_Receiver_exec.h | 213 - .../dds4ccm/examples/Hello/Sender/.gitignore | 7 - .../dds4ccm/examples/Hello/Sender/Hello_Sender.idl | 23 - .../dds4ccm/examples/Hello/Sender/Hello_Sender.mpc | 141 - .../examples/Hello/Sender/Hello_Sender_exec.cpp | 383 - .../examples/Hello/Sender/Hello_Sender_exec.h | 196 - .../dds4ccm/examples/Hello/descriptors/1_to_5.cdp | 1049 - .../examples/Hello/descriptors/5_Receivers.cdp | 1042 - .../examples/Hello/descriptors/5_Senders.cdp | 883 - .../dds4ccm/examples/Hello/descriptors/5_to_1.cdp | 1044 - .../examples/Hello/descriptors/DeploymentPlan.cdp | 464 - .../Hello/descriptors/HelloTest_Library.xml | 30 - .../examples/Hello/descriptors/ReceiverOnly.cdp | 249 - .../examples/Hello/descriptors/SenderOnly.cdp | 200 - .../Hello/descriptors/USER_QOS_PROFILES.xml | 64 - .../examples/Hello/descriptors/run_1_to_5.pl | 244 - .../examples/Hello/descriptors/run_5_to_1.pl | 244 - .../examples/Hello/descriptors/run_5_to_5.pl | 251 - .../examples/Hello/descriptors/run_receiver.pl | 243 - .../examples/Hello/descriptors/run_sender.pl | 243 - .../dds4ccm/examples/Hello/descriptors/run_test.pl | 245 - .../examples/Hello/descriptors/run_test_dds.pl | 25 - .../IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl | 26 - .../IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc | 81 - .../IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl | 23 - .../IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc | 22 - .../IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h | 21 - .../Shapes/Common/I2C_Shapes_Common.cpp | 126 - .../Shapes/Common/I2C_Shapes_Common.h | 52 - .../Shapes/Common/I2C_Shapes_Common.mpc | 23 - .../Shapes/Common/I2C_Shapes_Common_export.h | 35 - .../Shapes/Receiver/I2C_Shapes_Receiver.cpp | 95 - .../Shapes/Receiver/I2C_Shapes_Receiver.mpc | 21 - .../Shapes/Sender/I2C_Shapes_Sender.cpp | 102 - .../Shapes/Sender/I2C_Shapes_Sender.mpc | 19 - .../Shapes/descriptors/USER_QOS_PROFILES.xml | 67 - .../IDL2CPPWrapper/Shapes/descriptors/run_test.pl | 32 - .../dds4ccm/examples/Large_Deployment/.gitignore | 1 - .../examples/Large_Deployment/Common/.gitignore | 7 - .../examples/Large_Deployment/Common/Common.idl | 18 - .../examples/Large_Deployment/Common/Common.mpc | 22 - .../Common/Single_Service_Common.idl | 11 - .../Common/Single_Service_Common.mpc | 104 - .../examples/Large_Deployment/Connector/.gitignore | 8 - .../Large_Deployment/Connector/Large_Connector.idl | 17 - .../Large_Deployment/Connector/Large_Connector.mpc | 138 - .../examples/Large_Deployment/DDS_Pub/.gitignore | 5 - .../examples/Large_Deployment/DDS_Pub/DDS_Pub.idl | 14 - .../examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc | 138 - .../Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp | 70 - .../Large_Deployment/DDS_Pub/DDS_Pub_exec.h | 52 - .../examples/Large_Deployment/DDS_Sub/.gitignore | 5 - .../examples/Large_Deployment/DDS_Sub/DDS_Sub.idl | 13 - .../examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc | 136 - .../Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp | 180 - .../Large_Deployment/DDS_Sub/DDS_Sub_exec.h | 158 - .../Large_Deployment/Single_Service/.gitignore | 5 - .../Single_Service/Single_Service.idl | 12 - .../Single_Service/Single_Service.mpc | 146 - .../Large_Deployment/descriptors/LargePlan.cdp | 90685 ------------------- .../descriptors/generate_large_plan.py | 247 - .../Large_Deployment/descriptors/run_test.pl | 235 - CIAO/connectors/dds4ccm/examples/Quoter/.gitignore | 1 - .../dds4ccm/examples/Quoter/Base/.gitignore | 7 - .../dds4ccm/examples/Quoter/Base/Quoter_Base.idl | 30 - .../dds4ccm/examples/Quoter/Base/Quoter_Base.mpc | 24 - .../dds4ccm/examples/Quoter/Broker/.gitignore | 5 - .../dds4ccm/examples/Quoter/Broker/Broker.idl | 19 - .../dds4ccm/examples/Quoter/Broker/Broker.mpc | 138 - .../dds4ccm/examples/Quoter/Broker/Broker_exec.cpp | 218 - .../dds4ccm/examples/Quoter/Broker/Broker_exec.h | 167 - .../dds4ccm/examples/Quoter/Connector/.gitignore | 7 - .../examples/Quoter/Connector/Quoter_Connector.idl | 22 - .../examples/Quoter/Connector/Quoter_Connector.mpc | 142 - .../dds4ccm/examples/Quoter/Distributor/.gitignore | 5 - .../examples/Quoter/Distributor/Distributor.idl | 30 - .../examples/Quoter/Distributor/Distributor.mpc | 138 - .../Quoter/Distributor/Distributor_exec.cpp | 354 - .../examples/Quoter/Distributor/Distributor_exec.h | 196 - .../dds4ccm/examples/Quoter/descriptors/Plan.cdp | 426 - .../examples/Quoter/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/examples/Shapes/.gitignore | 1 - .../dds4ccm/examples/Shapes/Base/.gitignore | 7 - .../dds4ccm/examples/Shapes/Base/Shapes_Base.idl | 59 - .../dds4ccm/examples/Shapes/Base/Shapes_Base.mpc | 24 - .../dds4ccm/examples/Shapes/Connector/.gitignore | 7 - .../examples/Shapes/Connector/Shapes_Connector.idl | 24 - .../examples/Shapes/Connector/Shapes_Connector.mpc | 142 - .../dds4ccm/examples/Shapes/Receiver/.gitignore | 5 - .../examples/Shapes/Receiver/Shapes_Receiver.idl | 24 - .../examples/Shapes/Receiver/Shapes_Receiver.mpc | 138 - .../Shapes/Receiver/Shapes_Receiver_exec.cpp | 577 - .../Shapes/Receiver/Shapes_Receiver_exec.h | 260 - .../dds4ccm/examples/Shapes/Sender/.gitignore | 5 - .../examples/Shapes/Sender/Shapes_Sender.idl | 24 - .../examples/Shapes/Sender/Shapes_Sender.mpc | 138 - .../examples/Shapes/Sender/Shapes_Sender_exec.cpp | 407 - .../examples/Shapes/Sender/Shapes_Sender_exec.h | 177 - .../Shapes/descriptors/2013_interop_demo/run_1.cdp | 498 - .../Shapes/descriptors/2013_interop_demo/run_1.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_2.cdp | 1123 - .../Shapes/descriptors/2013_interop_demo/run_2.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_2.xml | 42 - .../Shapes/descriptors/2013_interop_demo/run_3.cdp | 1123 - .../Shapes/descriptors/2013_interop_demo/run_3.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_3.xml | 42 - .../Shapes/descriptors/2013_interop_demo/run_4.cdp | 520 - .../Shapes/descriptors/2013_interop_demo/run_4.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_4.xml | 26 - .../Shapes/descriptors/2013_interop_demo/run_6.cdp | 1123 - .../Shapes/descriptors/2013_interop_demo/run_6.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_6.xml | 54 - .../Shapes/descriptors/2013_interop_demo/run_7.cdp | 520 - .../Shapes/descriptors/2013_interop_demo/run_7.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_7.xml | 21 - .../Shapes/descriptors/2013_interop_demo/run_8.cdp | 840 - .../Shapes/descriptors/2013_interop_demo/run_8.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_8.xml | 21 - .../Shapes/descriptors/2013_interop_demo/run_9.cdp | 520 - .../Shapes/descriptors/2013_interop_demo/run_9.pl | 244 - .../Shapes/descriptors/2013_interop_demo/run_9.xml | 12 - .../dds4ccm/examples/Shapes/descriptors/Plan.cdp | 498 - .../examples/Shapes/descriptors/run_test.pl | 244 - .../dds4ccm/examples/Shapes/models/README | 19 - .../Shapes/models/Shapes-complete-delegation.xme | 19753 ---- .../examples/Shapes/models/Shapes-complete.xme | 19194 ---- .../dds4ccm/examples/Shapes/models/Shapes.xme | 37085 -------- .../examples/ShapesContr/Base/Shapes_Base.idl | 59 - .../examples/ShapesContr/Base/Shapes_Base.mpc | 101 - .../ShapesContr/Base/Shapes_Contr_Base.idl | 72 - .../ShapesContr/Connector/Shapes_Connector.idl | 24 - .../ShapesContr/Connector/Shapes_Connector.mpc | 142 - .../ShapesContr/Controller/Shapes_Controller.idl | 30 - .../ShapesContr/Controller/Shapes_Controller.mpc | 136 - .../Controller/Shapes_Controller_exec.cpp | 276 - .../Controller/Shapes_Controller_exec.h | 163 - .../ShapesContr/ControllerR/Shapes_ControllerR.idl | 23 - .../ShapesContr/ControllerR/Shapes_ControllerR.mpc | 116 - .../ControllerR/Shapes_ControllerR_exec.cpp | 249 - .../ControllerR/Shapes_ControllerR_exec.h | 125 - .../connectors/dds4ccm/examples/ShapesContr/README | 23 - .../ShapesContr/Receiver/Shapes_Receiver.idl | 26 - .../ShapesContr/Receiver/Shapes_Receiver.mpc | 140 - .../ShapesContr/Receiver/Shapes_Receiver_exec.cpp | 660 - .../ShapesContr/Receiver/Shapes_Receiver_exec.h | 291 - .../examples/ShapesContr/Sender/Shapes_Sender.idl | 22 - .../examples/ShapesContr/Sender/Shapes_Sender.mpc | 140 - .../ShapesContr/Sender/Shapes_Sender_exec.cpp | 411 - .../ShapesContr/Sender/Shapes_Sender_exec.h | 173 - .../ShapesContr/descriptors/USER_QOS_PROFILES.xml | 69 - .../examples/ShapesContr/descriptors/plan.cdp | 1576 - .../ShapesContr/descriptors/plan_nopub.cdp | 1609 - .../ShapesContr/descriptors/plan_nopub.xml | 42 - .../examples/ShapesContr/descriptors/run_test.pl | 293 - CIAO/connectors/dds4ccm/idl/.gitignore | 75 - CIAO/connectors/dds4ccm/idl/ccm_dds.idl | 281 - CIAO/connectors/dds4ccm/idl/dds/.gitignore | 26 - .../dds4ccm/idl/dds/opendds_lem_stub.mpc | 118 - CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl | 68 - CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl | 32 - .../idl/dds4ccm_ConnectorStatusListener.idl | 31 - .../dds4ccm/idl/dds4ccm_DataListenerControl.idl | 20 - CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl | 145 - .../dds4ccm/idl/dds4ccm_PortStatusListener.idl | 22 - .../connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl | 18 - .../dds4ccm/idl/dds4ccm_StateListenerControl.idl | 19 - CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc | 68 - CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc | 48 - CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc | 89 - CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl | 12 - CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl | 1254 - .../dds4ccm/idl/ndds/ndds_dcps_i_handle.idl | 19 - .../dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl | 10 - .../idl/ndds/ndds_dcps_instance_handleC.cpp | 60 - .../dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h | 41 - .../dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h | 64 - .../dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h | 46 - .../dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc | 49 - .../dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc | 29 - .../dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc | 73 - CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp | 215 - CIAO/connectors/dds4ccm/impl/CCM_DataReader.h | 116 - CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp | 160 - CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h | 100 - .../dds4ccm/impl/Coherent_Changes_Guard.cpp | 22 - .../dds4ccm/impl/Coherent_Changes_Guard.h | 37 - CIAO/connectors/dds4ccm/impl/ConditionManager.cpp | 523 - CIAO/connectors/dds4ccm/impl/ConditionManager.h | 200 - .../dds4ccm/impl/ContentFilterSetting.cpp | 171 - .../connectors/dds4ccm/impl/ContentFilterSetting.h | 48 - .../dds4ccm/impl/DDSCallbackStatusHandler.cpp | 398 - .../dds4ccm/impl/DDSCallbackStatusHandler.h | 160 - .../dds4ccm/impl/DDS_Base_Connector_T.cpp | 1162 - .../connectors/dds4ccm/impl/DDS_Base_Connector_T.h | 218 - .../dds4ccm/impl/DDS_Event_Connector_T.cpp | 572 - .../dds4ccm/impl/DDS_Event_Connector_T.h | 132 - CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp | 57 - CIAO/connectors/dds4ccm/impl/DDS_Get_T.h | 62 - CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp | 93 - CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h | 68 - CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp | 13 - CIAO/connectors/dds4ccm/impl/DDS_Read_T.h | 22 - CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp | 95 - CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h | 60 - .../dds4ccm/impl/DDS_State_Connector_T.cpp | 744 - .../dds4ccm/impl/DDS_State_Connector_T.h | 209 - .../dds4ccm/impl/DDS_Subscriber_Base_T.cpp | 333 - .../dds4ccm/impl/DDS_Subscriber_Base_T.h | 83 - .../dds4ccm/impl/DDS_TopicBase_Connector_T.cpp | 414 - .../dds4ccm/impl/DDS_TopicBase_Connector_T.h | 75 - CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp | 212 - CIAO/connectors/dds4ccm/impl/DDS_Update_T.h | 56 - CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp | 210 - CIAO/connectors/dds4ccm/impl/DDS_Write_T.h | 64 - .../dds4ccm/impl/DataListenerControl_T.cpp | 48 - .../dds4ccm/impl/DataListenerControl_T.h | 47 - .../dds4ccm/impl/DataReaderHandler_T.cpp | 53 - CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h | 39 - .../dds4ccm/impl/DataReaderListener_T.cpp | 292 - .../connectors/dds4ccm/impl/DataReaderListener_T.h | 126 - .../dds4ccm/impl/DataReaderStateListener_T.cpp | 344 - .../dds4ccm/impl/DataReaderStateListener_T.h | 126 - .../dds4ccm/impl/DomainParticipantManager.cpp | 291 - .../dds4ccm/impl/DomainParticipantManager.h | 145 - CIAO/connectors/dds4ccm/impl/Getter_T.cpp | 448 - CIAO/connectors/dds4ccm/impl/Getter_T.h | 173 - .../dds4ccm/impl/InstanceHandleManager_T.cpp | 78 - .../dds4ccm/impl/InstanceHandleManager_T.h | 56 - CIAO/connectors/dds4ccm/impl/LocalObject.cpp | 27 - CIAO/connectors/dds4ccm/impl/LocalObject.h | 33 - CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp | 35 - CIAO/connectors/dds4ccm/impl/LocalObject_T.h | 36 - .../connectors/dds4ccm/impl/PortStatusListener.cpp | 233 - CIAO/connectors/dds4ccm/impl/PortStatusListener.h | 77 - CIAO/connectors/dds4ccm/impl/PublisherListener.cpp | 350 - CIAO/connectors/dds4ccm/impl/PublisherListener.h | 77 - CIAO/connectors/dds4ccm/impl/Reader_T.cpp | 385 - CIAO/connectors/dds4ccm/impl/Reader_T.h | 104 - CIAO/connectors/dds4ccm/impl/SampleInfo.h | 49 - .../dds4ccm/impl/StateListenerControl_T.cpp | 32 - .../dds4ccm/impl/StateListenerControl_T.h | 36 - .../connectors/dds4ccm/impl/SubscriberListener.cpp | 334 - CIAO/connectors/dds4ccm/impl/SubscriberListener.h | 79 - CIAO/connectors/dds4ccm/impl/TimeUtilities.h | 38 - CIAO/connectors/dds4ccm/impl/TopicListener.cpp | 118 - CIAO/connectors/dds4ccm/impl/TopicListener.h | 45 - CIAO/connectors/dds4ccm/impl/Updater_T.cpp | 319 - CIAO/connectors/dds4ccm/impl/Updater_T.h | 85 - CIAO/connectors/dds4ccm/impl/Utils.cpp | 73 - CIAO/connectors/dds4ccm/impl/Utils.h | 217 - CIAO/connectors/dds4ccm/impl/Writer_T.cpp | 108 - CIAO/connectors/dds4ccm/impl/Writer_T.h | 57 - CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h | 50 - .../dds4ccm/impl/dds4ccm_dds_impl_export.h | 55 - CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc | 33 - CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h | 32 - .../dds4ccm/impl/logger/DDS4CCM_Logger_Export.h | 57 - CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp | 5 - CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h | 161 - .../dds4ccm/impl/logger/Logger_Service.cpp | 172 - .../dds4ccm/impl/logger/Logger_Service.h | 38 - .../dds4ccm/impl/logger/dds4ccm_logger.mpc | 21 - CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp | 50 - CIAO/connectors/dds4ccm/impl/ndds/Condition.h | 48 - .../dds4ccm/impl/ndds/ContentFilteredTopic.cpp | 109 - .../dds4ccm/impl/ndds/ContentFilteredTopic.h | 61 - CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp | 11 - CIAO/connectors/dds4ccm/impl/ndds/DataReader.h | 34 - .../dds4ccm/impl/ndds/DataReaderListener.cpp | 112 - .../dds4ccm/impl/ndds/DataReaderListener.h | 59 - CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp | 1003 - CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h | 228 - CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp | 13 - CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h | 37 - .../dds4ccm/impl/ndds/DataWriterListener.cpp | 83 - .../dds4ccm/impl/ndds/DataWriterListener.h | 57 - CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp | 490 - CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h | 131 - .../dds4ccm/impl/ndds/DomainParticipant.cpp | 1189 - .../dds4ccm/impl/ndds/DomainParticipant.h | 187 - .../dds4ccm/impl/ndds/DomainParticipantFactory.cpp | 340 - .../dds4ccm/impl/ndds/DomainParticipantFactory.h | 69 - .../impl/ndds/DomainParticipantListener.cpp | 264 - .../dds4ccm/impl/ndds/DomainParticipantListener.h | 110 - CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp | 471 - CIAO/connectors/dds4ccm/impl/ndds/Publisher.h | 120 - .../dds4ccm/impl/ndds/PublisherListener.cpp | 137 - .../dds4ccm/impl/ndds/PublisherListener.h | 69 - .../dds4ccm/impl/ndds/QueryCondition.cpp | 122 - CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h | 64 - .../connectors/dds4ccm/impl/ndds/ReadCondition.cpp | 89 - CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h | 57 - .../dds4ccm/impl/ndds/StatusCondition.cpp | 72 - .../connectors/dds4ccm/impl/ndds/StatusCondition.h | 53 - CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp | 617 - CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h | 141 - .../dds4ccm/impl/ndds/SubscriberListener.cpp | 163 - .../dds4ccm/impl/ndds/SubscriberListener.h | 78 - CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp | 204 - CIAO/connectors/dds4ccm/impl/ndds/Topic.h | 73 - .../dds4ccm/impl/ndds/TopicDescription.cpp | 59 - .../dds4ccm/impl/ndds/TopicDescription.h | 50 - .../connectors/dds4ccm/impl/ndds/TopicListener.cpp | 41 - CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h | 42 - CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp | 329 - CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h | 149 - CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp | 56 - CIAO/connectors/dds4ccm/impl/ndds/Utils.h | 22 - CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp | 233 - CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h | 121 - .../impl/ndds/convertors/BuiltinTopicKey_t.h | 22 - .../dds4ccm/impl/ndds/convertors/DataReaderQos.h | 69 - .../convertors/DataReaderResourceLimitsQosPolicy.h | 62 - .../dds4ccm/impl/ndds/convertors/DataWriterQos.h | 71 - .../convertors/DataWriterResourceLimitsQosPolicy.h | 40 - .../impl/ndds/convertors/DeadlineQosPolicy.h | 25 - .../ndds/convertors/DestinationOrderQosPolicy.h | 29 - .../ndds/convertors/DomainParticipantFactoryQos.h | 25 - .../impl/ndds/convertors/DomainParticipantQos.h | 29 - .../impl/ndds/convertors/DurabilityQosPolicy.h | 24 - .../ndds/convertors/DurabilityServiceQosPolicy.h | 35 - .../dds4ccm/impl/ndds/convertors/Duration_t.h | 28 - .../impl/ndds/convertors/EntityFactoryQosPolicy.h | 24 - .../impl/ndds/convertors/GroupDataQosPolicy.h | 25 - .../impl/ndds/convertors/HistoryQosPolicy.h | 28 - .../impl/ndds/convertors/InconsistentTopicStatus.h | 27 - .../impl/ndds/convertors/InstanceHandleSeq.h | 39 - .../impl/ndds/convertors/InstanceHandle_t.h | 14 - .../impl/ndds/convertors/LatencyBudgetQosPolicy.h | 25 - .../impl/ndds/convertors/LifespanQosPolicy.h | 25 - .../impl/ndds/convertors/LivelinessChangedStatus.h | 34 - .../impl/ndds/convertors/LivelinessLostStatus.h | 27 - .../impl/ndds/convertors/LivelinessQosPolicy.h | 27 - .../dds4ccm/impl/ndds/convertors/OctetSeq.h | 30 - .../ndds/convertors/OfferedDeadlineMissedStatus.h | 30 - .../ndds/convertors/OfferedIncompatibleQosStatus.h | 32 - .../impl/ndds/convertors/OwnershipQosPolicy.h | 24 - .../ndds/convertors/OwnershipStrengthQosPolicy.h | 24 - .../ndds/convertors/ParticipantBuiltinTopicData.h | 27 - .../impl/ndds/convertors/PartitionQosPolicy.h | 26 - .../impl/ndds/convertors/PresentationQosPolicy.h | 28 - .../ndds/convertors/PublicationBuiltinTopicData.h | 75 - .../ndds/convertors/PublicationMatchedStatus.h | 34 - .../dds4ccm/impl/ndds/convertors/PublisherQos.h | 35 - .../impl/ndds/convertors/QosPolicyCountSeq.h | 35 - .../ndds/convertors/ReaderDataLifecycleQosPolicy.h | 28 - .../impl/ndds/convertors/ReliabilityQosPolicy.h | 27 - .../ReliableReaderActivityChangedStatus.h | 33 - .../convertors/ReliableWriterCacheChangedStatus.h | 42 - .../convertors/RequestedDeadlineMissedStatus.h | 29 - .../convertors/RequestedIncompatibleQosStatus.h | 32 - .../impl/ndds/convertors/ResourceLimitsQosPolicy.h | 34 - .../dds4ccm/impl/ndds/convertors/SampleInfoSeq.h | 43 - .../impl/ndds/convertors/SampleLostStatus.h | 27 - .../impl/ndds/convertors/SampleRejectedStatus.h | 32 - .../dds4ccm/impl/ndds/convertors/StringSeq.h | 36 - .../dds4ccm/impl/ndds/convertors/SubscriberQos.h | 35 - .../ndds/convertors/SubscriptionBuiltinTopicData.h | 74 - .../ndds/convertors/SubscriptionMatchedStatus.h | 35 - .../ndds/convertors/TimeBasedFilterQosPolicy.h | 25 - .../dds4ccm/impl/ndds/convertors/Time_t.h | 28 - .../impl/ndds/convertors/TopicBuiltinTopicData.h | 66 - .../impl/ndds/convertors/TopicDataQosPolicy.h | 25 - .../dds4ccm/impl/ndds/convertors/TopicQos.h | 62 - .../ndds/convertors/TransportPriorityQosPolicy.h | 24 - .../TypeConsistencyEnforcementQosPolicy.h | 28 - .../impl/ndds/convertors/UserDataQosPolicy.h | 25 - .../ndds/convertors/WriterDataLifecycleQosPolicy.h | 24 - .../dds4ccm/impl/ndds/dds4ccm_ndds_export.h | 35 - .../connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc | 40 - CIAO/connectors/dds4ccm/models/README | 12 - CIAO/connectors/dds4ccm/models/dds4ccm.xme | 17214 ---- .../performance-tests/DDSLatency/.gitignore | 1 - .../DDSLatency/Base/Latency_Base.idl | 14 - .../DDSLatency/Base/Latency_Base.mpc | 26 - .../DDSLatency/DDS_Receiver/DDS_Receiver.mpc | 15 - .../DDSLatency/DDS_Receiver/Latency_Receiver.cpp | 361 - .../DDSLatency/DDS_Sender/DDS_Sender.mpc | 31 - .../DDSLatency/DDS_Sender/Latency_Sender.cpp | 774 - .../DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp | 715 - .../DDSLatency/descriptors/USER_QOS_PROFILES.xml | 184 - .../DDSLatency/descriptors/run_test_dds.pl | 47 - .../DDSLatency/descriptors/run_test_ndds.pl | 47 - .../performance-tests/DDSThroughput/.gitignore | 1 - .../DDSThroughput/Base/.gitignore | 7 - .../DDSThroughput/Base/Throughput_Base.idl | 34 - .../DDSThroughput/Base/Throughput_Base.mpc | 26 - .../DDSThroughput/DDS_Receiver/.gitignore | 1 - .../DDSThroughput/DDS_Receiver/DDS_Receiver.mpc | 15 - .../DDS_Receiver/Throughput_Receiver.cpp | 397 - .../DDSThroughput/DDS_Sender/.gitignore | 1 - .../DDSThroughput/DDS_Sender/DDS_Sender.mpc | 15 - .../DDSThroughput/DDS_Sender/Throughput_Sender.cpp | 326 - .../descriptors/USER_QOS_PROFILES.xml | 162 - .../DDSThroughput/descriptors/run_test_dds.pl | 26 - .../dds4ccm/performance-tests/Keyed/.gitignore | 1 - .../Keyed/Base/Perf_Keyed_Test_Base.idl | 37 - .../Keyed/Base/Perf_Keyed_Test_Base.mpc | 24 - .../Keyed/Connector/Perf_Keyed_Test_Connector.idl | 27 - .../Keyed/Connector/Perf_Keyed_Test_Connector.mpc | 142 - .../performance-tests/Keyed/Receiver/.gitignore | 1 - .../Keyed/Receiver/Perf_Keyed_Test_Receiver.idl | 20 - .../Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc | 146 - .../Receiver/Perf_Keyed_Test_Receiver_exec.cpp | 245 - .../Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h | 157 - .../performance-tests/Keyed/Sender/.gitignore | 1 - .../Keyed/Sender/Perf_Keyed_Test_Sender.idl | 28 - .../Keyed/Sender/Perf_Keyed_Test_Sender.mpc | 145 - .../Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp | 671 - .../Keyed/Sender/Perf_Keyed_Test_Sender_exec.h | 278 - .../Keyed/descriptors/KeyedTest_Library.xml | 90 - .../performance-tests/Keyed/descriptors/Plan.cdp | 541 - .../Keyed/descriptors/Plan_pub.cdp | 393 - .../Keyed/descriptors/Plan_pub3.cdp | 393 - .../Keyed/descriptors/Plan_pub_BE.cdp | 392 - .../Keyed/descriptors/Plan_sub.cdp | 247 - .../Keyed/descriptors/Plan_sub_BE.cdp | 248 - .../performance-tests/Keyed/descriptors/README | 25 - .../Keyed/descriptors/USER_QOS_PROFILES.xml | 128 - .../performance-tests/Keyed/descriptors/run_pub.pl | 225 - .../Keyed/descriptors/run_pub3.pl | 225 - .../Keyed/descriptors/run_pub_BE.pl | 225 - .../performance-tests/Keyed/descriptors/run_sub.pl | 225 - .../Keyed/descriptors/run_sub2.pl | 225 - .../Keyed/descriptors/run_sub3.pl | 225 - .../Keyed/descriptors/run_sub_BE.pl | 225 - .../Keyed/descriptors/run_test.pl | 233 - .../dds4ccm/performance-tests/Latency/.gitignore | 1 - .../performance-tests/Latency/Base/.gitignore | 7 - .../Latency/Base/LatencyTT_Test_Base.idl | 27 - .../Latency/Base/LatencyTT_Test_Base.mpc | 24 - .../performance-tests/Latency/Connector/.gitignore | 7 - .../Latency/Connector/LatencyTT_Test_Connector.idl | 27 - .../Latency/Connector/LatencyTT_Test_Connector.mpc | 142 - .../performance-tests/Latency/Receiver/.gitignore | 5 - .../Latency/Receiver/LatencyTT_Test_Receiver.idl | 20 - .../Latency/Receiver/LatencyTT_Test_Receiver.mpc | 148 - .../Receiver/LatencyTT_Test_Receiver_exec.cpp | 183 - .../Receiver/LatencyTT_Test_Receiver_exec.h | 144 - .../performance-tests/Latency/Sender/.gitignore | 5 - .../Latency/Sender/LatencyTT_Test_Sender.idl | 25 - .../Latency/Sender/LatencyTT_Test_Sender.mpc | 144 - .../Latency/Sender/LatencyTT_Test_Sender_exec.cpp | 691 - .../Latency/Sender/LatencyTT_Test_Sender_exec.h | 269 - .../Latency/descriptors/Latency_Library.xml | 87 - .../Latency/descriptors/Plan_SharedMem.cdp | 579 - .../Latency/descriptors/Plan_UDPv4.cdp | 579 - .../performance-tests/Latency/descriptors/README | 15 - .../Latency/descriptors/USER_QOS_PROFILES.xml | 184 - .../Latency/descriptors/run_test.pl | 223 - .../performance-tests/Throughput/.gitignore | 1 - .../Throughput/Base/Throughput_Base.idl | 49 - .../Throughput/Base/Throughput_Base.mpc | 24 - .../Throughput/Connector/Throughput_Connector.idl | 27 - .../Throughput/Connector/Throughput_Connector.mpc | 142 - .../Throughput/Receiver/Throughput_Receiver.idl | 21 - .../Throughput/Receiver/Throughput_Receiver.mpc | 150 - .../Receiver/Throughput_Receiver_exec.cpp | 332 - .../Throughput/Receiver/Throughput_Receiver_exec.h | 197 - .../SecConnector/Throughput_Sec_Connector.idl | 27 - .../SecConnector/Throughput_Sec_Connector.mpc | 141 - .../Throughput/Sender/Throughput_Sender.idl | 29 - .../Throughput/Sender/Throughput_Sender.mpc | 148 - .../Throughput/Sender/Throughput_Sender_exec.cpp | 536 - .../Throughput/Sender/Throughput_Sender_exec.h | 231 - .../Throughput/descriptors/Plan_pub.cdp | 463 - .../Throughput/descriptors/Plan_sub.cdp | 369 - .../Throughput/descriptors/Throughput_Library.xml | 77 - .../Throughput/descriptors/USER_QOS_PROFILES.xml | 139 - .../Throughput/descriptors/run_test.pl | 257 - CIAO/connectors/dds4ccm/tests/.gitignore | 1 - .../dds4ccm/tests/CSLDeadline/.gitignore | 1 - .../CSLDeadline/Base/CSL_DeadlineTest_Base.idl | 24 - .../CSLDeadline/Base/CSL_DeadlineTest_Base.mpc | 24 - .../dds4ccm/tests/CSLDeadline/Connector/.gitignore | 7 - .../Connector/CSL_DeadlineTest_Connector.idl | 22 - .../Connector/CSL_DeadlineTest_Connector.mpc | 142 - .../Receiver/CSL_DeadlineTest_Receiver.idl | 20 - .../Receiver/CSL_DeadlineTest_Receiver.mpc | 135 - .../Receiver/CSL_DeadlineTest_Receiver_exec.cpp | 191 - .../Receiver/CSL_DeadlineTest_Receiver_exec.h | 128 - .../dds4ccm/tests/CSLDeadline/Sender/.gitignore | 5 - .../CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl | 19 - .../CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc | 138 - .../Sender/CSL_DeadlineTest_Sender_exec.cpp | 248 - .../Sender/CSL_DeadlineTest_Sender_exec.h | 104 - .../CSLDeadline/descriptors/HelloTest_Library.xml | 48 - .../dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp | 412 - .../CSLDeadline/descriptors/USER_QOS_PROFILES.xml | 81 - .../tests/CSLDeadline/descriptors/run_test.pl | 242 - CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore | 1 - .../dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl | 24 - .../dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc | 24 - .../CSLQoS/Connector/CSL_QoSTest_Connector.idl | 22 - .../CSLQoS/Connector/CSL_QoSTest_Connector.mpc | 142 - .../tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl | 20 - .../tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc | 135 - .../CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp | 211 - .../CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h | 98 - .../tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl | 20 - .../tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc | 138 - .../CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp | 197 - .../tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h | 87 - .../dds4ccm/tests/CSLQoS/descriptors/Plan.cdp | 373 - .../tests/CSLQoS/descriptors/QoSTest_Library.xml | 44 - .../tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml | 77 - .../dds4ccm/tests/CSLQoS/descriptors/run_test.pl | 243 - .../dds4ccm/tests/CSLSampleRejected/.gitignore | 1 - .../CSLSampleRejected/Base/CSL_SRTest_Base.idl | 23 - .../CSLSampleRejected/Base/CSL_SRTest_Base.mpc | 24 - .../Connector/CSL_SRTest_Connector.idl | 22 - .../Connector/CSL_SRTest_Connector.mpc | 142 - .../Receiver/CSL_SRTest_Receiver.idl | 23 - .../Receiver/CSL_SRTest_Receiver.mpc | 136 - .../Receiver/CSL_SRTest_Receiver_exec.cpp | 516 - .../Receiver/CSL_SRTest_Receiver_exec.h | 269 - .../CSLSampleRejected/Sender/CSL_SRTest_Sender.idl | 18 - .../CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc | 138 - .../Sender/CSL_SRTest_Sender_exec.cpp | 203 - .../Sender/CSL_SRTest_Sender_exec.h | 129 - .../descriptors/HelloTest_Library.xml | 91 - .../tests/CSLSampleRejected/descriptors/Plan.cdp | 458 - .../descriptors/USER_QOS_PROFILES.xml | 129 - .../CSLSampleRejected/descriptors/run_test.pl | 243 - .../dds4ccm/tests/CSLUnexpStat/.gitignore | 1 - .../tests/CSLUnexpStat/Base/CSL_USTest_Base.idl | 23 - .../tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc | 24 - .../Connector/CSL_USTest_Connector.idl | 22 - .../Connector/CSL_USTest_Connector.mpc | 142 - .../CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl | 21 - .../CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc | 136 - .../Receiver/CSL_USTest_Receiver_exec.cpp | 573 - .../Receiver/CSL_USTest_Receiver_exec.h | 288 - .../CSLUnexpStat/Sender/CSL_USTest_Sender.idl | 19 - .../CSLUnexpStat/Sender/CSL_USTest_Sender.mpc | 138 - .../CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp | 580 - .../CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h | 205 - .../tests/CSLUnexpStat/descriptors/CSL_Library.xml | 39 - .../tests/CSLUnexpStat/descriptors/Plan.cdp | 432 - .../CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml | 72 - .../tests/CSLUnexpStat/descriptors/run_test.pl | 243 - .../dds4ccm/tests/CoherentUpdater/.gitignore | 1 - .../Base/CoherentUpdate_Test_Base.idl | 24 - .../Base/CoherentUpdate_Test_Base.mpc | 24 - .../tests/CoherentUpdater/Base/Reader_Starter.idl | 22 - .../tests/CoherentUpdater/Base/Reader_Starter.mpc | 109 - .../tests/CoherentUpdater/Connector/.gitignore | 7 - .../Connector/CoherentUpdate_Test_Connector.idl | 22 - .../Connector/CoherentUpdate_Test_Connector.mpc | 146 - .../tests/CoherentUpdater/Receiver/.gitignore | 5 - .../Receiver/CoherentUpdate_Test_Receiver.idl | 26 - .../Receiver/CoherentUpdate_Test_Receiver.mpc | 154 - .../Receiver/CoherentUpdate_Test_Receiver_exec.cpp | 376 - .../Receiver/CoherentUpdate_Test_Receiver_exec.h | 141 - .../tests/CoherentUpdater/Sender/.gitignore | 5 - .../Sender/CoherentUpdate_Test_Sender.idl | 24 - .../Sender/CoherentUpdate_Test_Sender.mpc | 153 - .../Sender/CoherentUpdate_Test_Sender_exec.cpp | 250 - .../Sender/CoherentUpdate_Test_Sender_exec.h | 135 - .../tests/CoherentUpdater/descriptors/Plan.cdp | 385 - .../descriptors/USER_QOS_PROFILES.xml | 67 - .../tests/CoherentUpdater/descriptors/run_test.pl | 243 - .../dds4ccm/tests/CoherentWriter/.gitignore | 1 - .../dds4ccm/tests/CoherentWriter/Base/.gitignore | 12 - .../Base/CoherentWrite_Test_Base.idl | 24 - .../Base/CoherentWrite_Test_Base.mpc | 24 - .../tests/CoherentWriter/Base/Reader_Starter.idl | 22 - .../tests/CoherentWriter/Base/Reader_Starter.mpc | 109 - .../tests/CoherentWriter/Connector/.gitignore | 7 - .../Connector/CoherentWrite_Test_Connector.idl | 22 - .../Connector/CoherentWrite_Test_Connector.mpc | 142 - .../tests/CoherentWriter/Receiver/.gitignore | 5 - .../Receiver/CoherentWrite_Test_Receiver.idl | 25 - .../Receiver/CoherentWrite_Test_Receiver.mpc | 155 - .../Receiver/CoherentWrite_Test_Receiver_exec.cpp | 498 - .../Receiver/CoherentWrite_Test_Receiver_exec.h | 214 - .../dds4ccm/tests/CoherentWriter/Sender/.gitignore | 5 - .../Sender/CoherentWrite_Test_Sender.idl | 24 - .../Sender/CoherentWrite_Test_Sender.mpc | 153 - .../Sender/CoherentWrite_Test_Sender_exec.cpp | 265 - .../Sender/CoherentWrite_Test_Sender_exec.h | 162 - .../descriptors/CoherentWriter_Library.xml | 45 - .../tests/CoherentWriter/descriptors/Plan.cdp | 462 - .../descriptors/USER_QOS_PROFILES.xml | 67 - .../tests/CoherentWriter/descriptors/run_test.pl | 243 - .../CollocatedPubSub/Base/Collocated_Base.idl | 22 - .../CollocatedPubSub/Base/Collocated_Base.mpc | 24 - .../Connector/Collocated_Connector.idl | 20 - .../Connector/Collocated_Connector.mpc | 144 - .../PubSubComponent/PubSub_Component.idl | 14 - .../PubSubComponent/PubSub_Component.mpc | 143 - .../PubSubComponent/PubSub_Component_exec.cpp | 301 - .../PubSubComponent/PubSub_Component_exec.h | 169 - .../SubComponent/Sub_Component.idl | 13 - .../SubComponent/Sub_Component.mpc | 143 - .../SubComponent/Sub_Component_exec.cpp | 199 - .../SubComponent/Sub_Component_exec.h | 148 - .../tests/CollocatedPubSub/descriptors/Plan.cdp | 654 - .../tests/CollocatedPubSub/descriptors/run_test.pl | 243 - .../tests/ConnectorFilesInDiffDir/.gitignore | 8 - .../tests/ConnectorFilesInDiffDir/DiffDir.idl | 18 - .../tests/ConnectorFilesInDiffDir/DiffDir.mpb | 7 - .../tests/ConnectorFilesInDiffDir/DiffDir.mpc | 26 - .../ConnectorFilesInDiffDir/DiffDir_Connector.idl | 17 - .../ConnectorFilesInDiffDir/DiffDir_Connector.mpc | 135 - .../CFTNamesClash/Base/CFT_Test_Base.idl | 39 - .../CFTNamesClash/Base/CFT_Test_Base.mpc | 24 - .../CFTNamesClash/Component/CFT_Test_Component.idl | 20 - .../CFTNamesClash/Component/CFT_Test_Component.mpc | 145 - .../Component/CFT_Test_Component_exec.cpp | 84 - .../Component/CFT_Test_Component_exec.h | 57 - .../CFTNamesClash/Connector/CFT_Test_Connector.idl | 22 - .../CFTNamesClash/Connector/CFT_Test_Connector.mpc | 142 - .../CFTNamesClash/descriptors/Plan.cdp | 419 - .../CFTNamesClash/descriptors/run_test.pl | 243 - .../Deployments/WrongQuery.cdp | 255 - .../ContentFilteredTopic/Deployments/run_test.pl | 214 - .../EventListener/Base/CFTLE_Test_Base.idl | 24 - .../EventListener/Base/CFTLE_Test_Base.mpc | 24 - .../Connector/CFTLE_Test_Connector.idl | 25 - .../Connector/CFTLE_Test_Connector.mpc | 142 - .../EventListener/Receiver/CFTLE_Test_Receiver.idl | 22 - .../EventListener/Receiver/CFTLE_Test_Receiver.mpc | 146 - .../Receiver/CFTLE_Test_Receiver_exec.cpp | 355 - .../Receiver/CFTLE_Test_Receiver_exec.h | 189 - .../EventListener/Sender/CFTLE_Test_Sender.idl | 21 - .../EventListener/Sender/CFTLE_Test_Sender.mpc | 145 - .../Sender/CFTLE_Test_Sender_exec.cpp | 257 - .../EventListener/Sender/CFTLE_Test_Sender_exec.h | 142 - .../EventListener/descriptors/Plan.cdp | 441 - .../EventListener/descriptors/run_test.pl | 243 - .../Exception/Base/Exception_Test_Base.idl | 25 - .../Exception/Base/Exception_Test_Base.mpc | 24 - .../Exception/Component/.gitignore | 5 - .../Component/Exception_Test_Component.idl | 18 - .../Component/Exception_Test_Component.mpc | 145 - .../Component/Exception_Test_Component_exec.cpp | 109 - .../Component/Exception_Test_Component_exec.h | 55 - .../Connector/Exception_Test_Connector.idl | 21 - .../Connector/Exception_Test_Connector.mpc | 142 - .../Exception/descriptors/Plan.cdp | 193 - .../Exception/descriptors/run_test.pl | 243 - .../tests/ContentFilteredTopic/ReadGet/.gitignore | 1 - .../ContentFilteredTopic/ReadGet/Base/.gitignore | 12 - .../ReadGet/Base/ReadGet_Starter.idl | 23 - .../ReadGet/Base/ReadGet_Starter.mpc | 109 - .../ReadGet/Base/ReadGet_Test_Base.idl | 24 - .../ReadGet/Base/ReadGet_Test_Base.mpc | 24 - .../ReadGet/Connector/.gitignore | 7 - .../ReadGet/Connector/ReadGet_Test_Connector.idl | 25 - .../ReadGet/Connector/ReadGet_Test_Connector.mpc | 146 - .../tests/ContentFilteredTopic/ReadGet/README | 77 - .../ReadGet/Receiver/.gitignore | 5 - .../ReadGet/Receiver/ReadGet_Test_Receiver.idl | 25 - .../ReadGet/Receiver/ReadGet_Test_Receiver.mpc | 155 - .../Receiver/ReadGet_Test_Receiver_exec.cpp | 1004 - .../ReadGet/Receiver/ReadGet_Test_Receiver_exec.h | 256 - .../ReadGet/Sender/ReadGet_Test_Sender.idl | 25 - .../ReadGet/Sender/ReadGet_Test_Sender.mpc | 153 - .../ReadGet/Sender/ReadGet_Test_Sender_exec.cpp | 338 - .../ReadGet/Sender/ReadGet_Test_Sender_exec.h | 195 - .../ReadGet/descriptors/Plan.cdp | 622 - .../ReadGet/descriptors/QueryCondition_Library.xml | 38 - .../ReadGet/descriptors/USER_QOS_PROFILES.xml | 67 - .../ReadGet/descriptors/run_test.pl | 243 - .../StateListener/Base/CFTLS_Test_Base.idl | 24 - .../StateListener/Base/CFTLS_Test_Base.mpc | 24 - .../Connector/CFTLS_Test_Connector.idl | 25 - .../Connector/CFTLS_Test_Connector.mpc | 142 - .../StateListener/Receiver/CFTLS_Test_Receiver.idl | 22 - .../StateListener/Receiver/CFTLS_Test_Receiver.mpc | 145 - .../Receiver/CFTLS_Test_Receiver_exec.cpp | 271 - .../Receiver/CFTLS_Test_Receiver_exec.h | 111 - .../StateListener/Sender/CFTLS_Test_Sender.idl | 21 - .../StateListener/Sender/CFTLS_Test_Sender.mpc | 145 - .../Sender/CFTLS_Test_Sender_exec.cpp | 241 - .../StateListener/Sender/CFTLS_Test_Sender_exec.h | 123 - .../StateListener/descriptors/Plan.cdp | 441 - .../StateListener/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore | 1 - .../dds4ccm/tests/DDSEntity/Base/.gitignore | 7 - .../dds4ccm/tests/DDSEntity/Base/Writer_Base.idl | 24 - .../dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc | 24 - .../dds4ccm/tests/DDSEntity/Connector/.gitignore | 7 - .../tests/DDSEntity/Connector/Writer_Connector.idl | 22 - .../tests/DDSEntity/Connector/Writer_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/DDSEntity/README | 7 - .../dds4ccm/tests/DDSEntity/Receiver/.gitignore | 5 - .../tests/DDSEntity/Receiver/Writer_Receiver.idl | 19 - .../tests/DDSEntity/Receiver/Writer_Receiver.mpc | 138 - .../DDSEntity/Receiver/Writer_Receiver_exec.cpp | 308 - .../DDSEntity/Receiver/Writer_Receiver_exec.h | 169 - .../dds4ccm/tests/DDSEntity/Sender/.gitignore | 5 - .../tests/DDSEntity/Sender/Writer_Sender.idl | 21 - .../tests/DDSEntity/Sender/Writer_Sender.mpc | 150 - .../tests/DDSEntity/Sender/Writer_Sender_exec.cpp | 386 - .../tests/DDSEntity/Sender/Writer_Sender_exec.h | 162 - .../dds4ccm/tests/DDSEntity/descriptors/Plan.cdp | 382 - .../tests/DDSEntity/descriptors/run_test.pl | 243 - .../tests/Derived/DDS_Derived_Connector_T.h | 27 - CIAO/connectors/dds4ccm/tests/Derived/Derived.idl | 18 - CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc | 22 - .../dds4ccm/tests/Derived/Derived_Connector.idl | 42 - .../dds4ccm/tests/Derived/Derived_Connector.mpc | 129 - .../dds4ccm/tests/DoubleNestedModule/.gitignore | 1 - .../tests/DoubleNestedModule/Base/.gitignore | 7 - .../tests/DoubleNestedModule/Base/DNM_Base.idl | 33 - .../tests/DoubleNestedModule/Base/DNM_Base.mpc | 24 - .../tests/DoubleNestedModule/Connector/.gitignore | 7 - .../DoubleNestedModule/Connector/DNM_Connector.idl | 28 - .../DoubleNestedModule/Connector/DNM_Connector.mpc | 140 - .../tests/DoubleNestedModule/Sender/.gitignore | 4 - .../tests/DoubleNestedModule/Sender/DNM_Sender.idl | 22 - .../tests/DoubleNestedModule/Sender/DNM_Sender.mpc | 143 - .../DoubleNestedModule/Sender/DNM_Sender_exec.cpp | 69 - .../DoubleNestedModule/Sender/DNM_Sender_exec.h | 46 - .../dds4ccm/tests/Event_Connection_Test/.gitignore | 1 - .../tests/Event_Connection_Test/Base/.gitignore | 7 - .../Base/Event_Connection_Test_Base.idl | 24 - .../Base/Event_Connection_Test_Base.mpc | 24 - .../Event_Connection_Test/Connector/.gitignore | 7 - .../Connector/Event_Connection_Test_Connector.idl | 22 - .../Connector/Event_Connection_Test_Connector.mpc | 142 - .../dds4ccm/tests/Event_Connection_Test/README | 25 - .../Event_Connection_Test/Receiver/.gitignore | 5 - .../Receiver/Event_Connection_Test_Receiver.idl | 21 - .../Receiver/Event_Connection_Test_Receiver.mpc | 135 - .../Event_Connection_Test_Receiver_exec.cpp | 264 - .../Receiver/Event_Connection_Test_Receiver_exec.h | 79 - .../tests/Event_Connection_Test/Sender/.gitignore | 5 - .../Sender/Event_Connection_Test_Sender.idl | 18 - .../Sender/Event_Connection_Test_Sender.mpc | 138 - .../Sender/Event_Connection_Test_Sender_exec.cpp | 91 - .../Sender/Event_Connection_Test_Sender_exec.h | 49 - .../Event_Connection_Test/descriptors/Plan.cdp | 549 - .../Event_Connection_Test/descriptors/run_test.pl | 243 - .../FixedSizeStruct/EventConnector/.gitignore | 1 - .../FixedSizeStruct/EventConnector/Base/.gitignore | 7 - .../EventConnector/Base/FSS_Event_Base.idl | 23 - .../EventConnector/Base/FSS_Event_Base.mpc | 24 - .../EventConnector/Connector/.gitignore | 6 - .../Connector/FSS_Event_Connector.idl | 25 - .../Connector/FSS_Event_Connector.mpc | 140 - .../FixedSizeStruct/StateConnector/.gitignore | 1 - .../FixedSizeStruct/StateConnector/Base/.gitignore | 7 - .../StateConnector/Base/FSS_State_Base.idl | 23 - .../StateConnector/Base/FSS_State_Base.mpc | 24 - .../StateConnector/Connector/.gitignore | 6 - .../Connector/FSS_State_Connector.idl | 25 - .../Connector/FSS_State_Connector.mpc | 142 - .../GetComponent/Event/Base/GCE_Test_Base.idl | 25 - .../GetComponent/Event/Base/GCE_Test_Base.mpc | 24 - .../Event/Component/GCE_Test_Component.idl | 24 - .../Event/Component/GCE_Test_Component.mpc | 145 - .../Event/Component/GCE_Test_Component_exec.cpp | 420 - .../Event/Component/GCE_Test_Component_exec.h | 70 - .../Event/Connector/GCE_Test_Connector.idl | 22 - .../Event/Connector/GCE_Test_Connector.mpc | 142 - .../tests/GetComponent/Event/descriptors/Plan.cdp | 361 - .../GetComponent/Event/descriptors/run_test.pl | 243 - .../GetComponent/State/Base/GCS_Test_Base.idl | 25 - .../GetComponent/State/Base/GCS_Test_Base.mpc | 24 - .../State/Component/GCS_Test_Component.idl | 25 - .../State/Component/GCS_Test_Component.mpc | 145 - .../State/Component/GCS_Test_Component_exec.cpp | 612 - .../State/Component/GCS_Test_Component_exec.h | 78 - .../State/Connector/GCS_Test_Connector.idl | 22 - .../State/Connector/GCS_Test_Connector.mpc | 142 - .../tests/GetComponent/State/descriptors/Plan.cdp | 441 - .../GetComponent/State/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/Getter/.gitignore | 1 - .../dds4ccm/tests/Getter/Base/.gitignore | 12 - .../dds4ccm/tests/Getter/Base/Get_Invoker.idl | 19 - .../dds4ccm/tests/Getter/Base/Get_Invoker.mpc | 111 - .../dds4ccm/tests/Getter/Base/Getter_Test_Base.idl | 34 - .../dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc | 24 - .../dds4ccm/tests/Getter/Connector/.gitignore | 7 - .../Getter/Connector/Getter_Test_Connector.idl | 26 - .../Getter/Connector/Getter_Test_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/Getter/README | 23 - .../dds4ccm/tests/Getter/Receiver/.gitignore | 5 - .../tests/Getter/Receiver/Getter_Test_Receiver.idl | 23 - .../tests/Getter/Receiver/Getter_Test_Receiver.mpc | 154 - .../Getter/Receiver/Getter_Test_Receiver_exec.cpp | 868 - .../Getter/Receiver/Getter_Test_Receiver_exec.h | 277 - .../dds4ccm/tests/Getter/Sender/.gitignore | 5 - .../tests/Getter/Sender/Getter_Test_Sender.idl | 27 - .../tests/Getter/Sender/Getter_Test_Sender.mpc | 149 - .../Getter/Sender/Getter_Test_Sender_exec.cpp | 378 - .../tests/Getter/Sender/Getter_Test_Sender_exec.h | 189 - .../tests/Getter/descriptors/Getter_Library.xml | 37 - .../dds4ccm/tests/Getter/descriptors/Plan.cdp | 542 - .../tests/Getter/descriptors/USER_QOS_PROFILES.xml | 67 - .../dds4ccm/tests/Getter/descriptors/run_test.pl | 249 - .../dds4ccm/tests/HomeDerived/Base/Hello_Base.idl | 23 - .../dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc | 24 - .../HomeDerived/Connector1/Hello_Connector.idl | 24 - .../HomeDerived/Connector1/Hello_Connector.mpc | 149 - .../HomeDerived/Connector2/Hello_Connector2.idl | 24 - .../HomeDerived/Connector2/Hello_Connector2.mpc | 149 - .../tests/HomeDerived/Sender/Hello_Sender.idl | 54 - .../tests/HomeDerived/Sender/Hello_Sender.mpc | 145 - .../tests/HomeDerived/Sender/Hello_Sender_exec.cpp | 723 - .../tests/HomeDerived/Sender/Hello_Sender_exec.h | 365 - .../HomeDerived/descriptors/DeploymentPlan.cdp | 753 - .../tests/HomeDerived/descriptors/run_test.pl | 250 - .../dds4ccm/tests/HomeTest/Base/HomeT_Base.idl | 23 - .../dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc | 24 - .../tests/HomeTest/Connector/HomeT_Connector.idl | 24 - .../tests/HomeTest/Connector/HomeT_Connector.mpc | 150 - .../dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc | 167 - .../tests/HomeTest/HomeComp/HomeT_HomeC.idl | 19 - .../tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp | 88 - .../tests/HomeTest/HomeComp/HomeT_HomeC_exec.h | 65 - .../dds4ccm/tests/HomeTest/HomeComp/controller.cpp | 114 - .../descriptors/DeploymentPlanConnOnly.cdp | 110 - .../HomeTest/descriptors/USER_QOS_PROFILES.xml | 64 - .../dds4ccm/tests/HomeTest/descriptors/run_test.pl | 267 - .../dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl | 24 - .../dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc | 24 - .../tests/IDL_Test/Base/IDL_Test_Interfaces.idl | 16 - .../tests/IDL_Test/Base/IDL_Test_Interfaces.mpc | 105 - .../IDL_Test/Component/IDL_Test_Base_Component.idl | 32 - .../IDL_Test/Component/IDL_Test_Base_Component.mpc | 175 - .../Component/IDL_Test_Derived_Component.idl | 31 - .../Component/IDL_Test_Derived_Component.mpc | 194 - .../IDL_Test/Connector/IDL_Test_Connector.idl | 22 - .../IDL_Test/Connector/IDL_Test_Connector.mpc | 142 - .../dds4ccm/tests/InstanceHandle/.gitignore | 1 - .../dds4ccm/tests/InstanceHandle/Base/.gitignore | 7 - .../tests/InstanceHandle/Base/Writer_Base.idl | 23 - .../tests/InstanceHandle/Base/Writer_Base.mpc | 24 - .../tests/InstanceHandle/Connector/.gitignore | 7 - .../InstanceHandle/Connector/Writer_Connector.idl | 22 - .../InstanceHandle/Connector/Writer_Connector.mpc | 142 - .../connectors/dds4ccm/tests/InstanceHandle/README | 6 - .../dds4ccm/tests/InstanceHandle/Sender/.gitignore | 5 - .../tests/InstanceHandle/Sender/Writer_Sender.idl | 19 - .../tests/InstanceHandle/Sender/Writer_Sender.mpc | 145 - .../InstanceHandle/Sender/Writer_Sender_exec.cpp | 368 - .../InstanceHandle/Sender/Writer_Sender_exec.h | 145 - .../tests/InstanceHandle/descriptors/Plan.cdp | 225 - .../tests/InstanceHandle/descriptors/run_test.pl | 243 - .../dds4ccm/tests/KeyedSamples/.gitignore | 1 - .../dds4ccm/tests/KeyedSamples/Base/.gitignore | 7 - .../tests/KeyedSamples/Base/Keyed_Test_Base.idl | 24 - .../tests/KeyedSamples/Base/Keyed_Test_Base.mpc | 24 - .../tests/KeyedSamples/Connector/.gitignore | 7 - .../Connector/Keyed_Test_Connector.idl | 22 - .../Connector/Keyed_Test_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/KeyedSamples/README | 16 - .../dds4ccm/tests/KeyedSamples/Receiver/.gitignore | 5 - .../KeyedSamples/Receiver/Keyed_Test_Receiver.idl | 22 - .../KeyedSamples/Receiver/Keyed_Test_Receiver.mpc | 136 - .../Receiver/Keyed_Test_Receiver_exec.cpp | 336 - .../Receiver/Keyed_Test_Receiver_exec.h | 185 - .../dds4ccm/tests/KeyedSamples/Sender/.gitignore | 5 - .../KeyedSamples/Sender/Keyed_Test_Sender.idl | 23 - .../KeyedSamples/Sender/Keyed_Test_Sender.mpc | 138 - .../KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp | 309 - .../KeyedSamples/Sender/Keyed_Test_Sender_exec.h | 166 - .../tests/KeyedSamples/descriptors/Plan.cdp | 414 - .../tests/KeyedSamples/descriptors/run_test.pl | 243 - .../dds4ccm/tests/KeyedWriter/.gitignore | 1 - .../dds4ccm/tests/KeyedWriter/Base/.gitignore | 7 - .../dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl | 24 - .../dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc | 24 - .../dds4ccm/tests/KeyedWriter/Connector/.gitignore | 1 - .../KeyedWriter/Connector/Writer_Connector.idl | 22 - .../KeyedWriter/Connector/Writer_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/KeyedWriter/README | 12 - .../dds4ccm/tests/KeyedWriter/Receiver/.gitignore | 5 - .../tests/KeyedWriter/Receiver/Writer_Receiver.idl | 21 - .../tests/KeyedWriter/Receiver/Writer_Receiver.mpc | 136 - .../KeyedWriter/Receiver/Writer_Receiver_exec.cpp | 278 - .../KeyedWriter/Receiver/Writer_Receiver_exec.h | 185 - .../dds4ccm/tests/KeyedWriter/Sender/.gitignore | 5 - .../tests/KeyedWriter/Sender/Writer_Sender.idl | 23 - .../tests/KeyedWriter/Sender/Writer_Sender.mpc | 138 - .../KeyedWriter/Sender/Writer_Sender_exec.cpp | 482 - .../tests/KeyedWriter/Sender/Writer_Sender_exec.h | 173 - .../descriptors/KeyedWriter_Library.xml | 45 - .../dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp | 427 - .../KeyedWriter/descriptors/USER_QOS_PROFILES.xml | 73 - .../tests/KeyedWriter/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/LateBinding/README | 40 - .../ReadGet/Base/RG_LateBinding_Base.idl | 24 - .../ReadGet/Base/RG_LateBinding_Base.mpc | 24 - .../LateBinding/ReadGet/Base/Reader_Starter.idl | 18 - .../LateBinding/ReadGet/Base/Reader_Starter.mpc | 110 - .../ReadGet/Connector/RG_LateBinding_Connector.idl | 25 - .../ReadGet/Connector/RG_LateBinding_Connector.mpc | 146 - .../ReadGet/Receiver/RG_LateBinding_Receiver.idl | 23 - .../ReadGet/Receiver/RG_LateBinding_Receiver.mpc | 155 - .../Receiver/RG_LateBinding_Receiver_exec.cpp | 284 - .../Receiver/RG_LateBinding_Receiver_exec.h | 214 - .../Receiver/RG_LateBinding_Receiver_impl.cpp | 373 - .../Receiver/RG_LateBinding_Receiver_impl.h | 69 - .../ReadGet/Sender/RG_LateBinding_Sender.idl | 24 - .../ReadGet/Sender/RG_LateBinding_Sender.mpc | 150 - .../ReadGet/Sender/RG_LateBinding_Sender_exec.cpp | 229 - .../ReadGet/Sender/RG_LateBinding_Sender_exec.h | 133 - .../ReadGet/descriptors/LateBinding_Library.xml | 36 - .../tests/LateBinding/ReadGet/descriptors/Plan.cdp | 461 - .../ReadGet/descriptors/USER_QOS_PROFILES.xml | 41 - .../LateBinding/ReadGet/descriptors/run_test.pl | 243 - .../UpdateWrite/Base/WU_LateBinding_Base.idl | 24 - .../UpdateWrite/Base/WU_LateBinding_Base.mpc | 24 - .../Connector/WU_LateBinding_Connector.idl | 25 - .../Connector/WU_LateBinding_Connector.mpc | 146 - .../Receiver/WU_LateBinding_Receiver.idl | 22 - .../Receiver/WU_LateBinding_Receiver.mpc | 140 - .../Receiver/WU_LateBinding_Receiver_exec.cpp | 332 - .../Receiver/WU_LateBinding_Receiver_exec.h | 247 - .../Receiver/WU_LateBinding_Receiver_impl.cpp | 56 - .../Receiver/WU_LateBinding_Receiver_impl.h | 22 - .../UpdateWrite/Sender/WU_LateBinding_Sender.idl | 22 - .../UpdateWrite/Sender/WU_LateBinding_Sender.mpc | 141 - .../Sender/WU_LateBinding_Sender_exec.cpp | 400 - .../Sender/WU_LateBinding_Sender_exec.h | 137 - .../LateBinding/UpdateWrite/descriptors/Plan.cdp | 512 - .../UpdateWrite/descriptors/run_test.pl | 243 - .../dds4ccm/tests/ListenManyByMany/.gitignore | 1 - .../dds4ccm/tests/ListenManyByMany/Base/.gitignore | 7 - .../tests/ListenManyByMany/Base/LMBM_Test_Base.idl | 24 - .../tests/ListenManyByMany/Base/LMBM_Test_Base.mpc | 24 - .../tests/ListenManyByMany/Connector/.gitignore | 7 - .../Connector/LMBM_Test_Connector.idl | 27 - .../Connector/LMBM_Test_Connector.mpc | 142 - .../dds4ccm/tests/ListenManyByMany/README | 3 - .../tests/ListenManyByMany/Receiver/.gitignore | 5 - .../Receiver/LMBM_Test_Receiver.idl | 22 - .../Receiver/LMBM_Test_Receiver.mpc | 145 - .../Receiver/LMBM_Test_Receiver_exec.cpp | 259 - .../Receiver/LMBM_Test_Receiver_exec.h | 107 - .../tests/ListenManyByMany/Sender/.gitignore | 5 - .../ListenManyByMany/Sender/LMBM_Test_Sender.idl | 22 - .../ListenManyByMany/Sender/LMBM_Test_Sender.mpc | 145 - .../Sender/LMBM_Test_Sender_exec.cpp | 317 - .../Sender/LMBM_Test_Sender_exec.h | 164 - .../descriptors/ListenManyByMany_Library.xml | 38 - .../tests/ListenManyByMany/descriptors/Plan.cdp | 434 - .../descriptors/USER_QOS_PROFILES.xml | 67 - .../tests/ListenManyByMany/descriptors/run_test.pl | 243 - .../dds4ccm/tests/ListenNotEnabled/.gitignore | 1 - .../dds4ccm/tests/ListenNotEnabled/Base/.gitignore | 7 - .../tests/ListenNotEnabled/Base/LNE_Test_Base.idl | 24 - .../tests/ListenNotEnabled/Base/LNE_Test_Base.mpc | 24 - .../tests/ListenNotEnabled/Connector/.gitignore | 7 - .../Connector/LNE_Test_Connector.idl | 25 - .../Connector/LNE_Test_Connector.mpc | 142 - .../dds4ccm/tests/ListenNotEnabled/README | 3 - .../tests/ListenNotEnabled/Receiver/.gitignore | 5 - .../Receiver/LNE_Test_Receiver.idl | 19 - .../Receiver/LNE_Test_Receiver.mpc | 146 - .../Receiver/LNE_Test_Receiver_exec.cpp | 234 - .../Receiver/LNE_Test_Receiver_exec.h | 174 - .../tests/ListenNotEnabled/Sender/.gitignore | 5 - .../ListenNotEnabled/Sender/LNE_Test_Sender.idl | 22 - .../ListenNotEnabled/Sender/LNE_Test_Sender.mpc | 145 - .../Sender/LNE_Test_Sender_exec.cpp | 293 - .../ListenNotEnabled/Sender/LNE_Test_Sender_exec.h | 168 - .../tests/ListenNotEnabled/descriptors/Plan.cdp | 371 - .../tests/ListenNotEnabled/descriptors/run_test.pl | 243 - .../dds4ccm/tests/ListenOneByOne/.gitignore | 1 - .../dds4ccm/tests/ListenOneByOne/Base/.gitignore | 7 - .../tests/ListenOneByOne/Base/LOBO_Test_Base.idl | 24 - .../tests/ListenOneByOne/Base/LOBO_Test_Base.mpc | 24 - .../tests/ListenOneByOne/Connector/.gitignore | 7 - .../Connector/LOBO_Test_Connector.idl | 27 - .../Connector/LOBO_Test_Connector.mpc | 142 - .../connectors/dds4ccm/tests/ListenOneByOne/README | 3 - .../tests/ListenOneByOne/Receiver/.gitignore | 5 - .../ListenOneByOne/Receiver/LOBO_Test_Receiver.idl | 22 - .../ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc | 145 - .../Receiver/LOBO_Test_Receiver_exec.cpp | 266 - .../Receiver/LOBO_Test_Receiver_exec.h | 107 - .../dds4ccm/tests/ListenOneByOne/Sender/.gitignore | 5 - .../ListenOneByOne/Sender/LOBO_Test_Sender.idl | 22 - .../ListenOneByOne/Sender/LOBO_Test_Sender.mpc | 145 - .../Sender/LOBO_Test_Sender_exec.cpp | 297 - .../ListenOneByOne/Sender/LOBO_Test_Sender_exec.h | 141 - .../tests/ListenOneByOne/descriptors/Plan.cdp | 393 - .../tests/ListenOneByOne/descriptors/run_test.pl | 243 - .../Base/Event_MemLeakDetection_Test_Base.idl | 24 - .../Base/Event_MemLeakDetection_Test_Base.mpc | 24 - .../Event_MemLeakDetection_Test_Connector.idl | 22 - .../Event_MemLeakDetection_Test_Connector.mpc | 142 - .../Event_MemLeakDetection_Test_Receiver.idl | 21 - .../Event_MemLeakDetection_Test_Receiver.mpc | 136 - .../Sender/Event_MemLeakDetection_Test_Sender.idl | 18 - .../Sender/Event_MemLeakDetection_Test_Sender.mpc | 138 - .../descriptors/All.cdp | 549 - .../descriptors/Connector_only.cdp | 98 - .../descriptors/Listen.cdp | 196 - .../descriptors/One_Connection.cdp | 194 - .../descriptors/Receiver_only.cdp | 88 - .../descriptors/Sender_only.cdp | 87 - .../descriptors/run_test.pl | 216 - .../Base/State_MemLeakDetection_Test_Base.idl | 24 - .../Base/State_MemLeakDetection_Test_Base.mpc | 24 - .../State_MemLeakDetection_Test_Connector.idl | 25 - .../State_MemLeakDetection_Test_Connector.mpc | 142 - .../State_MemLeakDetection_Test_Receiver.idl | 22 - .../State_MemLeakDetection_Test_Receiver.mpc | 136 - .../Sender/State_MemLeakDetection_Test_Sender.idl | 18 - .../Sender/State_MemLeakDetection_Test_Sender.mpc | 138 - .../descriptors/All.cdp | 721 - .../descriptors/Connector_only.cdp | 98 - .../descriptors/Listen.cdp | 197 - .../descriptors/One_Connection.cdp | 196 - .../descriptors/Receiver_only.cdp | 88 - .../descriptors/Sender_only.cdp | 87 - .../descriptors/run_test.pl | 216 - .../Base/TypeRegistration_Test_Base.idl | 23 - .../Base/TypeRegistration_Test_Base.mpc | 24 - .../Component/TypeRegistration_Test_Component.idl | 19 - .../Component/TypeRegistration_Test_Component.mpc | 145 - .../TypeRegistration_Test_Component_exec.cpp | 289 - .../TypeRegistration_Test_Component_exec.h | 186 - .../Connector/TypeRegistration_Test_Connector.idl | 22 - .../Connector/TypeRegistration_Test_Connector.mpc | 142 - .../TypeRegistration/descriptors/Plan.cdp | 253 - .../TypeRegistration/descriptors/run_test.pl | 243 - .../tests/MultiTopic/Base/MultiTopic_Base.idl | 41 - .../tests/MultiTopic/Base/MultiTopic_Base.mpc | 24 - .../MultiTopic/Connector/MultiTopic_Connector.idl | 24 - .../MultiTopic/Connector/MultiTopic_Connector.mpc | 156 - .../Connector/MultiTopic_Connector_T.cpp | 653 - .../MultiTopic/Connector/MultiTopic_Connector_T.h | 287 - .../tests/MultiTopic/Connector/ccm_dds_mt.idl | 51 - .../MultiTopic/Receiver/MultiTopic_Receiver.idl | 18 - .../MultiTopic/Receiver/MultiTopic_Receiver.mpc | 137 - .../Receiver/MultiTopic_Receiver_exec.cpp | 396 - .../MultiTopic/Receiver/MultiTopic_Receiver_exec.h | 195 - .../tests/MultiTopic/Sender/MultiTopic_Sender.idl | 22 - .../tests/MultiTopic/Sender/MultiTopic_Sender.mpc | 138 - .../MultiTopic/Sender/MultiTopic_Sender_exec.cpp | 350 - .../MultiTopic/Sender/MultiTopic_Sender_exec.h | 160 - .../dds4ccm/tests/MultiTopic/descriptors/Plan.cdp | 526 - .../tests/MultiTopic/descriptors/run_test.pl | 243 - .../tests/MultipleTemp/Base/MultipleTemp_Base.idl | 36 - .../tests/MultipleTemp/Base/MultipleTemp_Base.mpc | 25 - .../Connector/MultipleTemp_Connector.idl | 21 - .../Connector/MultipleTemp_Connector.mpc | 166 - .../Connector/MultipleTemp_Connector_T.cpp | 517 - .../Connector/MultipleTemp_Connector_T.h | 193 - .../tests/MultipleTemp/Connector/ccm_dds_mlt.idl | 30 - .../Receiver/MultipleTemp_Receiver.idl | 20 - .../Receiver/MultipleTemp_Receiver.mpc | 141 - .../Receiver/MultipleTemp_Receiver_exec.cpp | 250 - .../Receiver/MultipleTemp_Receiver_exec.h | 111 - .../MultipleTemp/Sender/MultipleTemp_Sender.idl | 20 - .../MultipleTemp/Sender/MultipleTemp_Sender.mpc | 142 - .../Sender/MultipleTemp_Sender_exec.cpp | 373 - .../MultipleTemp/Sender/MultipleTemp_Sender_exec.h | 83 - .../tests/MultipleTemp/descriptors/Plan.cdp | 489 - .../tests/MultipleTemp/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/NoModule/.gitignore | 14 - .../connectors/dds4ccm/tests/NoModule/NoModule.idl | 18 - .../connectors/dds4ccm/tests/NoModule/NoModule.mpc | 22 - .../dds4ccm/tests/NoModule/NoModule_Connector.idl | 17 - .../dds4ccm/tests/NoModule/NoModule_Connector.mpc | 130 - .../tests/NonChangeableAttribute/.gitignore | 1 - .../Base/NonChangeable_Base.idl | 23 - .../Base/NonChangeable_Base.mpc | 24 - .../Component/NonChangeable_Component.idl | 19 - .../Component/NonChangeable_Component.mpc | 145 - .../Component/NonChangeable_Component_exec.cpp | 255 - .../Component/NonChangeable_Component_exec.h | 75 - .../Connector/NonChangeable_Connector.idl | 27 - .../Connector/NonChangeable_Connector.mpc | 142 - .../dds4ccm/tests/NonChangeableAttribute/README | 15 - .../NonChangeableAttribute/descriptors/Plan.cdp | 198 - .../NonChangeableAttribute/descriptors/run_test.pl | 243 - .../dds4ccm/tests/On_Inconsistent_Topic/.gitignore | 1 - .../On_Inconsistent_Topic/Base/OIT_Test_Base.idl | 39 - .../On_Inconsistent_Topic/Base/OIT_Test_Base.mpc | 24 - .../On_Inconsistent_Topic/Receiver/.gitignore | 5 - .../Receiver/OIT_Test_Receiver.idl | 20 - .../Receiver/OIT_Test_Receiver.mpc | 145 - .../Receiver/OIT_Test_Receiver_exec.cpp | 199 - .../Receiver/OIT_Test_Receiver_exec.h | 102 - .../ReceiverConnector/.gitignore | 7 - .../ReceiverConnector/OIT_Receiver_Connector.idl | 26 - .../ReceiverConnector/OIT_Receiver_Connector.mpc | 142 - .../tests/On_Inconsistent_Topic/Sender/.gitignore | 4 - .../Sender/OIT_Test_Sender.idl | 19 - .../Sender/OIT_Test_Sender.mpc | 145 - .../Sender/OIT_Test_Sender_exec.cpp | 189 - .../Sender/OIT_Test_Sender_exec.h | 89 - .../SenderConnector/.gitignore | 7 - .../SenderConnector/OIT_Sender_Connector.idl | 26 - .../SenderConnector/OIT_Sender_Connector.mpc | 142 - .../On_Inconsistent_Topic/descriptors/Plan.cdp | 403 - .../On_Inconsistent_Topic/descriptors/run_test.pl | 244 - .../dds4ccm/tests/OneFile/Multiple/.gitignore | 13 - .../dds4ccm/tests/OneFile/Multiple/OFM_Base.idl | 40 - .../tests/OneFile/Multiple/OFM_Connector.idl | 19 - .../tests/OneFile/Multiple/OFM_Connector.mpc | 147 - .../dds4ccm/tests/OneFile/Single/.gitignore | 13 - .../dds4ccm/tests/OneFile/Single/OneFile_Base.idl | 23 - .../tests/OneFile/Single/OneFile_Connector.idl | 27 - .../tests/OneFile/Single/OneFile_Connector.mpc | 148 - CIAO/connectors/dds4ccm/tests/PSAT/.gitignore | 23 - .../dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h | 95 - .../dds4ccm/tests/PSAT/PSAT_Connector.idl | 21 - .../connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl | 248 - .../connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc | 204 - CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl | 23 - .../dds4ccm/tests/PSLDeadline/.gitignore | 1 - .../dds4ccm/tests/PSLDeadline/Base/.gitignore | 7 - .../PSLDeadline/Base/PSL_DeadlineTest_Base.idl | 24 - .../PSLDeadline/Base/PSL_DeadlineTest_Base.mpc | 24 - .../dds4ccm/tests/PSLDeadline/Connector/.gitignore | 7 - .../Connector/PSL_DeadlineTest_Connector.idl | 25 - .../Connector/PSL_DeadlineTest_Connector.mpc | 142 - .../dds4ccm/tests/PSLDeadline/Receiver/.gitignore | 5 - .../Receiver/PSL_DeadlineTest_Receiver.idl | 20 - .../Receiver/PSL_DeadlineTest_Receiver.mpc | 136 - .../Receiver/PSL_DeadlineTest_Receiver_exec.cpp | 504 - .../Receiver/PSL_DeadlineTest_Receiver_exec.h | 240 - .../dds4ccm/tests/PSLDeadline/Sender/.gitignore | 5 - .../PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl | 20 - .../PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc | 138 - .../Sender/PSL_DeadlineTest_Sender_exec.cpp | 292 - .../Sender/PSL_DeadlineTest_Sender_exec.h | 185 - .../PSLDeadline/descriptors/Deadline_Library.xml | 54 - .../dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp | 431 - .../PSLDeadline/descriptors/USER_QOS_PROFILES.xml | 87 - .../tests/PSLDeadline/descriptors/run_test.pl | 243 - .../dds4ccm/tests/PSLSampleLost/.gitignore | 1 - .../dds4ccm/tests/PSLSampleLost/Base/.gitignore | 7 - .../PSLSampleLost/Base/PSL_SampleLost_Base.idl | 24 - .../PSLSampleLost/Base/PSL_SampleLost_Base.mpc | 24 - .../Connector/PSL_SampleLost_Connector.idl | 25 - .../Connector/PSL_SampleLost_Connector.mpc | 142 - .../Receiver/PSL_SampleLost_Receiver.idl | 20 - .../Receiver/PSL_SampleLost_Receiver.mpc | 136 - .../Receiver/PSL_SampleLost_Receiver_exec.cpp | 506 - .../Receiver/PSL_SampleLost_Receiver_exec.h | 241 - .../PSLSampleLost/Sender/PSL_SampleLost_Sender.idl | 19 - .../PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc | 138 - .../Sender/PSL_SampleLost_Sender_exec.cpp | 270 - .../Sender/PSL_SampleLost_Sender_exec.h | 173 - .../descriptors/HelloTest_Library.xml | 58 - .../tests/PSLSampleLost/descriptors/Plan.cdp | 430 - .../descriptors/USER_QOS_PROFILES.xml | 92 - .../tests/PSLSampleLost/descriptors/run_test.pl | 243 - .../dds4ccm/tests/Policies/deadline_qos_test.cpp | 14 - .../dds4ccm/tests/Policies/deadline_qos_test.h | 17 - .../dds4ccm/tests/Policies/dest_order_qos_test.cpp | 12 - .../dds4ccm/tests/Policies/dest_order_qos_test.h | 17 - .../dds4ccm/tests/Policies/dp_factory_qos_test.cpp | 7 - .../dds4ccm/tests/Policies/dp_factory_qos_test.h | 15 - .../dds4ccm/tests/Policies/dp_qos_test.cpp | 44 - .../dds4ccm/tests/Policies/dp_qos_test.h | 16 - .../dds4ccm/tests/Policies/dr_qos_test.cpp | 146 - .../dds4ccm/tests/Policies/dr_qos_test.h | 16 - .../dds4ccm/tests/Policies/dur_qos_test.cpp | 13 - .../dds4ccm/tests/Policies/dur_qos_test.h | 17 - .../tests/Policies/dur_service_qos_test.cpp | 17 - .../dds4ccm/tests/Policies/dur_service_qos_test.h | 17 - .../connectors/dds4ccm/tests/Policies/duration.cpp | 14 - CIAO/connectors/dds4ccm/tests/Policies/duration.h | 17 - .../dds4ccm/tests/Policies/dw_qos_test.cpp | 162 - .../dds4ccm/tests/Policies/dw_qos_test.h | 16 - .../tests/Policies/entity_factory_qos_test.cpp | 13 - .../tests/Policies/entity_factory_qos_test.h | 17 - .../dds4ccm/tests/Policies/group_data_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/group_data_qos_test.h | 17 - .../dds4ccm/tests/Policies/hist_qos_test.cpp | 14 - .../dds4ccm/tests/Policies/hist_qos_test.h | 17 - .../dds4ccm/tests/Policies/lat_budget_qos_test.cpp | 14 - .../dds4ccm/tests/Policies/lat_budget_qos_test.h | 17 - .../dds4ccm/tests/Policies/lifespan_qos_test.cpp | 14 - .../dds4ccm/tests/Policies/lifespan_qos_test.h | 17 - .../dds4ccm/tests/Policies/liveliness_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/liveliness_qos_test.h | 17 - CIAO/connectors/dds4ccm/tests/Policies/main.cpp | 91 - .../dds4ccm/tests/Policies/octet_seq.cpp | 32 - CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h | 18 - .../dds4ccm/tests/Policies/ownership_qos_test.cpp | 13 - .../dds4ccm/tests/Policies/ownership_qos_test.h | 17 - .../tests/Policies/ownership_strength_qos_test.cpp | 12 - .../tests/Policies/ownership_strength_qos_test.h | 17 - .../dds4ccm/tests/Policies/partition_qos_test.cpp | 31 - .../dds4ccm/tests/Policies/partition_qos_test.h | 17 - .../connectors/dds4ccm/tests/Policies/policies.mpc | 47 - .../tests/Policies/presentation_qos_test.cpp | 17 - .../dds4ccm/tests/Policies/presentation_qos_test.h | 17 - .../dds4ccm/tests/Policies/pub_qos_test.cpp | 56 - .../dds4ccm/tests/Policies/pub_qos_test.h | 16 - .../tests/Policies/rd_lifecycle_qos_test.cpp | 17 - .../dds4ccm/tests/Policies/rd_lifecycle_qos_test.h | 17 - .../tests/Policies/reliability_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/reliability_qos_test.h | 17 - .../tests/Policies/resource_limits_qos_test.cpp | 15 - .../tests/Policies/resource_limits_qos_test.h | 17 - CIAO/connectors/dds4ccm/tests/Policies/run_test.pl | 27 - .../dds4ccm/tests/Policies/states_test.cpp | 130 - .../dds4ccm/tests/Policies/states_test.h | 15 - .../dds4ccm/tests/Policies/string_seq.cpp | 32 - .../connectors/dds4ccm/tests/Policies/string_seq.h | 18 - .../dds4ccm/tests/Policies/sub_qos_test.cpp | 57 - .../dds4ccm/tests/Policies/sub_qos_test.h | 17 - .../dds4ccm/tests/Policies/tbf_qos_test.cpp | 13 - .../dds4ccm/tests/Policies/tbf_qos_test.h | 17 - .../dds4ccm/tests/Policies/tp_data_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/tp_data_qos_test.h | 17 - .../dds4ccm/tests/Policies/tp_qos_test.cpp | 146 - .../dds4ccm/tests/Policies/tp_qos_test.h | 16 - .../tests/Policies/transport_prio_qos_test.cpp | 12 - .../tests/Policies/transport_prio_qos_test.h | 17 - .../typeconsistencyenforcement_qos_test.cpp | 16 - .../Policies/typeconsistencyenforcement_qos_test.h | 21 - .../dds4ccm/tests/Policies/user_data_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/user_data_qos_test.h | 17 - .../tests/Policies/wr_lifecycle_qos_test.cpp | 13 - .../dds4ccm/tests/Policies/wr_lifecycle_qos_test.h | 17 - CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore | 1 - .../tests/PortUsage/Base/PortUsage_Test_Base.idl | 37 - .../tests/PortUsage/Base/PortUsage_Test_Base.mpc | 24 - .../EventComponent/PortUsageEvent_Component.idl | 25 - .../EventComponent/PortUsageEvent_Component.mpc | 145 - .../PortUsageEvent_Component_exec.cpp | 291 - .../EventComponent/PortUsageEvent_Component_exec.h | 117 - .../EventConnector/PortUsageEvent_Connector.idl | 25 - .../EventConnector/PortUsageEvent_Connector.mpc | 142 - .../StateComponent/PortUsageState_Component.idl | 27 - .../StateComponent/PortUsageState_Component.mpc | 145 - .../PortUsageState_Component_exec.cpp | 360 - .../StateComponent/PortUsageState_Component_exec.h | 130 - .../StateConnector/PortUsageState_Connector.idl | 25 - .../StateConnector/PortUsageState_Connector.mpc | 142 - .../tests/PortUsage/descriptors/Event_Get.cdp | 259 - .../tests/PortUsage/descriptors/Event_Listen.cdp | 259 - .../tests/PortUsage/descriptors/Event_Write.cdp | 259 - .../tests/PortUsage/descriptors/State_Get.cdp | 259 - .../tests/PortUsage/descriptors/State_Listen.cdp | 259 - .../tests/PortUsage/descriptors/State_Read.cdp | 247 - .../PortUsage/descriptors/State_StateListen.cdp | 259 - .../tests/PortUsage/descriptors/State_Update.cdp | 259 - .../tests/PortUsage/descriptors/run_test.pl | 216 - .../Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl | 24 - .../Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc | 24 - .../Proxies/ReadWrite/Base/Reader_Starter.idl | 29 - .../Proxies/ReadWrite/Base/Reader_Starter.mpc | 110 - .../Connector/Proxy_RW_Test_Connector.idl | 25 - .../Connector/Proxy_RW_Test_Connector.mpc | 142 - .../ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl | 23 - .../ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc | 155 - .../Receiver/Proxy_RW_Test_Receiver_exec.cpp | 584 - .../Receiver/Proxy_RW_Test_Receiver_exec.h | 280 - .../ReadWrite/Sender/Proxy_RW_Test_Sender.idl | 26 - .../ReadWrite/Sender/Proxy_RW_Test_Sender.mpc | 151 - .../ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp | 420 - .../ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h | 207 - .../tests/Proxies/ReadWrite/descriptors/Plan.cdp | 425 - .../ReadWrite/descriptors/Proxy_RW_Library.xml | 38 - .../ReadWrite/descriptors/USER_QOS_PROFILES.xml | 67 - .../Proxies/ReadWrite/descriptors/run_test.pl | 243 - .../connectors/dds4ccm/tests/QosProfile/.gitignore | 1 - .../tests/QosProfile/Base/QosProfile_Test_Base.idl | 24 - .../tests/QosProfile/Base/QosProfile_Test_Base.mpc | 24 - .../Component/QosProfile_Test_Component.idl | 18 - .../Component/QosProfile_Test_Component.mpc | 145 - .../Component/QosProfile_Test_Component_exec.cpp | 63 - .../Component/QosProfile_Test_Component_exec.h | 48 - .../Connector/QosProfile_Test_Connector.idl | 25 - .../Connector/QosProfile_Test_Connector.mpc | 142 - .../QosProfile/descriptors/PlanMultipleHashes.cdp | 206 - .../tests/QosProfile/descriptors/PlanNoHash.cdp | 206 - .../QosProfile/descriptors/PlanWrongNames.cdp | 206 - .../QosProfile/descriptors/QosProfile_Library.xml | 36 - .../QosProfile/descriptors/USER_QOS_PROFILES.xml | 41 - .../tests/QosProfile/descriptors/run_test.pl | 229 - .../dds4ccm/tests/QueryCondition/DDS/Base/Base.idl | 14 - .../dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc | 13 - .../DDS/DDS_Receiver/DDS_Receiver.mpc | 19 - .../DDS/DDS_Receiver/QC_Receiver.cpp | 418 - .../QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc | 18 - .../QueryCondition/DDS/DDS_Sender/QC_Sender.cpp | 172 - .../dds4ccm/tests/QueryCondition/DDS/README | 40 - .../DDS/descriptors/USER_QOS_PROFILES.xml | 69 - .../QueryCondition/DDS/descriptors/run_test.pl | 31 - .../QueryCondition/DDS_OneByOne/Base/Base_ObO.idl | 14 - .../QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc | 13 - .../DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc | 19 - .../DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp | 432 - .../DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc | 18 - .../DDS_OneByOne/DDS_Sender/ObO_Sender.cpp | 172 - .../tests/QueryCondition/DDS_OneByOne/README | 40 - .../DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml | 69 - .../DDS_OneByOne/descriptors/run_test.pl | 31 - .../Different/Base/Different_Test_Base.idl | 24 - .../Different/Base/Different_Test_Base.mpc | 24 - .../Connector/Different_Test_Connector.idl | 25 - .../Connector/Different_Test_Connector.mpc | 146 - .../dds4ccm/tests/QueryCondition/Different/README | 20 - .../Different/Receiver/Different_Test_Receiver.idl | 20 - .../Different/Receiver/Different_Test_Receiver.mpc | 146 - .../Receiver/Different_Test_Receiver_exec.cpp | 661 - .../Receiver/Different_Test_Receiver_exec.h | 212 - .../Different/Sender/Different_Test_Sender.idl | 21 - .../Different/Sender/Different_Test_Sender.mpc | 145 - .../Sender/Different_Test_Sender_exec.cpp | 262 - .../Different/Sender/Different_Test_Sender_exec.h | 162 - .../QueryCondition/Different/descriptors/Plan.cdp | 458 - .../descriptors/QueryCondition_Library.xml | 38 - .../Different/descriptors/USER_QOS_PROFILES.xml | 67 - .../Different/descriptors/run_test.pl | 243 - .../EventListener/Base/QCLE_Test_Base.idl | 24 - .../EventListener/Base/QCLE_Test_Base.mpc | 24 - .../Connector/QCLE_Test_Connector.idl | 25 - .../Connector/QCLE_Test_Connector.mpc | 142 - .../EventListener/Receiver/QCLE_Test_Receiver.idl | 22 - .../EventListener/Receiver/QCLE_Test_Receiver.mpc | 146 - .../Receiver/QCLE_Test_Receiver_exec.cpp | 364 - .../Receiver/QCLE_Test_Receiver_exec.h | 191 - .../EventListener/Sender/QCLE_Test_Sender.idl | 22 - .../EventListener/Sender/QCLE_Test_Sender.mpc | 145 - .../EventListener/Sender/QCLE_Test_Sender_exec.cpp | 323 - .../EventListener/Sender/QCLE_Test_Sender_exec.h | 179 - .../EventListener/descriptors/Plan.cdp | 413 - .../EventListener/descriptors/run_test.pl | 243 - .../ReadGet/Base/ReadGet_Starter.idl | 23 - .../ReadGet/Base/ReadGet_Starter.mpc | 109 - .../ReadGet/Base/ReadGet_Test_Base.idl | 24 - .../ReadGet/Base/ReadGet_Test_Base.mpc | 24 - .../ReadGet/Connector/ReadGet_Test_Connector.idl | 25 - .../ReadGet/Connector/ReadGet_Test_Connector.mpc | 146 - .../ReadGet/Receiver/ReadGet_Test_Receiver.idl | 24 - .../ReadGet/Receiver/ReadGet_Test_Receiver.mpc | 155 - .../Receiver/ReadGet_Test_Receiver_exec.cpp | 823 - .../ReadGet/Receiver/ReadGet_Test_Receiver_exec.h | 253 - .../ReadGet/Sender/ReadGet_Test_Sender.idl | 25 - .../ReadGet/Sender/ReadGet_Test_Sender.mpc | 153 - .../ReadGet/Sender/ReadGet_Test_Sender_exec.cpp | 345 - .../ReadGet/Sender/ReadGet_Test_Sender_exec.h | 195 - .../QueryCondition/ReadGet/descriptors/Plan.cdp | 516 - .../ReadGet/descriptors/QueryCondition_Library.xml | 38 - .../ReadGet/descriptors/USER_QOS_PROFILES.xml | 67 - .../QueryCondition/ReadGet/descriptors/run_test.pl | 243 - .../StateListener/Base/QCLS_Test_Base.idl | 24 - .../StateListener/Base/QCLS_Test_Base.mpc | 24 - .../Connector/QCLS_Test_Connector.idl | 25 - .../Connector/QCLS_Test_Connector.mpc | 142 - .../StateListener/Receiver/QCLS_Test_Receiver.idl | 22 - .../StateListener/Receiver/QCLS_Test_Receiver.mpc | 146 - .../Receiver/QCLS_Test_Receiver_exec.cpp | 371 - .../Receiver/QCLS_Test_Receiver_exec.h | 198 - .../StateListener/Sender/QCLS_Test_Sender.idl | 22 - .../StateListener/Sender/QCLS_Test_Sender.mpc | 145 - .../StateListener/Sender/QCLS_Test_Sender_exec.cpp | 311 - .../StateListener/Sender/QCLS_Test_Sender_exec.h | 186 - .../StateListener/descriptors/Plan.cdp | 413 - .../StateListener/descriptors/run_test.pl | 243 - .../TwoListeners/Base/QCTL_Test_Base.idl | 24 - .../TwoListeners/Base/QCTL_Test_Base.mpc | 24 - .../TwoListeners/Connector/QCTL_Test_Connector.idl | 25 - .../TwoListeners/Connector/QCTL_Test_Connector.mpc | 142 - .../TwoListeners/Receiver/QCTL_Test_Receiver.idl | 23 - .../TwoListeners/Receiver/QCTL_Test_Receiver.mpc | 146 - .../Receiver/QCTL_Test_Receiver_exec.cpp | 593 - .../Receiver/QCTL_Test_Receiver_exec.h | 265 - .../TwoListeners/Sender/QCTL_Test_Sender.idl | 23 - .../TwoListeners/Sender/QCTL_Test_Sender.mpc | 145 - .../TwoListeners/Sender/QCTL_Test_Sender_exec.cpp | 306 - .../TwoListeners/Sender/QCTL_Test_Sender_exec.h | 177 - .../TwoListeners/descriptors/Plan.cdp | 492 - .../TwoListeners/descriptors/run_test.pl | 243 - .../TwoQueries/Base/QCTQ_Starter.idl | 23 - .../TwoQueries/Base/QCTQ_Starter.mpc | 109 - .../TwoQueries/Base/QCTQ_Test_Base.idl | 24 - .../TwoQueries/Base/QCTQ_Test_Base.mpc | 24 - .../TwoQueries/Connector/QCTQ_Test_Connector.idl | 25 - .../TwoQueries/Connector/QCTQ_Test_Connector.mpc | 146 - .../dds4ccm/tests/QueryCondition/TwoQueries/README | 39 - .../TwoQueries/Receiver/QCTQ_Test_Receiver.idl | 24 - .../TwoQueries/Receiver/QCTQ_Test_Receiver.mpc | 155 - .../Receiver/QCTQ_Test_Receiver_exec.cpp | 806 - .../TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h | 221 - .../TwoQueries/Sender/QCTQ_Test_Sender.idl | 25 - .../TwoQueries/Sender/QCTQ_Test_Sender.mpc | 153 - .../TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp | 349 - .../TwoQueries/Sender/QCTQ_Test_Sender_exec.h | 196 - .../QueryCondition/TwoQueries/descriptors/Plan.cdp | 520 - .../descriptors/QueryCondition_Library.xml | 38 - .../TwoQueries/descriptors/USER_QOS_PROFILES.xml | 67 - .../TwoQueries/descriptors/run_test.pl | 243 - .../TwoQueriesMany/Base/QCTQM_Starter.idl | 23 - .../TwoQueriesMany/Base/QCTQM_Starter.mpc | 109 - .../TwoQueriesMany/Base/QCTQM_Test_Base.idl | 24 - .../TwoQueriesMany/Base/QCTQM_Test_Base.mpc | 24 - .../Connector/QCTQM_Test_Connector.idl | 25 - .../Connector/QCTQM_Test_Connector.mpc | 146 - .../tests/QueryCondition/TwoQueriesMany/README | 39 - .../Receiver/QCTQM_Test_Receiver.idl | 24 - .../Receiver/QCTQM_Test_Receiver.mpc | 155 - .../Receiver/QCTQM_Test_Receiver_exec.cpp | 831 - .../Receiver/QCTQM_Test_Receiver_exec.h | 221 - .../TwoQueriesMany/Sender/QCTQM_Test_Sender.idl | 25 - .../TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc | 153 - .../Sender/QCTQM_Test_Sender_exec.cpp | 348 - .../TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h | 196 - .../TwoQueriesMany/descriptors/Plan.cdp | 520 - .../descriptors/QueryCondition_Library.xml | 37 - .../descriptors/USER_QOS_PROFILES.xml | 67 - .../TwoQueriesMany/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/Reader/.gitignore | 1 - .../dds4ccm/tests/Reader/Base/Reader_Starter.idl | 19 - .../dds4ccm/tests/Reader/Base/Reader_Starter.mpc | 110 - .../dds4ccm/tests/Reader/Base/Reader_Test_Base.idl | 24 - .../dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc | 25 - .../Reader/Connector/Reader_Test_Connector.idl | 25 - .../Reader/Connector/Reader_Test_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/Reader/README | 22 - .../tests/Reader/Receiver/Reader_Test_Receiver.idl | 22 - .../tests/Reader/Receiver/Reader_Test_Receiver.mpc | 155 - .../Reader/Receiver/Reader_Test_Receiver_exec.cpp | 816 - .../Reader/Receiver/Reader_Test_Receiver_exec.h | 251 - .../tests/Reader/Sender/Reader_Test_Sender.idl | 25 - .../tests/Reader/Sender/Reader_Test_Sender.mpc | 149 - .../Reader/Sender/Reader_Test_Sender_exec.cpp | 255 - .../tests/Reader/Sender/Reader_Test_Sender_exec.h | 167 - .../dds4ccm/tests/Reader/descriptors/Plan.cdp | 389 - .../tests/Reader/descriptors/Reader_Library.xml | 37 - .../tests/Reader/descriptors/USER_QOS_PROFILES.xml | 67 - .../dds4ccm/tests/Reader/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/ResetTopic/README | 32 - .../ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl | 24 - .../ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc | 24 - .../ResetTopic/ReadGet/Base/Reader_Starter.idl | 18 - .../ResetTopic/ReadGet/Base/Reader_Starter.mpc | 110 - .../ReadGet/Connector/RG_ResetTopic_Connector.idl | 25 - .../ReadGet/Connector/RG_ResetTopic_Connector.mpc | 146 - .../ReadGet/Receiver/RG_ResetTopic_Receiver.idl | 23 - .../ReadGet/Receiver/RG_ResetTopic_Receiver.mpc | 155 - .../Receiver/RG_ResetTopic_Receiver_exec.cpp | 281 - .../ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h | 192 - .../Receiver/RG_ResetTopic_Receiver_impl.cpp | 394 - .../ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h | 75 - .../ReadGet/Sender/RG_ResetTopic_Sender.idl | 24 - .../ReadGet/Sender/RG_ResetTopic_Sender.mpc | 150 - .../ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp | 256 - .../ReadGet/Sender/RG_ResetTopic_Sender_exec.h | 137 - .../tests/ResetTopic/ReadGet/descriptors/Plan.cdp | 461 - .../ReadGet/descriptors/ResetTopic_Library.xml | 36 - .../ReadGet/descriptors/USER_QOS_PROFILES.xml | 39 - .../ResetTopic/ReadGet/descriptors/run_test.pl | 243 - .../ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl | 24 - .../ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc | 24 - .../ToEmpty/Connector/TE_ResetTopic_Connector.idl | 25 - .../ToEmpty/Connector/TE_ResetTopic_Connector.mpc | 146 - .../ResetTopic/ToEmpty/Sender/SenderDriver.cpp | 92 - .../ToEmpty/Sender/TE_ResetTopic_Sender.idl | 27 - .../ToEmpty/Sender/TE_ResetTopic_Sender.mpc | 164 - .../ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp | 385 - .../ToEmpty/Sender/TE_ResetTopic_Sender_exec.h | 145 - .../tests/ResetTopic/ToEmpty/descriptors/Plan.cdp | 338 - .../ResetTopic/ToEmpty/descriptors/run_test.pl | 264 - .../ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl | 24 - .../ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc | 24 - .../TooLong/Connector/TL_ResetTopic_Connector.idl | 25 - .../TooLong/Connector/TL_ResetTopic_Connector.mpc | 146 - .../ResetTopic/TooLong/Sender/SenderDriver.cpp | 92 - .../TooLong/Sender/TL_ResetTopic_Sender.idl | 27 - .../TooLong/Sender/TL_ResetTopic_Sender.mpc | 164 - .../TooLong/Sender/TL_ResetTopic_Sender_exec.cpp | 426 - .../TooLong/Sender/TL_ResetTopic_Sender_exec.h | 145 - .../tests/ResetTopic/TooLong/descriptors/Plan.cdp | 338 - .../ResetTopic/TooLong/descriptors/run_test.pl | 264 - .../UpdateListen/Base/UL_ResetTopic_Base.idl | 24 - .../UpdateListen/Base/UL_ResetTopic_Base.mpc | 24 - .../Connector/UL_ResetTopic_Connector.idl | 25 - .../Connector/UL_ResetTopic_Connector.mpc | 146 - .../UpdateListen/Receiver/ReceiverDriver.cpp | 87 - .../Receiver/UL_ResetTopic_Receiver.idl | 26 - .../Receiver/UL_ResetTopic_Receiver.mpc | 160 - .../Receiver/UL_ResetTopic_Receiver_exec.cpp | 328 - .../Receiver/UL_ResetTopic_Receiver_exec.h | 197 - .../UpdateListen/Sender/SenderDriver.cpp | 87 - .../UpdateListen/Sender/UL_ResetTopic_Sender.idl | 26 - .../UpdateListen/Sender/UL_ResetTopic_Sender.mpc | 164 - .../Sender/UL_ResetTopic_Sender_exec.cpp | 333 - .../Sender/UL_ResetTopic_Sender_exec.h | 146 - .../ResetTopic/UpdateListen/descriptors/Plan.cdp | 407 - .../UpdateListen/descriptors/run_test.pl | 280 - .../WriteListen/Base/WL_ResetTopic_Base.idl | 24 - .../WriteListen/Base/WL_ResetTopic_Base.mpc | 24 - .../Connector/WL_ResetTopic_Connector.idl | 25 - .../Connector/WL_ResetTopic_Connector.mpc | 146 - .../WriteListen/Receiver/ReceiverDriver.cpp | 87 - .../Receiver/WL_ResetTopic_Receiver.idl | 26 - .../Receiver/WL_ResetTopic_Receiver.mpc | 160 - .../Receiver/WL_ResetTopic_Receiver_exec.cpp | 307 - .../Receiver/WL_ResetTopic_Receiver_exec.h | 179 - .../ResetTopic/WriteListen/Sender/SenderDriver.cpp | 87 - .../WriteListen/Sender/WL_ResetTopic_Sender.idl | 26 - .../WriteListen/Sender/WL_ResetTopic_Sender.mpc | 164 - .../Sender/WL_ResetTopic_Sender_exec.cpp | 281 - .../WriteListen/Sender/WL_ResetTopic_Sender_exec.h | 137 - .../ResetTopic/WriteListen/descriptors/Plan.cdp | 407 - .../ResetTopic/WriteListen/descriptors/run_test.pl | 280 - .../connectors/dds4ccm/tests/SLDisabled/.gitignore | 1 - .../tests/SLDisabled/Base/SL_Disabled_Base.idl | 24 - .../tests/SLDisabled/Base/SL_Disabled_Base.mpc | 24 - .../SLDisabled/Connector/SL_Disabled_Connector.idl | 25 - .../SLDisabled/Connector/SL_Disabled_Connector.mpc | 142 - .../SLDisabled/Receiver/SL_Disabled_Receiver.idl | 19 - .../SLDisabled/Receiver/SL_Disabled_Receiver.mpc | 136 - .../Receiver/SL_Disabled_Receiver_exec.cpp | 247 - .../Receiver/SL_Disabled_Receiver_exec.h | 181 - .../tests/SLDisabled/Sender/SL_Disabled_Sender.idl | 19 - .../tests/SLDisabled/Sender/SL_Disabled_Sender.mpc | 138 - .../SLDisabled/Sender/SL_Disabled_Sender_exec.cpp | 513 - .../SLDisabled/Sender/SL_Disabled_Sender_exec.h | 185 - .../dds4ccm/tests/SLDisabled/descriptors/Plan.cdp | 386 - .../tests/SLDisabled/descriptors/run_test.pl | 243 - .../dds4ccm/tests/SLManyByMany/.gitignore | 1 - .../tests/SLManyByMany/Base/SL_ManyByMany_Base.idl | 24 - .../tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc | 24 - .../Connector/SL_ManyByMany_Connector.idl | 24 - .../Connector/SL_ManyByMany_Connector.mpc | 142 - CIAO/connectors/dds4ccm/tests/SLManyByMany/README | 26 - .../Receiver/SL_ManyByMany_Receiver.idl | 19 - .../Receiver/SL_ManyByMany_Receiver.mpc | 136 - .../Receiver/SL_ManyByMany_Receiver_exec.cpp | 612 - .../Receiver/SL_ManyByMany_Receiver_exec.h | 208 - .../SLManyByMany/Sender/SL_ManyByMany_Sender.idl | 19 - .../SLManyByMany/Sender/SL_ManyByMany_Sender.mpc | 138 - .../Sender/SL_ManyByMany_Sender_exec.cpp | 544 - .../Sender/SL_ManyByMany_Sender_exec.h | 187 - .../tests/SLManyByMany/descriptors/Plan.cdp | 407 - .../SLManyByMany/descriptors/SlMbM_Library.xml | 47 - .../SLManyByMany/descriptors/USER_QOS_PROFILES.xml | 79 - .../tests/SLManyByMany/descriptors/run_test.pl | 243 - .../connectors/dds4ccm/tests/SLOneByOne/.gitignore | 1 - .../tests/SLOneByOne/Base/SL_OneByOne_Base.idl | 24 - .../tests/SLOneByOne/Base/SL_OneByOne_Base.mpc | 24 - .../SLOneByOne/Connector/SLOneByOne_Connector.mpc | 142 - .../SLOneByOne/Connector/SL_OneByOne_Connector.idl | 25 - .../SLOneByOne/Receiver/SL_OneByOne_Receiver.idl | 19 - .../SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc | 136 - .../Receiver/SL_OneByOne_Receiver_exec.cpp | 455 - .../Receiver/SL_OneByOne_Receiver_exec.h | 179 - .../tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl | 19 - .../tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc | 138 - .../SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp | 482 - .../SLOneByOne/Sender/SL_OneByOne_Sender_exec.h | 160 - .../dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp | 407 - .../tests/SLOneByOne/descriptors/SlObO_Library.xml | 47 - .../SLOneByOne/descriptors/USER_QOS_PROFILES.xml | 79 - .../tests/SLOneByOne/descriptors/run_test.pl | 243 - .../tests/SetConnectorAttributes/.gitignore | 1 - .../Base/SetConnectorAttribute_Base.idl | 23 - .../Base/SetConnectorAttribute_Base.mpc | 24 - .../SetConnectorAttributes/Component/.gitignore | 5 - .../Component/SetConnectorAttribute_Component.idl | 19 - .../Component/SetConnectorAttribute_Component.mpc | 145 - .../SetConnectorAttribute_Component_exec.cpp | 203 - .../SetConnectorAttribute_Component_exec.h | 61 - .../Connector/SetConnectorAttribute_Connector.idl | 27 - .../Connector/SetConnectorAttribute_Connector.mpc | 142 - .../dds4ccm/tests/SetConnectorAttributes/README | 15 - .../SetConnectorAttributes/descriptors/Plan.cdp | 209 - .../SetConnectorAttributes/descriptors/run_test.pl | 243 - .../DifferentDatatype/Base/Base.idl | 46 - .../DifferentDatatype/Base/Base.mpc | 24 - .../DifferentDatatype/Component/Component.idl | 23 - .../DifferentDatatype/Component/Component.mpc | 152 - .../DifferentDatatype/Component/Component_exec.cpp | 317 - .../DifferentDatatype/Component/Component_exec.h | 52 - .../DifferentDatatype/Connector1/Connector1.idl | 27 - .../DifferentDatatype/Connector1/Connector1.mpc | 140 - .../DifferentDatatype/Connector2/Connector2.idl | 25 - .../DifferentDatatype/Connector2/Connector2.mpc | 140 - .../DifferentDatatype/Connector3/Connector3.idl | 25 - .../DifferentDatatype/Connector3/Connector3.mpc | 140 - .../DifferentDatatype/descriptors/Plan.cdp | 445 - .../descriptors/Shared_Library.xml | 38 - .../descriptors/Standalone_Library.xml | 38 - .../descriptors/USER_QOS_PROFILES.xml | 80 - .../DifferentDatatype/descriptors/run_test.pl | 237 - .../DifferentDomainID/Base/Base.idl | 45 - .../DifferentDomainID/Base/Base.mpc | 24 - .../DifferentDomainID/Component/Component.idl | 23 - .../DifferentDomainID/Component/Component.mpc | 152 - .../DifferentDomainID/Component/Component_exec.cpp | 316 - .../DifferentDomainID/Component/Component_exec.h | 52 - .../DifferentDomainID/Connector1/Connector1.idl | 27 - .../DifferentDomainID/Connector1/Connector1.mpc | 140 - .../DifferentDomainID/Connector2/Connector2.idl | 25 - .../DifferentDomainID/Connector2/Connector2.mpc | 140 - .../DifferentDomainID/Connector3/Connector3.idl | 25 - .../DifferentDomainID/Connector3/Connector3.mpc | 140 - .../DifferentDomainID/descriptors/Plan.cdp | 478 - .../descriptors/Shared_Library.xml | 38 - .../descriptors/Standalone_Library.xml | 38 - .../descriptors/USER_QOS_PROFILES.xml | 80 - .../DifferentDomainID/descriptors/run_test.pl | 241 - .../dds4ccm/tests/SharedDomainParticipant/README | 11 - .../SameDatatype/Base/Base.idl | 23 - .../SameDatatype/Base/Base.mpc | 24 - .../SameDatatype/Component/Component.idl | 24 - .../SameDatatype/Component/Component.mpc | 144 - .../SameDatatype/Component/Component_exec.cpp | 586 - .../SameDatatype/Component/Component_exec.h | 69 - .../SameDatatype/Connector/Connector.idl | 25 - .../SameDatatype/Connector/Connector.mpc | 138 - .../SameDatatype/descriptors/DefaultQoS.cdp | 321 - .../SameDatatype/descriptors/Plan.cdp | 496 - .../SameDatatype/descriptors/Shared_Library.xml | 38 - .../descriptors/Standalone_Library.xml | 38 - .../SameDatatype/descriptors/USER_QOS_PROFILES.xml | 80 - .../SameDatatype/descriptors/run_test.pl | 244 - .../descriptors/run_test_default_qos.pl | 244 - .../dds4ccm/tests/State_Connection_Test/.gitignore | 1 - .../Base/State_Connection_Test_Base.idl | 24 - .../Base/State_Connection_Test_Base.mpc | 24 - .../Connector/State_Connection_Test_Connector.idl | 25 - .../Connector/State_Connection_Test_Connector.mpc | 142 - .../dds4ccm/tests/State_Connection_Test/README | 35 - .../State_Connection_Test/Receiver/.gitignore | 5 - .../Receiver/State_Connection_Test_Receiver.idl | 22 - .../Receiver/State_Connection_Test_Receiver.mpc | 135 - .../State_Connection_Test_Receiver_exec.cpp | 374 - .../Receiver/State_Connection_Test_Receiver_exec.h | 112 - .../tests/State_Connection_Test/Sender/.gitignore | 5 - .../Sender/State_Connection_Test_Sender.idl | 18 - .../Sender/State_Connection_Test_Sender.mpc | 138 - .../Sender/State_Connection_Test_Sender_exec.cpp | 98 - .../Sender/State_Connection_Test_Sender_exec.h | 45 - .../State_Connection_Test/descriptors/Plan.cdp | 721 - .../State_Connection_Test/descriptors/run_test.pl | 243 - .../dds4ccm/tests/TimeConversion/.gitignore | 1 - .../tests/TimeConversion/Time_Conversion.mpc | 7 - .../dds4ccm/tests/TimeConversion/run_test.pl | 27 - .../tests/TimeConversion/time_conversion.cpp | 84 - .../tests/TopicName/Base/TopicName_Test_Base.idl | 25 - .../tests/TopicName/Base/TopicName_Test_Base.mpc | 24 - .../Component/TopicName_Test_Component.idl | 18 - .../Component/TopicName_Test_Component.mpc | 145 - .../Component/TopicName_Test_Component_exec.cpp | 63 - .../Component/TopicName_Test_Component_exec.h | 47 - .../Connector/TopicName_Test_Connector.idl | 22 - .../Connector/TopicName_Test_Connector.mpc | 142 - .../tests/TopicName/descriptors/TooLong.cdp | 191 - .../tests/TopicName/descriptors/run_test.pl | 231 - CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore | 1 - .../dds4ccm/tests/TwoTopics/Base/.gitignore | 7 - .../tests/TwoTopics/Base/TwoTopics_Base.idl | 34 - .../tests/TwoTopics/Base/TwoTopics_Base.mpc | 24 - .../dds4ccm/tests/TwoTopics/Connector/.gitignore | 7 - .../TwoTopics/Connector/TwoTopics_Connector.idl | 26 - .../TwoTopics/Connector/TwoTopics_Connector.mpc | 142 - .../dds4ccm/tests/TwoTopicsDifferentNs/.gitignore | 1 - .../TwoTopicsDifferentNs/Connector/Connector.idl | 48 - .../TwoTopicsDifferentNs/Connector/Connector.mpc | 145 - .../tests/TwoTopicsDifferentNs/Goodbye/.gitignore | 7 - .../TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl | 26 - .../TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc | 24 - .../tests/TwoTopicsDifferentNs/Hello/.gitignore | 7 - .../TwoTopicsDifferentNs/Hello/HelloGoodbye.idl | 27 - .../TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc | 24 - .../dds4ccm/tests/TypeSupport/TypeSupport.mpc | 8 - CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp | 297 - .../dds4ccm/tests/TypeSupport/run_test.pl | 27 - .../dds4ccm/tests/UnkeyedSamples/.gitignore | 1 - .../UnkeyedSamples/Base/Unkeyed_Test_Base.idl | 23 - .../UnkeyedSamples/Base/Unkeyed_Test_Base.mpc | 24 - .../tests/UnkeyedSamples/Connector/.gitignore | 7 - .../Connector/Unkeyed_Test_Connector.idl | 25 - .../Connector/Unkeyed_Test_Connector.mpc | 146 - .../connectors/dds4ccm/tests/UnkeyedSamples/README | 6 - .../tests/UnkeyedSamples/Receiver/.gitignore | 5 - .../Receiver/Unkeyed_Test_Receiver.idl | 22 - .../Receiver/Unkeyed_Test_Receiver.mpc | 136 - .../Receiver/Unkeyed_Test_Receiver_exec.cpp | 370 - .../Receiver/Unkeyed_Test_Receiver_exec.h | 234 - .../dds4ccm/tests/UnkeyedSamples/Sender/.gitignore | 5 - .../UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl | 22 - .../UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc | 138 - .../Sender/Unkeyed_Test_Sender_exec.cpp | 324 - .../Sender/Unkeyed_Test_Sender_exec.h | 184 - .../tests/UnkeyedSamples/descriptors/Plan.cdp | 424 - .../tests/UnkeyedSamples/descriptors/run_test.pl | 243 - .../dds4ccm/tests/UnkeyedWriter/.gitignore | 1 - .../tests/UnkeyedWriter/Base/Writer_Base.idl | 26 - .../tests/UnkeyedWriter/Base/Writer_Base.mpc | 24 - .../UnkeyedWriter/Connector/Writer_Connector.idl | 25 - .../UnkeyedWriter/Connector/Writer_Connector.mpc | 146 - .../UnkeyedWriter/Receiver/Writer_Receiver.idl | 21 - .../UnkeyedWriter/Receiver/Writer_Receiver.mpc | 136 - .../Receiver/Writer_Receiver_exec.cpp | 267 - .../UnkeyedWriter/Receiver/Writer_Receiver_exec.h | 185 - .../tests/UnkeyedWriter/Sender/Writer_Sender.idl | 23 - .../tests/UnkeyedWriter/Sender/Writer_Sender.mpc | 138 - .../UnkeyedWriter/Sender/Writer_Sender_exec.cpp | 465 - .../UnkeyedWriter/Sender/Writer_Sender_exec.h | 199 - .../tests/UnkeyedWriter/descriptors/Plan.cdp | 430 - .../descriptors/USER_QOS_PROFILES.xml | 67 - .../descriptors/UnkeyedWriter_Library.xml | 39 - .../tests/UnkeyedWriter/descriptors/run_test.pl | 243 - CIAO/connectors/dds4ccm/tests/Updater/.gitignore | 1 - .../dds4ccm/tests/Updater/Base/Updater_Base.idl | 24 - .../dds4ccm/tests/Updater/Base/Updater_Base.mpc | 24 - .../tests/Updater/Connector/Updater_Connector.idl | 25 - .../tests/Updater/Connector/Updater_Connector.mpc | 142 - .../tests/Updater/Receiver/Updater_Receiver.idl | 19 - .../tests/Updater/Receiver/Updater_Receiver.mpc | 136 - .../Updater/Receiver/Updater_Receiver_exec.cpp | 278 - .../tests/Updater/Receiver/Updater_Receiver_exec.h | 173 - .../tests/Updater/Sender/Updater_Sender.idl | 19 - .../tests/Updater/Sender/Updater_Sender.mpc | 138 - .../tests/Updater/Sender/Updater_Sender_exec.cpp | 773 - .../tests/Updater/Sender/Updater_Sender_exec.h | 201 - .../dds4ccm/tests/Updater/descriptors/Plan.cdp | 390 - .../dds4ccm/tests/Updater/descriptors/run_test.pl | 243 - .../dds4ccm/tests/UserdataCopyCount/.gitignore | 1 - .../tests/UserdataCopyCount/Base/.gitignore | 7 - .../tests/UserdataCopyCount/Base/UCC_Test_Base.idl | 37 - .../tests/UserdataCopyCount/Base/UCC_Test_Base.mpc | 24 - .../tests/UserdataCopyCount/Component/.gitignore | 5 - .../Component/UCC_Test_Component.idl | 19 - .../Component/UCC_Test_Component.mpc | 146 - .../Component/UCC_Test_Component_exec.cpp | 322 - .../Component/UCC_Test_Component_exec.h | 202 - .../tests/UserdataCopyCount/Connector/.gitignore | 7 - .../Connector/UCC_Test_Connector.idl | 30 - .../Connector/UCC_Test_Connector.mpc | 142 - .../tests/UserdataCopyCount/descriptors/Plan.cdp | 283 - .../UserdataCopyCount/descriptors/run_test.pl | 243 - .../dds4ccm/tests/VariousTopicsEvent/.gitignore | 1 - .../tests/VariousTopicsEvent/Base/.gitignore | 7 - .../tests/VariousTopicsEvent/Base/VTopic_Base.idl | 118 - .../tests/VariousTopicsEvent/Base/VTopic_Base.mpc | 25 - .../tests/VariousTopicsEvent/Conn_Array/.gitignore | 7 - .../Conn_Array/VT_Array_Connector.idl | 25 - .../Conn_Array/VT_Array_Connector.mpc | 141 - .../tests/VariousTopicsEvent/Conn_Seq/.gitignore | 7 - .../Conn_Seq/VT_Seq_Connector.idl | 25 - .../Conn_Seq/VT_Seq_Connector.mpc | 141 - .../VariousTopicsEvent/Conn_String/.gitignore | 7 - .../Conn_String/VT_String_Connector.idl | 25 - .../Conn_String/VT_String_Connector.mpc | 142 - .../tests/VariousTopicsEvent/Conn_Union/.gitignore | 7 - .../Conn_Union/VT_Union_Connector.idl | 30 - .../Conn_Union/VT_Union_Connector.mpc | 140 - .../VariousTopicsEvent/Conn_Valuetype/.gitignore | 7 - .../Conn_Valuetype/VT_Valuetype_Connector.idl | 30 - .../Conn_Valuetype/VT_Valuetype_Connector.mpc | 140 - .../tests/VariousTopicsEvent/Connector/.gitignore | 7 - .../Connector/VTopic_Connector.idl | 25 - .../Connector/VTopic_Connector.mpc | 142 - .../tests/VariousTopicsEvent/Receiver/.gitignore | 5 - .../Receiver/VTopic_Receiver.idl | 20 - .../Receiver/VTopic_Receiver.mpc | 166 - .../Receiver/VTopic_Receiver_exec.cpp | 155 - .../Receiver/VTopic_Receiver_exec.h | 92 - .../tests/VariousTopicsEvent/Sender/.gitignore | 5 - .../VariousTopicsEvent/Sender/VTopic_Sender.idl | 19 - .../VariousTopicsEvent/Sender/VTopic_Sender.mpc | 169 - .../Sender/VTopic_Sender_exec.cpp | 139 - .../VariousTopicsEvent/Sender/VTopic_Sender_exec.h | 81 - .../tests/VariousTopicsEvent/descriptors/Plan.cdp | 1247 - .../VariousTopicsEvent/descriptors/run_test.pl | 243 - .../dds4ccm/tests/VariousTopicsState/.gitignore | 1 - .../tests/VariousTopicsState/Base/VTopics_Base.idl | 118 - .../tests/VariousTopicsState/Base/VTopics_Base.mpc | 25 - .../Conn_Array/VTS_Array_Connector.idl | 25 - .../Conn_Array/VTS_Array_Connector.mpc | 141 - .../Conn_Seq/VTS_Seq_Connector.idl | 25 - .../Conn_Seq/VTS_Seq_Connector.mpc | 141 - .../Conn_String/VTS_String_Connector.idl | 25 - .../Conn_String/VTS_String_Connector.mpc | 142 - .../Conn_Union/VTS_Union_Connector.idl | 31 - .../Conn_Union/VTS_Union_Connector.mpc | 140 - .../Conn_Valuetype/VTS_Valuetype_Connector.idl | 30 - .../Conn_Valuetype/VTS_Valuetype_Connector.mpc | 143 - .../Connector/VTopics_Connector.idl | 25 - .../Connector/VTopics_Connector.mpc | 142 - .../Receiver/VTopics_Receiver.idl | 20 - .../Receiver/VTopics_Receiver.mpc | 170 - .../Receiver/VTopics_Receiver_exec.cpp | 155 - .../Receiver/VTopics_Receiver_exec.h | 90 - .../VariousTopicsState/Sender/VTopics_Sender.idl | 19 - .../VariousTopicsState/Sender/VTopics_Sender.mpc | 166 - .../Sender/VTopics_Sender_exec.cpp | 138 - .../Sender/VTopics_Sender_exec.h | 82 - .../tests/VariousTopicsState/descriptors/Plan.cdp | 1095 - .../VariousTopicsState/descriptors/run_test.pl | 243 - .../Shapes_asm/Deployment/descriptors/Plan.cdp | 498 - .../Shapes_asm/Deployment/scripts/run_test.pl | 242 - .../src/Shapes_Control_comp.idl | 22 - .../src/Shapes_Control_comp.mpc | 177 - .../src/Shapes_Control_comp_exec.cpp | 297 - .../src/Shapes_Control_comp_exec.h | 216 - .../src/Shapes_Receiver_comp.idl | 14 - .../src/Shapes_Receiver_comp.mpc | 173 - .../src/Shapes_Receiver_comp_exec.cpp | 188 - .../src/Shapes_Receiver_comp_exec.h | 201 - .../Shapes_Sender_comp/src/Shapes_Sender_comp.idl | 17 - .../Shapes_Sender_comp/src/Shapes_Sender_comp.mpc | 181 - .../src/Shapes_Sender_comp_exec.cpp | 236 - .../src/Shapes_Sender_comp_exec.h | 168 - .../tutorials/Shapes/Shapes_asm/ports/Shapes.mpb | 7 - .../Shapes/Shapes_asm/ports/Shapes_Control_obj.idl | 18 - .../Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc | 125 - .../Shapes_asm/ports/Shapes_ShapeType_conn.idl | 26 - .../Shapes_asm/ports/Shapes_ShapeType_conn.mpc | 152 - .../Shapes_asm/ports/Shapes_ShapeType_msg.idl | 22 - .../Shapes_asm/ports/Shapes_ShapeType_msg.mpc | 27 - .../Shapes/Shapes_asm/ports/Shapes_defn.idl | 13 - .../Shapes/Shapes_asm/ports/Shapes_defn.mpc | 41 - .../tutorials/Shapes/Tutorial/01_general.html | 131 - .../dds4ccm/tutorials/Shapes/Tutorial/02_idl.html | 194 - .../tutorials/Shapes/Tutorial/03_executors.html | 128 - .../tutorials/Shapes/Tutorial/04_dds4ccm.html | 75 - .../tutorials/Shapes/Tutorial/05_coding.html | 28 - .../tutorials/Shapes/Tutorial/06_compilation.html | 248 - .../Shapes/Tutorial/Code/Deployment/Plan.cdp | 476 - .../Shapes/Tutorial/Code/Deployment/artifacts.cdp | 67 - .../Tutorial/Code/Deployment/connections.cdp | 75 - .../Tutorial/Code/Deployment/implementation.cdp | 52 - .../Shapes/Tutorial/Code/Deployment/instance.cdp | 63 - .../Shapes_Control_comp_exec.cpp | 190 - .../Shapes_Control_comp/Shapes_Control_comp_exec.h | 188 - .../Shapes_Receiver_comp_exec.cpp | 204 - .../Shapes_Receiver_comp_exec.h | 199 - .../Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp | 152 - .../Shapes_Sender_comp/Shapes_Sender_comp_exec.h | 158 - .../tutorials/Shapes/Tutorial/images/images.png | Bin 5359 -> 0 bytes .../tutorials/Shapes/Tutorial/images/system.png | Bin 14963 -> 0 bytes CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl | 28 - CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc | 212 - CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl | 25 - .../tests/AMIDDS/Connector/AmiDds_Connector.idl | 25 - .../tests/AMIDDS/Connector/AmiDds_Connector.mpc | 141 - CIAO/connectors/tests/AMIDDS/README.txt | 3 - .../tests/AMIDDS/Receiver/AmiDds_Receiver.idl | 21 - .../tests/AMIDDS/Receiver/AmiDds_Receiver.mpc | 133 - .../tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp | 155 - .../tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h | 90 - .../tests/AMIDDS/Sender/AmiDds_Sender.idl | 26 - .../tests/AMIDDS/Sender/AmiDds_Sender.mpc | 130 - .../tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp | 372 - .../tests/AMIDDS/Sender/AmiDds_Sender_exec.h | 92 - CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp | 576 - .../tests/AMIDDS/descriptors/run_test.pl | 243 - CIAO/docs/CIAO.pdf | Bin 1803308 -> 0 bytes CIAO/docs/CIAO_Style_Guide.txt | 62 - CIAO/docs/CIAO_android_port.html | 168 - CIAO/docs/ConfigValues.html | 270 - CIAO/docs/Connectors.graffle | 13260 --- CIAO/docs/EnvVars.html | 35 - CIAO/docs/OMG-CCM-Tutorial.pptx | Bin 7401850 -> 0 bytes CIAO/docs/Porting_Hints.txt | 56 - CIAO/docs/Purify.html | 72 - CIAO/docs/TODO.html | 233 - CIAO/docs/Trace.html | 32 - CIAO/docs/XML/componentassembly.dtd | 367 - CIAO/docs/XML/corbacomponent.dtd | 316 - CIAO/docs/XML/properties.dtd | 87 - CIAO/docs/XML/softpkg.dtd | 220 - CIAO/docs/com-impl.html | 58 - CIAO/docs/fm/CIAO-1.gif | Bin 897 -> 0 bytes CIAO/docs/fm/CIAO-10.gif | Bin 9758 -> 0 bytes CIAO/docs/fm/CIAO-11.gif | Bin 7417 -> 0 bytes CIAO/docs/fm/CIAO-12.gif | Bin 3720 -> 0 bytes CIAO/docs/fm/CIAO-13.gif | Bin 4870 -> 0 bytes CIAO/docs/fm/CIAO-14.gif | Bin 6765 -> 0 bytes CIAO/docs/fm/CIAO-15.gif | Bin 5063 -> 0 bytes CIAO/docs/fm/CIAO-16.gif | Bin 10013 -> 0 bytes CIAO/docs/fm/CIAO-17.gif | Bin 7900 -> 0 bytes CIAO/docs/fm/CIAO-18.gif | Bin 5065 -> 0 bytes CIAO/docs/fm/CIAO-19.gif | Bin 4998 -> 0 bytes CIAO/docs/fm/CIAO-2.gif | Bin 3437 -> 0 bytes CIAO/docs/fm/CIAO-20.gif | Bin 3646 -> 0 bytes CIAO/docs/fm/CIAO-21.gif | Bin 7937 -> 0 bytes CIAO/docs/fm/CIAO-22.gif | Bin 3578 -> 0 bytes CIAO/docs/fm/CIAO-23.gif | Bin 6979 -> 0 bytes CIAO/docs/fm/CIAO-24.gif | Bin 6767 -> 0 bytes CIAO/docs/fm/CIAO-25.gif | Bin 7222 -> 0 bytes CIAO/docs/fm/CIAO-26.gif | Bin 3599 -> 0 bytes CIAO/docs/fm/CIAO-27.gif | Bin 6936 -> 0 bytes CIAO/docs/fm/CIAO-28.gif | Bin 7408 -> 0 bytes CIAO/docs/fm/CIAO-29.gif | Bin 8489 -> 0 bytes CIAO/docs/fm/CIAO-3.gif | Bin 3237 -> 0 bytes CIAO/docs/fm/CIAO-30.gif | Bin 3599 -> 0 bytes CIAO/docs/fm/CIAO-31.gif | Bin 5718 -> 0 bytes CIAO/docs/fm/CIAO-32.gif | Bin 6704 -> 0 bytes CIAO/docs/fm/CIAO-33.gif | Bin 3430 -> 0 bytes CIAO/docs/fm/CIAO-34.gif | Bin 3498 -> 0 bytes CIAO/docs/fm/CIAO-35.gif | Bin 7937 -> 0 bytes CIAO/docs/fm/CIAO-36.gif | Bin 9758 -> 0 bytes CIAO/docs/fm/CIAO-37.gif | Bin 5249 -> 0 bytes CIAO/docs/fm/CIAO-4.gif | Bin 3223 -> 0 bytes CIAO/docs/fm/CIAO-5.gif | Bin 4813 -> 0 bytes CIAO/docs/fm/CIAO-6.gif | Bin 3939 -> 0 bytes CIAO/docs/fm/CIAO-7.gif | Bin 3750 -> 0 bytes CIAO/docs/fm/CIAO-8.gif | Bin 950 -> 0 bytes CIAO/docs/fm/CIAO-9.gif | Bin 3592 -> 0 bytes CIAO/docs/fm/CIAO.css | 1802 - CIAO/docs/fm/CIAO.fm | Bin 669696 -> 0 bytes CIAO/docs/fm/CIAO.htm | 12199 --- .../images/CIAO_Component_Container_and_CORBA.eps | Bin 23331 -> 0 bytes .../images/CIAO_Component_Container_and_CORBA.sxd | Bin 7110 -> 0 bytes .../CIAO_Components_Administrator_Highlight.eps | Bin 33784 -> 0 bytes .../CIAO_Components_Administrator_Highlight.sxd | Bin 7984 -> 0 bytes .../images/CIAO_Components_Messenger_Highlight.eps | Bin 33795 -> 0 bytes .../images/CIAO_Components_Messenger_Highlight.sxd | Bin 7974 -> 0 bytes ...IAO_Components_Messenger_Runnable_Highlight.eps | Bin 33545 -> 0 bytes ...IAO_Components_Messenger_Runnable_Highlight.sxd | Bin 7913 -> 0 bytes .../images/CIAO_Components_Receiver_Highlight.eps | Bin 33765 -> 0 bytes .../images/CIAO_Components_Receiver_Highlight.sxd | Bin 7996 -> 0 bytes .../fm/images/CIAO_Descriptors_Administrator.eps | Bin 45153 -> 0 bytes .../fm/images/CIAO_Descriptors_Administrator.sxd | Bin 7650 -> 0 bytes .../fm/images/CIAO_Descriptors_Application.eps | Bin 43126 -> 0 bytes .../fm/images/CIAO_Descriptors_Application.sxd | Bin 7749 -> 0 bytes CIAO/docs/fm/images/CIAO_Descriptors_Messenger.eps | Bin 45003 -> 0 bytes CIAO/docs/fm/images/CIAO_Descriptors_Messenger.sxd | Bin 7689 -> 0 bytes .../images/CIAO_Descriptors_Messenger_Assembly.eps | Bin 45649 -> 0 bytes .../images/CIAO_Descriptors_Messenger_Assembly.sxd | Bin 7734 -> 0 bytes CIAO/docs/fm/images/CIAO_Descriptors_Receiver.eps | Bin 43962 -> 0 bytes CIAO/docs/fm/images/CIAO_Descriptors_Receiver.sxd | Bin 7609 -> 0 bytes .../fm/images/CIAO_Generic_Component_Diagram.eps | Bin 24463 -> 0 bytes .../fm/images/CIAO_Generic_Component_Diagram.sxd | Bin 7347 -> 0 bytes CIAO/docs/fm/images/CIAO_IDL3_to_IDL2_Files.eps | Bin 36027 -> 0 bytes CIAO/docs/fm/images/CIAO_IDL3_to_IDL2_Files.sxd | Bin 7578 -> 0 bytes CIAO/docs/fm/images/CIAO_IDL_CIDL_Files.eps | Bin 55449 -> 0 bytes CIAO/docs/fm/images/CIAO_IDL_CIDL_Files.sxd | Bin 7907 -> 0 bytes .../images/CIAO_IDL_CIDL_Files_CIDL_Highlight.eps | Bin 56760 -> 0 bytes .../images/CIAO_IDL_CIDL_Files_CIDL_Highlight.sxd | Bin 8165 -> 0 bytes .../fm/images/CIAO_MessengerHome_Class_Diagram.eps | Bin 48412 -> 0 bytes .../fm/images/CIAO_MessengerHome_Class_Diagram.sxd | Bin 7983 -> 0 bytes .../fm/images/CIAO_Messenger_Class_Diagram.eps | Bin 54234 -> 0 bytes .../fm/images/CIAO_Messenger_Class_Diagram.sxd | Bin 8447 -> 0 bytes .../fm/images/CIAO_Messenger_Component_Diagram.eps | Bin 33462 -> 0 bytes .../fm/images/CIAO_Messenger_Component_Diagram.sxd | Bin 7825 -> 0 bytes .../images/CIAO_Messenger_Deployment_Diagram.eps | Bin 50590 -> 0 bytes .../images/CIAO_Messenger_Deployment_Diagram.sxd | Bin 7886 -> 0 bytes ...eployment_Diagram_All_Connections_Highlight.eps | Bin 229977 -> 0 bytes ...eployment_Diagram_All_Connections_Highlight.sxd | Bin 8041 -> 0 bytes ...nger_Deployment_Diagram_All_Nodes_Highlight.eps | Bin 230269 -> 0 bytes ...nger_Deployment_Diagram_All_Nodes_Highlight.sxd | Bin 7934 -> 0 bytes ...ger_Deployment_Diagram_Connection_Highlight.eps | Bin 51341 -> 0 bytes ...ger_Deployment_Diagram_Connection_Highlight.sxd | Bin 8051 -> 0 bytes ...Messenger_Deployment_Diagram_Node_Highlight.eps | Bin 51917 -> 0 bytes ...Messenger_Deployment_Diagram_Node_Highlight.sxd | Bin 8141 -> 0 bytes .../CIAO_Messenger_IDL_Generated_Class_Diagram.eps | Bin 37446 -> 0 bytes .../CIAO_Messenger_IDL_Generated_Class_Diagram.sxd | Bin 7495 -> 0 bytes .../images/CIAO_Messenger_Interaction_Diagram.eps | Bin 25993 -> 0 bytes .../images/CIAO_Messenger_Interaction_Diagram.sxd | Bin 7390 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_01.eps | Bin 23463 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_01.sxd | Bin 7094 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_02.eps | Bin 23424 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_02.sxd | Bin 7151 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_03.eps | Bin 23927 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_03.sxd | Bin 7146 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_04.eps | Bin 23427 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_04.sxd | Bin 7151 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_05.eps | Bin 23434 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_05.sxd | Bin 7148 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_06.eps | Bin 23457 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_06.sxd | Bin 7147 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_07.eps | Bin 23459 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_07.sxd | Bin 7146 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_08.eps | Bin 23127 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_08.sxd | Bin 7149 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_09.eps | Bin 23346 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_09.sxd | Bin 7146 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_Overview.eps | Bin 22216 -> 0 bytes CIAO/docs/fm/images/CIAO_Roadmap_Overview.sxd | Bin 6811 -> 0 bytes .../docs/fm/images/CIAO_Runnable_Class_Diagram.eps | Bin 41532 -> 0 bytes .../docs/fm/images/CIAO_Runnable_Class_Diagram.sxd | Bin 7786 -> 0 bytes CIAO/docs/fm/images/OCILOGO_bw_book.eps | Bin 72640 -> 0 bytes CIAO/docs/generate_component_mpc.html | 84 - CIAO/docs/imgs/CCM-v5.vsd | Bin 486912 -> 0 bytes CIAO/docs/imgs/CCM.vsd | Bin 643072 -> 0 bytes CIAO/docs/imgs/DAnCE-Dynamic.png | Bin 71061 -> 0 bytes CIAO/docs/imgs/DAnCE-Dynamic.sxd | Bin 46579 -> 0 bytes CIAO/docs/imgs/File-Gen-Existing.png | Bin 40181 -> 0 bytes CIAO/docs/imgs/File-Gen-Future.png | Bin 41057 -> 0 bytes CIAO/docs/imgs/File_Generation_Flow.vsd | Bin 107008 -> 0 bytes CIAO/docs/imgs/IDL-CIDL-classes.vsd | Bin 201216 -> 0 bytes CIAO/docs/imgs/basic-container.png | Bin 8000 -> 0 bytes CIAO/docs/imgs/ciao-dynamic1.jpg | Bin 56203 -> 0 bytes CIAO/docs/imgs/ciao-dynamic2.jpg | Bin 46081 -> 0 bytes CIAO/docs/imgs/ciao-static-vs-dynamic.jpg | Bin 44220 -> 0 bytes CIAO/docs/imgs/ciao-static1.jpg | Bin 53013 -> 0 bytes CIAO/docs/imgs/ciao-static2.jpg | Bin 64775 -> 0 bytes CIAO/docs/imgs/component-basic.png | Bin 151172 -> 0 bytes CIAO/docs/imgs/dance_arch.jpg | Bin 70602 -> 0 bytes CIAO/docs/imgs/dance_arch.vsd | Bin 100352 -> 0 bytes CIAO/docs/imgs/deployment.png | Bin 10392 -> 0 bytes CIAO/docs/imgs/extended-container.png | Bin 19243 -> 0 bytes CIAO/docs/imgs/home-config.png | Bin 9873 -> 0 bytes CIAO/docs/imgs/static_dance_arch.jpg | Bin 58200 -> 0 bytes CIAO/docs/imgs/static_dance_arch.vsd | Bin 86528 -> 0 bytes CIAO/docs/imgs/static_dance_impl.jpg | Bin 56173 -> 0 bytes CIAO/docs/imgs/static_dance_impl.vsd | Bin 101888 -> 0 bytes CIAO/docs/index.html | 163 - CIAO/docs/new_components.html | 129 - CIAO/docs/releasenotes/index.html | 102 - CIAO/docs/releasenotes/switch.html | 35 - CIAO/docs/static_ciao_contents.html | 359 - CIAO/docs/static_ciao_index.html | 23 - CIAO/docs/static_ciao_toc.html | 26 - CIAO/docs/static_config_example.html | 1353 - CIAO/docs/static_config_rtexample.html | 1079 - CIAO/docs/static_dance.html | 214 - CIAO/docs/value_factory_registration.html | 49 - CIAO/etc/ciao.doxygen | 2325 - CIAO/etc/ciao_dds4ccm.doxygen | 2324 - CIAO/examples/BasicSP/.gitignore | 5 - CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl | 21 - CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc | 112 - .../BasicSP/BMClosedED/BMClosedED_exec.cpp | 190 - CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h | 131 - CIAO/examples/BasicSP/BMClosedED/config | 1 - CIAO/examples/BasicSP/BMDevice/BMDevice.idl | 29 - CIAO/examples/BasicSP/BMDevice/BMDevice.mpc | 114 - CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp | 157 - CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h | 128 - CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl | 19 - CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc | 116 - CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp | 140 - CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h | 94 - CIAO/examples/BasicSP/BasicSP.idl | 49 - CIAO/examples/BasicSP/BasicSP.mpc | 99 - CIAO/examples/BasicSP/BasicSP.mwc | 7 - CIAO/examples/BasicSP/EC/EC.idl | 40 - CIAO/examples/BasicSP/EC/EC.mpc | 155 - CIAO/examples/BasicSP/EC/EC_exec.cpp | 294 - CIAO/examples/BasicSP/EC/EC_exec.h | 166 - CIAO/examples/BasicSP/EC/README | 11 - CIAO/examples/BasicSP/EC/client.cpp | 60 - CIAO/examples/BasicSP/EC/controller.cpp | 124 - CIAO/examples/BasicSP/README.html | 58 - CIAO/examples/BasicSP/RepoMan_Usage.html | 117 - CIAO/examples/BasicSP/descriptors/BasicSP.cdd | 91 - CIAO/examples/BasicSP/descriptors/BasicSP.dat | 4 - .../examples/BasicSP/descriptors/BasicSP_Homed.cdp | 549 - .../BasicSP/descriptors/BasicSP_Unhomed.cdp | 409 - CIAO/examples/BasicSP/descriptors/run_test.pl | 252 - CIAO/examples/DevGuideExamples/CIAO.mwc | 3 - .../examples/DevGuideExamples/Messenger/.gitignore | 4 - .../DevGuideExamples/Messenger/Administrator.idl | 22 - .../DevGuideExamples/Messenger/Administrator.mpc | 108 - .../Messenger/Administrator_Client.cpp | 120 - .../Messenger/Administrator_Client_IDL2.cpp | 8 - .../Messenger/Administrator_Client_IDL2.mpc | 46 - .../Messenger/Administrator_Client_IDL3.cpp | 8 - .../Messenger/Administrator_Client_IDL3.mpc | 30 - .../Messenger/Administrator_exec_i.cpp | 258 - .../Messenger/Administrator_exec_i.h | 111 - .../DevGuideExamples/Messenger/History.idl | 19 - .../DevGuideExamples/Messenger/History_exec_i.cpp | 94 - .../DevGuideExamples/Messenger/History_exec_i.h | 69 - .../DevGuideExamples/Messenger/Message.idl | 19 - .../DevGuideExamples/Messenger/Messenger.idl | 28 - .../DevGuideExamples/Messenger/Messenger.mpc | 170 - .../Messenger/Messenger_exec_i.cpp | 240 - .../DevGuideExamples/Messenger/Messenger_exec_i.h | 128 - .../DevGuideExamples/Messenger/Publication.idl | 17 - .../Messenger/Publication_exec_i.cpp | 80 - .../Messenger/Publication_exec_i.h | 69 - .../DevGuideExamples/Messenger/Receiver.idl | 21 - .../DevGuideExamples/Messenger/Receiver.mpc | 108 - .../DevGuideExamples/Messenger/Receiver_exec_i.cpp | 175 - .../DevGuideExamples/Messenger/Receiver_exec_i.h | 101 - .../DevGuideExamples/Messenger/Runnable.idl | 17 - .../DevGuideExamples/Messenger/Runnable_exec_i.cpp | 59 - .../DevGuideExamples/Messenger/Runnable_exec_i.h | 64 - .../descriptors/Application-flattened.cdp | 278 - .../Messenger/descriptors/ApplicationNodeMap.cdd | 91 - .../Messenger/descriptors/admin.dat | 7 - .../Messenger/descriptors/run_test.pl | 109 - CIAO/examples/DevGuideExamples/readme.txt | 14 - CIAO/examples/Display/.gitignore | 1 - CIAO/examples/Display/Display_Base/.gitignore | 3 - .../examples/Display/Display_Base/Display_Base.idl | 52 - .../examples/Display/Display_Base/Display_Base.mpc | 77 - CIAO/examples/Display/GPS/.gitignore | 4 - CIAO/examples/Display/GPS/GPS.idl | 29 - CIAO/examples/Display/GPS/GPS.mpc | 115 - CIAO/examples/Display/GPS/GPSEI.idl | 31 - CIAO/examples/Display/GPS/GPS_exec.cpp | 162 - CIAO/examples/Display/GPS/GPS_exec.h | 116 - CIAO/examples/Display/NavDisplay/.gitignore | 16 - CIAO/examples/Display/NavDisplay/NavDisplay.idl | 31 - CIAO/examples/Display/NavDisplay/NavDisplay.mpc | 113 - .../Display/NavDisplay/NavDisplay_exec.cpp | 115 - CIAO/examples/Display/NavDisplay/NavDisplay_exec.h | 99 - .../Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp | 23 - .../Display/NavDisplayGUI_exec/AddNavUnitCmd.h | 25 - CIAO/examples/Display/NavDisplayGUI_exec/Command.h | 18 - .../Display/NavDisplayGUI_exec/DetailView.cpp | 51 - .../Display/NavDisplayGUI_exec/DetailView.h | 29 - .../Display/NavDisplayGUI_exec/MapView.cpp | 27 - CIAO/examples/Display/NavDisplayGUI_exec/MapView.h | 25 - .../Display/NavDisplayGUI_exec/NavDisplayGUI.mpc | 86 - .../NavDisplayGUI_exec/NavDisplayGUI_exec.cpp | 184 - .../NavDisplayGUI_exec/NavDisplayGUI_exec.h | 108 - .../Display/NavDisplayGUI_exec/NavUnit.cpp | 6 - CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h | 50 - .../Display/NavDisplayGUI_exec/NodeItem.cpp | 14 - .../examples/Display/NavDisplayGUI_exec/NodeItem.h | 36 - .../Display/NavDisplayGUI_exec/QuitCmd.cpp | 20 - CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h | 23 - .../Display/NavDisplayGUI_exec/RootPanel.cpp | 105 - .../Display/NavDisplayGUI_exec/RootPanel.h | 65 - .../NavDisplayGUI_exec/UpdatePositionCmd.cpp | 25 - .../Display/NavDisplayGUI_exec/UpdatePositionCmd.h | 26 - .../examples/Display/NavDisplayGUI_exec/Worker.cpp | 39 - CIAO/examples/Display/NavDisplayGUI_exec/Worker.h | 33 - .../Display/NavDisplayGUI_exec/trolltech.gif | Bin 42629 -> 0 bytes .../Display/NavDisplayGUI_exec/worldmap1.gif | Bin 207612 -> 0 bytes .../Display/NavDisplayGUI_exec/worldmap1.xpm | 651 - CIAO/examples/Display/README.html | 204 - CIAO/examples/Display/RateGen/.gitignore | 5 - CIAO/examples/Display/RateGen/RateGen.idl | 32 - CIAO/examples/Display/RateGen/RateGen.mpc | 133 - CIAO/examples/Display/RateGen/RateGen_exec.cpp | 284 - CIAO/examples/Display/RateGen/RateGen_exec.h | 161 - CIAO/examples/Display/RateGen/controller.cpp | 118 - .../Display/descriptors/Modified_Deployment.xsd | 826 - CIAO/examples/Display/descriptors/XMI.xsd | 35 - .../Display/descriptors/deploymentplanmore.cdp | 982 - .../Display/descriptors/deploymentplanone.cdp | 545 - .../descriptors/flattened_deploymentplannat.cdp | 556 - .../examples/Display/descriptors/run_all_in_one.pl | 269 - CIAO/examples/Display/descriptors/run_test.pl | 244 - .../examples/Display/descriptors/run_test_contr.pl | 48 - CIAO/examples/Display/descriptors/run_test_more.pl | 268 - .../Display/descriptors/run_test_more_contr.pl | 80 - CIAO/examples/Display/descriptors/run_test_one.pl | 245 - .../Display/descriptors/run_test_one_contr.pl | 46 - CIAO/examples/Display/example.gif | Bin 221399 -> 0 bytes CIAO/examples/Hello/Base/Hello.idl | 32 - CIAO/examples/Hello/Base/Hello.mpc | 109 - CIAO/examples/Hello/Receiver/Hello_Receiver.idl | 16 - CIAO/examples/Hello/Receiver/Hello_Receiver.mpc | 132 - .../Hello/Receiver/Hello_Receiver_exec.cpp | 171 - CIAO/examples/Hello/Receiver/Hello_Receiver_exec.h | 67 - CIAO/examples/Hello/Sender/Hello_Sender.idl | 17 - CIAO/examples/Hello/Sender/Hello_Sender.mpc | 133 - CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp | 205 - CIAO/examples/Hello/Sender/Hello_Sender_exec.h | 115 - CIAO/examples/Hello/descriptors/Plan.cdp | 238 - CIAO/examples/Hello/descriptors/run_test.pl | 278 - CIAO/examples/Hello_Event/.gitignore | 1 - .../examples/Hello_Event/Hello_Base/Hello_Base.idl | 23 - .../examples/Hello_Event/Hello_Base/Hello_Base.mpc | 108 - CIAO/examples/Hello_Event/Receiver/Receiver.idl | 19 - CIAO/examples/Hello_Event/Receiver/Receiver.mpc | 139 - .../Hello_Event/Receiver/Receiver_exec.cpp | 140 - CIAO/examples/Hello_Event/Receiver/Receiver_exec.h | 111 - CIAO/examples/Hello_Event/Sender/.gitignore | 1 - CIAO/examples/Hello_Event/Sender/Sender.idl | 27 - CIAO/examples/Hello_Event/Sender/Sender.mpc | 158 - CIAO/examples/Hello_Event/Sender/Sender_exec.cpp | 178 - CIAO/examples/Hello_Event/Sender/Sender_exec.h | 140 - CIAO/examples/Hello_Event/Sender/starter.cpp | 88 - .../Hello_Event/descriptors/DeploymentPlan.cdp | 257 - .../descriptors/DeploymentPlan_without_ns.cdp | 224 - .../Hello_Event/descriptors/NodeManagerMap.cdd | 50 - CIAO/examples/Hello_Event/descriptors/NodeMap.cdd | 29 - .../PlanLocality_DifferentProcesses.cdp | 226 - .../descriptors/PlanLocality_SameProcess.cdp | 222 - .../Hello_Event/descriptors/run_NodeDaemons.pl | 41 - CIAO/examples/Hello_Event/descriptors/run_test.pl | 235 - .../run_test_PlanLocality_DifferentProcesses.pl | 203 - .../run_test_PlanLocality_SameProcess.pl | 203 - .../Hello_Event/descriptors/run_test_shs.pl | 271 - .../Hello_Event/descriptors/run_test_without_ns.pl | 203 - .../descriptors/shs.ciao.localityconfig | 9 - .../Hello_Event/descriptors/shs.localityconfig | 7 - CIAO/examples/Hello_Event/step-by-step.html | 317 - CIAO/examples/Null_Component/.gitignore | 9 - CIAO/examples/Null_Component/Null_Component.idl | 37 - CIAO/examples/Null_Component/Null_Component.mpc | 113 - CIAO/examples/Null_Component/Null_Interface.idl | 20 - CIAO/examples/Null_Component/Null_Interface.mpc | 76 - .../Null_Component/descriptors/NodeMap.cdd | 31 - .../Null_Component/descriptors/Null_Homed.cdp | 121 - .../Null_PlanLocality_DifferentProcesses.cdp | 118 - .../descriptors/Null_PlanLocality_SameProcess.cdp | 114 - .../Null_Component/descriptors/Null_Unhomed.cdp | 86 - .../Null_Component/descriptors/run_test.pl | 218 - .../descriptors/run_test_without_ns.pl | 192 - .../Null_Component/model/Null_Component.xme | 882 - CIAO/examples/ciao_android.lst | 12 - CIAO/performance-tests/Benchmark/.gitignore | 4 - CIAO/performance-tests/Benchmark/Benchmark.idl | 46 - CIAO/performance-tests/Benchmark/Benchmark.mpc | 96 - CIAO/performance-tests/Benchmark/LatencyTest.cpp | 19 - CIAO/performance-tests/Benchmark/LatencyTest.h | 28 - .../Benchmark/Multi_Threaded/.gitignore | 1 - .../Benchmark/Multi_Threaded/Client_Task.cpp | 27 - .../Benchmark/Multi_Threaded/Client_Task.h | 26 - .../Benchmark/Multi_Threaded/Multi_Threaded.mpc | 23 - .../Benchmark/Multi_Threaded/NOTE.txt | 15 - .../Benchmark/Multi_Threaded/README | 14 - .../Benchmark/Multi_Threaded/client.cpp | 87 - .../Benchmark/Multi_Threaded/run_test.pl | 94 - .../Benchmark/Multi_Threaded/svc.conf | 3 - CIAO/performance-tests/Benchmark/README | 24 - .../Benchmark/RoundTrip/.gitignore | 5 - CIAO/performance-tests/Benchmark/RoundTrip/README | 11 - .../Benchmark/RoundTrip/RoundTrip.idl | 29 - .../Benchmark/RoundTrip/RoundTrip.mpc | 134 - .../Benchmark/RoundTrip/RoundTripEI.idl | 31 - .../Benchmark/RoundTrip/RoundTrip_exec.cpp | 121 - .../Benchmark/RoundTrip/RoundTrip_exec.h | 101 - .../Benchmark/RoundTrip/client.cpp | 176 - .../Benchmark/RoundTrip/run_test.pl | 122 - .../performance-tests/Benchmark/RoundTrip/svc.conf | 4 - .../Benchmark/RoundTripClient/.gitignore | 4 - .../Benchmark/RoundTripClient/RoundTripClient.idl | 29 - .../Benchmark/RoundTripClient/RoundTripClient.mpc | 134 - .../RoundTripClient/RoundTripClientEI.idl | 29 - .../RoundTripClient/RoundTripClient_exec.cpp | 157 - .../RoundTripClient/RoundTripClient_exec.h | 89 - .../Benchmark/RoundTripClient/client.cpp | 54 - .../Benchmark/RoundTripClient/run_test.pl | 93 - .../Benchmark/RoundTripClient/run_test_ior_cad.pl | 75 - .../Benchmark/RoundTripServer/.gitignore | 1 - .../Benchmark/RoundTripServer/LatencyTest.cpp | 21 - .../Benchmark/RoundTripServer/LatencyTest.h | 37 - .../Benchmark/RoundTripServer/RoundTripServer.mpc | 21 - .../Benchmark/RoundTripServer/Test.idl | 13 - .../Benchmark/RoundTripServer/server.cpp | 92 - .../Benchmark/descriptors/Benchmark.cad | 34 - .../descriptors/CIAO_Installation_Data.ini | 5 - .../Benchmark/descriptors/Multi_Threaded.cad | 112 - .../Benchmark/descriptors/NOTE.txt | 67 - .../Benchmark/descriptors/RoundTrip.csd | 46 - .../Benchmark/descriptors/RoundTrip.ssd | 43 - .../Benchmark/descriptors/RoundTripClient.cad | 49 - .../Benchmark/descriptors/RoundTripClient.csd | 44 - .../Benchmark/descriptors/RoundTripClient.ssd | 39 - .../Benchmark/descriptors/Test-IOR.cad | 41 - .../Benchmark/descriptors/test-multi-process.dat | 5 - .../Benchmark/descriptors/test.dat | 2 - CIAO/performance-tests/Benchmark/server.cpp | 92 - CIAO/performance-tests/Benchmark/svc.conf | 4 - .../Protocols/Controller/Controller.cpp | 227 - .../Protocols/Controller/Controller.mpc | 10 - .../Protocols/Receiver/Receiver.idl | 21 - .../Protocols/Receiver/Receiver.mpc | 114 - .../Protocols/Receiver/Receiver_exec.cpp | 285 - .../Protocols/Receiver/Receiver_exec.h | 92 - .../Sender/Custom_Network_Priority_Mapping.cpp | 127 - .../Sender/Custom_Network_Priority_Mapping.h | 52 - CIAO/performance-tests/Protocols/Sender/Sender.idl | 39 - CIAO/performance-tests/Protocols/Sender/Sender.mpc | 114 - .../Protocols/Sender/Sender_exec.cpp | 691 - .../Protocols/Sender/Sender_exec.h | 60 - .../Protocols/common/Protocols.idl | 34 - .../Protocols/common/Protocols.mpc | 76 - .../descriptors/CIAO_Installation_Data.ini | 5 - .../Protocols/descriptors/Receiver.csd | 40 - .../Protocols/descriptors/Receiver.ssd | 37 - .../Protocols/descriptors/Sender.csd | 40 - .../Protocols/descriptors/Sender.ssd | 37 - .../Protocols/descriptors/default.cad | 59 - .../Protocols/descriptors/remote.cad | 62 - .../Protocols/descriptors/run_test.pl | 86 - .../Protocols/descriptors/svc.conf | 2 - .../Protocols/descriptors/test.dat | 2 - CIAO/rules.ciao.GNU | 57 - .../Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM | 93 - .../SEC_CheckPoint/TSEC_CheckPoint.idl | 25 - .../SEC_CheckPoint/TSEC_CheckPoint.mpc | 118 - .../SEC_CheckPoint/TSEC_CheckPointEI.idl | 16 - .../SEC_CheckPoint/TSEC_CheckPoint_exec.cpp | 590 - .../SEC_CheckPoint/TSEC_CheckPoint_exec.h | 242 - .../SEC_CheckPoint/controller.cpp | 195 - .../descriptors/DeploymentPlan.cdp | 118 - .../descriptors/TestNodeManagerMap.cdd | 28 - .../descriptors/rt-config-example.csr | 30 - .../Bug_2130_Regression/descriptors/run_test.pl | 209 - .../Bug_2130_Regression/interfaces/.gitignore | 2 - CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl | 50 - CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc | 42 - CIAO/tests/Bug_3769_Regression/.gitignore | 5 - .../Bug_3769_Regression/Bug_3769_Regression.mpc | 121 - CIAO/tests/Bug_3769_Regression/Foo.idl | 206 - CIAO/tests/Bug_3769_Regression/Foo_exec.cpp | 1815 - CIAO/tests/Bug_3769_Regression/Foo_exec.h | 382 - .../descriptors/DeploymentPlan.cdp | 1848 - .../Bug_3769_Regression/descriptors/run_test.pl | 233 - .../descriptors/run_test_cdr.pl | 250 - CIAO/tests/Bug_3817_Regression/.gitignore | 7 - CIAO/tests/Bug_3817_Regression/Bar.idl | 18 - CIAO/tests/Bug_3817_Regression/Bar.mpc | 128 - CIAO/tests/Bug_3832_Regression/run_test.pl | 66 - CIAO/tests/Bug_3834_Regression/.gitignore | 11 - CIAO/tests/Bug_3834_Regression/CompA.idl | 15 - CIAO/tests/Bug_3834_Regression/CompA.mpc | 113 - CIAO/tests/Bug_3834_Regression/CompA_exec.cpp | 135 - CIAO/tests/Bug_3834_Regression/CompA_exec.h | 110 - CIAO/tests/Bug_3834_Regression/CompB.idl | 13 - CIAO/tests/Bug_3834_Regression/CompB.mpc | 114 - CIAO/tests/Bug_3834_Regression/CompB_exec.cpp | 114 - CIAO/tests/Bug_3834_Regression/CompB_exec.h | 87 - CIAO/tests/Bug_3834_Regression/Moo.idl | 12 - CIAO/tests/Bug_3834_Regression/Moo.mpc | 103 - .../Bug_3834_Regression/descriptors/NodeMap.cdd | 29 - .../PlanLocality_DifferentProcesses.cdp | 277 - .../descriptors/PlanLocality_SameProcess.cdp | 265 - .../Bug_3834_Regression/descriptors/run_test.pl | 218 - .../descriptors/run_test_without_ns.pl | 192 - .../model/Bug_3834_Regression.xme | 1240 - CIAO/tests/Bug_3890_Regression/.gitignore | 1 - .../Bug_3890_Regression/Bug_3890_Regression.mpc | 122 - CIAO/tests/Bug_3890_Regression/Foo.idl | 89 - .../Bug_3936_Regression/Bug_3936_Regression.idl | 24 - CIAO/tests/Bug_3936_Regression/run_test.pl | 45 - .../Bug_3937_Regression/Bug_3937_Regression.idl | 43 - CIAO/tests/Bug_3937_Regression/run_test.pl | 45 - .../Bug_3944_Regression/base_connector_conn.idl | 38 - CIAO/tests/Bug_3944_Regression/connector_conn.idl | 22 - .../Bug_3944_Regression/connector_inst_conn.idl | 19 - CIAO/tests/Bug_3944_Regression/run_test.pl | 45 - CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl | 35 - CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc | 106 - CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl | 80 - CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc | 105 - .../Bug_4086_Regression/Bug_4086_Regression.mpc | 121 - CIAO/tests/Bug_4086_Regression/Foo.idl | 19 - CIAO/tests/Bug_4086_Regression/Foo_exec.cpp | 93 - CIAO/tests/Bug_4086_Regression/Foo_exec.h | 62 - .../descriptors/DeploymentPlan.cdp | 106 - .../Bug_4086_Regression/descriptors/run_test.pl | 233 - .../descriptors/run_test_cdr.pl | 250 - CIAO/tests/Bug_4087_Regression/run_test.pl | 51 - CIAO/tests/Bug_4087_Regression/test.idl | 29 - CIAO/tests/CIDL/CodeGen/.gitignore | 9 - CIAO/tests/CIDL/CodeGen/Basic.idl | 70 - CIAO/tests/CIDL/CodeGen/Basic.mpc | 78 - CIAO/tests/CIDL/CodeGen/CodeGen.idl | 45 - CIAO/tests/CIDL/CodeGen/CodeGen.mpc | 114 - CIAO/tests/CIDL/CodeGen/README | 41 - CIAO/tests/CIF/.gitignore | 1 - CIAO/tests/CIF/Common/CIF_Common.cpp | 375 - CIAO/tests/CIF/Common/CIF_Common.h | 43 - CIAO/tests/CIF/Common/CIF_Common.mpc | 19 - CIAO/tests/CIF/Common/CIF_Common_export.h | 52 - CIAO/tests/CIF/Component/CIF_Component.idl | 59 - CIAO/tests/CIF/Component/CIF_Component.mpc | 160 - CIAO/tests/CIF/Component/CIF_Component_exec.cpp | 357 - CIAO/tests/CIF/Component/CIF_Component_exec.h | 240 - CIAO/tests/CIF/Events/Events.mpc | 14 - CIAO/tests/CIF/Events/client.cpp | 1784 - CIAO/tests/CIF/Navigation/.gitignore | 6 - CIAO/tests/CIF/Navigation/Navigation.mpc | 14 - CIAO/tests/CIF/Navigation/client.cpp | 727 - CIAO/tests/CIF/Receptacle/.gitignore | 5 - CIAO/tests/CIF/Receptacle/Receptacle.mpc | 14 - CIAO/tests/CIF/Receptacle/client.cpp | 1016 - CIAO/tests/CIF/descriptors/Plan.cdp | 213 - CIAO/tests/CIF/descriptors/run_test.pl | 268 - CIAO/tests/Collocation/Coll_Base/Base.idl | 18 - CIAO/tests/Collocation/Coll_Base/Base.mpc | 108 - CIAO/tests/Collocation/README | 23 - CIAO/tests/Collocation/Receiver/Receiver.idl | 15 - CIAO/tests/Collocation/Receiver/Receiver.mpc | 137 - CIAO/tests/Collocation/Receiver/Receiver_exec.cpp | 228 - CIAO/tests/Collocation/Receiver/Receiver_exec.h | 103 - CIAO/tests/Collocation/Sender/Sender.idl | 12 - CIAO/tests/Collocation/Sender/Sender.mpc | 139 - CIAO/tests/Collocation/Sender/Sender_exec.cpp | 183 - CIAO/tests/Collocation/Sender/Sender_exec.h | 129 - .../Collocation/descriptors/PlanAllOnMore.cdp | 252 - .../tests/Collocation/descriptors/PlanAllOnOne.cdp | 246 - .../Collocation/descriptors/PlanAllOnOneBest.cdp | 244 - .../Collocation/descriptors/PlanAllOnOneNo.cdp | 244 - .../Collocation/descriptors/PlanAllOnOneNoTP.cdp | 244 - CIAO/tests/Collocation/descriptors/run_test.pl | 262 - CIAO/tests/Cookies/Cookie.cpp | 61 - CIAO/tests/Cookies/Cookie.h | 30 - CIAO/tests/Cookies/Cookies.mpc | 41 - CIAO/tests/Cookies/Test.idl | 14 - CIAO/tests/Cookies/client.cpp | 83 - CIAO/tests/Cookies/run_test.pl | 72 - CIAO/tests/Cookies/server.cpp | 102 - CIAO/tests/DAnCE/Components/ProcessColocation.idl | 13 - CIAO/tests/DAnCE/Components/ProcessColocation.mpc | 106 - .../DAnCE/Components/ProcessColocation_exec.cpp | 187 - .../DAnCE/Components/ProcessColocation_exec.h | 123 - CIAO/tests/DAnCE/Components/Progressive.idl | 20 - CIAO/tests/DAnCE/Components/Progressive.mpc | 109 - CIAO/tests/DAnCE/Components/Progressive_exec.cpp | 213 - CIAO/tests/DAnCE/Components/Progressive_exec.h | 139 - CIAO/tests/DAnCE/Components/SimpleAttribute.idl | 23 - CIAO/tests/DAnCE/Components/SimpleAttribute.mpc | 106 - .../DAnCE/Components/SimpleAttribute_exec.cpp | 240 - CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h | 121 - CIAO/tests/DAnCE/Components/SimpleCommon.idl | 28 - CIAO/tests/DAnCE/Components/SimpleCommon.mpc | 78 - CIAO/tests/DAnCE/Components/SimpleConsumer.idl | 21 - CIAO/tests/DAnCE/Components/SimpleConsumer.mpc | 108 - .../tests/DAnCE/Components/SimpleConsumer_exec.cpp | 142 - CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h | 83 - CIAO/tests/DAnCE/Components/SimpleEmitter.idl | 21 - CIAO/tests/DAnCE/Components/SimpleEmitter.mpc | 108 - CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp | 130 - CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h | 78 - CIAO/tests/DAnCE/Components/SimpleFailure.idl | 26 - CIAO/tests/DAnCE/Components/SimpleFailure.mpc | 106 - CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp | 163 - CIAO/tests/DAnCE/Components/SimpleFailure_exec.h | 87 - .../tests/DAnCE/Components/SimpleLocalProvider.idl | 19 - .../tests/DAnCE/Components/SimpleLocalProvider.mpc | 109 - .../DAnCE/Components/SimpleLocalProvider_exec.cpp | 164 - .../DAnCE/Components/SimpleLocalProvider_exec.h | 100 - CIAO/tests/DAnCE/Components/SimpleLocalUser.idl | 19 - CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc | 109 - .../DAnCE/Components/SimpleLocalUser_exec.cpp | 149 - CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h | 78 - CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl | 19 - CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc | 108 - .../DAnCE/Components/SimpleMultipleUser_exec.cpp | 172 - .../DAnCE/Components/SimpleMultipleUser_exec.h | 78 - .../DAnCE/Components/SimpleNilFacetProvider.idl | 21 - .../DAnCE/Components/SimpleNilFacetProvider.mpc | 110 - .../Components/SimpleNilFacetProvider_exec.cpp | 158 - .../DAnCE/Components/SimpleNilFacetProvider_exec.h | 96 - CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl | 19 - CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc | 109 - .../DAnCE/Components/SimpleNilFacetUser_exec.cpp | 157 - .../DAnCE/Components/SimpleNilFacetUser_exec.h | 78 - CIAO/tests/DAnCE/Components/SimpleNull.idl | 12 - CIAO/tests/DAnCE/Components/SimpleNull.mpc | 105 - CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp | 148 - CIAO/tests/DAnCE/Components/SimpleNull_exec.h | 81 - CIAO/tests/DAnCE/Components/SimpleProvider.idl | 19 - CIAO/tests/DAnCE/Components/SimpleProvider.mpc | 109 - .../tests/DAnCE/Components/SimpleProvider_exec.cpp | 164 - CIAO/tests/DAnCE/Components/SimpleProvider_exec.h | 100 - CIAO/tests/DAnCE/Components/SimplePublisher.idl | 21 - CIAO/tests/DAnCE/Components/SimplePublisher.mpc | 108 - .../DAnCE/Components/SimplePublisher_exec.cpp | 129 - CIAO/tests/DAnCE/Components/SimplePublisher_exec.h | 78 - CIAO/tests/DAnCE/Components/SimpleUser.idl | 19 - CIAO/tests/DAnCE/Components/SimpleUser.mpc | 109 - CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp | 149 - CIAO/tests/DAnCE/Components/SimpleUser_exec.h | 78 - .../EM-Launch-Failures/1NodeFailureAtActivate.cdp | 145 - .../EM-Launch-Failures/1NodeFailureAtStartup.cdp | 145 - .../DAnCE/EM-Launch-Failures/1NodeNoFailure.cdp | 145 - .../EM-Launch-Failures/2NodeFailureAtActivate.cdp | 196 - .../EM-Launch-Failures/2NodeFailureAtStartup.cdp | 196 - .../DAnCE/EM-Launch-Failures/2NodeNoFailure.cdp | 196 - .../EM-Launch-Failures/5NodeFailureAtActivate.cdp | 343 - .../EM-Launch-Failures/5NodeFailureAtStartup.cdp | 343 - .../DAnCE/EM-Launch-Failures/5NodeNoFailure.cdp | 343 - CIAO/tests/DAnCE/EM-Launch-Failures/README.txt | 9 - CIAO/tests/DAnCE/EM-Launch-Failures/run_test.pl | 275 - CIAO/tests/DAnCE/EM-Redeployment/README.txt | 6 - CIAO/tests/DAnCE/EM-Redeployment/run_test.pl | 233 - .../DAnCE/EM-Redeployment/run_test_noevent.pl | 240 - .../1NodeFailureAtPassivate.cdp | 145 - .../EM-Shutdown-Failures/1NodeFailureAtRemove.cdp | 145 - .../DAnCE/EM-Shutdown-Failures/1NodeNoFailure.cdp | 145 - .../2NodeFailureAtPassivate.cdp | 196 - .../EM-Shutdown-Failures/2NodeFailureAtRemove.cdp | 196 - .../DAnCE/EM-Shutdown-Failures/2NodeNoFailure.cdp | 196 - .../5NodeFailureAtPassivate.cdp | 343 - .../EM-Shutdown-Failures/5NodeFailureAtRemove.cdp | 343 - .../DAnCE/EM-Shutdown-Failures/5NodeNoFailure.cdp | 343 - CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt | 14 - CIAO/tests/DAnCE/EM-Shutdown-Failures/run_test.pl | 276 - .../EmitsConnectionExplicitHome.cdp | 250 - .../EmitsConnectionExplicitHome_NS.cdp | 261 - .../MultiplexConnectionExplicitHome.cdp | 285 - .../MultiplexConnectionExplicitHome_NS.cdp | 350 - .../MultiplexConnectionExplicitHome_NS_PL_DP.cdp | 363 - .../MultiplexConnectionExplicitHome_NS_PL_SP.cdp | 359 - .../PublishConnectionExplicitHome.cdp | 250 - .../PublishConnectionExplicitHome_NS.cdp | 277 - .../PublishConnectionExplicitHome_NS_PL_DP.cdp | 353 - .../PublishConnectionExplicitHome_NS_PL_SP.cdp | 349 - .../SimpleComponentExplicitHome.cdp | 125 - .../SimpleProcessColocation.cdp | 128 - .../SimpleProcessColocation_2.cdp | 169 - .../SimpleProcessColocation_Default.cdp | 209 - .../SimplexConnectionExplicitHome.cdp | 285 - .../SimplexConnectionExplicitHome_NS.cdp | 307 - .../SimplexConnectionExplicitHome_NS_PL_DP.cdp | 320 - .../SimplexConnectionExplicitHome_NS_PL_SP.cdp | 316 - .../SimplexConnectionExplicitHome_NilFacet.cdp | 285 - .../DAnCE/ExecutionManager-Deployments/run_test.pl | 235 - .../ExecutionManager-Deployments/run_test_cdr.pl | 248 - .../run_test_cdr_noevent.pl | 255 - .../run_test_noevent.pl | 243 - CIAO/tests/DAnCE/Executor-Destructor/Component.cdp | 279 - .../DAnCE/Executor-Destructor/Exec_Dest_Status.cpp | 51 - .../DAnCE/Executor-Destructor/Exec_Dest_Status.h | 57 - .../Executor-Destructor/Exec_Dest_Status_export.h | 56 - .../DAnCE/Executor-Destructor/Exec_Dest_export.h | 56 - .../Executor-Destructor/Executor_Destructor.idl | 14 - .../Executor-Destructor/Executor_Destructor.mpc | 166 - .../Executor_Destructor_Interceptor.cpp | 106 - .../Executor_Destructor_Interceptor.h | 86 - .../Executor_Destructor_exec.cpp | 167 - .../Executor-Destructor/Executor_Destructor_exec.h | 120 - .../Executor-Destructor/exec-dest.localityconfig | 9 - CIAO/tests/DAnCE/Executor-Destructor/run_test.pl | 208 - .../Launch-Failures/Component/Launch_Failure.idl | 39 - .../Launch-Failures/Component/Launch_Failure.mpc | 140 - .../Component/Launch_Failure_exec.cpp | 290 - .../Component/Launch_Failure_exec.h | 200 - .../Launch-Failures/Interceptors/Interceptors.mpc | 12 - .../Interceptors/Selective_Error.cpp | 159 - .../Launch-Failures/Interceptors/Selective_Error.h | 77 - .../Interceptors/Selective_Error_Export.h | 57 - .../descriptors/AttributeException.cdp | 106 - .../descriptors/AttributeMismatch.cdp | 102 - .../descriptors/DestEndpointFailure.cdp | 176 - .../descriptors/EntrypointException.cdp | 87 - .../descriptors/EntrypointFails.cdp | 87 - .../descriptors/EntrypointIncorrect.cdp | 87 - .../descriptors/IncorrectLibraryName.cdp | 95 - .../descriptors/InvalidInstanceType.cdp | 106 - .../descriptors/LocalDestEndpointFailure.cdp | 180 - .../LocalFacetConnectionDifferentLMs.cdp | 181 - .../descriptors/LocalNilFacetConnection.cdp | 140 - .../descriptors/LocalSourceEndpointFailure.cdp | 181 - .../descriptors/SourceEndpointFailure.cdp | 176 - .../descriptors/SuccessfulDeployment.cdp | 95 - .../descriptors/besteffort.localityconfig | 8 - .../DAnCE/Launch-Failures/descriptors/run_test.pl | 228 - .../descriptors/run_tests_besteffort.pl | 236 - .../LocalityManager/CPUAffinity/CPUAffinity.idl | 20 - .../LocalityManager/CPUAffinity/CPUAffinity.mpc | 121 - .../CPUAffinity/CPUAffinity_exec.cpp | 119 - .../LocalityManager/CPUAffinity/CPUAffinity_exec.h | 52 - .../LocalityManager/CPUAffinity/Component.cdp | 199 - .../DAnCE/LocalityManager/CPUAffinity/run_test.pl | 244 - .../CommandlinePassage/CommandlinePassage.idl | 20 - .../CommandlinePassage/CommandlinePassage.mpc | 121 - .../CommandlinePassage/CommandlinePassage_exec.cpp | 105 - .../CommandlinePassage/CommandlinePassage_exec.h | 52 - .../CommandlinePassage/Component.cdp | 154 - .../CommandlinePassage/Component_OpenMode.cdp | 154 - .../CommandlinePassage/Component_cmd.cdp | 143 - .../LocalityManager/CommandlinePassage/run_test.pl | 244 - .../CommandlinePassage/run_test_cmd.pl | 245 - .../CommandlinePassage/run_test_openmode.pl | 245 - .../UnexpectedShutdown/Component.cdp | 168 - .../UnexpectedShutdown/UnexpectedShutdown.idl | 21 - .../UnexpectedShutdown/UnexpectedShutdown.mpc | 122 - .../UnexpectedShutdown/UnexpectedShutdown_exec.cpp | 117 - .../UnexpectedShutdown/UnexpectedShutdown_exec.h | 86 - .../nodemanager-besteffort.lconfig | 2 - .../LocalityManager/UnexpectedShutdown/run_test.pl | 244 - .../EmitsConnectionExplicitHome.cdp | 250 - .../LocalSimplexConnectionExplicitHome.cdp | 293 - .../MultiplexConnectionExplicitHome.cdp | 285 - .../PublishConnectionExplicitHome.cdp | 292 - .../SimpleAttributeExplicitHome.cdp | 191 - .../SimpleComponentExplicitHome.cdp | 125 - .../SimpleComponentUnhomed.cdp | 87 - .../DAnCE/NodeManager-Deployments/SimpleHome.cdp | 91 - .../SimpleProcessColocation.cdp | 128 - .../SimpleProcessColocation_2.cdp | 169 - .../SimpleProcessColocation_Default.cdp | 209 - .../SimplexConnectionExplicitHome.cdp | 285 - .../TwoComponentsOneHome.cdp | 304 - .../DAnCE/NodeManager-Deployments/run_test.pl | 210 - .../DAnCE/NodeManager-Deployments/run_test_cdr.pl | 230 - .../run_test_cdr_noevent.pl | 240 - .../NodeManager-Deployments/run_test_noevent.pl | 221 - .../DAnCE/PartialShutdown/Base/PartialShutdown.idl | 24 - .../DAnCE/PartialShutdown/Base/PartialShutdown.mpc | 87 - .../PartialShutdown/Component1/Component1.idl | 27 - .../PartialShutdown/Component1/Component1.mpc | 149 - .../PartialShutdown/Component1/Component1_exec.cpp | 429 - .../PartialShutdown/Component1/Component1_exec.h | 205 - .../PartialShutdown/Component2/Component2.idl | 27 - .../PartialShutdown/Component2/Component2.mpc | 147 - .../PartialShutdown/Component2/Component2_exec.cpp | 429 - .../PartialShutdown/Component2/Component2_exec.h | 206 - .../PartialShutdown/Component3/Component3.idl | 27 - .../PartialShutdown/Component3/Component3.mpc | 147 - .../PartialShutdown/Component3/Component3_exec.cpp | 430 - .../PartialShutdown/Component3/Component3_exec.h | 208 - .../DAnCE/PartialShutdown/descriptors/Plan.cdp | 486 - .../DAnCE/PartialShutdown/descriptors/run_test.pl | 262 - .../Progressive_Deployments/NodeManagerMap.cdd | 50 - .../tests/DAnCE/Progressive_Deployments/Plan_A.cdp | 132 - .../tests/DAnCE/Progressive_Deployments/Plan_B.cdp | 148 - .../tests/DAnCE/Progressive_Deployments/Plan_C.cdp | 288 - .../DAnCE/Progressive_Deployments/run_test.pl | 242 - .../tests/DAnCE/StoreReferences/DeploymentPlan.cdp | 140 - .../DAnCE/StoreReferences/StoreReferences.idl | 24 - .../DAnCE/StoreReferences/StoreReferences.mpc | 130 - .../DAnCE/StoreReferences/StoreReferences_exec.cpp | 99 - .../DAnCE/StoreReferences/StoreReferences_exec.h | 58 - CIAO/tests/DAnCE/StoreReferences/client.cpp | 54 - CIAO/tests/DAnCE/StoreReferences/run_test.pl | 273 - CIAO/tests/DAnCE/Threading/Base/Threading.idl | 24 - CIAO/tests/DAnCE/Threading/Base/Threading.mpc | 87 - .../DAnCE/Threading/Component1/Component1.idl | 21 - .../DAnCE/Threading/Component1/Component1.mpc | 151 - .../DAnCE/Threading/Component1/Component1_exec.cpp | 142 - .../DAnCE/Threading/Component1/Component1_exec.h | 129 - .../DAnCE/Threading/Component2/Component2.idl | 20 - .../DAnCE/Threading/Component2/Component2.mpc | 148 - .../DAnCE/Threading/Component2/Component2_exec.cpp | 193 - .../DAnCE/Threading/Component2/Component2_exec.h | 129 - CIAO/tests/DAnCE/Threading/README | 11 - CIAO/tests/DAnCE/Threading/descriptors/Plan.cdp | 268 - CIAO/tests/DAnCE/Threading/descriptors/run_test.pl | 259 - .../ComplexComponent/Attributes/.gitignore | 2 - .../ComplexComponent/Attributes/Attributes.idl | 50 - .../ComplexComponent/Attributes/Attributes.mpc | 16 - .../ComplexComponent/EventSink/.gitignore | 2 - .../ComplexComponent/EventSink/EventSink.idl | 28 - .../ComplexComponent/EventSink/EventSink.mpc | 17 - .../ComplexComponent/EventSource/.gitignore | 2 - .../ComplexComponent/EventSource/EventSource.idl | 23 - .../ComplexComponent/EventSource/EventSource.mpc | 16 - .../Components/ComplexComponent/Facets/.gitignore | 2 - .../Components/ComplexComponent/Facets/Facets.idl | 45 - .../Components/ComplexComponent/Facets/Facets.mpc | 16 - .../ComplexComponent/Receptacles/.gitignore | 2 - .../ComplexComponent/Receptacles/Receptacles.idl | 67 - .../ComplexComponent/Receptacles/Receptacles.mpc | 20 - .../IDL3/Components/SimpleComponent/.gitignore | 2 - .../Components/SimpleComponent/SimpleComponent.idl | 95 - .../Components/SimpleComponent/SimpleComponent.mpc | 20 - CIAO/tests/IDL3/Connectors/README.txt | 3 - CIAO/tests/IDL3/Connectors/incorrect_consumes.idl | 17 - CIAO/tests/IDL3/Connectors/incorrect_emits.idl | 17 - CIAO/tests/IDL3/Connectors/incorrect_publishes.idl | 17 - CIAO/tests/IDL3/Connectors/run_test.pl | 67 - CIAO/tests/IDL3/Events/Abstract/.gitignore | 2 - CIAO/tests/IDL3/Events/Abstract/Abstract.idl | 37 - CIAO/tests/IDL3/Events/Abstract/Abstract.mpc | 16 - CIAO/tests/IDL3/Events/Any/.gitignore | 1 - CIAO/tests/IDL3/Events/Any/Any.mpc | 24 - CIAO/tests/IDL3/Events/Any/EventAny.idl | 15 - CIAO/tests/IDL3/Events/Any/README | 36 - CIAO/tests/IDL3/Events/Any/main.cpp | 83 - CIAO/tests/IDL3/Events/Any/run_test.pl | 32 - CIAO/tests/IDL3/Events/Regular/.gitignore | 2 - CIAO/tests/IDL3/Events/Regular/Regular.idl | 43 - CIAO/tests/IDL3/Events/Regular/Regular.mpc | 19 - .../tests/IDL3/Homes/Attributes/HomeAttributes.idl | 53 - .../tests/IDL3/Homes/Attributes/HomeAttributes.mpc | 16 - CIAO/tests/IDL3/Homes/Basic/Basic.idl | 34 - CIAO/tests/IDL3/Homes/Basic/Basic.mpc | 16 - CIAO/tests/IDL3/Homes/Factory/Factory.idl | 35 - CIAO/tests/IDL3/Homes/Factory/Factory.mpc | 16 - CIAO/tests/IDL3/Homes/Finder/.gitignore | 2 - CIAO/tests/IDL3/Homes/Finder/Finder.idl | 29 - CIAO/tests/IDL3/Homes/Finder/Finder.mpc | 16 - CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl | 32 - CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc | 16 - CIAO/tests/IDL3/ImpliedIDL/All/README | 90 - CIAO/tests/IDL3/ImpliedIDL/All/all.mpc | 35 - CIAO/tests/IDL3/ImpliedIDL/All/convert.idl | 56 - CIAO/tests/IDL3/ImpliedIDL/All/include.idl | 37 - CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl | 88 - CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl | 93 - CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl | 27 - .../IDL3/ImpliedIDL/Components/Basic/.gitignore | 2 - .../IDL3/ImpliedIDL/Components/Basic/ICBasic.idl | 24 - .../IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc | 16 - .../ImpliedIDL/Components/EventSink/.gitignore | 2 - .../Components/EventSink/ICEventSink.idl | 29 - .../Components/EventSink/ICEventSink.mpc | 16 - .../ImpliedIDL/Components/EventSource/.gitignore | 2 - .../Components/EventSource/ICEventSource.idl | 37 - .../Components/EventSource/ICEventSource.mpc | 20 - .../Components/Receptacles/ICReceptacles.idl | 27 - .../Components/Receptacles/ICReceptacles.mpc | 17 - CIAO/tests/IDL3/ImpliedIDL/Events/.gitignore | 2 - CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl | 21 - CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc | 16 - CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl | 27 - CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc | 17 - CIAO/tests/IDL3/Lookup/README | 22 - CIAO/tests/IDL3/Lookup/lookup_test.idl | 75 - CIAO/tests/IDL3/Lookup/lookup_test.mpc | 15 - .../IDL3_to_XMI/Bug_3607_Regression/run_test.pl | 53 - .../tests/IDL3_to_XMI/Bug_3607_Regression/test.idl | 10 - .../Forward_Declared/Forward_Declared.mpc | 7 - CIAO/tests/IDL3_to_XMI/Forward_Declared/README | 5 - CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl | 18 - CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl | 18 - CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl | 19 - CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl | 19 - .../IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc | 12 - CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp | 98 - CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h | 63 - CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl | 61 - .../IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp | 58 - CIAO/tests/IDL3_to_XMI/XMI.dtd | 6384 -- CIAO/tests/IDL3_to_XMI/XMI_For_Array/run_test.pl | 53 - CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl | 19 - .../IDL3_to_XMI/XMI_For_Included_File/File1.idl | 13 - .../IDL3_to_XMI/XMI_For_Included_File/File2.idl | 18 - .../IDL3_to_XMI/XMI_For_Included_File/run_test.pl | 53 - .../IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl | 76 - .../IDL3_to_XMI/XMI_For_Module_Reopen/test.idl | 41 - CIAO/tests/IDL3_to_XMI/XMI_For_Native/run_test.pl | 60 - CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl | 4 - .../tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl | 54 - CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl | 23 - CIAO/tests/IDL_Test/Cornucopia/.gitignore | 7 - CIAO/tests/IDL_Test/Cornucopia/Cornucopia.doxygen | 1801 - CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl | 306 - CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc | 126 - CIAO/tests/IDL_Test/Cornucopia/README | 40 - CIAO/tests/IDL_Test/Cornucopia/run_test.pl | 29 - .../Double_Inherited_Component/ComponentC.cdp | 126 - .../Double_Inherited_Component/ComponentC_exec.cpp | 114 - .../Double_Inherited_Component/ComponentC_exec.h | 73 - .../Inherited_components.idl | 48 - .../Inherited_components.mpc | 121 - .../Double_Inherited_Component/run_test.pl | 246 - CIAO/tests/IDL_Test/IDL3_Plus/.gitignore | 10 - CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl | 371 - CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc | 143 - CIAO/tests/IDL_Test/IDL3_Plus/README | 15 - CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl | 7 - CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc | 103 - CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl | 13 - CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc | 102 - .../IDL_Test/Inherited_Component/Extended/Base.idl | 44 - .../IDL_Test/Inherited_Component/Extended/Base.mpc | 125 - .../Inherited_Component/Extended/Derived.idl | 31 - .../Inherited_Component/Extended/Derived.mpc | 160 - .../Inherited_Component/Extended/Tester.cpp | 80 - .../tests/IDL_Test/Inherited_Component/IhC_Bar.idl | 20 - .../tests/IDL_Test/Inherited_Component/IhC_Bar.mpc | 143 - .../tests/IDL_Test/Inherited_Component/IhC_Foo.idl | 22 - .../tests/IDL_Test/Inherited_Component/IhC_Foo.mpc | 131 - CIAO/tests/IDL_Test/Inherited_Servants/Base.idl | 26 - CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc | 126 - CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl | 63 - CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc | 162 - CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp | 80 - CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl | 112 - CIAO/tests/IDL_Test/Keywords/Keywords.mpc | 106 - CIAO/tests/IDL_Test/Lem_Pragma/A.idl | 10 - CIAO/tests/IDL_Test/Lem_Pragma/B.idl | 11 - CIAO/tests/IDL_Test/Lem_Pragma/C.idl | 15 - CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc | 131 - .../IDL_Test/Lem_Specific_Export/Lem_Export.idl | 6 - .../IDL_Test/Lem_Specific_Export/Lem_Export.mpc | 126 - .../Lem_Specific_Export/Lem_Export_exec.cpp | 103 - .../IDL_Test/Lem_Specific_Export/Lem_Export_exec.h | 81 - .../IDL_Test/NonTopic_Connector/NonTopic_Base.idl | 62 - .../NonTopic_Connector/NonTopic_Connector.idl | 22 - .../NonTopic_Connector/NonTopic_Connector.mpc | 174 - .../NonTopic_Connector/NonTopic_Connector_T.cpp | 133 - .../NonTopic_Connector/NonTopic_Connector_T.h | 49 - .../descriptors/DeploymentPlan.cdp | 112 - .../NonTopic_Connector/descriptors/run_test.pl | 224 - .../IDL_Test/NonTopic_Connector/nontopic_test.idl | 39 - CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl | 12 - CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc | 129 - .../IDL_Test/Reused_Facet_Interface/Basic.idl | 56 - .../IDL_Test/Reused_Facet_Interface/Basic.mpc | 80 - .../IDL_Test/Reused_Facet_Interface/CodeGen.idl | 45 - CIAO/tests/IDL_Test/Reused_Facet_Interface/README | 13 - .../Reused_Facet_Interface.mpc | 110 - .../tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl | 40 - .../tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc | 103 - CIAO/tests/Minimum/Minimum_Base/Minimum_Base.idl | 17 - CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc | 63 - CIAO/tests/Minimum/Receiver/.gitignore | 5 - CIAO/tests/Minimum/Receiver/Receiver.idl | 18 - CIAO/tests/Minimum/Receiver/Receiver.mpc | 132 - CIAO/tests/Minimum/Receiver/Receiver_exec.cpp | 152 - CIAO/tests/Minimum/Receiver/Receiver_exec.h | 115 - CIAO/tests/Minimum/Sender/.gitignore | 4 - CIAO/tests/Minimum/Sender/Sender.idl | 26 - CIAO/tests/Minimum/Sender/Sender.mpc | 111 - CIAO/tests/Minimum/Sender/Sender_exec.cpp | 158 - CIAO/tests/Minimum/Sender/Sender_exec.h | 121 - CIAO/tests/TTSCTest/Sender/Sender.idl | 10 - CIAO/tests/TTSCTest/Sender/Sender.mpc | 111 - CIAO/tests/TTSCTest/Sender/Sender_exec.cpp | 208 - CIAO/tests/TTSCTest/Sender/Sender_exec.h | 88 - CIAO/tests/TTSCTest/TTSConnector/TTSConnector.idl | 53 - CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc | 131 - .../TTSCTest/TTSConnector/TTSConnector_conn.cpp | 221 - .../TTSCTest/TTSConnector/TTSConnector_conn.h | 123 - .../tests/TTSCTest/TimeTriggerServiceConnector.odt | Bin 15540 -> 0 bytes CIAO/tests/TTSCTest/descriptors/DeploymentPlan.cdp | 209 - CIAO/tests/TTSCTest/descriptors/run_test.pl | 251 - CIAO/tests/TTSConnContext/README.txt | 19 - CIAO/tests/TTSConnContext/Sender/Sender.idl | 10 - CIAO/tests/TTSConnContext/Sender/Sender.mpc | 112 - CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp | 207 - CIAO/tests/TTSConnContext/Sender/Sender_exec.h | 88 - .../TTSConnContext/TTSCConnector/TTSCConnector.idl | 53 - .../TTSConnContext/TTSCConnector/TTSCConnector.mpc | 131 - .../TTSCConnector/TTSCConnector_conn.cpp | 245 - .../TTSCConnector/TTSCConnector_conn.h | 123 - .../TTSConnContext/descriptors/DeploymentPlan.cdp | 187 - CIAO/tests/TTSConnContext/descriptors/run_test.pl | 251 - CIAO/tests/Thread/README.txt | 3 - CIAO/tests/Thread/Receiver/Receiver.idl | 23 - CIAO/tests/Thread/Receiver/Receiver.mpc | 141 - CIAO/tests/Thread/Receiver/Receiver_exec.cpp | 373 - CIAO/tests/Thread/Receiver/Receiver_exec.h | 85 - CIAO/tests/Thread/Sender/Sender.idl | 31 - CIAO/tests/Thread/Sender/Sender.mpc | 138 - CIAO/tests/Thread/Sender/Sender_exec.cpp | 410 - CIAO/tests/Thread/Sender/Sender_exec.h | 115 - CIAO/tests/Thread/Sender/starter.cpp | 77 - CIAO/tests/Thread/Thread_Base/Thread_Base.idl | 24 - CIAO/tests/Thread/Thread_Base/Thread_Base.mpc | 76 - CIAO/tests/Thread/descriptors/DeploymentPlan.cdp | 365 - .../tests/Thread/descriptors/DeploymentPlanDat.cdp | 321 - CIAO/tests/Thread/descriptors/NodeManagerMap.cdd | 51 - CIAO/tests/Thread/descriptors/NodeManagerMap.dat | 4 - CIAO/tests/Thread/descriptors/run_test.pl | 235 - CIAO/tests/Thread/descriptors/run_test_cdd.pl | 200 - CIAO/tests/Thread/descriptors/run_test_dat.pl | 200 - CIAO/tools/IDL3_to_IDL2/.gitignore | 1 - CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc | 73 - CIAO/tools/IDL3_to_IDL2/README | 141 - .../IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h | 57 - CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp | 1225 - CIAO/tools/IDL3_to_IDL2/basic_visitor.h | 109 - CIAO/tools/IDL3_to_IDL2/be_extern.h | 85 - CIAO/tools/IDL3_to_IDL2/be_global.cpp | 154 - CIAO/tools/IDL3_to_IDL2/be_global.h | 99 - CIAO/tools/IDL3_to_IDL2/be_helper.cpp | 422 - CIAO/tools/IDL3_to_IDL2/be_helper.h | 170 - CIAO/tools/IDL3_to_IDL2/be_init.cpp | 30 - CIAO/tools/IDL3_to_IDL2/be_produce.cpp | 166 - CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp | 150 - CIAO/tools/IDL3_to_IDL2/be_sunsoft.h | 40 - CIAO/tools/IDL3_to_IDL2/be_util.cpp | 60 - CIAO/tools/IDL3_to_IDL2/be_util.h | 41 - CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp | 463 - CIAO/tools/IDL3_to_IDL2/checking_visitor.h | 106 - CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp | 121 - CIAO/tools/IDL3_to_IDL2/identifier_helper.h | 55 - CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp | 914 - CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h | 77 - CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp | 282 - CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h | 81 - CIAO/tools/IDL3_to_XMI/.gitignore | 1 - CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h | 57 - CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc | 68 - CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp | 2694 - CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h | 324 - CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp | 1191 - CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h | 131 - CIAO/tools/IDL3_to_XMI/Literals.cpp | 154 - CIAO/tools/IDL3_to_XMI/Literals.h | 167 - CIAO/tools/IDL3_to_XMI/be_extern.h | 85 - CIAO/tools/IDL3_to_XMI/be_global.cpp | 170 - CIAO/tools/IDL3_to_XMI/be_global.h | 82 - CIAO/tools/IDL3_to_XMI/be_helper.cpp | 425 - CIAO/tools/IDL3_to_XMI/be_helper.h | 172 - CIAO/tools/IDL3_to_XMI/be_init.cpp | 29 - CIAO/tools/IDL3_to_XMI/be_produce.cpp | 137 - CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp | 183 - CIAO/tools/IDL3_to_XMI/be_sunsoft.h | 38 - CIAO/tools/IDL3_to_XMI/be_util.cpp | 62 - CIAO/tools/IDL3_to_XMI/be_util.h | 41 - CIAO/tools/IDL3_to_XMI/identifier_helper.cpp | 112 - CIAO/tools/IDL3_to_XMI/identifier_helper.h | 53 - CIAO/tutorials/Quoter/Simple/.gitignore | 1 - CIAO/tutorials/Quoter/Simple/01.html | 385 - CIAO/tutorials/Quoter/Simple/02.html | 198 - CIAO/tutorials/Quoter/Simple/03.html | 474 - CIAO/tutorials/Quoter/Simple/04.html | 162 - CIAO/tutorials/Quoter/Simple/Broker/.gitignore | 6 - .../tutorials/Quoter/Simple/Broker/StockBroker.idl | 38 - .../tutorials/Quoter/Simple/Broker/StockBroker.mpc | 164 - .../Quoter/Simple/Broker/StockBrokerDriver.cpp | 109 - .../Quoter/Simple/Broker/StockBroker_exec.cpp | 202 - .../Quoter/Simple/Broker/StockBroker_exec.h | 108 - .../tutorials/Quoter/Simple/Distributor/.gitignore | 6 - .../Quoter/Simple/Distributor/StockDistributor.idl | 42 - .../Quoter/Simple/Distributor/StockDistributor.mpc | 164 - .../Simple/Distributor/StockDistributorDriver.cpp | 113 - .../Simple/Distributor/StockDistributor_exec.cpp | 353 - .../Simple/Distributor/StockDistributor_exec.h | 244 - CIAO/tutorials/Quoter/Simple/Icons/AddConnMode.gif | Bin 106 -> 0 bytes CIAO/tutorials/Quoter/Simple/Icons/SetMode.gif | Bin 125 -> 0 bytes CIAO/tutorials/Quoter/Simple/Model/Quoter.xme | 1452 - CIAO/tutorials/Quoter/Simple/README.html | 172 - CIAO/tutorials/Quoter/Simple/Stock_Base/.gitignore | 4 - .../Quoter/Simple/Stock_Base/Stock_Base.idl | 46 - .../Quoter/Simple/Stock_Base/Stock_Base.mpc | 108 - .../tutorials/Quoter/Simple/descriptors/Broker.cpd | 13 - .../Quoter/Simple/descriptors/Default.pcd | 6 - .../Quoter/Simple/descriptors/Distributor.cpd | 13 - .../tutorials/Quoter/Simple/descriptors/Domain.cdd | 49 - .../Quoter/Simple/descriptors/NodeMap.cdd | 50 - CIAO/tutorials/Quoter/Simple/descriptors/Plan.cdp | 249 - .../Quoter/Simple/descriptors/StockBroker.ccd | 49 - .../descriptors/StockBrokerMonolithicImpl.cid | 35 - .../Quoter/Simple/descriptors/StockBroker_exec.iad | 78 - .../Quoter/Simple/descriptors/StockBroker_stub.iad | 56 - .../Quoter/Simple/descriptors/StockBroker_svnt.iad | 73 - .../Quoter/Simple/descriptors/StockDistributor.ccd | 49 - .../descriptors/StockDistributorMonolithicImpl.cid | 35 - .../Simple/descriptors/StockDistributor_exec.iad | 78 - .../Simple/descriptors/StockDistributor_stub.iad | 56 - .../Simple/descriptors/StockDistributor_svnt.iad | 73 - .../Quoter/Simple/descriptors/StockQuoter.cid | 39 - .../Quoter/Simple/descriptors/StockQuoter.cpd | 11 - .../Quoter/Simple/descriptors/TopLevelPackage.tpd | 6 - CIAO/tutorials/Quoter/Simple/descriptors/XMI.xsd | 35 - .../Quoter/Simple/descriptors/runNodeDaemons.pl | 42 - .../Quoter/Simple/descriptors/run_test.pl | 292 - CIAO/tutorials/Quoter/Simple/images/fig1.jpg | Bin 13971 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig10.jpg | Bin 294005 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig11.jpg | Bin 285268 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig12.jpg | Bin 293606 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig2.jpg | Bin 236022 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig3.jpg | Bin 49404 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig4.jpg | Bin 274446 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig5.jpg | Bin 292040 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig6.jpg | Bin 269726 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig6a.jpg | Bin 298962 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig7.jpg | Bin 294415 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig8.jpg | Bin 136474 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/fig9.jpg | Bin 128558 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/quoter.jpg | Bin 15027 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/step1.jpg | Bin 17752 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/step2.jpg | Bin 29764 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/step3.jpg | Bin 32189 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/step6.jpg | Bin 10762 -> 0 bytes CIAO/tutorials/Quoter/Simple/images/steps.jpg | Bin 82487 -> 0 bytes CIAO/tutorials/Quoter/Simple/index.html | 351 - DAnCE/COPYING | 111 - DAnCE/ChangeLogs/ChangeLog-2011a | 1502 - DAnCE/ChangeLogs/ChangeLog-2011b | 444 - DAnCE/ChangeLogs/ChangeLog-2012a | 399 - DAnCE/ChangeLogs/ChangeLog-2013a | 701 - DAnCE/ChangeLogs/ChangeLog-2014a | 188 - DAnCE/ChangeLogs/ChangeLog-2014b | 24 - DAnCE/ChangeLogs/DAnCE-1_3_1 | 201 - DAnCE/ChangeLogs/DAnCE-1_3_2 | 208 - DAnCE/ChangeLogs/DAnCE-1_3_3 | 42 - DAnCE/DAnCE-INSTALL.html | 110 - DAnCE/DAnCE_TAO.mwc | 19 - DAnCE/MPC/config/dance.mpb | 5 - DAnCE/MPC/config/dance_applicationmanager.mpb | 5 - DAnCE/MPC/config/dance_applicationmanager_skel.mpb | 5 - DAnCE/MPC/config/dance_applicationmanager_stub.mpb | 5 - DAnCE/MPC/config/dance_artifact_installation.mpb | 5 - DAnCE/MPC/config/dance_completion_counter.mpb | 4 - DAnCE/MPC/config/dance_config_handlers.mpb | 14 - DAnCE/MPC/config/dance_config_handlers_base.mpb | 7 - DAnCE/MPC/config/dance_convert_plan.mpb | 5 - DAnCE/MPC/config/dance_deployment_scheduler.mpb | 5 - DAnCE/MPC/config/dance_deployment_skel.mpb | 6 - DAnCE/MPC/config/dance_deployment_stub.mpb | 8 - DAnCE/MPC/config/dance_domain_validator.mpb | 4 - DAnCE/MPC/config/dance_domainapplication.mpb | 5 - DAnCE/MPC/config/dance_domainapplication_skel.mpb | 5 - DAnCE/MPC/config/dance_domainapplication_stub.mpb | 5 - .../MPC/config/dance_domainapplicationmanager.mpb | 5 - .../config/dance_domainapplicationmanager_skel.mpb | 5 - .../config/dance_domainapplicationmanager_stub.mpb | 5 - DAnCE/MPC/config/dance_exe.mpb | 4 - DAnCE/MPC/config/dance_executionmanager_skel.mpb | 5 - DAnCE/MPC/config/dance_executionmanager_stub.mpb | 5 - DAnCE/MPC/config/dance_installation_handlers.mpb | 5 - .../dance_installation_repository_manager.mpb | 5 - DAnCE/MPC/config/dance_lib.mpb | 4 - DAnCE/MPC/config/dance_locality_handler.mpb | 5 - DAnCE/MPC/config/dance_locality_manager.mpb | 5 - DAnCE/MPC/config/dance_logger.mpb | 5 - DAnCE/MPC/config/dance_nodeapplication.mpb | 7 - DAnCE/MPC/config/dance_nodeapplication_skel.mpb | 5 - DAnCE/MPC/config/dance_nodeapplication_stub.mpb | 5 - DAnCE/MPC/config/dance_nodeapplicationmanager.mpb | 5 - .../config/dance_nodeapplicationmanager_skel.mpb | 5 - .../config/dance_nodeapplicationmanager_stub.mpb | 5 - DAnCE/MPC/config/dance_nodemanager_skel.mpb | 5 - DAnCE/MPC/config/dance_nodemanager_stub.mpb | 5 - DAnCE/MPC/config/dance_output.mpb | 5 - DAnCE/MPC/config/dance_plan_launcher.mpb | 11 - DAnCE/MPC/config/dance_repositorymanager_skel.mpb | 5 - DAnCE/MPC/config/dance_repositorymanager_stub.mpb | 5 - DAnCE/MPC/config/dance_repositorymanagerbase.mpb | 7 - DAnCE/MPC/config/dance_shs_daemon.mpb | 4 - DAnCE/MPC/config/dance_shs_stub.mpb | 6 - DAnCE/MPC/config/dance_skel.mpb | 6 - DAnCE/MPC/config/dance_split_plan.mpb | 5 - DAnCE/MPC/config/dance_stub.mpb | 6 - DAnCE/MPC/config/dance_targetmanager_skel.mpb | 5 - DAnCE/MPC/config/dance_targetmanager_stub.mpb | 5 - DAnCE/MPC/config/dance_tools.mpb | 4 - DAnCE/MPC/config/danceidldefaults.mpb | 6 - DAnCE/MPC/config/dancelib_with_idl.mpb | 3 - DAnCE/NEWS | 204 - DAnCE/PROBLEM-REPORT-FORM | 92 - DAnCE/VERSION | 8 - DAnCE/bin/.gitignore | 14 - DAnCE/bin/PythonDAnCE/__init__.py | 1 - DAnCE/bin/PythonDAnCE/generator/__init__.py | 52 - DAnCE/bin/PythonDAnCE/generator/_path.py | 0 DAnCE/bin/PythonDAnCE/generator/artifact.py | 25 - DAnCE/bin/PythonDAnCE/generator/comp_impl.py | 59 - DAnCE/bin/PythonDAnCE/generator/comp_inst.py | 25 - DAnCE/bin/PythonDAnCE/generator/config_prop.py | 17 - DAnCE/bin/PythonDAnCE/generator/connection.py | 12 - .../PythonDAnCE/generator/deploy_requirement.py | 12 - .../PythonDAnCE/generator/external_reference.py | 14 - DAnCE/bin/PythonDAnCE/generator/footer.py | 9 - DAnCE/bin/PythonDAnCE/generator/header.py | 15 - DAnCE/bin/PythonDAnCE/generator/home_impl.py | 58 - DAnCE/bin/PythonDAnCE/generator/home_inst.py | 13 - DAnCE/bin/PythonDAnCE/generator/homed_comp_impl.py | 13 - DAnCE/bin/PythonDAnCE/generator/homed_comp_inst.py | 24 - .../bin/PythonDAnCE/generator/internal_endpoint.py | 13 - DAnCE/bin/PythonDAnCE/generator/templet.py | 326 - DAnCE/bin/ciao.localityconfig | 15 - DAnCE/bin/dance_tests.lst | 17 - DAnCE/bin/generate_plan.py | 90 - DAnCE/bin/nodemanager.localityconfig | 5 - DAnCE/bin/update_package.py | 118 - DAnCE/dance/.gitignore | 18 - DAnCE/dance/DAnCE_ArtifactInstallation.idl | 37 - DAnCE/dance/DAnCE_Core.mpc | 89 - DAnCE/dance/DAnCE_DeploymentInterceptors.idl | 99 - .../DAnCE_DeploymentInterceptors_Base_Impl.cpp | 119 - .../dance/DAnCE_DeploymentInterceptors_Base_Impl.h | 109 - DAnCE/dance/DAnCE_LocalityManager.idl | 115 - DAnCE/dance/DAnCE_Properties.idl | 101 - DAnCE/dance/DAnCE_Properties.mpc | 29 - DAnCE/dance/DAnCE_Utility.cpp | 671 - DAnCE/dance/DAnCE_Utility.h | 161 - DAnCE/dance/DAnCE_Utility.tpp | 178 - DAnCE/dance/Deployment/.gitignore | 121 - DAnCE/dance/Deployment/Deployment.idl | 20 - DAnCE/dance/Deployment/Deployment_Application.idl | 22 - .../Deployment/Deployment_ApplicationManager.idl | 30 - DAnCE/dance/Deployment/Deployment_Base.idl | 39 - DAnCE/dance/Deployment/Deployment_Connection.idl | 16 - DAnCE/dance/Deployment/Deployment_Core.mpc | 680 - DAnCE/dance/Deployment/Deployment_Data.idl | 39 - .../dance/Deployment/Deployment_DeploymentPlan.idl | 208 - .../Deployment/Deployment_DomainApplication.idl | 15 - .../Deployment_DomainApplicationManager.idl | 17 - .../Deployment/Deployment_ExecutionManager.idl | 19 - .../Deployment_InvalidComponentExecParameter.idl | 11 - .../Deployment/Deployment_InvalidConnection.idl | 11 - .../Deployment_InvalidNodeExecParameter.idl | 11 - .../Deployment/Deployment_InvalidProperty.idl | 11 - .../Deployment/Deployment_NodeApplication.idl | 12 - .../Deployment_NodeApplicationManager.idl | 13 - DAnCE/dance/Deployment/Deployment_NodeManager.idl | 33 - .../dance/Deployment/Deployment_Packaging_Data.idl | 199 - DAnCE/dance/Deployment/Deployment_PlanError.idl | 11 - .../Deployment/Deployment_RepositoryManager.idl | 49 - .../Deployment_ResourceCommitmentManager.idl | 33 - .../Deployment/Deployment_ResourceNotAvailable.idl | 14 - DAnCE/dance/Deployment/Deployment_StartError.idl | 13 - DAnCE/dance/Deployment/Deployment_StopError.idl | 13 - DAnCE/dance/Deployment/Deployment_TargetData.idl | 66 - .../dance/Deployment/Deployment_TargetManager.idl | 32 - .../dance/DomainApplication/DomainApplication.mpc | 16 - .../DomainApplication/Domain_Application_Export.h | 57 - .../DomainApplication/Domain_Application_Impl.cpp | 977 - .../DomainApplication/Domain_Application_Impl.h | 202 - .../DomainApplicationManager.mpc | 23 - .../DomainApplicationManager_Export.h | 57 - .../DomainApplicationManager_Impl.cpp | 1194 - .../DomainApplicationManager_Impl.h | 215 - .../DomainApplicationManager/Node_Locator.cpp | 237 - .../dance/DomainApplicationManager/Node_Locator.h | 58 - DAnCE/dance/ExecutionManager/.gitignore | 1 - DAnCE/dance/ExecutionManager/ExecutionManager.mpc | 14 - .../ExecutionManager/ExecutionManager_Impl.cpp | 333 - .../dance/ExecutionManager/ExecutionManager_Impl.h | 113 - .../ExecutionManager/ExecutionManager_Module.cpp | 387 - .../ExecutionManager/ExecutionManager_Module.h | 90 - DAnCE/dance/ExecutionManager/Execution_Manager.cpp | 66 - .../LocalityManager/Configuration/CPU_Affinity.cpp | 120 - .../LocalityManager/Configuration/CPU_Affinity.h | 46 - .../Configuration/CPU_Affinity_export.h | 55 - .../Configuration/Configuration.mpc | 19 - .../LocalityManager/Configuration/Process_Name.cpp | 110 - .../LocalityManager/Configuration/Process_Name.h | 46 - .../Configuration/Process_Name_export.h | 55 - .../Configuration/Process_Priority.cpp | 82 - .../Configuration/Process_Priority.h | 46 - .../Configuration/Process_Priority_export.h | 55 - DAnCE/dance/LocalityManager/Daemon/.gitignore | 1 - .../LocalityManager/Daemon/Locality_Manager.cpp | 49 - .../LocalityManager/Daemon/Locality_Manager.mpc | 37 - .../Daemon/Locality_Manager_Impl.cpp | 1142 - .../LocalityManager/Daemon/Locality_Manager_Impl.h | 115 - .../Daemon/Locality_Manager_Impl_Export.h | 57 - .../Daemon/Locality_Manager_Task.cpp | 375 - .../LocalityManager/Daemon/Locality_Manager_Task.h | 52 - .../Handler/Config_Handler_Impl.cpp | 184 - .../LocalityManager/Handler/Config_Handler_Impl.h | 94 - .../Handler/DAnCE_Locality_Handler_export.h | 55 - .../LocalityManager/Handler/Inst_Handler_Impl.cpp | 212 - .../LocalityManager/Handler/Inst_Handler_Impl.h | 94 - .../Handler/Interceptor_Handler_Impl.cpp | 185 - .../Handler/Interceptor_Handler_Impl.h | 94 - .../Handler/LocalityActivator_Impl.cpp | 763 - .../Handler/LocalityActivator_Impl.h | 201 - .../LocalityManager/Handler/LocalityHandler.mpc | 25 - .../Handler/Locality_Manager_Handler_Impl.cpp | 255 - .../Handler/Locality_Manager_Handler_Impl.h | 97 - .../dance/LocalityManager/Handler/Plugin_Conf.cpp | 228 - DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h | 32 - .../LocalityManager/Interceptors/Best_Effort.cpp | 158 - .../LocalityManager/Interceptors/Best_Effort.h | 77 - .../Interceptors/DAnCE_Error_Interceptors_export.h | 55 - .../Interceptors/Error_Interceptors.mpc | 17 - .../Interceptors/Standard_Error.cpp | 132 - .../LocalityManager/Interceptors/Standard_Error.h | 76 - .../Scheduler/Dependency_Sorter.cpp | 92 - .../LocalityManager/Scheduler/Dependency_Sorter.h | 42 - .../Scheduler/Deployment_Completion.cpp | 95 - .../Scheduler/Deployment_Completion.h | 62 - .../LocalityManager/Scheduler/Deployment_Event.cpp | 6 - .../LocalityManager/Scheduler/Deployment_Event.h | 63 - .../LocalityManager/Scheduler/Deployment_Event.inl | 49 - .../Scheduler/Deployment_Scheduler.cpp | 78 - .../Scheduler/Deployment_Scheduler.h | 51 - .../Scheduler/Deployment_Scheduler.inl | 28 - .../Scheduler/Deployment_Scheduler_export.h | 55 - .../Scheduler/Events/Action_Base.cpp | 181 - .../LocalityManager/Scheduler/Events/Action_Base.h | 42 - .../Scheduler/Events/Configured.cpp | 91 - .../LocalityManager/Scheduler/Events/Configured.h | 47 - .../LocalityManager/Scheduler/Events/Connect.cpp | 97 - .../LocalityManager/Scheduler/Events/Connect.h | 49 - .../Scheduler/Events/Disconnect.cpp | 91 - .../LocalityManager/Scheduler/Events/Disconnect.h | 47 - .../LocalityManager/Scheduler/Events/Endpoint.cpp | 98 - .../LocalityManager/Scheduler/Events/Endpoint.h | 48 - .../LocalityManager/Scheduler/Events/Install.cpp | 99 - .../LocalityManager/Scheduler/Events/Install.h | 49 - .../LocalityManager/Scheduler/Events/Passivate.cpp | 94 - .../LocalityManager/Scheduler/Events/Passivate.h | 49 - .../LocalityManager/Scheduler/Events/Remove.cpp | 93 - .../LocalityManager/Scheduler/Events/Remove.h | 49 - .../LocalityManager/Scheduler/Events/Start.cpp | 93 - .../dance/LocalityManager/Scheduler/Events/Start.h | 49 - .../LocalityManager/Scheduler/Plugin_Manager.cpp | 378 - .../LocalityManager/Scheduler/Plugin_Manager.h | 106 - .../dance/LocalityManager/Scheduler/Scheduler.mpc | 45 - DAnCE/dance/Logger/DAnCE_Logger_Export.h | 57 - DAnCE/dance/Logger/Log_Macros.cpp | 5 - DAnCE/dance/Logger/Log_Macros.h | 160 - DAnCE/dance/Logger/Logger.mpc | 19 - DAnCE/dance/Logger/Logger_Service.cpp | 190 - DAnCE/dance/Logger/Logger_Service.h | 33 - DAnCE/dance/NodeApplication/NodeApplication.mpc | 20 - .../dance/NodeApplication/NodeApplication_Export.h | 57 - .../dance/NodeApplication/NodeApplication_Impl.cpp | 538 - DAnCE/dance/NodeApplication/NodeApplication_Impl.h | 95 - .../NodeApplicationManager.mpc | 15 - .../NodeApplicationManager_Export.h | 57 - .../NodeApplicationManager_Impl.cpp | 398 - .../NodeApplicationManager_Impl.h | 67 - DAnCE/dance/NodeManager/.gitignore | 1 - DAnCE/dance/NodeManager/NodeManager.mpc | 13 - DAnCE/dance/NodeManager/NodeManager_Impl.cpp | 247 - DAnCE/dance/NodeManager/NodeManager_Impl.h | 69 - DAnCE/dance/NodeManager/Node_Manager.cpp | 65 - DAnCE/dance/NodeManager/Node_Manager_Module.cpp | 742 - DAnCE/dance/NodeManager/Node_Manager_Module.h | 113 - DAnCE/dance/NodeManager/README | 15 - DAnCE/dance/Plan_Launcher/.gitignore | 1 - DAnCE/dance/Plan_Launcher/Daemon/.gitignore | 7 - DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp | 107 - DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl | 27 - DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc | 60 - .../dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp | 57 - DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h | 44 - DAnCE/dance/Plan_Launcher/Deployment_Failure.h | 23 - DAnCE/dance/Plan_Launcher/EM_Launcher.cpp | 65 - DAnCE/dance/Plan_Launcher/EM_Launcher.h | 42 - DAnCE/dance/Plan_Launcher/LM_Launcher.cpp | 67 - DAnCE/dance/Plan_Launcher/LM_Launcher.h | 40 - DAnCE/dance/Plan_Launcher/NM_Launcher.cpp | 14 - DAnCE/dance/Plan_Launcher/NM_Launcher.h | 39 - DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp | 1042 - DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc | 28 - DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h | 56 - .../Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp | 637 - .../Plan_Launcher/Plan_Launcher_Base_Impl_T.h | 88 - DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h | 57 - DAnCE/dance/RepositoryManager/.gitignore | 7 - DAnCE/dance/RepositoryManager/PC_Updater.cpp | 245 - DAnCE/dance/RepositoryManager/PC_Updater.h | 110 - DAnCE/dance/RepositoryManager/PC_Updater_T.cpp | 19 - DAnCE/dance/RepositoryManager/PC_Updater_T.h | 38 - DAnCE/dance/RepositoryManager/README | 48 - DAnCE/dance/RepositoryManager/RM_Helper.cpp | 262 - DAnCE/dance/RepositoryManager/RM_Helper.h | 75 - .../dance/RepositoryManager/RepositoryManager.cpp | 272 - .../dance/RepositoryManager/RepositoryManager.mpc | 49 - .../RepositoryManager/RepositoryManagerDaemon.idl | 11 - .../RepositoryManager/RepositoryManager_Impl.cpp | 1269 - .../RepositoryManager/RepositoryManager_Impl.h | 231 - .../dance/RepositoryManager/Repository_Manager.cpp | 67 - .../Repository_Manager_Module.cpp | 544 - .../RepositoryManager/Repository_Manager_Module.h | 105 - DAnCE/dance/RepositoryManager/URL_Parser.cpp | 100 - DAnCE/dance/RepositoryManager/URL_Parser.h | 61 - DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp | 386 - DAnCE/dance/RepositoryManager/ZIP_Wrapper.h | 113 - .../RepositoryManager/repository_manager_admin.cpp | 247 - .../RepositoryManager/repository_manager_admin.h | 63 - .../repository_manager_admin_exec.cpp | 472 - DAnCE/dance/TargetManager/.gitignore | 1 - DAnCE/dance/TargetManager/DomainDataManager.cpp | 648 - DAnCE/dance/TargetManager/DomainDataManager.h | 242 - .../TargetManager/ResourceCommitmentManager.cpp | 60 - .../TargetManager/ResourceCommitmentManager.h | 58 - DAnCE/dance/TargetManager/TargetManager.mpc | 15 - DAnCE/dance/TargetManager/TargetManager_Impl.cpp | 56 - DAnCE/dance/TargetManager/TargetManager_Impl.h | 49 - DAnCE/dance/TargetManager/Target_Manager.cpp | 64 - .../dance/TargetManager/Target_Manager_Module.cpp | 345 - DAnCE/dance/TargetManager/Target_Manager_Module.h | 90 - DAnCE/dance/Version.h | 8 - DAnCE/docs/DAnCE_Logging.txt | 96 - DAnCE/docs/Error_Documentation/Checked.png | Bin 277 -> 0 bytes DAnCE/docs/Error_Documentation/Collapsed.png | Bin 193 -> 0 bytes DAnCE/docs/Error_Documentation/Expanded.png | Bin 210 -> 0 bytes DAnCE/docs/Error_Documentation/LeafRowHandle.png | Bin 210 -> 0 bytes DAnCE/docs/Error_Documentation/Mixed.png | Bin 213 -> 0 bytes DAnCE/docs/Error_Documentation/Unchecked.png | Bin 205 -> 0 bytes DAnCE/docs/Error_Documentation/blank.png | Bin 168 -> 0 bytes DAnCE/docs/Error_Documentation/index.html | 1081 - DAnCE/docs/Error_Documentation/outliner.js | 190 - DAnCE/docs/LocalityManager-Plugins.txt | 106 - DAnCE/docs/OMG-DnC-Tutorial.ppt | Bin 6372864 -> 0 bytes DAnCE/docs/releasenotes/dance.html | 229 - DAnCE/docs/releasenotes/index.html | 95 - DAnCE/docs/schema/06-04-02.xsd | 1010 - DAnCE/docs/schema/Basic_Deployment_Data.xsd | 441 - DAnCE/docs/schema/Deployment.xsd | 29 - DAnCE/docs/schema/README.html | 57 - DAnCE/docs/schema/Spec_Defined_Deployment.xsd | 897 - DAnCE/docs/schema/Spec_Defined_XMI.xsd | 35 - DAnCE/docs/schema/XMI.xsd | 39 - DAnCE/docs/schema/ccd.xsd | 27 - DAnCE/docs/schema/cdd.xsd | 60 - DAnCE/docs/schema/cdp.xsd | 43 - DAnCE/docs/schema/cid.xsd | 126 - DAnCE/docs/schema/cpd.xsd | 49 - DAnCE/docs/schema/iad.xsd | 32 - DAnCE/docs/schema/pcd.xsd | 32 - DAnCE/docs/schema/toplevel.xsd | 15 - DAnCE/docs/schema/unused_06-04-02.xsd | 201 - DAnCE/docs/schema/unused_elements.xsd | 161 - DAnCE/docs/schema/xsc-banner.cpp | 11 - DAnCE/docs/schema/xsc-banner.h | 10 - .../sources/Error_Documentation.oo3/contents.bin | Bin 5009 -> 0 bytes DAnCE/docs/sources/LocalityManager.graffle | 10717 --- DAnCE/docs/sources/dance-deployment.odg | Bin 18284 -> 0 bytes DAnCE/etc/DAnCE.doxygen | 2331 - DAnCE/lib/.empty | 1 - DAnCE/rules.dance.GNU | 44 - DAnCE/tests/Bug_3832_Regression/run_test.pl | 63 - DAnCE/tests/Config_Handlers/Config_Handlers.mpc | 12 - .../Config_Handlers/DynAny_Handler/dynany_test.idl | 27 - .../tests/Config_Handlers/DynAny_Handler/test.cpp | 290 - .../tests/Config_Handlers/DynAny_Handler/test.mpc | 15 - .../Package_Handlers/Package_Handlers.mpc | 9 - .../Config_Handlers/Package_Handlers/test.cpp | 109 - DAnCE/tests/Config_Handlers/test.cdp | 1828 - DAnCE/tests/Config_Handlers/test.cpp | 117 - DAnCE/tests/DeploymentPlanDump/.gitignore | 1 - DAnCE/tests/DeploymentPlanDump/CcmDance2-host1.cdp | 640 - DAnCE/tests/DeploymentPlanDump/CcmDance2-host2.cdp | 970 - DAnCE/tests/DeploymentPlanDump/CcmDance2.cdp | 1301 - DAnCE/tests/DeploymentPlanDump/CcmDance4-host1.cdp | 1056 - DAnCE/tests/DeploymentPlanDump/CcmDance4-host2.cdp | 942 - .../DeploymentPlanDump/DeploymentPlanDump.mpc | 8 - DAnCE/tests/DeploymentPlanDump/NewCcmDance1.cdp | 1064 - DAnCE/tests/DeploymentPlanDump/test.cpp | 36 - .../tests/DeploymentPlanTestReferences/.gitignore | 1 - .../DeploymentPlanTestReferences.mpc | 8 - DAnCE/tests/DeploymentPlanTestReferences/test.cpp | 54 - DAnCE/tests/DeploymentTest1/.gitignore | 1 - DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc | 8 - DAnCE/tests/DeploymentTest1/test.cpp | 67 - .../CircularDependency/CircularDependency.mpc | 9 - .../Circular_Dependency_export.h | 54 - .../CircularDependency/Deployment.cdp | 91 - .../CircularDependency/Handler_A.cpp | 104 - .../LocalityManager/CircularDependency/Handler_A.h | 94 - .../CircularDependency/Handler_B.cpp | 104 - .../LocalityManager/CircularDependency/Handler_B.h | 94 - .../LocalityManager/CircularDependency/run_test.pl | 219 - .../LocalityManager/ExplicitExec/Deployment.cdp | 64 - .../LocalityManager/ExplicitExec/ExplicitExec.mpc | 13 - .../tests/LocalityManager/ExplicitExec/run_test.pl | 244 - .../LocalityManager/ProcessName/Deployment.cdp | 64 - .../tests/LocalityManager/ProcessName/run_test.pl | 255 - .../LocalityManager/SpawnMultiple/Deployment.cdp | 107 - .../LocalityManager/SpawnMultiple/run_test.pl | 244 - .../tests/LocalityManager/SpawnOne/Deployment.cdp | 53 - DAnCE/tests/LocalityManager/SpawnOne/run_test.pl | 244 - DAnCE/tests/NameServiceTest/.gitignore | 2 - DAnCE/tests/NameServiceTest/Dummy.idl | 12 - DAnCE/tests/NameServiceTest/DummyImpl.cpp | 13 - DAnCE/tests/NameServiceTest/DummyImpl.h | 24 - DAnCE/tests/NameServiceTest/NameServiceTest.mpc | 28 - DAnCE/tests/NameServiceTest/RegistrationPath.h | 8 - DAnCE/tests/NameServiceTest/clt_main.cpp | 84 - DAnCE/tests/NameServiceTest/run_test.pl | 72 - DAnCE/tests/NameServiceTest/srv_main.cpp | 71 - .../.gitignore | 1 - .../NAM_NA.mpc | 7 - .../test.cpp | 47 - .../NodeManager-NodeApplicationManager/.gitignore | 1 - .../NodeManager-NodeApplicationManager.mpc | 7 - .../NodeManager-NodeApplicationManager/test.cpp | 42 - DAnCE/tests/Parsing/ArtGallery3Nodes.cdd | 74 - .../Parsing/InvalidConfigPropValueDeclaration.cdp | 136 - DAnCE/tests/Parsing/InvalidConnection.cdp | 136 - DAnCE/tests/Parsing/InvalidDatatypeValue.cdp | 136 - DAnCE/tests/Parsing/InvalidElement.cdp | 136 - DAnCE/tests/Parsing/InvalidReference.cdp | 136 - DAnCE/tests/Parsing/Parsing.mpc | 16 - DAnCE/tests/Parsing/domain.cpp | 57 - DAnCE/tests/Parsing/run_test.pl | 67 - DAnCE/tests/Parsing/test.cpp | 63 - DAnCE/tests/Plan_Launcher/EM-Delay/Deployment.cdp | 53 - DAnCE/tests/Plan_Launcher/EM-Delay/run_test.pl | 256 - DAnCE/tests/Plan_Launcher/EM-Delay/run_test_ns.pl | 256 - DAnCE/tests/Plan_Launcher/NM-Delay/Deployment.cdp | 56 - DAnCE/tests/Plan_Launcher/NM-Delay/NodeMap.cdd | 96 - DAnCE/tests/Plan_Launcher/NM-Delay/run_test.pl | 260 - DAnCE/tests/Plan_Launcher/NM-Delay/run_test_ns.pl | 256 - DAnCE/tests/TargetManager/CmpClient.cpp | 304 - DAnCE/tests/TargetManager/TM_Client.mpc | 20 - DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl | 61 - DAnCE/tests/scripts/BasicSP/basicsp.dat | 3 - DAnCE/tools/Artifact_Installation/.gitignore | 4 - .../Artifact_Installation.mpc | 107 - .../Artifact_Installation_Handler_Svc.cpp | 32 - .../Artifact_Installation_Handler_Svc.h | 36 - .../Artifact_Installation_Handler_export.h | 55 - .../Artifact_Installation_Impl.cpp | 706 - .../Artifact_Installation_Impl.h | 171 - .../Artifact_Installation_Impl.inl | 121 - .../Artifact_Installation_exec.cpp | 184 - .../DAnCE_Artifact_Installation_Handler.cpp | 33 - .../DAnCE_Artifact_Installation_Handler.h | 74 - .../DAnCE_Artifact_Installation_Handler.idl | 39 - .../DAnCE_Artifact_Installation_Handler.inl | 35 - .../DAnCE_Artifact_Installation_export.h | 55 - .../File_Installation_Handler.cpp | 166 - .../File_Installation_Handler.h | 64 - .../Http_Installation_Handler.cpp | 229 - .../Http_Installation_Handler.h | 65 - .../Installation_Repository_Manager.cpp | 91 - .../Installation_Repository_Manager.h | 93 - .../Installation_Repository_Manager_Impl.cpp | 400 - .../Installation_Repository_Manager_Impl.h | 103 - .../Installation_Repository_Manager_export.h | 55 - DAnCE/tools/Completion/CompletionHandler_T.h | 35 - DAnCE/tools/Completion/Completion_Counter_Base.cpp | 10 - DAnCE/tools/Completion/Completion_Counter_Base.h | 82 - DAnCE/tools/Completion/Completion_Counter_Base.inl | 109 - DAnCE/tools/Config_Handlers/ADD_Handler.cpp | 173 - DAnCE/tools/Config_Handlers/ADD_Handler.h | 69 - DAnCE/tools/Config_Handlers/Any_Handler.cpp | 69 - DAnCE/tools/Config_Handlers/Any_Handler.h | 60 - .../Config_Handlers/Basic_Deployment_Data.cpp | 18321 ---- .../Config_Handlers/Basic_Deployment_Data.hpp | 8913 -- DAnCE/tools/Config_Handlers/CCD_Handler.cpp | 179 - DAnCE/tools/Config_Handlers/CCD_Handler.h | 55 - DAnCE/tools/Config_Handlers/CEPE_Handler.cpp | 49 - DAnCE/tools/Config_Handlers/CEPE_Handler.h | 65 - DAnCE/tools/Config_Handlers/CPD_Handler.cpp | 152 - DAnCE/tools/Config_Handlers/CPD_Handler.h | 66 - DAnCE/tools/Config_Handlers/CRDD_Handler.cpp | 64 - DAnCE/tools/Config_Handlers/CRDD_Handler.h | 65 - DAnCE/tools/Config_Handlers/Common.h | 45 - .../ComponentPropertyDescription_Handler.cpp | 39 - .../ComponentPropertyDescription_Handler.h | 59 - DAnCE/tools/Config_Handlers/Config_Handlers.mpc | 131 - .../Config_Handlers_Common_Export.h | 57 - .../tools/Config_Handlers/Config_Handlers_Export.h | 57 - DAnCE/tools/Config_Handlers/DD_Handler.cpp | 225 - DAnCE/tools/Config_Handlers/DD_Handler.h | 107 - DAnCE/tools/Config_Handlers/DP_Handler.cpp | 294 - DAnCE/tools/Config_Handlers/DP_Handler.h | 85 - DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp | 105 - DAnCE/tools/Config_Handlers/DP_PCD_Handler.h | 65 - DAnCE/tools/Config_Handlers/DataType_Handler.cpp | 165 - DAnCE/tools/Config_Handlers/DataType_Handler.h | 60 - DAnCE/tools/Config_Handlers/Deployment.cpp | 854 - DAnCE/tools/Config_Handlers/Deployment.hpp | 221 - DAnCE/tools/Config_Handlers/DnC_Dump.cpp | 1208 - DAnCE/tools/Config_Handlers/DnC_Dump.h | 147 - DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp | 102 - DAnCE/tools/Config_Handlers/DnC_Dump_T.h | 50 - DAnCE/tools/Config_Handlers/Dump_Obj.cpp | 68 - DAnCE/tools/Config_Handlers/Dump_Obj.h | 77 - .../DynAny_Handler/DataType_Handler.cpp | 165 - .../DynAny_Handler/DataType_Handler.h | 57 - .../DynAny_Handler/DynAlias_Handler.cpp | 102 - .../DynAny_Handler/DynAlias_Handler.h | 50 - .../DynAny_Handler/DynAny_Handler.cpp | 475 - .../DynAny_Handler/DynAny_Handler.h | 83 - .../DynAny_Handler/DynAny_Handler.mpc | 26 - .../DynAny_Handler/DynAny_Handler_Export.h | 53 - .../DynAny_Handler/DynArray_Handler.cpp | 159 - .../DynAny_Handler/DynArray_Handler.h | 50 - .../DynAny_Handler/DynEnum_Handler.cpp | 123 - .../DynAny_Handler/DynEnum_Handler.h | 49 - .../DynAny_Handler/DynSequence_Handler.cpp | 163 - .../DynAny_Handler/DynSequence_Handler.h | 50 - .../DynAny_Handler/DynString_Handler.cpp | 87 - .../DynAny_Handler/DynString_Handler.h | 50 - .../DynAny_Handler/DynStruct_Handler.cpp | 141 - .../DynAny_Handler/DynStruct_Handler.h | 48 - DAnCE/tools/Config_Handlers/ERE_Handler.cpp | 59 - DAnCE/tools/Config_Handlers/ERE_Handler.h | 68 - DAnCE/tools/Config_Handlers/ESD_Handler.cpp | 122 - DAnCE/tools/Config_Handlers/ESD_Handler.h | 67 - DAnCE/tools/Config_Handlers/IDD_Handler.cpp | 169 - DAnCE/tools/Config_Handlers/IDD_Handler.h | 68 - DAnCE/tools/Config_Handlers/IDREF_Base.cpp | 104 - DAnCE/tools/Config_Handlers/IDREF_Base.h | 89 - DAnCE/tools/Config_Handlers/ID_Handler.cpp | 43 - DAnCE/tools/Config_Handlers/ID_Handler.h | 76 - DAnCE/tools/Config_Handlers/IRDD_Handler.cpp | 116 - DAnCE/tools/Config_Handlers/IRDD_Handler.h | 67 - DAnCE/tools/Config_Handlers/MDD_Handler.cpp | 178 - DAnCE/tools/Config_Handlers/MDD_Handler.h | 66 - DAnCE/tools/Config_Handlers/PCD_Handler.cpp | 133 - DAnCE/tools/Config_Handlers/PCD_Handler.h | 73 - DAnCE/tools/Config_Handlers/PL_Handler.cpp | 50 - DAnCE/tools/Config_Handlers/PL_Handler.h | 48 - DAnCE/tools/Config_Handlers/PSPE_Handler.cpp | 149 - DAnCE/tools/Config_Handlers/PSPE_Handler.h | 63 - .../Package_Handlers/CAD_Handler.cpp | 277 - .../Config_Handlers/Package_Handlers/CAD_Handler.h | 57 - .../Package_Handlers/CID_Handler.cpp | 408 - .../Config_Handlers/Package_Handlers/CID_Handler.h | 65 - .../Package_Handlers/CPD_Handler.cpp | 159 - .../Config_Handlers/Package_Handlers/CPD_Handler.h | 72 - .../Package_Handlers/Comp_Intf_Descr_Handler.cpp | 164 - .../Package_Handlers/Comp_Intf_Descr_Handler.h | 52 - .../Package_Handlers/IAD_Handler.cpp | 123 - .../Config_Handlers/Package_Handlers/IAD_Handler.h | 64 - .../Config_Handlers/Package_Handlers/NIA_Handler.h | 64 - .../Package_Handlers/PCD_Handler.cpp | 165 - .../Config_Handlers/Package_Handlers/PCD_Handler.h | 67 - .../Config_Handlers/Package_Handlers/PC_Intf.cpp | 73 - .../Config_Handlers/Package_Handlers/PC_Intf.h | 56 - .../Package_Handlers/Package_Handlers.mpc | 38 - .../Package_Handlers/Packaging_Handlers_Export.h | 57 - .../Package_Handlers/SID_Handler.cpp | 151 - .../Config_Handlers/Package_Handlers/SID_Handler.h | 69 - DAnCE/tools/Config_Handlers/Property_Handler.cpp | 54 - DAnCE/tools/Config_Handlers/Property_Handler.h | 68 - DAnCE/tools/Config_Handlers/RDD_Handler.cpp | 53 - DAnCE/tools/Config_Handlers/RDD_Handler.h | 61 - DAnCE/tools/Config_Handlers/Req_Handler.cpp | 55 - DAnCE/tools/Config_Handlers/Req_Handler.h | 69 - DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp | 172 - DAnCE/tools/Config_Handlers/STD_CID_Handler.h | 73 - DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp | 58 - DAnCE/tools/Config_Handlers/STD_CPD_Handler.h | 76 - DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp | 45 - DAnCE/tools/Config_Handlers/STD_IAD_Handler.h | 62 - DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp | 51 - DAnCE/tools/Config_Handlers/STD_PCD_Handler.h | 72 - DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp | 69 - DAnCE/tools/Config_Handlers/STD_PC_Intf.h | 60 - .../Config_Handlers/SatisfierProperty_Handler.cpp | 121 - .../Config_Handlers/SatisfierProperty_Handler.h | 67 - DAnCE/tools/Config_Handlers/Utils/Exceptions.h | 38 - DAnCE/tools/Config_Handlers/Utils/Functors.h | 83 - DAnCE/tools/Config_Handlers/XMI.cpp | 888 - DAnCE/tools/Config_Handlers/XMI.hpp | 397 - DAnCE/tools/Config_Handlers/XML_File_Intf.cpp | 229 - DAnCE/tools/Config_Handlers/XML_File_Intf.h | 69 - .../Config_Handlers/XSC_XML_Handlers_Export.h | 53 - DAnCE/tools/Config_Handlers/ccd.cpp | 1502 - DAnCE/tools/Config_Handlers/ccd.hpp | 741 - DAnCE/tools/Config_Handlers/cdd.cpp | 3334 - DAnCE/tools/Config_Handlers/cdd.hpp | 1654 - DAnCE/tools/Config_Handlers/cdp.cpp | 2366 - DAnCE/tools/Config_Handlers/cdp.hpp | 1187 - DAnCE/tools/Config_Handlers/cid.cpp | 6047 -- DAnCE/tools/Config_Handlers/cid.hpp | 2885 - DAnCE/tools/Config_Handlers/cpd.cpp | 2081 - DAnCE/tools/Config_Handlers/cpd.hpp | 1008 - DAnCE/tools/Config_Handlers/iad.cpp | 1491 - DAnCE/tools/Config_Handlers/iad.hpp | 748 - DAnCE/tools/Config_Handlers/pcd.cpp | 1304 - DAnCE/tools/Config_Handlers/pcd.hpp | 647 - DAnCE/tools/Config_Handlers/toplevel.cpp | 348 - DAnCE/tools/Config_Handlers/toplevel.hpp | 220 - DAnCE/tools/Convert_Plan/.gitignore | 1 - DAnCE/tools/Convert_Plan/Convert_Plan.cpp | 169 - DAnCE/tools/Convert_Plan/Convert_Plan.mpc | 28 - DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp | 237 - DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h | 24 - .../tools/Convert_Plan/DAnCE_Convert_Plan_export.h | 55 - DAnCE/tools/Domain_Validator/.gitignore | 6 - .../CORBA/CORBA_Domain_Validator.mpc | 16 - .../CORBA/CORBA_Domain_Validator_export.h | 56 - .../CORBA/CORBA_Domain_Validator_impl.cpp | 490 - .../CORBA/CORBA_Domain_Validator_impl.h | 87 - DAnCE/tools/Domain_Validator/Domain_Validator.idl | 64 - DAnCE/tools/Domain_Validator/Domain_Validator.mpc | 26 - .../Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h | 57 - DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp | 258 - DAnCE/tools/Logger_Backend/ndds/Log_Backend.h | 76 - DAnCE/tools/Logger_Backend/ndds/Log_Record.idl | 25 - DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp | 201 - DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc | 42 - .../Logger_Backend/ndds/USER_QOS_PROFILES.xml | 30 - DAnCE/tools/Logger_Backend/ndds/svc.conf | 2 - DAnCE/tools/Split_Plan/.gitignore | 1 - DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h | 55 - DAnCE/tools/Split_Plan/Locality_Splitter.cpp | 453 - DAnCE/tools/Split_Plan/Locality_Splitter.h | 94 - DAnCE/tools/Split_Plan/Node_Splitter.cpp | 61 - DAnCE/tools/Split_Plan/Node_Splitter.h | 41 - DAnCE/tools/Split_Plan/Split_Plan.cpp | 433 - DAnCE/tools/Split_Plan/Split_Plan.h | 78 - DAnCE/tools/Split_Plan/Split_Plan.mpc | 23 - DAnCE/tools/Split_Plan/Split_Plan_exec.cpp | 200 - DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp | 31 - DAnCE/tools/Split_Plan/Sub_UUID_Generator.h | 36 - DAnCE/tools/System_Health/.gitignore | 4 - DAnCE/tools/System_Health/Daemon/.gitignore | 7 - DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp | 127 - DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl | 21 - DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc | 55 - .../tools/System_Health/Daemon/SHS_Daemon_Impl.cpp | 74 - DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h | 39 - .../DAnCE_SHS_CORBA_Transport_export.h | 55 - .../Interceptors/DAnCE_SHS_Interceptors_export.h | 55 - .../Interceptors/SHS_CORBA_Transport.cpp | 145 - .../Interceptors/SHS_CORBA_Transport.h | 33 - .../System_Health/Interceptors/SHS_Interceptor.cpp | 313 - .../System_Health/Interceptors/SHS_Interceptor.h | 87 - .../System_Health/Interceptors/SHS_Interceptor.mpc | 37 - .../System_Health/Interceptors/SHS_Transport.h | 34 - DAnCE/tools/System_Health/SHS_DataModel.idl | 87 - DAnCE/tools/System_Health/System_Health.mpc | 36 - 4156 files changed, 891017 deletions(-) delete mode 100644 CIAO/CIAO-INSTALL.html delete mode 100644 CIAO/CIAO.mwc delete mode 100644 CIAO/CIAO_DAnCE.mwc delete mode 100644 CIAO/CIAO_TAO.mwc delete mode 100644 CIAO/CIAO_TAO_DAnCE.mwc delete mode 100644 CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc delete mode 100644 CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc delete mode 100644 CIAO/CIAO_TAO_OpenDDS.mwc delete mode 100644 CIAO/COPYING delete mode 100644 CIAO/ChangeLogs/CIAO-1_3_1 delete mode 100644 CIAO/ChangeLogs/CIAO-1_3_2 delete mode 100644 CIAO/ChangeLogs/CIAO-1_3_3 delete mode 100644 CIAO/ChangeLogs/ChangeLog-2004a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2004b delete mode 100644 CIAO/ChangeLogs/ChangeLog-2006a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2006b delete mode 100644 CIAO/ChangeLogs/ChangeLog-2007a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2007b delete mode 100644 CIAO/ChangeLogs/ChangeLog-2009a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2010a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2010b delete mode 100644 CIAO/ChangeLogs/ChangeLog-2011a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2011b delete mode 100644 CIAO/ChangeLogs/ChangeLog-2012a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2013a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2014a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2014b delete mode 100644 CIAO/ChangeLogs/ChangeLog-pre_release delete mode 100644 CIAO/MPC/config/ami4ccm_lem_stub.mpb delete mode 100644 CIAO/MPC/config/ami4ccm_servant.mpb delete mode 100644 CIAO/MPC/config/ami4ccm_stub.mpb delete mode 100644 CIAO/MPC/config/avoids_ccm_direct_collocation.mpb delete mode 100644 CIAO/MPC/config/avoids_ccm_lw.mpb delete mode 100644 CIAO/MPC/config/avoids_ccm_noevent.mpb delete mode 100644 CIAO/MPC/config/ccm.mpb delete mode 100644 CIAO/MPC/config/ccm_configvalue.mpb delete mode 100644 CIAO/MPC/config/ccm_cookie.mpb delete mode 100644 CIAO/MPC/config/ccm_direct_collocation.mpb delete mode 100644 CIAO/MPC/config/ccm_executor.mpb delete mode 100644 CIAO/MPC/config/ccm_lem_stub.mpb delete mode 100644 CIAO/MPC/config/ccm_lw.mpb delete mode 100644 CIAO/MPC/config/ccm_noevent.mpb delete mode 100644 CIAO/MPC/config/ccm_session_stub.mpb delete mode 100644 CIAO/MPC/config/ccm_stub.mpb delete mode 100644 CIAO/MPC/config/ccm_svnt.mpb delete mode 100644 CIAO/MPC/config/ciao.mpb delete mode 100644 CIAO/MPC/config/ciao_base.mpb delete mode 100644 CIAO/MPC/config/ciao_connector_base.mpb delete mode 100644 CIAO/MPC/config/ciao_container_base_stub.mpb delete mode 100644 CIAO/MPC/config/ciao_deployment_handlers.mpb delete mode 100644 CIAO/MPC/config/ciao_example_output.mpb delete mode 100644 CIAO/MPC/config/ciao_exe.mpb delete mode 100644 CIAO/MPC/config/ciao_executor.mpb delete mode 100644 CIAO/MPC/config/ciao_lib.mpb delete mode 100644 CIAO/MPC/config/ciao_logger.mpb delete mode 100644 CIAO/MPC/config/ciao_output.mpb delete mode 100644 CIAO/MPC/config/ciao_servant.mpb delete mode 100644 CIAO/MPC/config/ciao_session_container.mpb delete mode 100644 CIAO/MPC/config/ciao_session_container_stub.mpb delete mode 100644 CIAO/MPC/config/ciao_vcwarnings.mpb delete mode 100644 CIAO/MPC/config/ciaoexe.mpb delete mode 100644 CIAO/MPC/config/ciaoidldefaults.mpb delete mode 100644 CIAO/MPC/config/ciaolib_with_idl.mpb delete mode 100644 CIAO/MPC/config/componentidldefaults.mpb delete mode 100644 CIAO/MPC/config/connectoridldefaults.mpb delete mode 100644 CIAO/MPC/config/dds4ccm.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_base.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_dcps.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_impl.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_lem_stub.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_logger.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_opendds_lem_stub.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_skel.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_stub.mpb delete mode 100644 CIAO/MPC/config/dds4ccm_ts_default.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp_impl.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp_skel.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp_stub.mpb delete mode 100644 CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb delete mode 100644 CIAO/MPC/config/taobaseidl3toidl2defaults.mpb delete mode 100644 CIAO/MPC/config/taoidl3toid2_ccm_lw.mpb delete mode 100644 CIAO/MPC/config/taoidl3toidl2defaults.mpb delete mode 100644 CIAO/MPC/config/taoidl3toxmidefaults.mpb delete mode 100644 CIAO/NEWS delete mode 100644 CIAO/PROBLEM-REPORT-FORM delete mode 100644 CIAO/VERSION delete mode 100644 CIAO/bin/.gitignore delete mode 100644 CIAO/bin/ciao_tests.lst delete mode 100755 CIAO/bin/generate_component_mpc.pl delete mode 100644 CIAO/ccm/.gitignore delete mode 100644 CIAO/ccm/CCM_Base.idl delete mode 100644 CIAO/ccm/CCM_CCMException.idl delete mode 100644 CIAO/ccm/CCM_Configurator.idl delete mode 100644 CIAO/ccm/CCM_Context.idl delete mode 100644 CIAO/ccm/CCM_Cookie.idl delete mode 100644 CIAO/ccm/CCM_EnterpriseComponent.idl delete mode 100644 CIAO/ccm/CCM_Enumeration.idl delete mode 100644 CIAO/ccm/CCM_EventBase.idl delete mode 100644 CIAO/ccm/CCM_EventConsumerBase.idl delete mode 100644 CIAO/ccm/CCM_Events.idl delete mode 100644 CIAO/ccm/CCM_Exceptions.idl delete mode 100644 CIAO/ccm/CCM_ExecutorLocator.idl delete mode 100644 CIAO/ccm/CCM_Home.idl delete mode 100644 CIAO/ccm/CCM_HomeConfiguration.idl delete mode 100644 CIAO/ccm/CCM_HomeExecutorBase.idl delete mode 100644 CIAO/ccm/CCM_HomeFinder.idl delete mode 100644 CIAO/ccm/CCM_Homes.idl delete mode 100644 CIAO/ccm/CCM_KeylessCCMHome.idl delete mode 100644 CIAO/ccm/CCM_Navigation.idl delete mode 100644 CIAO/ccm/CCM_Object.idl delete mode 100644 CIAO/ccm/CCM_PrimaryKeyBase.idl delete mode 100644 CIAO/ccm/CCM_Receptacle.idl delete mode 100644 CIAO/ccm/CCM_StandardConfigurator.idl delete mode 100644 CIAO/ccm/CCM_Transaction.idl delete mode 100644 CIAO/ccm/CCM_lem_stub.mpc delete mode 100644 CIAO/ccm/CCM_stub.mpc delete mode 100644 CIAO/ccm/CCM_svnt.mpc delete mode 100644 CIAO/ccm/Components.idl delete mode 100644 CIAO/ccm/CosPersistentState.idl delete mode 100644 CIAO/ccm/Entity/CCM_ComponentId.idl delete mode 100644 CIAO/ccm/Entity/CCM_Entity2Context.idl delete mode 100644 CIAO/ccm/Entity/CCM_EntityComponent.idl delete mode 100644 CIAO/ccm/Entity/CCM_EntityContext.idl delete mode 100644 CIAO/ccm/Entity/CCM_StateIdFactory.idl delete mode 100644 CIAO/ccm/Entity/CCM_entity_svnt.mpc delete mode 100644 CIAO/ccm/Extended/CCM_BadComponentReference.idl delete mode 100644 CIAO/ccm/Extended/CCM_CCM2Context.idl delete mode 100644 CIAO/ccm/Extended/CCM_HomeRegistration.idl delete mode 100644 CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl delete mode 100644 CIAO/ccm/Security.idl delete mode 100644 CIAO/ccm/Session/.gitignore delete mode 100644 CIAO/ccm/Session/CCM_Session2Context.idl delete mode 100644 CIAO/ccm/Session/CCM_SessionComponent.idl delete mode 100644 CIAO/ccm/Session/CCM_SessionContext.idl delete mode 100644 CIAO/ccm/Session/CCM_SessionSynchronization.idl delete mode 100644 CIAO/ccm/Session/CCM_session.mpc delete mode 100644 CIAO/ciao/Base/.gitignore delete mode 100644 CIAO/ciao/Base/CIAO_Base.mpc delete mode 100644 CIAO/ciao/Base/CIAO_Exceptions.idl delete mode 100644 CIAO/ciao/Base/CIAO_Properties.idl delete mode 100644 CIAO/ciao/Base/Client_init.cpp delete mode 100644 CIAO/ciao/Base/Client_init.h delete mode 100644 CIAO/ciao/Base/Server_init.cpp delete mode 100644 CIAO/ciao/Base/Server_init.h delete mode 100644 CIAO/ciao/Containers/.gitignore delete mode 100644 CIAO/ciao/Containers/Container_Base.idl delete mode 100644 CIAO/ciao/Containers/Container_Base_T.cpp delete mode 100644 CIAO/ciao/Containers/Container_Base_T.h delete mode 100644 CIAO/ciao/Containers/Containers.mpc delete mode 100644 CIAO/ciao/Containers/Session/.gitignore delete mode 100644 CIAO/ciao/Containers/Session/Session_Container.cpp delete mode 100644 CIAO/ciao/Containers/Session/Session_Container.h delete mode 100644 CIAO/ciao/Containers/Session/Session_Container.idl delete mode 100644 CIAO/ciao/Containers/Session/Session_Container.mpc delete mode 100644 CIAO/ciao/Contexts/Context_Impl_Base_T.cpp delete mode 100644 CIAO/ciao/Contexts/Context_Impl_Base_T.h delete mode 100644 CIAO/ciao/Contexts/Session/Session_Context_T.cpp delete mode 100644 CIAO/ciao/Contexts/Session/Session_Context_T.h delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_State.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/CIAO_State.h delete mode 100644 CIAO/ciao/Deployment/Handlers/Component_Handler.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/Component_Handler.h delete mode 100644 CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/Connection_Handler.h delete mode 100644 CIAO/ciao/Deployment/Handlers/Container_Handler.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/Container_Handler.h delete mode 100644 CIAO/ciao/Deployment/Handlers/Home_Handler.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/Home_Handler.h delete mode 100644 CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp delete mode 100644 CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h delete mode 100644 CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc delete mode 100644 CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h delete mode 100644 CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp delete mode 100644 CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h delete mode 100644 CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp delete mode 100644 CIAO/ciao/Deployment/Interceptors/Name_Utilities.h delete mode 100644 CIAO/ciao/Logger/CIAO_Logger_Export.h delete mode 100644 CIAO/ciao/Logger/Log_Macros.cpp delete mode 100644 CIAO/ciao/Logger/Log_Macros.h delete mode 100644 CIAO/ciao/Logger/Logger.mpc delete mode 100644 CIAO/ciao/Logger/Logger_Service.cpp delete mode 100644 CIAO/ciao/Logger/Logger_Service.h delete mode 100644 CIAO/ciao/Servants/.gitignore delete mode 100644 CIAO/ciao/Servants/CIAO_Servant_Impl_export.h delete mode 100644 CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp delete mode 100644 CIAO/ciao/Servants/Connector_Servant_Impl_Base.h delete mode 100644 CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp delete mode 100644 CIAO/ciao/Servants/Facet_Servant_Base_T.cpp delete mode 100644 CIAO/ciao/Servants/Facet_Servant_Base_T.h delete mode 100644 CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp delete mode 100644 CIAO/ciao/Servants/Home_Servant_Impl_Base.h delete mode 100644 CIAO/ciao/Servants/Home_Servant_Impl_T.cpp delete mode 100644 CIAO/ciao/Servants/Home_Servant_Impl_T.h delete mode 100644 CIAO/ciao/Servants/Servant_Impl_Base.cpp delete mode 100644 CIAO/ciao/Servants/Servant_Impl_Base.h delete mode 100644 CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp delete mode 100644 CIAO/ciao/Servants/Servants.mpc delete mode 100644 CIAO/ciao/Servants/Session/Servant_Impl_T.cpp delete mode 100644 CIAO/ciao/Servants/Session/Servant_Impl_T.h delete mode 100644 CIAO/ciao/Servants/StandardConfigurator_Impl.cpp delete mode 100644 CIAO/ciao/Servants/StandardConfigurator_Impl.h delete mode 100644 CIAO/ciao/Valuetype_Factories/ConfigValue.cpp delete mode 100644 CIAO/ciao/Valuetype_Factories/ConfigValue.h delete mode 100644 CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h delete mode 100644 CIAO/ciao/Valuetype_Factories/Cookie_Export.h delete mode 100644 CIAO/ciao/Valuetype_Factories/Cookies.cpp delete mode 100644 CIAO/ciao/Valuetype_Factories/Cookies.h delete mode 100644 CIAO/ciao/Valuetype_Factories/Cookies.inl delete mode 100644 CIAO/ciao/Valuetype_Factories/Factories.mpc delete mode 100644 CIAO/ciao/Version.h delete mode 100644 CIAO/ciao/install_ciao_headers.mpc delete mode 100644 CIAO/connectors/ami4ccm/ami4ccm/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp delete mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h delete mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl delete mode 100644 CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc delete mode 100644 CIAO/connectors/ami4ccm/docs/TestCoverage.odt delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp delete mode 100755 CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl delete mode 100755 CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/models/Hello-complete.xme delete mode 100644 CIAO/connectors/ami4ccm/examples/Hello/models/Hello.xme delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h delete mode 100644 CIAO/connectors/ami4ccm/examples/Quoter/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/models/CoSMIC/ami4ccm.xme delete mode 100644 CIAO/connectors/ami4ccm/tests/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/IDL_Test/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc delete mode 100755 CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/README delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Base/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp delete mode 100755 CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/.gitignore delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM.emx delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM_Hello.jpg delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/artifacts.cdp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/connections.cdp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/implementation.cdp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/instance.cdp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/images.png delete mode 100644 CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/system.png delete mode 100644 CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html delete mode 100644 CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf delete mode 100644 CIAO/connectors/dds4ccm/docs/TestCoverage.ods delete mode 100644 CIAO/connectors/dds4ccm/docs/details.txt delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl delete mode 100755 CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py delete mode 100755 CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/models/README delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme delete mode 100644 CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/README delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp delete mode 100644 CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml delete mode 100755 CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/idl/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/idl/ccm_dds.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc delete mode 100644 CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc delete mode 100644 CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/CCM_DataReader.h delete mode 100644 CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ConditionManager.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ConditionManager.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Get_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Read_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Update_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DDS_Write_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Getter_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Getter_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/LocalObject.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/LocalObject.h delete mode 100644 CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/LocalObject_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/PortStatusListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/PublisherListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/PublisherListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Reader_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Reader_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/SampleInfo.h delete mode 100644 CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/SubscriberListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/TimeUtilities.h delete mode 100644 CIAO/connectors/dds4ccm/impl/TopicListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/TopicListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Updater_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Updater_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Utils.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Utils.h delete mode 100644 CIAO/connectors/dds4ccm/impl/Writer_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/Writer_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc delete mode 100644 CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h delete mode 100644 CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Condition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Publisher.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Topic.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Utils.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h delete mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc delete mode 100644 CIAO/connectors/dds4ccm/models/README delete mode 100644 CIAO/connectors/dds4ccm/models/dds4ccm.xme delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/README delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Derived/Derived.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/README delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/README delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/README delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/README delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/README delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/README delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/README delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/NoModule/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README delete mode 100644 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/duration.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/duration.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/main.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/policies.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h delete mode 100755 CIAO/connectors/dds4ccm/tests/Policies/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/states_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/string_seq.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/README delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/README delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/README delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README delete mode 100644 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl delete mode 100755 CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/README delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc delete mode 100755 CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp delete mode 100755 CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml delete mode 100644 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/connections.cdp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/implementation.cdp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/instance.cdp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/images.png delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/images/system.png delete mode 100644 CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl delete mode 100644 CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc delete mode 100644 CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl delete mode 100644 CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl delete mode 100644 CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc delete mode 100644 CIAO/connectors/tests/AMIDDS/README.txt delete mode 100644 CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl delete mode 100644 CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc delete mode 100644 CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp delete mode 100644 CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h delete mode 100644 CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl delete mode 100644 CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc delete mode 100644 CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp delete mode 100644 CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h delete mode 100644 CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp delete mode 100755 CIAO/connectors/tests/AMIDDS/descriptors/run_test.pl delete mode 100644 CIAO/docs/CIAO.pdf delete mode 100644 CIAO/docs/CIAO_Style_Guide.txt delete mode 100644 CIAO/docs/CIAO_android_port.html delete mode 100644 CIAO/docs/ConfigValues.html delete mode 100644 CIAO/docs/Connectors.graffle delete mode 100644 CIAO/docs/EnvVars.html delete mode 100644 CIAO/docs/OMG-CCM-Tutorial.pptx delete mode 100644 CIAO/docs/Porting_Hints.txt delete mode 100644 CIAO/docs/Purify.html delete mode 100644 CIAO/docs/TODO.html delete mode 100644 CIAO/docs/Trace.html delete mode 100644 CIAO/docs/XML/componentassembly.dtd delete mode 100644 CIAO/docs/XML/corbacomponent.dtd delete mode 100644 CIAO/docs/XML/properties.dtd delete mode 100644 CIAO/docs/XML/softpkg.dtd delete mode 100644 CIAO/docs/com-impl.html delete mode 100644 CIAO/docs/fm/CIAO-1.gif delete mode 100644 CIAO/docs/fm/CIAO-10.gif delete mode 100644 CIAO/docs/fm/CIAO-11.gif delete mode 100644 CIAO/docs/fm/CIAO-12.gif delete mode 100644 CIAO/docs/fm/CIAO-13.gif delete mode 100644 CIAO/docs/fm/CIAO-14.gif delete mode 100644 CIAO/docs/fm/CIAO-15.gif delete mode 100644 CIAO/docs/fm/CIAO-16.gif delete mode 100644 CIAO/docs/fm/CIAO-17.gif delete mode 100644 CIAO/docs/fm/CIAO-18.gif delete mode 100644 CIAO/docs/fm/CIAO-19.gif delete mode 100644 CIAO/docs/fm/CIAO-2.gif delete mode 100644 CIAO/docs/fm/CIAO-20.gif delete mode 100644 CIAO/docs/fm/CIAO-21.gif delete mode 100644 CIAO/docs/fm/CIAO-22.gif delete mode 100644 CIAO/docs/fm/CIAO-23.gif delete mode 100644 CIAO/docs/fm/CIAO-24.gif delete mode 100644 CIAO/docs/fm/CIAO-25.gif delete mode 100644 CIAO/docs/fm/CIAO-26.gif delete mode 100644 CIAO/docs/fm/CIAO-27.gif delete mode 100644 CIAO/docs/fm/CIAO-28.gif delete mode 100644 CIAO/docs/fm/CIAO-29.gif delete mode 100644 CIAO/docs/fm/CIAO-3.gif delete mode 100644 CIAO/docs/fm/CIAO-30.gif delete mode 100644 CIAO/docs/fm/CIAO-31.gif delete mode 100644 CIAO/docs/fm/CIAO-32.gif delete mode 100644 CIAO/docs/fm/CIAO-33.gif delete mode 100644 CIAO/docs/fm/CIAO-34.gif delete mode 100644 CIAO/docs/fm/CIAO-35.gif delete mode 100644 CIAO/docs/fm/CIAO-36.gif delete mode 100644 CIAO/docs/fm/CIAO-37.gif delete mode 100644 CIAO/docs/fm/CIAO-4.gif delete mode 100644 CIAO/docs/fm/CIAO-5.gif delete mode 100644 CIAO/docs/fm/CIAO-6.gif delete mode 100644 CIAO/docs/fm/CIAO-7.gif delete mode 100644 CIAO/docs/fm/CIAO-8.gif delete mode 100644 CIAO/docs/fm/CIAO-9.gif delete mode 100644 CIAO/docs/fm/CIAO.css delete mode 100644 CIAO/docs/fm/CIAO.fm delete mode 100644 CIAO/docs/fm/CIAO.htm delete mode 100644 CIAO/docs/fm/images/CIAO_Component_Container_and_CORBA.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Component_Container_and_CORBA.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Administrator_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Administrator_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Messenger_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Messenger_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Messenger_Runnable_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Messenger_Runnable_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Receiver_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Components_Receiver_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Administrator.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Administrator.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Application.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Application.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Messenger.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Messenger.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Messenger_Assembly.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Messenger_Assembly.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Receiver.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Descriptors_Receiver.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Generic_Component_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Generic_Component_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_IDL3_to_IDL2_Files.eps delete mode 100644 CIAO/docs/fm/images/CIAO_IDL3_to_IDL2_Files.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_IDL_CIDL_Files.eps delete mode 100644 CIAO/docs/fm/images/CIAO_IDL_CIDL_Files.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_IDL_CIDL_Files_CIDL_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_IDL_CIDL_Files_CIDL_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_MessengerHome_Class_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_MessengerHome_Class_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Class_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Class_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Component_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Component_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_All_Connections_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_All_Connections_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_All_Nodes_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_All_Nodes_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_Connection_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_Connection_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_Node_Highlight.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Deployment_Diagram_Node_Highlight.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_IDL_Generated_Class_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_IDL_Generated_Class_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Interaction_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Messenger_Interaction_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_01.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_01.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_02.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_02.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_03.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_03.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_04.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_04.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_05.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_05.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_06.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_06.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_07.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_07.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_08.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_08.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_09.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_09.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_Overview.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Roadmap_Overview.sxd delete mode 100644 CIAO/docs/fm/images/CIAO_Runnable_Class_Diagram.eps delete mode 100644 CIAO/docs/fm/images/CIAO_Runnable_Class_Diagram.sxd delete mode 100644 CIAO/docs/fm/images/OCILOGO_bw_book.eps delete mode 100644 CIAO/docs/generate_component_mpc.html delete mode 100644 CIAO/docs/imgs/CCM-v5.vsd delete mode 100644 CIAO/docs/imgs/CCM.vsd delete mode 100644 CIAO/docs/imgs/DAnCE-Dynamic.png delete mode 100644 CIAO/docs/imgs/DAnCE-Dynamic.sxd delete mode 100644 CIAO/docs/imgs/File-Gen-Existing.png delete mode 100644 CIAO/docs/imgs/File-Gen-Future.png delete mode 100644 CIAO/docs/imgs/File_Generation_Flow.vsd delete mode 100644 CIAO/docs/imgs/IDL-CIDL-classes.vsd delete mode 100644 CIAO/docs/imgs/basic-container.png delete mode 100644 CIAO/docs/imgs/ciao-dynamic1.jpg delete mode 100644 CIAO/docs/imgs/ciao-dynamic2.jpg delete mode 100644 CIAO/docs/imgs/ciao-static-vs-dynamic.jpg delete mode 100644 CIAO/docs/imgs/ciao-static1.jpg delete mode 100644 CIAO/docs/imgs/ciao-static2.jpg delete mode 100644 CIAO/docs/imgs/component-basic.png delete mode 100644 CIAO/docs/imgs/dance_arch.jpg delete mode 100644 CIAO/docs/imgs/dance_arch.vsd delete mode 100644 CIAO/docs/imgs/deployment.png delete mode 100644 CIAO/docs/imgs/extended-container.png delete mode 100644 CIAO/docs/imgs/home-config.png delete mode 100644 CIAO/docs/imgs/static_dance_arch.jpg delete mode 100644 CIAO/docs/imgs/static_dance_arch.vsd delete mode 100644 CIAO/docs/imgs/static_dance_impl.jpg delete mode 100644 CIAO/docs/imgs/static_dance_impl.vsd delete mode 100644 CIAO/docs/index.html delete mode 100644 CIAO/docs/new_components.html delete mode 100644 CIAO/docs/releasenotes/index.html delete mode 100644 CIAO/docs/releasenotes/switch.html delete mode 100644 CIAO/docs/static_ciao_contents.html delete mode 100644 CIAO/docs/static_ciao_index.html delete mode 100644 CIAO/docs/static_ciao_toc.html delete mode 100644 CIAO/docs/static_config_example.html delete mode 100644 CIAO/docs/static_config_rtexample.html delete mode 100644 CIAO/docs/static_dance.html delete mode 100644 CIAO/docs/value_factory_registration.html delete mode 100644 CIAO/etc/ciao.doxygen delete mode 100644 CIAO/etc/ciao_dds4ccm.doxygen delete mode 100644 CIAO/examples/BasicSP/.gitignore delete mode 100644 CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl delete mode 100644 CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc delete mode 100644 CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp delete mode 100644 CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h delete mode 100644 CIAO/examples/BasicSP/BMClosedED/config delete mode 100644 CIAO/examples/BasicSP/BMDevice/BMDevice.idl delete mode 100644 CIAO/examples/BasicSP/BMDevice/BMDevice.mpc delete mode 100644 CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp delete mode 100644 CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h delete mode 100644 CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl delete mode 100644 CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc delete mode 100644 CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp delete mode 100644 CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h delete mode 100644 CIAO/examples/BasicSP/BasicSP.idl delete mode 100644 CIAO/examples/BasicSP/BasicSP.mpc delete mode 100644 CIAO/examples/BasicSP/BasicSP.mwc delete mode 100644 CIAO/examples/BasicSP/EC/EC.idl delete mode 100644 CIAO/examples/BasicSP/EC/EC.mpc delete mode 100644 CIAO/examples/BasicSP/EC/EC_exec.cpp delete mode 100644 CIAO/examples/BasicSP/EC/EC_exec.h delete mode 100644 CIAO/examples/BasicSP/EC/README delete mode 100644 CIAO/examples/BasicSP/EC/client.cpp delete mode 100644 CIAO/examples/BasicSP/EC/controller.cpp delete mode 100644 CIAO/examples/BasicSP/README.html delete mode 100644 CIAO/examples/BasicSP/RepoMan_Usage.html delete mode 100644 CIAO/examples/BasicSP/descriptors/BasicSP.cdd delete mode 100644 CIAO/examples/BasicSP/descriptors/BasicSP.dat delete mode 100644 CIAO/examples/BasicSP/descriptors/BasicSP_Homed.cdp delete mode 100644 CIAO/examples/BasicSP/descriptors/BasicSP_Unhomed.cdp delete mode 100755 CIAO/examples/BasicSP/descriptors/run_test.pl delete mode 100644 CIAO/examples/DevGuideExamples/CIAO.mwc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/.gitignore delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_Client.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/History.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Message.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Messenger.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Publication.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Receiver.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Runnable.idl delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd delete mode 100644 CIAO/examples/DevGuideExamples/Messenger/descriptors/admin.dat delete mode 100755 CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl delete mode 100644 CIAO/examples/DevGuideExamples/readme.txt delete mode 100644 CIAO/examples/Display/.gitignore delete mode 100644 CIAO/examples/Display/Display_Base/.gitignore delete mode 100644 CIAO/examples/Display/Display_Base/Display_Base.idl delete mode 100644 CIAO/examples/Display/Display_Base/Display_Base.mpc delete mode 100644 CIAO/examples/Display/GPS/.gitignore delete mode 100644 CIAO/examples/Display/GPS/GPS.idl delete mode 100644 CIAO/examples/Display/GPS/GPS.mpc delete mode 100644 CIAO/examples/Display/GPS/GPSEI.idl delete mode 100644 CIAO/examples/Display/GPS/GPS_exec.cpp delete mode 100644 CIAO/examples/Display/GPS/GPS_exec.h delete mode 100644 CIAO/examples/Display/NavDisplay/.gitignore delete mode 100644 CIAO/examples/Display/NavDisplay/NavDisplay.idl delete mode 100644 CIAO/examples/Display/NavDisplay/NavDisplay.mpc delete mode 100644 CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp delete mode 100644 CIAO/examples/Display/NavDisplay/NavDisplay_exec.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/Command.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/DetailView.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/DetailView.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/MapView.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/MapView.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NavUnit.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/NodeItem.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/QuitCmd.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/RootPanel.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/Worker.cpp delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/Worker.h delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif delete mode 100644 CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.xpm delete mode 100644 CIAO/examples/Display/README.html delete mode 100644 CIAO/examples/Display/RateGen/.gitignore delete mode 100644 CIAO/examples/Display/RateGen/RateGen.idl delete mode 100644 CIAO/examples/Display/RateGen/RateGen.mpc delete mode 100644 CIAO/examples/Display/RateGen/RateGen_exec.cpp delete mode 100644 CIAO/examples/Display/RateGen/RateGen_exec.h delete mode 100644 CIAO/examples/Display/RateGen/controller.cpp delete mode 100644 CIAO/examples/Display/descriptors/Modified_Deployment.xsd delete mode 100644 CIAO/examples/Display/descriptors/XMI.xsd delete mode 100644 CIAO/examples/Display/descriptors/deploymentplanmore.cdp delete mode 100644 CIAO/examples/Display/descriptors/deploymentplanone.cdp delete mode 100644 CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp delete mode 100755 CIAO/examples/Display/descriptors/run_all_in_one.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test_contr.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test_more.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test_more_contr.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test_one.pl delete mode 100755 CIAO/examples/Display/descriptors/run_test_one_contr.pl delete mode 100644 CIAO/examples/Display/example.gif delete mode 100644 CIAO/examples/Hello/Base/Hello.idl delete mode 100644 CIAO/examples/Hello/Base/Hello.mpc delete mode 100644 CIAO/examples/Hello/Receiver/Hello_Receiver.idl delete mode 100644 CIAO/examples/Hello/Receiver/Hello_Receiver.mpc delete mode 100644 CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp delete mode 100644 CIAO/examples/Hello/Receiver/Hello_Receiver_exec.h delete mode 100644 CIAO/examples/Hello/Sender/Hello_Sender.idl delete mode 100644 CIAO/examples/Hello/Sender/Hello_Sender.mpc delete mode 100644 CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp delete mode 100644 CIAO/examples/Hello/Sender/Hello_Sender_exec.h delete mode 100644 CIAO/examples/Hello/descriptors/Plan.cdp delete mode 100755 CIAO/examples/Hello/descriptors/run_test.pl delete mode 100644 CIAO/examples/Hello_Event/.gitignore delete mode 100644 CIAO/examples/Hello_Event/Hello_Base/Hello_Base.idl delete mode 100644 CIAO/examples/Hello_Event/Hello_Base/Hello_Base.mpc delete mode 100644 CIAO/examples/Hello_Event/Receiver/Receiver.idl delete mode 100644 CIAO/examples/Hello_Event/Receiver/Receiver.mpc delete mode 100644 CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp delete mode 100644 CIAO/examples/Hello_Event/Receiver/Receiver_exec.h delete mode 100644 CIAO/examples/Hello_Event/Sender/.gitignore delete mode 100644 CIAO/examples/Hello_Event/Sender/Sender.idl delete mode 100644 CIAO/examples/Hello_Event/Sender/Sender.mpc delete mode 100644 CIAO/examples/Hello_Event/Sender/Sender_exec.cpp delete mode 100644 CIAO/examples/Hello_Event/Sender/Sender_exec.h delete mode 100644 CIAO/examples/Hello_Event/Sender/starter.cpp delete mode 100644 CIAO/examples/Hello_Event/descriptors/DeploymentPlan.cdp delete mode 100644 CIAO/examples/Hello_Event/descriptors/DeploymentPlan_without_ns.cdp delete mode 100644 CIAO/examples/Hello_Event/descriptors/NodeManagerMap.cdd delete mode 100755 CIAO/examples/Hello_Event/descriptors/NodeMap.cdd delete mode 100644 CIAO/examples/Hello_Event/descriptors/PlanLocality_DifferentProcesses.cdp delete mode 100644 CIAO/examples/Hello_Event/descriptors/PlanLocality_SameProcess.cdp delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_NodeDaemons.pl delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_test.pl delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_test_PlanLocality_DifferentProcesses.pl delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_test_PlanLocality_SameProcess.pl delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_test_shs.pl delete mode 100755 CIAO/examples/Hello_Event/descriptors/run_test_without_ns.pl delete mode 100644 CIAO/examples/Hello_Event/descriptors/shs.ciao.localityconfig delete mode 100644 CIAO/examples/Hello_Event/descriptors/shs.localityconfig delete mode 100644 CIAO/examples/Hello_Event/step-by-step.html delete mode 100644 CIAO/examples/Null_Component/.gitignore delete mode 100644 CIAO/examples/Null_Component/Null_Component.idl delete mode 100644 CIAO/examples/Null_Component/Null_Component.mpc delete mode 100644 CIAO/examples/Null_Component/Null_Interface.idl delete mode 100644 CIAO/examples/Null_Component/Null_Interface.mpc delete mode 100644 CIAO/examples/Null_Component/descriptors/NodeMap.cdd delete mode 100644 CIAO/examples/Null_Component/descriptors/Null_Homed.cdp delete mode 100644 CIAO/examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp delete mode 100644 CIAO/examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp delete mode 100644 CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp delete mode 100755 CIAO/examples/Null_Component/descriptors/run_test.pl delete mode 100755 CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl delete mode 100644 CIAO/examples/Null_Component/model/Null_Component.xme delete mode 100644 CIAO/examples/ciao_android.lst delete mode 100644 CIAO/performance-tests/Benchmark/.gitignore delete mode 100644 CIAO/performance-tests/Benchmark/Benchmark.idl delete mode 100644 CIAO/performance-tests/Benchmark/Benchmark.mpc delete mode 100644 CIAO/performance-tests/Benchmark/LatencyTest.cpp delete mode 100644 CIAO/performance-tests/Benchmark/LatencyTest.h delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/.gitignore delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/README delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp delete mode 100755 CIAO/performance-tests/Benchmark/Multi_Threaded/run_test.pl delete mode 100644 CIAO/performance-tests/Benchmark/Multi_Threaded/svc.conf delete mode 100644 CIAO/performance-tests/Benchmark/README delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/.gitignore delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/README delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/client.cpp delete mode 100755 CIAO/performance-tests/Benchmark/RoundTrip/run_test.pl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTrip/svc.conf delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/.gitignore delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp delete mode 100755 CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl delete mode 100755 CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/.gitignore delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl delete mode 100644 CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/Benchmark.cad delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/CIAO_Installation_Data.ini delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/NOTE.txt delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/RoundTrip.csd delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/RoundTrip.ssd delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.cad delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.csd delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.ssd delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/Test-IOR.cad delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/test-multi-process.dat delete mode 100644 CIAO/performance-tests/Benchmark/descriptors/test.dat delete mode 100644 CIAO/performance-tests/Benchmark/server.cpp delete mode 100644 CIAO/performance-tests/Benchmark/svc.conf delete mode 100644 CIAO/performance-tests/Protocols/Controller/Controller.cpp delete mode 100644 CIAO/performance-tests/Protocols/Controller/Controller.mpc delete mode 100644 CIAO/performance-tests/Protocols/Receiver/Receiver.idl delete mode 100644 CIAO/performance-tests/Protocols/Receiver/Receiver.mpc delete mode 100644 CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp delete mode 100644 CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h delete mode 100644 CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp delete mode 100644 CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h delete mode 100644 CIAO/performance-tests/Protocols/Sender/Sender.idl delete mode 100644 CIAO/performance-tests/Protocols/Sender/Sender.mpc delete mode 100644 CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp delete mode 100644 CIAO/performance-tests/Protocols/Sender/Sender_exec.h delete mode 100644 CIAO/performance-tests/Protocols/common/Protocols.idl delete mode 100644 CIAO/performance-tests/Protocols/common/Protocols.mpc delete mode 100644 CIAO/performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini delete mode 100644 CIAO/performance-tests/Protocols/descriptors/Receiver.csd delete mode 100644 CIAO/performance-tests/Protocols/descriptors/Receiver.ssd delete mode 100644 CIAO/performance-tests/Protocols/descriptors/Sender.csd delete mode 100644 CIAO/performance-tests/Protocols/descriptors/Sender.ssd delete mode 100644 CIAO/performance-tests/Protocols/descriptors/default.cad delete mode 100644 CIAO/performance-tests/Protocols/descriptors/remote.cad delete mode 100755 CIAO/performance-tests/Protocols/descriptors/run_test.pl delete mode 100644 CIAO/performance-tests/Protocols/descriptors/svc.conf delete mode 100644 CIAO/performance-tests/Protocols/descriptors/test.dat delete mode 100644 CIAO/rules.ciao.GNU delete mode 100644 CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h delete mode 100644 CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp delete mode 100644 CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp delete mode 100644 CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.cdd delete mode 100644 CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr delete mode 100755 CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl delete mode 100644 CIAO/tests/Bug_2130_Regression/interfaces/.gitignore delete mode 100644 CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl delete mode 100644 CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc delete mode 100644 CIAO/tests/Bug_3769_Regression/.gitignore delete mode 100644 CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc delete mode 100644 CIAO/tests/Bug_3769_Regression/Foo.idl delete mode 100644 CIAO/tests/Bug_3769_Regression/Foo_exec.cpp delete mode 100644 CIAO/tests/Bug_3769_Regression/Foo_exec.h delete mode 100644 CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl delete mode 100755 CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl delete mode 100644 CIAO/tests/Bug_3817_Regression/.gitignore delete mode 100644 CIAO/tests/Bug_3817_Regression/Bar.idl delete mode 100644 CIAO/tests/Bug_3817_Regression/Bar.mpc delete mode 100755 CIAO/tests/Bug_3832_Regression/run_test.pl delete mode 100644 CIAO/tests/Bug_3834_Regression/.gitignore delete mode 100644 CIAO/tests/Bug_3834_Regression/CompA.idl delete mode 100644 CIAO/tests/Bug_3834_Regression/CompA.mpc delete mode 100644 CIAO/tests/Bug_3834_Regression/CompA_exec.cpp delete mode 100644 CIAO/tests/Bug_3834_Regression/CompA_exec.h delete mode 100644 CIAO/tests/Bug_3834_Regression/CompB.idl delete mode 100644 CIAO/tests/Bug_3834_Regression/CompB.mpc delete mode 100644 CIAO/tests/Bug_3834_Regression/CompB_exec.cpp delete mode 100644 CIAO/tests/Bug_3834_Regression/CompB_exec.h delete mode 100644 CIAO/tests/Bug_3834_Regression/Moo.idl delete mode 100644 CIAO/tests/Bug_3834_Regression/Moo.mpc delete mode 100755 CIAO/tests/Bug_3834_Regression/descriptors/NodeMap.cdd delete mode 100644 CIAO/tests/Bug_3834_Regression/descriptors/PlanLocality_DifferentProcesses.cdp delete mode 100644 CIAO/tests/Bug_3834_Regression/descriptors/PlanLocality_SameProcess.cdp delete mode 100755 CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl delete mode 100755 CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl delete mode 100755 CIAO/tests/Bug_3834_Regression/model/Bug_3834_Regression.xme delete mode 100644 CIAO/tests/Bug_3890_Regression/.gitignore delete mode 100644 CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc delete mode 100644 CIAO/tests/Bug_3890_Regression/Foo.idl delete mode 100644 CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl delete mode 100755 CIAO/tests/Bug_3936_Regression/run_test.pl delete mode 100644 CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl delete mode 100755 CIAO/tests/Bug_3937_Regression/run_test.pl delete mode 100644 CIAO/tests/Bug_3944_Regression/base_connector_conn.idl delete mode 100644 CIAO/tests/Bug_3944_Regression/connector_conn.idl delete mode 100644 CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl delete mode 100755 CIAO/tests/Bug_3944_Regression/run_test.pl delete mode 100644 CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl delete mode 100644 CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc delete mode 100644 CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl delete mode 100644 CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc delete mode 100644 CIAO/tests/Bug_4086_Regression/Bug_4086_Regression.mpc delete mode 100644 CIAO/tests/Bug_4086_Regression/Foo.idl delete mode 100644 CIAO/tests/Bug_4086_Regression/Foo_exec.cpp delete mode 100644 CIAO/tests/Bug_4086_Regression/Foo_exec.h delete mode 100644 CIAO/tests/Bug_4086_Regression/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/tests/Bug_4086_Regression/descriptors/run_test.pl delete mode 100755 CIAO/tests/Bug_4086_Regression/descriptors/run_test_cdr.pl delete mode 100755 CIAO/tests/Bug_4087_Regression/run_test.pl delete mode 100644 CIAO/tests/Bug_4087_Regression/test.idl delete mode 100644 CIAO/tests/CIDL/CodeGen/.gitignore delete mode 100644 CIAO/tests/CIDL/CodeGen/Basic.idl delete mode 100644 CIAO/tests/CIDL/CodeGen/Basic.mpc delete mode 100644 CIAO/tests/CIDL/CodeGen/CodeGen.idl delete mode 100644 CIAO/tests/CIDL/CodeGen/CodeGen.mpc delete mode 100644 CIAO/tests/CIDL/CodeGen/README delete mode 100644 CIAO/tests/CIF/.gitignore delete mode 100644 CIAO/tests/CIF/Common/CIF_Common.cpp delete mode 100644 CIAO/tests/CIF/Common/CIF_Common.h delete mode 100644 CIAO/tests/CIF/Common/CIF_Common.mpc delete mode 100644 CIAO/tests/CIF/Common/CIF_Common_export.h delete mode 100644 CIAO/tests/CIF/Component/CIF_Component.idl delete mode 100644 CIAO/tests/CIF/Component/CIF_Component.mpc delete mode 100644 CIAO/tests/CIF/Component/CIF_Component_exec.cpp delete mode 100644 CIAO/tests/CIF/Component/CIF_Component_exec.h delete mode 100644 CIAO/tests/CIF/Events/Events.mpc delete mode 100644 CIAO/tests/CIF/Events/client.cpp delete mode 100644 CIAO/tests/CIF/Navigation/.gitignore delete mode 100644 CIAO/tests/CIF/Navigation/Navigation.mpc delete mode 100644 CIAO/tests/CIF/Navigation/client.cpp delete mode 100644 CIAO/tests/CIF/Receptacle/.gitignore delete mode 100644 CIAO/tests/CIF/Receptacle/Receptacle.mpc delete mode 100644 CIAO/tests/CIF/Receptacle/client.cpp delete mode 100644 CIAO/tests/CIF/descriptors/Plan.cdp delete mode 100755 CIAO/tests/CIF/descriptors/run_test.pl delete mode 100644 CIAO/tests/Collocation/Coll_Base/Base.idl delete mode 100644 CIAO/tests/Collocation/Coll_Base/Base.mpc delete mode 100644 CIAO/tests/Collocation/README delete mode 100644 CIAO/tests/Collocation/Receiver/Receiver.idl delete mode 100644 CIAO/tests/Collocation/Receiver/Receiver.mpc delete mode 100644 CIAO/tests/Collocation/Receiver/Receiver_exec.cpp delete mode 100644 CIAO/tests/Collocation/Receiver/Receiver_exec.h delete mode 100644 CIAO/tests/Collocation/Sender/Sender.idl delete mode 100644 CIAO/tests/Collocation/Sender/Sender.mpc delete mode 100644 CIAO/tests/Collocation/Sender/Sender_exec.cpp delete mode 100644 CIAO/tests/Collocation/Sender/Sender_exec.h delete mode 100644 CIAO/tests/Collocation/descriptors/PlanAllOnMore.cdp delete mode 100644 CIAO/tests/Collocation/descriptors/PlanAllOnOne.cdp delete mode 100644 CIAO/tests/Collocation/descriptors/PlanAllOnOneBest.cdp delete mode 100644 CIAO/tests/Collocation/descriptors/PlanAllOnOneNo.cdp delete mode 100644 CIAO/tests/Collocation/descriptors/PlanAllOnOneNoTP.cdp delete mode 100755 CIAO/tests/Collocation/descriptors/run_test.pl delete mode 100644 CIAO/tests/Cookies/Cookie.cpp delete mode 100644 CIAO/tests/Cookies/Cookie.h delete mode 100644 CIAO/tests/Cookies/Cookies.mpc delete mode 100644 CIAO/tests/Cookies/Test.idl delete mode 100644 CIAO/tests/Cookies/client.cpp delete mode 100755 CIAO/tests/Cookies/run_test.pl delete mode 100644 CIAO/tests/Cookies/server.cpp delete mode 100644 CIAO/tests/DAnCE/Components/ProcessColocation.idl delete mode 100644 CIAO/tests/DAnCE/Components/ProcessColocation.mpc delete mode 100644 CIAO/tests/DAnCE/Components/ProcessColocation_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/ProcessColocation_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/Progressive.idl delete mode 100644 CIAO/tests/DAnCE/Components/Progressive.mpc delete mode 100644 CIAO/tests/DAnCE/Components/Progressive_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/Progressive_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleAttribute.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleAttribute.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleAttribute_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleAttribute_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleCommon.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleCommon.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleConsumer.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleConsumer.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleConsumer_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleEmitter.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleEmitter.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleEmitter_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleEmitter_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleFailure.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleFailure.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleFailure_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleFailure_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalProvider.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalUser.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetProvider_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetUser.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNilFacetUser_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNull.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNull.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNull_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleNull_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleProvider.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleProvider.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleProvider_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimplePublisher.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimplePublisher.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimplePublisher_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimplePublisher_exec.h delete mode 100644 CIAO/tests/DAnCE/Components/SimpleUser.idl delete mode 100644 CIAO/tests/DAnCE/Components/SimpleUser.mpc delete mode 100644 CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Components/SimpleUser_exec.h delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/1NodeFailureAtActivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/1NodeFailureAtStartup.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/1NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/2NodeFailureAtActivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/2NodeFailureAtStartup.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/2NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/5NodeFailureAtActivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/5NodeFailureAtStartup.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/5NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Launch-Failures/README.txt delete mode 100755 CIAO/tests/DAnCE/EM-Launch-Failures/run_test.pl delete mode 100644 CIAO/tests/DAnCE/EM-Redeployment/README.txt delete mode 100755 CIAO/tests/DAnCE/EM-Redeployment/run_test.pl delete mode 100755 CIAO/tests/DAnCE/EM-Redeployment/run_test_noevent.pl delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/1NodeFailureAtPassivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/1NodeFailureAtRemove.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/1NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/2NodeFailureAtPassivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/2NodeFailureAtRemove.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/2NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/5NodeFailureAtPassivate.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/5NodeFailureAtRemove.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/5NodeNoFailure.cdp delete mode 100644 CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt delete mode 100755 CIAO/tests/DAnCE/EM-Shutdown-Failures/run_test.pl delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_SP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp delete mode 100644 CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp delete mode 100755 CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl delete mode 100755 CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl delete mode 100755 CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr_noevent.pl delete mode 100755 CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_noevent.pl delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Component.cdp delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_export.h delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h delete mode 100644 CIAO/tests/DAnCE/Executor-Destructor/exec-dest.localityconfig delete mode 100755 CIAO/tests/DAnCE/Executor-Destructor/run_test.pl delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/DestEndpointFailure.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/LocalDestEndpointFailure.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/LocalFacetConnectionDifferentLMs.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/LocalNilFacetConnection.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/LocalSourceEndpointFailure.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/SourceEndpointFailure.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/SuccessfulDeployment.cdp delete mode 100644 CIAO/tests/DAnCE/Launch-Failures/descriptors/besteffort.localityconfig delete mode 100755 CIAO/tests/DAnCE/Launch-Failures/descriptors/run_test.pl delete mode 100755 CIAO/tests/DAnCE/Launch-Failures/descriptors/run_tests_besteffort.pl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/Component.cdp delete mode 100755 CIAO/tests/DAnCE/LocalityManager/CPUAffinity/run_test.pl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_cmd.cdp delete mode 100755 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test.pl delete mode 100755 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl delete mode 100755 CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/Component.cdp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h delete mode 100644 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/nodemanager-besteffort.lconfig delete mode 100755 CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/run_test.pl delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleComponentExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleComponentUnhomed.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_2.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_Default.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp delete mode 100644 CIAO/tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp delete mode 100755 CIAO/tests/DAnCE/NodeManager-Deployments/run_test.pl delete mode 100755 CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl delete mode 100755 CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr_noevent.pl delete mode 100755 CIAO/tests/DAnCE/NodeManager-Deployments/run_test_noevent.pl delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h delete mode 100644 CIAO/tests/DAnCE/PartialShutdown/descriptors/Plan.cdp delete mode 100755 CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl delete mode 100644 CIAO/tests/DAnCE/Progressive_Deployments/NodeManagerMap.cdd delete mode 100644 CIAO/tests/DAnCE/Progressive_Deployments/Plan_A.cdp delete mode 100644 CIAO/tests/DAnCE/Progressive_Deployments/Plan_B.cdp delete mode 100644 CIAO/tests/DAnCE/Progressive_Deployments/Plan_C.cdp delete mode 100755 CIAO/tests/DAnCE/Progressive_Deployments/run_test.pl delete mode 100644 CIAO/tests/DAnCE/StoreReferences/DeploymentPlan.cdp delete mode 100644 CIAO/tests/DAnCE/StoreReferences/StoreReferences.idl delete mode 100644 CIAO/tests/DAnCE/StoreReferences/StoreReferences.mpc delete mode 100644 CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.cpp delete mode 100644 CIAO/tests/DAnCE/StoreReferences/StoreReferences_exec.h delete mode 100644 CIAO/tests/DAnCE/StoreReferences/client.cpp delete mode 100755 CIAO/tests/DAnCE/StoreReferences/run_test.pl delete mode 100644 CIAO/tests/DAnCE/Threading/Base/Threading.idl delete mode 100644 CIAO/tests/DAnCE/Threading/Base/Threading.mpc delete mode 100644 CIAO/tests/DAnCE/Threading/Component1/Component1.idl delete mode 100644 CIAO/tests/DAnCE/Threading/Component1/Component1.mpc delete mode 100644 CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h delete mode 100644 CIAO/tests/DAnCE/Threading/Component2/Component2.idl delete mode 100644 CIAO/tests/DAnCE/Threading/Component2/Component2.mpc delete mode 100644 CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp delete mode 100644 CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h delete mode 100644 CIAO/tests/DAnCE/Threading/README delete mode 100644 CIAO/tests/DAnCE/Threading/descriptors/Plan.cdp delete mode 100755 CIAO/tests/DAnCE/Threading/descriptors/run_test.pl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Attributes/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSink/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSource/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Facets/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl delete mode 100644 CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc delete mode 100644 CIAO/tests/IDL3/Components/SimpleComponent/.gitignore delete mode 100644 CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl delete mode 100644 CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc delete mode 100644 CIAO/tests/IDL3/Connectors/README.txt delete mode 100644 CIAO/tests/IDL3/Connectors/incorrect_consumes.idl delete mode 100644 CIAO/tests/IDL3/Connectors/incorrect_emits.idl delete mode 100644 CIAO/tests/IDL3/Connectors/incorrect_publishes.idl delete mode 100755 CIAO/tests/IDL3/Connectors/run_test.pl delete mode 100644 CIAO/tests/IDL3/Events/Abstract/.gitignore delete mode 100644 CIAO/tests/IDL3/Events/Abstract/Abstract.idl delete mode 100644 CIAO/tests/IDL3/Events/Abstract/Abstract.mpc delete mode 100644 CIAO/tests/IDL3/Events/Any/.gitignore delete mode 100644 CIAO/tests/IDL3/Events/Any/Any.mpc delete mode 100644 CIAO/tests/IDL3/Events/Any/EventAny.idl delete mode 100644 CIAO/tests/IDL3/Events/Any/README delete mode 100644 CIAO/tests/IDL3/Events/Any/main.cpp delete mode 100755 CIAO/tests/IDL3/Events/Any/run_test.pl delete mode 100644 CIAO/tests/IDL3/Events/Regular/.gitignore delete mode 100644 CIAO/tests/IDL3/Events/Regular/Regular.idl delete mode 100644 CIAO/tests/IDL3/Events/Regular/Regular.mpc delete mode 100644 CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl delete mode 100644 CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc delete mode 100644 CIAO/tests/IDL3/Homes/Basic/Basic.idl delete mode 100644 CIAO/tests/IDL3/Homes/Basic/Basic.mpc delete mode 100644 CIAO/tests/IDL3/Homes/Factory/Factory.idl delete mode 100644 CIAO/tests/IDL3/Homes/Factory/Factory.mpc delete mode 100644 CIAO/tests/IDL3/Homes/Finder/.gitignore delete mode 100644 CIAO/tests/IDL3/Homes/Finder/Finder.idl delete mode 100644 CIAO/tests/IDL3/Homes/Finder/Finder.mpc delete mode 100644 CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl delete mode 100644 CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/README delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/all.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/convert.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/include.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/Basic/.gitignore delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/.gitignore delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/.gitignore delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Events/.gitignore delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl delete mode 100644 CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc delete mode 100644 CIAO/tests/IDL3/Lookup/README delete mode 100644 CIAO/tests/IDL3/Lookup/lookup_test.idl delete mode 100644 CIAO/tests/IDL3/Lookup/lookup_test.mpc delete mode 100755 CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/test.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/README delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/a.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/b.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/c_nok.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/Forward_Declared/c_ok.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc delete mode 100644 CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp delete mode 100644 CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h delete mode 100755 CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI.dtd delete mode 100755 CIAO/tests/IDL3_to_XMI/XMI_For_Array/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Array/test.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl delete mode 100755 CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl delete mode 100755 CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl delete mode 100755 CIAO/tests/IDL3_to_XMI/XMI_For_Native/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Native/test.idl delete mode 100755 CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl delete mode 100644 CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/test.idl delete mode 100644 CIAO/tests/IDL_Test/Cornucopia/.gitignore delete mode 100644 CIAO/tests/IDL_Test/Cornucopia/Cornucopia.doxygen delete mode 100644 CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl delete mode 100644 CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc delete mode 100644 CIAO/tests/IDL_Test/Cornucopia/README delete mode 100755 CIAO/tests/IDL_Test/Cornucopia/run_test.pl delete mode 100644 CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC.cdp delete mode 100644 CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp delete mode 100644 CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h delete mode 100644 CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl delete mode 100644 CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc delete mode 100755 CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl delete mode 100644 CIAO/tests/IDL_Test/IDL3_Plus/.gitignore delete mode 100644 CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl delete mode 100644 CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc delete mode 100644 CIAO/tests/IDL_Test/IDL3_Plus/README delete mode 100644 CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl delete mode 100644 CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc delete mode 100644 CIAO/tests/IDL_Test/Included_Component/IC_Foo.idl delete mode 100644 CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Servants/Base.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl delete mode 100644 CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc delete mode 100644 CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp delete mode 100644 CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl delete mode 100644 CIAO/tests/IDL_Test/Keywords/Keywords.mpc delete mode 100644 CIAO/tests/IDL_Test/Lem_Pragma/A.idl delete mode 100644 CIAO/tests/IDL_Test/Lem_Pragma/B.idl delete mode 100644 CIAO/tests/IDL_Test/Lem_Pragma/C.idl delete mode 100644 CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc delete mode 100644 CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl delete mode 100644 CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc delete mode 100644 CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.cpp delete mode 100644 CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/tests/IDL_Test/NonTopic_Connector/descriptors/run_test.pl delete mode 100644 CIAO/tests/IDL_Test/NonTopic_Connector/nontopic_test.idl delete mode 100644 CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.idl delete mode 100644 CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc delete mode 100644 CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl delete mode 100644 CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc delete mode 100644 CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl delete mode 100644 CIAO/tests/IDL_Test/Reused_Facet_Interface/README delete mode 100644 CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc delete mode 100644 CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl delete mode 100644 CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc delete mode 100644 CIAO/tests/Minimum/Minimum_Base/Minimum_Base.idl delete mode 100644 CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc delete mode 100644 CIAO/tests/Minimum/Receiver/.gitignore delete mode 100644 CIAO/tests/Minimum/Receiver/Receiver.idl delete mode 100644 CIAO/tests/Minimum/Receiver/Receiver.mpc delete mode 100644 CIAO/tests/Minimum/Receiver/Receiver_exec.cpp delete mode 100644 CIAO/tests/Minimum/Receiver/Receiver_exec.h delete mode 100644 CIAO/tests/Minimum/Sender/.gitignore delete mode 100644 CIAO/tests/Minimum/Sender/Sender.idl delete mode 100644 CIAO/tests/Minimum/Sender/Sender.mpc delete mode 100644 CIAO/tests/Minimum/Sender/Sender_exec.cpp delete mode 100644 CIAO/tests/Minimum/Sender/Sender_exec.h delete mode 100644 CIAO/tests/TTSCTest/Sender/Sender.idl delete mode 100644 CIAO/tests/TTSCTest/Sender/Sender.mpc delete mode 100644 CIAO/tests/TTSCTest/Sender/Sender_exec.cpp delete mode 100644 CIAO/tests/TTSCTest/Sender/Sender_exec.h delete mode 100644 CIAO/tests/TTSCTest/TTSConnector/TTSConnector.idl delete mode 100644 CIAO/tests/TTSCTest/TTSConnector/TTSConnector.mpc delete mode 100644 CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp delete mode 100644 CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h delete mode 100644 CIAO/tests/TTSCTest/TimeTriggerServiceConnector.odt delete mode 100644 CIAO/tests/TTSCTest/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/tests/TTSCTest/descriptors/run_test.pl delete mode 100644 CIAO/tests/TTSConnContext/README.txt delete mode 100644 CIAO/tests/TTSConnContext/Sender/Sender.idl delete mode 100644 CIAO/tests/TTSConnContext/Sender/Sender.mpc delete mode 100644 CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp delete mode 100644 CIAO/tests/TTSConnContext/Sender/Sender_exec.h delete mode 100644 CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.idl delete mode 100644 CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc delete mode 100644 CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp delete mode 100644 CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h delete mode 100644 CIAO/tests/TTSConnContext/descriptors/DeploymentPlan.cdp delete mode 100755 CIAO/tests/TTSConnContext/descriptors/run_test.pl delete mode 100644 CIAO/tests/Thread/README.txt delete mode 100644 CIAO/tests/Thread/Receiver/Receiver.idl delete mode 100644 CIAO/tests/Thread/Receiver/Receiver.mpc delete mode 100644 CIAO/tests/Thread/Receiver/Receiver_exec.cpp delete mode 100644 CIAO/tests/Thread/Receiver/Receiver_exec.h delete mode 100644 CIAO/tests/Thread/Sender/Sender.idl delete mode 100644 CIAO/tests/Thread/Sender/Sender.mpc delete mode 100644 CIAO/tests/Thread/Sender/Sender_exec.cpp delete mode 100644 CIAO/tests/Thread/Sender/Sender_exec.h delete mode 100644 CIAO/tests/Thread/Sender/starter.cpp delete mode 100644 CIAO/tests/Thread/Thread_Base/Thread_Base.idl delete mode 100644 CIAO/tests/Thread/Thread_Base/Thread_Base.mpc delete mode 100644 CIAO/tests/Thread/descriptors/DeploymentPlan.cdp delete mode 100644 CIAO/tests/Thread/descriptors/DeploymentPlanDat.cdp delete mode 100644 CIAO/tests/Thread/descriptors/NodeManagerMap.cdd delete mode 100644 CIAO/tests/Thread/descriptors/NodeManagerMap.dat delete mode 100755 CIAO/tests/Thread/descriptors/run_test.pl delete mode 100755 CIAO/tests/Thread/descriptors/run_test_cdd.pl delete mode 100755 CIAO/tests/Thread/descriptors/run_test_dat.pl delete mode 100644 CIAO/tools/IDL3_to_IDL2/.gitignore delete mode 100644 CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc delete mode 100644 CIAO/tools/IDL3_to_IDL2/README delete mode 100644 CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/basic_visitor.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_extern.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_global.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_global.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_helper.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_helper.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_init.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_produce.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_sunsoft.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_util.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/be_util.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/checking_visitor.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/identifier_helper.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h delete mode 100644 CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h delete mode 100644 CIAO/tools/IDL3_to_XMI/.gitignore delete mode 100644 CIAO/tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h delete mode 100644 CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc delete mode 100644 CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h delete mode 100644 CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h delete mode 100644 CIAO/tools/IDL3_to_XMI/Literals.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/Literals.h delete mode 100644 CIAO/tools/IDL3_to_XMI/be_extern.h delete mode 100644 CIAO/tools/IDL3_to_XMI/be_global.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_global.h delete mode 100644 CIAO/tools/IDL3_to_XMI/be_helper.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_helper.h delete mode 100644 CIAO/tools/IDL3_to_XMI/be_init.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_produce.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_sunsoft.h delete mode 100644 CIAO/tools/IDL3_to_XMI/be_util.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/be_util.h delete mode 100644 CIAO/tools/IDL3_to_XMI/identifier_helper.cpp delete mode 100644 CIAO/tools/IDL3_to_XMI/identifier_helper.h delete mode 100644 CIAO/tutorials/Quoter/Simple/.gitignore delete mode 100644 CIAO/tutorials/Quoter/Simple/01.html delete mode 100644 CIAO/tutorials/Quoter/Simple/02.html delete mode 100644 CIAO/tutorials/Quoter/Simple/03.html delete mode 100644 CIAO/tutorials/Quoter/Simple/04.html delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/.gitignore delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp delete mode 100644 CIAO/tutorials/Quoter/Simple/Broker/StockBroker_exec.h delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/.gitignore delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp delete mode 100644 CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h delete mode 100644 CIAO/tutorials/Quoter/Simple/Icons/AddConnMode.gif delete mode 100644 CIAO/tutorials/Quoter/Simple/Icons/SetMode.gif delete mode 100644 CIAO/tutorials/Quoter/Simple/Model/Quoter.xme delete mode 100644 CIAO/tutorials/Quoter/Simple/README.html delete mode 100644 CIAO/tutorials/Quoter/Simple/Stock_Base/.gitignore delete mode 100644 CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl delete mode 100644 CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/Broker.cpd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/Default.pcd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/Distributor.cpd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/Domain.cdd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/NodeMap.cdd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/Plan.cdp delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockBroker.ccd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockBrokerMonolithicImpl.cid delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockBroker_exec.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockBroker_stub.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockBroker_svnt.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockDistributor.ccd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockDistributorMonolithicImpl.cid delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockDistributor_exec.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockDistributor_stub.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockDistributor_svnt.iad delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockQuoter.cid delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/StockQuoter.cpd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/TopLevelPackage.tpd delete mode 100644 CIAO/tutorials/Quoter/Simple/descriptors/XMI.xsd delete mode 100755 CIAO/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl delete mode 100755 CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig1.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig10.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig11.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig12.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig2.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig3.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig4.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig5.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig6.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig6a.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig7.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig8.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/fig9.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/quoter.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/step1.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/step2.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/step3.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/step6.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/images/steps.jpg delete mode 100644 CIAO/tutorials/Quoter/Simple/index.html delete mode 100644 DAnCE/COPYING delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2011a delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2011b delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2012a delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2013a delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2014a delete mode 100644 DAnCE/ChangeLogs/ChangeLog-2014b delete mode 100644 DAnCE/ChangeLogs/DAnCE-1_3_1 delete mode 100644 DAnCE/ChangeLogs/DAnCE-1_3_2 delete mode 100644 DAnCE/ChangeLogs/DAnCE-1_3_3 delete mode 100644 DAnCE/DAnCE-INSTALL.html delete mode 100644 DAnCE/DAnCE_TAO.mwc delete mode 100644 DAnCE/MPC/config/dance.mpb delete mode 100644 DAnCE/MPC/config/dance_applicationmanager.mpb delete mode 100644 DAnCE/MPC/config/dance_applicationmanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_applicationmanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_artifact_installation.mpb delete mode 100644 DAnCE/MPC/config/dance_completion_counter.mpb delete mode 100644 DAnCE/MPC/config/dance_config_handlers.mpb delete mode 100644 DAnCE/MPC/config/dance_config_handlers_base.mpb delete mode 100644 DAnCE/MPC/config/dance_convert_plan.mpb delete mode 100644 DAnCE/MPC/config/dance_deployment_scheduler.mpb delete mode 100644 DAnCE/MPC/config/dance_deployment_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_deployment_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_domain_validator.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplication.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplication_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplication_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplicationmanager.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_exe.mpb delete mode 100644 DAnCE/MPC/config/dance_executionmanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_executionmanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_installation_handlers.mpb delete mode 100644 DAnCE/MPC/config/dance_installation_repository_manager.mpb delete mode 100644 DAnCE/MPC/config/dance_lib.mpb delete mode 100644 DAnCE/MPC/config/dance_locality_handler.mpb delete mode 100644 DAnCE/MPC/config/dance_locality_manager.mpb delete mode 100644 DAnCE/MPC/config/dance_logger.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplication.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplication_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplication_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplicationmanager.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_nodemanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_nodemanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_output.mpb delete mode 100644 DAnCE/MPC/config/dance_plan_launcher.mpb delete mode 100644 DAnCE/MPC/config/dance_repositorymanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_repositorymanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_repositorymanagerbase.mpb delete mode 100644 DAnCE/MPC/config/dance_shs_daemon.mpb delete mode 100644 DAnCE/MPC/config/dance_shs_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_split_plan.mpb delete mode 100644 DAnCE/MPC/config/dance_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_targetmanager_skel.mpb delete mode 100644 DAnCE/MPC/config/dance_targetmanager_stub.mpb delete mode 100644 DAnCE/MPC/config/dance_tools.mpb delete mode 100644 DAnCE/MPC/config/danceidldefaults.mpb delete mode 100644 DAnCE/MPC/config/dancelib_with_idl.mpb delete mode 100644 DAnCE/NEWS delete mode 100644 DAnCE/PROBLEM-REPORT-FORM delete mode 100644 DAnCE/VERSION delete mode 100644 DAnCE/bin/.gitignore delete mode 100755 DAnCE/bin/PythonDAnCE/__init__.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/__init__.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/_path.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/artifact.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/comp_impl.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/comp_inst.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/config_prop.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/connection.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/external_reference.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/footer.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/header.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/home_impl.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/home_inst.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/homed_comp_impl.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/homed_comp_inst.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py delete mode 100755 DAnCE/bin/PythonDAnCE/generator/templet.py delete mode 100644 DAnCE/bin/ciao.localityconfig delete mode 100644 DAnCE/bin/dance_tests.lst delete mode 100755 DAnCE/bin/generate_plan.py delete mode 100644 DAnCE/bin/nodemanager.localityconfig delete mode 100755 DAnCE/bin/update_package.py delete mode 100644 DAnCE/dance/.gitignore delete mode 100644 DAnCE/dance/DAnCE_ArtifactInstallation.idl delete mode 100644 DAnCE/dance/DAnCE_Core.mpc delete mode 100644 DAnCE/dance/DAnCE_DeploymentInterceptors.idl delete mode 100644 DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.cpp delete mode 100644 DAnCE/dance/DAnCE_DeploymentInterceptors_Base_Impl.h delete mode 100644 DAnCE/dance/DAnCE_LocalityManager.idl delete mode 100644 DAnCE/dance/DAnCE_Properties.idl delete mode 100644 DAnCE/dance/DAnCE_Properties.mpc delete mode 100644 DAnCE/dance/DAnCE_Utility.cpp delete mode 100644 DAnCE/dance/DAnCE_Utility.h delete mode 100644 DAnCE/dance/DAnCE_Utility.tpp delete mode 100644 DAnCE/dance/Deployment/.gitignore delete mode 100644 DAnCE/dance/Deployment/Deployment.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_Application.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_ApplicationManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_Base.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_Connection.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_Core.mpc delete mode 100644 DAnCE/dance/Deployment/Deployment_Data.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_DomainApplication.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_DomainApplicationManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_ExecutionManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_InvalidComponentExecParameter.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_InvalidConnection.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_InvalidNodeExecParameter.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_InvalidProperty.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_NodeApplication.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_NodeApplicationManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_NodeManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_Packaging_Data.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_PlanError.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_RepositoryManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_ResourceNotAvailable.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_StartError.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_StopError.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_TargetData.idl delete mode 100644 DAnCE/dance/Deployment/Deployment_TargetManager.idl delete mode 100644 DAnCE/dance/DomainApplication/DomainApplication.mpc delete mode 100644 DAnCE/dance/DomainApplication/Domain_Application_Export.h delete mode 100644 DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp delete mode 100644 DAnCE/dance/DomainApplication/Domain_Application_Impl.h delete mode 100644 DAnCE/dance/DomainApplicationManager/DomainApplicationManager.mpc delete mode 100644 DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Export.h delete mode 100644 DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp delete mode 100644 DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.h delete mode 100644 DAnCE/dance/DomainApplicationManager/Node_Locator.cpp delete mode 100644 DAnCE/dance/DomainApplicationManager/Node_Locator.h delete mode 100644 DAnCE/dance/ExecutionManager/.gitignore delete mode 100644 DAnCE/dance/ExecutionManager/ExecutionManager.mpc delete mode 100644 DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp delete mode 100644 DAnCE/dance/ExecutionManager/ExecutionManager_Impl.h delete mode 100644 DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp delete mode 100644 DAnCE/dance/ExecutionManager/ExecutionManager_Module.h delete mode 100644 DAnCE/dance/ExecutionManager/Execution_Manager.cpp delete mode 100644 DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.cpp delete mode 100644 DAnCE/dance/LocalityManager/Configuration/CPU_Affinity.h delete mode 100644 DAnCE/dance/LocalityManager/Configuration/CPU_Affinity_export.h delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Configuration.mpc delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Name.cpp delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Name.h delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Name_export.h delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Priority.cpp delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Priority.h delete mode 100644 DAnCE/dance/LocalityManager/Configuration/Process_Priority_export.h delete mode 100644 DAnCE/dance/LocalityManager/Daemon/.gitignore delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager.cpp delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager.mpc delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl_Export.h delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp delete mode 100644 DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/Config_Handler_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/DAnCE_Locality_Handler_export.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/Inst_Handler_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/Interceptor_Handler_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/LocalityHandler.mpc delete mode 100644 DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.h delete mode 100644 DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp delete mode 100644 DAnCE/dance/LocalityManager/Handler/Plugin_Conf.h delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/Best_Effort.cpp delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/Best_Effort.h delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/Standard_Error.cpp delete mode 100644 DAnCE/dance/LocalityManager/Interceptors/Standard_Error.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Dependency_Sorter.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Completion.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Event.inl delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler.inl delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Deployment_Scheduler_export.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Configured.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Configured.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Connect.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Disconnect.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Endpoint.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Install.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Passivate.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Remove.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Remove.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Start.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Events/Start.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.h delete mode 100644 DAnCE/dance/LocalityManager/Scheduler/Scheduler.mpc delete mode 100644 DAnCE/dance/Logger/DAnCE_Logger_Export.h delete mode 100644 DAnCE/dance/Logger/Log_Macros.cpp delete mode 100644 DAnCE/dance/Logger/Log_Macros.h delete mode 100644 DAnCE/dance/Logger/Logger.mpc delete mode 100644 DAnCE/dance/Logger/Logger_Service.cpp delete mode 100644 DAnCE/dance/Logger/Logger_Service.h delete mode 100644 DAnCE/dance/NodeApplication/NodeApplication.mpc delete mode 100644 DAnCE/dance/NodeApplication/NodeApplication_Export.h delete mode 100644 DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp delete mode 100644 DAnCE/dance/NodeApplication/NodeApplication_Impl.h delete mode 100644 DAnCE/dance/NodeApplicationManager/NodeApplicationManager.mpc delete mode 100644 DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Export.h delete mode 100644 DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.cpp delete mode 100644 DAnCE/dance/NodeApplicationManager/NodeApplicationManager_Impl.h delete mode 100644 DAnCE/dance/NodeManager/.gitignore delete mode 100644 DAnCE/dance/NodeManager/NodeManager.mpc delete mode 100644 DAnCE/dance/NodeManager/NodeManager_Impl.cpp delete mode 100644 DAnCE/dance/NodeManager/NodeManager_Impl.h delete mode 100644 DAnCE/dance/NodeManager/Node_Manager.cpp delete mode 100644 DAnCE/dance/NodeManager/Node_Manager_Module.cpp delete mode 100644 DAnCE/dance/NodeManager/Node_Manager_Module.h delete mode 100644 DAnCE/dance/NodeManager/README delete mode 100644 DAnCE/dance/Plan_Launcher/.gitignore delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/.gitignore delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.idl delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon_Impl.h delete mode 100644 DAnCE/dance/Plan_Launcher/Deployment_Failure.h delete mode 100644 DAnCE/dance/Plan_Launcher/EM_Launcher.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/EM_Launcher.h delete mode 100644 DAnCE/dance/Plan_Launcher/LM_Launcher.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/LM_Launcher.h delete mode 100644 DAnCE/dance/Plan_Launcher/NM_Launcher.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/NM_Launcher.h delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h delete mode 100644 DAnCE/dance/Plan_Launcher/Plan_Launcher_Export.h delete mode 100644 DAnCE/dance/RepositoryManager/.gitignore delete mode 100644 DAnCE/dance/RepositoryManager/PC_Updater.cpp delete mode 100644 DAnCE/dance/RepositoryManager/PC_Updater.h delete mode 100644 DAnCE/dance/RepositoryManager/PC_Updater_T.cpp delete mode 100644 DAnCE/dance/RepositoryManager/PC_Updater_T.h delete mode 100644 DAnCE/dance/RepositoryManager/README delete mode 100644 DAnCE/dance/RepositoryManager/RM_Helper.cpp delete mode 100644 DAnCE/dance/RepositoryManager/RM_Helper.h delete mode 100644 DAnCE/dance/RepositoryManager/RepositoryManager.cpp delete mode 100644 DAnCE/dance/RepositoryManager/RepositoryManager.mpc delete mode 100644 DAnCE/dance/RepositoryManager/RepositoryManagerDaemon.idl delete mode 100644 DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp delete mode 100644 DAnCE/dance/RepositoryManager/RepositoryManager_Impl.h delete mode 100644 DAnCE/dance/RepositoryManager/Repository_Manager.cpp delete mode 100644 DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp delete mode 100644 DAnCE/dance/RepositoryManager/Repository_Manager_Module.h delete mode 100644 DAnCE/dance/RepositoryManager/URL_Parser.cpp delete mode 100644 DAnCE/dance/RepositoryManager/URL_Parser.h delete mode 100644 DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp delete mode 100644 DAnCE/dance/RepositoryManager/ZIP_Wrapper.h delete mode 100644 DAnCE/dance/RepositoryManager/repository_manager_admin.cpp delete mode 100644 DAnCE/dance/RepositoryManager/repository_manager_admin.h delete mode 100644 DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp delete mode 100644 DAnCE/dance/TargetManager/.gitignore delete mode 100644 DAnCE/dance/TargetManager/DomainDataManager.cpp delete mode 100644 DAnCE/dance/TargetManager/DomainDataManager.h delete mode 100644 DAnCE/dance/TargetManager/ResourceCommitmentManager.cpp delete mode 100644 DAnCE/dance/TargetManager/ResourceCommitmentManager.h delete mode 100644 DAnCE/dance/TargetManager/TargetManager.mpc delete mode 100644 DAnCE/dance/TargetManager/TargetManager_Impl.cpp delete mode 100644 DAnCE/dance/TargetManager/TargetManager_Impl.h delete mode 100644 DAnCE/dance/TargetManager/Target_Manager.cpp delete mode 100644 DAnCE/dance/TargetManager/Target_Manager_Module.cpp delete mode 100644 DAnCE/dance/TargetManager/Target_Manager_Module.h delete mode 100644 DAnCE/dance/Version.h delete mode 100644 DAnCE/docs/DAnCE_Logging.txt delete mode 100644 DAnCE/docs/Error_Documentation/Checked.png delete mode 100644 DAnCE/docs/Error_Documentation/Collapsed.png delete mode 100644 DAnCE/docs/Error_Documentation/Expanded.png delete mode 100644 DAnCE/docs/Error_Documentation/LeafRowHandle.png delete mode 100644 DAnCE/docs/Error_Documentation/Mixed.png delete mode 100644 DAnCE/docs/Error_Documentation/Unchecked.png delete mode 100644 DAnCE/docs/Error_Documentation/blank.png delete mode 100644 DAnCE/docs/Error_Documentation/index.html delete mode 100644 DAnCE/docs/Error_Documentation/outliner.js delete mode 100644 DAnCE/docs/LocalityManager-Plugins.txt delete mode 100644 DAnCE/docs/OMG-DnC-Tutorial.ppt delete mode 100644 DAnCE/docs/releasenotes/dance.html delete mode 100644 DAnCE/docs/releasenotes/index.html delete mode 100644 DAnCE/docs/schema/06-04-02.xsd delete mode 100644 DAnCE/docs/schema/Basic_Deployment_Data.xsd delete mode 100644 DAnCE/docs/schema/Deployment.xsd delete mode 100644 DAnCE/docs/schema/README.html delete mode 100644 DAnCE/docs/schema/Spec_Defined_Deployment.xsd delete mode 100644 DAnCE/docs/schema/Spec_Defined_XMI.xsd delete mode 100644 DAnCE/docs/schema/XMI.xsd delete mode 100644 DAnCE/docs/schema/ccd.xsd delete mode 100644 DAnCE/docs/schema/cdd.xsd delete mode 100644 DAnCE/docs/schema/cdp.xsd delete mode 100644 DAnCE/docs/schema/cid.xsd delete mode 100644 DAnCE/docs/schema/cpd.xsd delete mode 100644 DAnCE/docs/schema/iad.xsd delete mode 100644 DAnCE/docs/schema/pcd.xsd delete mode 100644 DAnCE/docs/schema/toplevel.xsd delete mode 100644 DAnCE/docs/schema/unused_06-04-02.xsd delete mode 100644 DAnCE/docs/schema/unused_elements.xsd delete mode 100644 DAnCE/docs/schema/xsc-banner.cpp delete mode 100644 DAnCE/docs/schema/xsc-banner.h delete mode 100644 DAnCE/docs/sources/Error_Documentation.oo3/contents.bin delete mode 100644 DAnCE/docs/sources/LocalityManager.graffle delete mode 100644 DAnCE/docs/sources/dance-deployment.odg delete mode 100644 DAnCE/etc/DAnCE.doxygen delete mode 100644 DAnCE/lib/.empty delete mode 100644 DAnCE/rules.dance.GNU delete mode 100755 DAnCE/tests/Bug_3832_Regression/run_test.pl delete mode 100644 DAnCE/tests/Config_Handlers/Config_Handlers.mpc delete mode 100644 DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl delete mode 100644 DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp delete mode 100644 DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc delete mode 100644 DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc delete mode 100644 DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp delete mode 100644 DAnCE/tests/Config_Handlers/test.cdp delete mode 100644 DAnCE/tests/Config_Handlers/test.cpp delete mode 100644 DAnCE/tests/DeploymentPlanDump/.gitignore delete mode 100644 DAnCE/tests/DeploymentPlanDump/CcmDance2-host1.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/CcmDance2-host2.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/CcmDance2.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/CcmDance4-host1.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/CcmDance4-host2.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc delete mode 100644 DAnCE/tests/DeploymentPlanDump/NewCcmDance1.cdp delete mode 100644 DAnCE/tests/DeploymentPlanDump/test.cpp delete mode 100644 DAnCE/tests/DeploymentPlanTestReferences/.gitignore delete mode 100644 DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc delete mode 100644 DAnCE/tests/DeploymentPlanTestReferences/test.cpp delete mode 100644 DAnCE/tests/DeploymentTest1/.gitignore delete mode 100644 DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc delete mode 100644 DAnCE/tests/DeploymentTest1/test.cpp delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/CircularDependency.mpc delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Circular_Dependency_export.h delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Deployment.cdp delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Handler_A.cpp delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Handler_A.h delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Handler_B.cpp delete mode 100644 DAnCE/tests/LocalityManager/CircularDependency/Handler_B.h delete mode 100755 DAnCE/tests/LocalityManager/CircularDependency/run_test.pl delete mode 100644 DAnCE/tests/LocalityManager/ExplicitExec/Deployment.cdp delete mode 100644 DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc delete mode 100755 DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl delete mode 100644 DAnCE/tests/LocalityManager/ProcessName/Deployment.cdp delete mode 100755 DAnCE/tests/LocalityManager/ProcessName/run_test.pl delete mode 100644 DAnCE/tests/LocalityManager/SpawnMultiple/Deployment.cdp delete mode 100755 DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl delete mode 100644 DAnCE/tests/LocalityManager/SpawnOne/Deployment.cdp delete mode 100755 DAnCE/tests/LocalityManager/SpawnOne/run_test.pl delete mode 100644 DAnCE/tests/NameServiceTest/.gitignore delete mode 100644 DAnCE/tests/NameServiceTest/Dummy.idl delete mode 100644 DAnCE/tests/NameServiceTest/DummyImpl.cpp delete mode 100644 DAnCE/tests/NameServiceTest/DummyImpl.h delete mode 100644 DAnCE/tests/NameServiceTest/NameServiceTest.mpc delete mode 100644 DAnCE/tests/NameServiceTest/RegistrationPath.h delete mode 100644 DAnCE/tests/NameServiceTest/clt_main.cpp delete mode 100755 DAnCE/tests/NameServiceTest/run_test.pl delete mode 100644 DAnCE/tests/NameServiceTest/srv_main.cpp delete mode 100644 DAnCE/tests/NodeApplicationManager-NodeApplication/.gitignore delete mode 100644 DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc delete mode 100644 DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp delete mode 100644 DAnCE/tests/NodeManager-NodeApplicationManager/.gitignore delete mode 100644 DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc delete mode 100644 DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp delete mode 100644 DAnCE/tests/Parsing/ArtGallery3Nodes.cdd delete mode 100644 DAnCE/tests/Parsing/InvalidConfigPropValueDeclaration.cdp delete mode 100644 DAnCE/tests/Parsing/InvalidConnection.cdp delete mode 100644 DAnCE/tests/Parsing/InvalidDatatypeValue.cdp delete mode 100644 DAnCE/tests/Parsing/InvalidElement.cdp delete mode 100644 DAnCE/tests/Parsing/InvalidReference.cdp delete mode 100644 DAnCE/tests/Parsing/Parsing.mpc delete mode 100644 DAnCE/tests/Parsing/domain.cpp delete mode 100755 DAnCE/tests/Parsing/run_test.pl delete mode 100644 DAnCE/tests/Parsing/test.cpp delete mode 100644 DAnCE/tests/Plan_Launcher/EM-Delay/Deployment.cdp delete mode 100755 DAnCE/tests/Plan_Launcher/EM-Delay/run_test.pl delete mode 100755 DAnCE/tests/Plan_Launcher/EM-Delay/run_test_ns.pl delete mode 100644 DAnCE/tests/Plan_Launcher/NM-Delay/Deployment.cdp delete mode 100755 DAnCE/tests/Plan_Launcher/NM-Delay/NodeMap.cdd delete mode 100755 DAnCE/tests/Plan_Launcher/NM-Delay/run_test.pl delete mode 100755 DAnCE/tests/Plan_Launcher/NM-Delay/run_test_ns.pl delete mode 100644 DAnCE/tests/TargetManager/CmpClient.cpp delete mode 100644 DAnCE/tests/TargetManager/TM_Client.mpc delete mode 100755 DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl delete mode 100644 DAnCE/tests/scripts/BasicSP/basicsp.dat delete mode 100644 DAnCE/tools/Artifact_Installation/.gitignore delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl delete mode 100644 DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h delete mode 100644 DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl delete mode 100644 DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.inl delete mode 100644 DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h delete mode 100644 DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/File_Installation_Handler.h delete mode 100644 DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h delete mode 100644 DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h delete mode 100644 DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp delete mode 100644 DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h delete mode 100644 DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h delete mode 100644 DAnCE/tools/Completion/CompletionHandler_T.h delete mode 100644 DAnCE/tools/Completion/Completion_Counter_Base.cpp delete mode 100644 DAnCE/tools/Completion/Completion_Counter_Base.h delete mode 100644 DAnCE/tools/Completion/Completion_Counter_Base.inl delete mode 100644 DAnCE/tools/Config_Handlers/ADD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ADD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Any_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Any_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp delete mode 100644 DAnCE/tools/Config_Handlers/CCD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/CCD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/CEPE_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/CEPE_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/CPD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/CPD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/CRDD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/CRDD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Common.h delete mode 100644 DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Config_Handlers.mpc delete mode 100644 DAnCE/tools/Config_Handlers/Config_Handlers_Common_Export.h delete mode 100644 DAnCE/tools/Config_Handlers/Config_Handlers_Export.h delete mode 100644 DAnCE/tools/Config_Handlers/DD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DP_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DP_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DP_PCD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DP_PCD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DataType_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DataType_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Deployment.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Deployment.hpp delete mode 100644 DAnCE/tools/Config_Handlers/DnC_Dump.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DnC_Dump.h delete mode 100644 DAnCE/tools/Config_Handlers/DnC_Dump_T.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DnC_Dump_T.h delete mode 100644 DAnCE/tools/Config_Handlers/Dump_Obj.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Dump_Obj.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynString_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/ERE_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ERE_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/ESD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ESD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/IDD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/IDD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/IDREF_Base.cpp delete mode 100644 DAnCE/tools/Config_Handlers/IDREF_Base.h delete mode 100644 DAnCE/tools/Config_Handlers/ID_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ID_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/IRDD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/IRDD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/MDD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/MDD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/PCD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/PCD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/PL_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/PL_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/PSPE_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/PSPE_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CAD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CID_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/CPD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/IAD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/NIA_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/PCD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/PC_Intf.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Package_Handlers/SID_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Property_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Property_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/RDD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/RDD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Req_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/Req_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/STD_CID_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/STD_CID_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/STD_CPD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/STD_CPD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/STD_IAD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/STD_IAD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/STD_PCD_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/STD_PCD_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/STD_PC_Intf.cpp delete mode 100644 DAnCE/tools/Config_Handlers/STD_PC_Intf.h delete mode 100644 DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp delete mode 100644 DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.h delete mode 100644 DAnCE/tools/Config_Handlers/Utils/Exceptions.h delete mode 100644 DAnCE/tools/Config_Handlers/Utils/Functors.h delete mode 100644 DAnCE/tools/Config_Handlers/XMI.cpp delete mode 100644 DAnCE/tools/Config_Handlers/XMI.hpp delete mode 100644 DAnCE/tools/Config_Handlers/XML_File_Intf.cpp delete mode 100644 DAnCE/tools/Config_Handlers/XML_File_Intf.h delete mode 100644 DAnCE/tools/Config_Handlers/XSC_XML_Handlers_Export.h delete mode 100644 DAnCE/tools/Config_Handlers/ccd.cpp delete mode 100644 DAnCE/tools/Config_Handlers/ccd.hpp delete mode 100644 DAnCE/tools/Config_Handlers/cdd.cpp delete mode 100644 DAnCE/tools/Config_Handlers/cdd.hpp delete mode 100644 DAnCE/tools/Config_Handlers/cdp.cpp delete mode 100644 DAnCE/tools/Config_Handlers/cdp.hpp delete mode 100644 DAnCE/tools/Config_Handlers/cid.cpp delete mode 100644 DAnCE/tools/Config_Handlers/cid.hpp delete mode 100644 DAnCE/tools/Config_Handlers/cpd.cpp delete mode 100644 DAnCE/tools/Config_Handlers/cpd.hpp delete mode 100644 DAnCE/tools/Config_Handlers/iad.cpp delete mode 100644 DAnCE/tools/Config_Handlers/iad.hpp delete mode 100644 DAnCE/tools/Config_Handlers/pcd.cpp delete mode 100644 DAnCE/tools/Config_Handlers/pcd.hpp delete mode 100644 DAnCE/tools/Config_Handlers/toplevel.cpp delete mode 100644 DAnCE/tools/Config_Handlers/toplevel.hpp delete mode 100644 DAnCE/tools/Convert_Plan/.gitignore delete mode 100644 DAnCE/tools/Convert_Plan/Convert_Plan.cpp delete mode 100644 DAnCE/tools/Convert_Plan/Convert_Plan.mpc delete mode 100644 DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp delete mode 100644 DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h delete mode 100644 DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h delete mode 100644 DAnCE/tools/Domain_Validator/.gitignore delete mode 100644 DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc delete mode 100644 DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h delete mode 100644 DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp delete mode 100644 DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h delete mode 100644 DAnCE/tools/Domain_Validator/Domain_Validator.idl delete mode 100644 DAnCE/tools/Domain_Validator/Domain_Validator.mpc delete mode 100644 DAnCE/tools/Logger_Backend/ndds/DAnCE_NDDS_Log_Export.h delete mode 100644 DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp delete mode 100644 DAnCE/tools/Logger_Backend/ndds/Log_Backend.h delete mode 100644 DAnCE/tools/Logger_Backend/ndds/Log_Record.idl delete mode 100644 DAnCE/tools/Logger_Backend/ndds/Log_Server.cpp delete mode 100644 DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc delete mode 100644 DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml delete mode 100644 DAnCE/tools/Logger_Backend/ndds/svc.conf delete mode 100644 DAnCE/tools/Split_Plan/.gitignore delete mode 100644 DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h delete mode 100644 DAnCE/tools/Split_Plan/Locality_Splitter.cpp delete mode 100644 DAnCE/tools/Split_Plan/Locality_Splitter.h delete mode 100644 DAnCE/tools/Split_Plan/Node_Splitter.cpp delete mode 100644 DAnCE/tools/Split_Plan/Node_Splitter.h delete mode 100644 DAnCE/tools/Split_Plan/Split_Plan.cpp delete mode 100644 DAnCE/tools/Split_Plan/Split_Plan.h delete mode 100644 DAnCE/tools/Split_Plan/Split_Plan.mpc delete mode 100644 DAnCE/tools/Split_Plan/Split_Plan_exec.cpp delete mode 100644 DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp delete mode 100644 DAnCE/tools/Split_Plan/Sub_UUID_Generator.h delete mode 100644 DAnCE/tools/System_Health/.gitignore delete mode 100644 DAnCE/tools/System_Health/Daemon/.gitignore delete mode 100644 DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp delete mode 100644 DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl delete mode 100644 DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc delete mode 100644 DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp delete mode 100644 DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h delete mode 100644 DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h delete mode 100644 DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc delete mode 100644 DAnCE/tools/System_Health/Interceptors/SHS_Transport.h delete mode 100644 DAnCE/tools/System_Health/SHS_DataModel.idl delete mode 100644 DAnCE/tools/System_Health/System_Health.mpc diff --git a/CIAO/CIAO-INSTALL.html b/CIAO/CIAO-INSTALL.html deleted file mode 100644 index 518cbd9da73..00000000000 --- a/CIAO/CIAO-INSTALL.html +++ /dev/null @@ -1,137 +0,0 @@ - - Building and Installing CIAO - - -
-

Building and Installing CIAO

-

The first thing you should do to install CIAO is to set the environment - variable CIAO_ROOT to - be $TAO_ROOT/CIAO, or whereever you have installed - the CIAO sources. The DANCE_ROOT environment - variable should also be set to $TAO_ROOT/DAnCE, or - wherever you have installed the DAnCE sources. Please refer - to the ACE installation notes, - TAO installation notes, and the DAnCE installation - notes for instructions on setting $ACE_ROOT, - $TAO_ROOT, and $DANCE_ROOT respectively. They are needed since CIAO sits on - top of ACE+TAO+DAnCE. Compiling ACE+TAO+DAnCE successfully is the first requirement - for compiling CIAO. -

-

CIAO is divided into several parts, so different installation/building rules - apply to different parts of CIAO.
-
-

-
    -
  1. - CIAO core/examples: This part of CIAO include following directories: $CIAO_ROOT/ccm, $CIAO_ROOT/ciao, - $CIAO_ROOT/examples.
    2. -
-
-

Supported Platforms for CIAO

-

CIAO should be usable on most platforms that TAO+DAnCE runs on. Please see - TAO+DAnCE installation pages for details -

-

If you have porting questions or - have a problem compiling DAnCE or CIAO with TAO and ACE on the platforms shown above - please send email to either ACE Newsgroup or - the CIAO mailing list and we'll - try to help you fix the problems. You can also submit bug reports and - enhancement requests in our bug tracking - system. -

-

CIAO can be obtained electronically - via the WWW and ftp. CIAO is - bundled with the ACE and TAO release. You'll always need the most recent - version of ACE and TAO because CIAO tracks changes to ACE and TAO very closely. -

-
-

Install CIAO core/tools/examples

-

Most of the GNUmakefiles/project files/solution files required to build CIAO - are available in the release. If you don't like the configurations used, please - feel free to regenerate them using MPC. Please see this file - for more details. -

-

To build CIAO core/tools/examples: -

-
    -
  1. - Make sure ACE, TAO, and DAnCE are built. -
  2. - Make sure all ACE/TAO/DAnCE/etc. generated libs are in $ACE_ROOT/lib. To - build CIAO you will need: -
      -
    • - ACE -
    • - TAO -
    • - TAO_IDL -
    • - IORTable -
    • - Valuetype -
    • - Security -
    • - ACEXML -
      • -
    • - DAnCE -
      • -
    -
  3. - Generate the Makefile/Solution/Project files and build -

    For the supported build tools please see - MPC manual. -

    -

    On Linux: do $ACE_ROOT/bin/mwc.pl -type gnuace at the - locations specified above then make. -

    -

    On Windows/VC8: do %ACE_ROOT%/bin/mwc.pl -type vc8 - at the locations specified above then Open the solution file and build. -

    -

    Note: You can run mwc.pl at $CIAO_ROOT. - After running the command - with proper augment once then you - can do make at $CIAO_ROOT (Linux) or open the - workspace/solution file at $CIAO_ROOT (Windows) to build. -

    -
    4. -
- Building CIAO quickly : You can build CIAO quickly by doing - the following: - -
-

Connectors

-

See this tutorial for more information - on connectors. -

-

See DDS4CCM-INSTALL - for more information on how to build and install the DDS4CCM connector. -

-
-

Android

-

See this documentation for more information on how to set up a CIAO android port. -

-
-

Back to the CIAO home - page.

- - - diff --git a/CIAO/CIAO.mwc b/CIAO/CIAO.mwc deleted file mode 100644 index 70537148ebc..00000000000 --- a/CIAO/CIAO.mwc +++ /dev/null @@ -1,3 +0,0 @@ -// -*- MPC -*- -workspace { -} diff --git a/CIAO/CIAO_DAnCE.mwc b/CIAO/CIAO_DAnCE.mwc deleted file mode 100644 index 63fb07b277d..00000000000 --- a/CIAO/CIAO_DAnCE.mwc +++ /dev/null @@ -1,13 +0,0 @@ -workspace { - ccm - ciao - tools - connectors/ami4ccm/ami4ccm - connectors/dds4ccm/idl - connectors/dds4ccm/impl - - $(DANCE_ROOT) - exclude { - $(DANCE_ROOT)/tests - } -} diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc deleted file mode 100644 index 1d8a8f4a319..00000000000 --- a/CIAO/CIAO_TAO.mwc +++ /dev/null @@ -1,29 +0,0 @@ -// -*- MPC -*- -workspace { - $(ACE_ROOT)/ace - $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/apps/JAWS/server - $(ACE_ROOT)/protocols/ace/INet - $(ACE_ROOT)/contrib/minizip - $(TAO_ROOT)/tao - $(TAO_ROOT)/TAO_IDL - $(TAO_ROOT)/utils - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc - $(TAO_ROOT)/orbsvcs/Naming_Service - $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - ccm - ciao - $(DANCE_ROOT) - tools - connectors - tests - examples - performance-tests - tutorials - exclude { - $(TAO_ROOT)/utils/nsgroup - } - -} diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc deleted file mode 100644 index 5c5f9a67316..00000000000 --- a/CIAO/CIAO_TAO_DAnCE.mwc +++ /dev/null @@ -1,23 +0,0 @@ -// -*- MPC -*- -workspace { - $(ACE_ROOT)/ace - $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/apps/JAWS/server - $(ACE_ROOT)/protocols/ace/INet - $(ACE_ROOT)/contrib/minizip - $(TAO_ROOT)/TAO_IDL - $(TAO_ROOT)/tao - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc - $(TAO_ROOT)/orbsvcs/Naming_Service - $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - ccm - ciao - tools - $(DANCE_ROOT)/dance - $(DANCE_ROOT)/tools - connectors/ami4ccm/ami4ccm - connectors/dds4ccm/idl - connectors/dds4ccm/impl -} diff --git a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc b/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc deleted file mode 100644 index 31289bdf92b..00000000000 --- a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc +++ /dev/null @@ -1,24 +0,0 @@ -// -*- MPC -*- -workspace { - $(ACE_ROOT)/ace - $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/apps/JAWS/server - $(ACE_ROOT)/protocols/ace/INet - $(ACE_ROOT)/contrib/minizip - $(TAO_ROOT)/TAO_IDL - $(TAO_ROOT)/tao - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc - $(TAO_ROOT)/orbsvcs/Naming_Service - $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - ccm - ciao - tools - $(DANCE_ROOT)/dance - $(DANCE_ROOT)/tools - connectors/ami4ccm/ami4ccm - connectors/dds4ccm/idl - connectors/dds4ccm/impl - $(DDS_ROOT)/DDS_TAOv2.mwc -} diff --git a/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc b/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc deleted file mode 100644 index 74bf4978986..00000000000 --- a/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc +++ /dev/null @@ -1,45 +0,0 @@ -// -*- MPC -*- -workspace { - $(ACE_ROOT)/ace - $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/protocols/ace/INet - $(TAO_ROOT)/TAO_IDL - $(TAO_ROOT)/tao - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc - $(TAO_ROOT)/orbsvcs/Naming_Service - $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - ccm - ciao - $(DANCE_ROOT)/dance - $(DANCE_ROOT)/tools - connectors/dds4ccm/idl - connectors/dds4ccm/impl - $(DDS_ROOT)/DDS_TAOv2.mwc - $(DDS_ROOT)/examples/DCPS/ishapes - connectors/dds4ccm/examples/Shapes - exclude { - $(DANCE_ROOT)/dance/TargetManager - $(DANCE_ROOT)/dance/RepositoryManager - $(DANCE_ROOT)/tools/System_Health - $(DANCE_ROOT)/tools/Logger_Backend - $(ACE_ROOT)/ace/Compression - $(ACE_ROOT)/ace/ETCL - $(ACE_ROOT)/ace/Monitor_Control - $(ACE_ROOT)/ace/SSL - $(TAO_ROOT)/tao/CSD_Framework - $(TAO_ROOT)/tao/CSD_ThreadPool - $(TAO_ROOT)/tao/Compression - $(TAO_ROOT)/tao/Dynamic_TP - $(TAO_ROOT)/tao/ETCL - $(TAO_ROOT)/tao/TransportCurrent - $(TAO_ROOT)/tao/ZIOP - $(TAO_ROOT)/tao/SmartProxies - $(TAO_ROOT)/tao/RTCORBA - $(TAO_ROOT)/tao/RTPortableServer - $(TAO_ROOT)/tao/RTScheduling - $(TAO_ROOT)/tao/Monitor - - } -} diff --git a/CIAO/CIAO_TAO_OpenDDS.mwc b/CIAO/CIAO_TAO_OpenDDS.mwc deleted file mode 100644 index 6c4c0e3948d..00000000000 --- a/CIAO/CIAO_TAO_OpenDDS.mwc +++ /dev/null @@ -1,30 +0,0 @@ -// -*- MPC -*- -workspace { - $(ACE_ROOT)/ace - $(ACE_ROOT)/apps/gperf/src - $(ACE_ROOT)/apps/JAWS/server - $(ACE_ROOT)/protocols/ace/INet - $(ACE_ROOT)/contrib/minizip - $(TAO_ROOT)/tao - $(TAO_ROOT)/TAO_IDL - $(TAO_ROOT)/utils - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc - $(TAO_ROOT)/orbsvcs/Naming_Service - $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - ccm - ciao - $(DANCE_ROOT) - tools - connectors - tests - examples - performance-tests - tutorials - $(DDS_ROOT)/DDS_TAOv2.mwc - exclude { - $(TAO_ROOT)/utils/nsgroup - } - -} diff --git a/CIAO/COPYING b/CIAO/COPYING deleted file mode 100644 index f0e103fa12c..00000000000 --- a/CIAO/COPYING +++ /dev/null @@ -1,111 +0,0 @@ - - _________________________________________________________________ - - Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), - DAnCE(TM), and CoSMIC(TM) - - [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM) - (henceforth referred to as "DOC software") are copyrighted by - [5]Douglas C. Schmidt and his [6]research group at [7]Washington - University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2016, all rights reserved. Since DOC - software is open-source, freely available software, you are free to - use, modify, copy, and distribute--perpetually and irrevocably--the - DOC software source code and object code produced from the source, as - well as copy and distribute modified versions of this software. You - must, however, include this copyright statement along with any code - built using DOC software that you release. No copyright statement - needs to be provided if you just ship binary executables of your - software products. - - You can use DOC software in commercial and/or binary software releases - and are under no obligation to redistribute any of your source code - that is built using DOC software. Note, however, that you may not - misappropriate the DOC software code, such as copyrighting it yourself - or claiming authorship of the DOC software code, in a way that will - prevent DOC software from being distributed freely using an - open-source development model. You needn't inform anyone that you're - using DOC software in your software, though we encourage you to let - [10]us know so we can promote your project in the [11]DOC software - success stories. - - The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites - are maintained by the [17]DOC Group at the [18]Institute for Software - Integrated Systems (ISIS) and the [19]Center for Distributed Object - Computing of Washington University, St. Louis for the development of - open-source software as part of the open-source software community. - Submissions are provided by the submitter ``as is'' with no warranties - whatsoever, including any warranty of merchantability, noninfringement - of third party intellectual property, or fitness for any particular - purpose. In no event shall the submitter be liable for any direct, - indirect, special, exemplary, punitive, or consequential damages, - including without limitation, lost profits, even if advised of the - possibility of such damages. Likewise, DOC software is provided as is - with no warranties of any kind, including the warranties of design, - merchantability, and fitness for a particular purpose, - noninfringement, or arising from a course of dealing, usage or trade - practice. Washington University, UC Irvine, Vanderbilt University, - their employees, and students shall have no liability with respect to - the infringement of copyrights, trade secrets or any patents by DOC - software or any part thereof. Moreover, in no event will Washington - University, UC Irvine, or Vanderbilt University, their employees, or - students be liable for any lost revenue or profits or other special, - indirect and consequential damages. - - DOC software is provided with no support and without any obligation on - the part of Washington University, UC Irvine, Vanderbilt University, - their employees, or students to assist in its use, correction, - modification, or enhancement. A [20]number of companies around the - world provide commercial support for DOC software, however. DOC - software is Y2K-compliant, as long as the underlying OS platform is - Y2K-compliant. Likewise, DOC software is compliant with the new US - daylight savings rule passed by Congress as "The Energy Policy Act of - 2005," which established new daylight savings times (DST) rules for - the United States that expand DST as of March 2007. Since DOC software - obtains time/date and calendaring information from operating systems - users will not be affected by the new DST rules as long as they - upgrade their operating systems accordingly. - - The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM), - Washington University, UC Irvine, and Vanderbilt University, may not - be used to endorse or promote products or services derived from this - source without express written permission from Washington University, - UC Irvine, or Vanderbilt University. This license grants no permission - to call products or services derived from this source ACE(TM), - TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant - permission for the name Washington University, UC Irvine, or - Vanderbilt University to appear in their names. - - If you have any suggestions, additions, comments, or questions, please - let [21]me know. - - [22]Douglas C. Schmidt - _________________________________________________________________ - - Back to the [23]ACE home page. - -References - - 1. http://www.cs.wustl.edu/~schmidt/ACE.html - 2. http://www.cs.wustl.edu/~schmidt/TAO.html - 3. http://www.dre.vanderbilt.edu/CIAO/ - 4. http://www.dre.vanderbilt.edu/cosmic/ - 5. http://www.dre.vanderbilt.edu/~schmidt/ - 6. http://www.cs.wustl.edu/~schmidt/ACE-members.html - 7. http://www.wustl.edu/ - 8. http://www.uci.edu/ - 9. http://www.vanderbilt.edu/ - 10. mailto:doc_group@cs.wustl.edu - 11. http://www.cs.wustl.edu/~schmidt/ACE-users.html - 12. http://www.cs.wustl.edu/~schmidt/ACE.html - 13. http://www.cs.wustl.edu/~schmidt/TAO.html - 14. http://www.dre.vanderbilt.edu/CIAO/ - 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/ - 16. http://www.dre.vanderbilt.edu/cosmic/ - 17. http://www.dre.vanderbilt.edu/ - 18. http://www.isis.vanderbilt.edu/ - 19. http://www.cs.wustl.edu/~schmidt/doc-center.html - 20. http://www.cs.wustl.edu/~schmidt/commercial-support.html - 21. mailto:d.schmidt@vanderbilt.edu - 22. http://www.dre.vanderbilt.edu/~schmidt/ - 23. http://www.cs.wustl.edu/ACE.html diff --git a/CIAO/ChangeLogs/CIAO-1_3_1 b/CIAO/ChangeLogs/CIAO-1_3_1 deleted file mode 100644 index 1bbee95d21b..00000000000 --- a/CIAO/ChangeLogs/CIAO-1_3_1 +++ /dev/null @@ -1,612 +0,0 @@ -commit 39668e74d887084a2295d7cf3d445e7c42d7704e -Author: Johnny Willemsen -Date: Thu Dec 11 14:26:56 2014 +0100 - - Catch exceptions as const - * CIAO/ciao/Containers/Container_Base_T.cpp: - * CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp: - * CIAO/ciao/Deployment/Handlers/Home_Handler.cpp: - * CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp: - * CIAO/performance-tests/Protocols/Controller/Controller.cpp: - * CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp: - * CIAO/tests/DAnCE/Components/Progressive_exec.cpp: - * CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp: - * CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp: - * CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp: - * DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp: - * DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/dance/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/dance/TargetManager/DomainDataManager.cpp: - * DAnCE/dance/TargetManager/Target_Manager_Module.cpp: - * DAnCE/tests/TargetManager/CmpClient.cpp: - * DAnCE/tools/Config_Handlers/Any_Handler.cpp: - * DAnCE/tools/Config_Handlers/XML_File_Intf.cpp: - * DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: - * TAO/docs/tutorials/Quoter/AMI/client.cpp: - * TAO/docs/tutorials/Quoter/AMI/server.cpp: - * TAO/docs/tutorials/Quoter/Event_Service/client.cpp: - * TAO/docs/tutorials/Quoter/Event_Service/server.cpp: - * TAO/docs/tutorials/Quoter/Naming_Service/client.cpp: - * TAO/docs/tutorials/Quoter/Naming_Service/server.cpp: - * TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp: - * TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp: - * TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html: - * TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp: - * TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp: - * TAO/docs/tutorials/Quoter/Simple/Client/client.cpp: - * TAO/docs/tutorials/Quoter/Simple/Client/index.html: - * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp: - * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp: - * TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp: - * TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp: - * TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp: - * TAO/docs/tutorials/Quoter/Simple/Server/index.html: - * TAO/docs/tutorials/Quoter/Simple/Server/server.cpp: - * TAO/examples/Borland/ChatClient.cpp: - * TAO/examples/Borland/ChatClientWnd.cpp: - * TAO/examples/Borland/ORBThread.cpp: - * TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp: - * TAO/orbsvcs/IFR_Service/be_produce.cpp: - * TAO/orbsvcs/Notify_Service/Notify_Service.cpp: - * TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp: - * TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp: - * TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp: - * TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp: - * TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp: - * TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp: - * TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp: - * TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp: - * TAO/orbsvcs/examples/ORT/Gateway_i.cpp: - * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: - * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: - * TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp: - * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: - * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp: - * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp: - * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp: - * TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp: - * TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp: - * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp: - * TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: - * TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp: - * TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp: - * TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp: - * TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp: - * TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: - * TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp: - * TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp: - * TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp: - * TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: - * TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp: - * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp: - * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp: - * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: - * TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp: - * TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp: - * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp: - * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp: - * TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp: - * TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp: - * TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: - * TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp: - * TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp: - * TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: - * TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp: - * TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp: - * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h: - * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp: - * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp: - * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp: - * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h: - * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp: - * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp: - * TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp: - * TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp: - * TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp: - * TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp: - * TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp: - * TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp: - * TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp: - * TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp: - * TAO/tao/IORTable/Async_IOR_Table_Impl.cpp: - * TAO/tests/Bug_2241_Regression/Client_Task.cpp: - * TAO/tests/Bug_2345_Regression/server.cpp: - * TAO/tests/Bug_2494_Regression/client.cpp: - * TAO/tests/Bug_2494_Regression/server.cpp: - * TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp: - * TAO/tests/Bug_2560_Regression/client.cpp: - * TAO/tests/Bug_2560_Regression/server.cpp: - * TAO/tests/Bug_2654_Regression/client.cpp: - * TAO/tests/Bug_2683_Regression/client.cpp: - * TAO/tests/Bug_2683_Regression/server.cpp: - * TAO/tests/Bug_2809_Regression/server.cpp: - * TAO/tests/Bug_3068_Regression/client.cpp: - * TAO/tests/Bug_3068_Regression/server.cpp: - * TAO/tests/Bug_3068_Regression/test_i.cpp: - * TAO/tests/Bug_3276_Regression/client.cpp: - * TAO/tests/Bug_3531_Regression/client.cpp: - * TAO/tests/Bug_3531_Regression/server.cpp: - * TAO/tests/Bug_3531b_Regression/server.cpp: - * TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp: - * TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp: - * TAO/tests/Bug_3755_Ext_Regression/common.cpp: - * TAO/tests/Bug_3755_Regression/server.cpp: - * TAO/tests/Bug_3826_Regression/server.cpp: - * TAO/tests/Bug_933_Regression/Messenger_i.cpp: - * TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp: - * TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp: - * TAO/tests/CollocationLockup/CollocationLockup.cpp: - * TAO/tests/CollocationLockup/SimpleNamingService.cpp: - * TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp: - * TAO/tests/DII_AMI_Forward/client.cpp: - * TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp: - * TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp: - * TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp: - * TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp: - * TAO/tests/MT_NoUpcall_Connect/client.cpp: - * TAO/tests/Native_Exceptions/client.cpp: - * TAO/tests/Native_Exceptions/server.cpp: - * TAO/tests/Oneway_Send_Timeouts/Client.cpp: - * TAO/tests/Oneway_Timeouts/client.cpp: - * TAO/tests/Oneway_Timeouts/server.cpp: - * TAO/tests/POA/EndpointPolicy/server.cpp: - * TAO/tests/POA/Persistent_ID/client.cpp: - * TAO/tests/Param_Test/except.cpp: - * TAO/tests/Storable/test.cpp: - * TAO/tests/UNKNOWN_Exception/client.cpp: - * TAO/utils/monitor/monitor_client.cpp: - -commit 132154fa12b98a56009b813262733a7f92e3a4d9 -Author: Johnny Willemsen -Date: Tue Dec 9 13:13:14 2014 +0100 - - Mention move to github and the fact that the ChangeLog is now generated as part of the release process - * ACE/NEWS: - * CIAO/NEWS: - * DAnCE/NEWS: - * TAO/NEWS: - -commit 6e85b2d8191f7ee294bd663ad3e93fb5ce5d0026 -Author: Johnny Willemsen -Date: Sun Dec 7 15:32:35 2014 +0100 - - Updated links to point to http://www.dre.vanderbilt.edu/~schmidt/TAO.html - * CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp: - * CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h: - * CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp: - * CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h: - * CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: - * CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp: - * CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h: - * CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp: - * CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h: - * CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp: - * CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h: - * CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h: - * CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h: - * CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h: - * CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp: - * CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * CIAO/examples/Hello/Sender/Hello_Sender_exec.cpp: - * CIAO/examples/Hello/Sender/Hello_Sender_exec.h: - * CIAO/examples/Hello_Event/Receiver/Receiver_exec.cpp: - * CIAO/examples/Hello_Event/Receiver/Receiver_exec.h: - * CIAO/examples/Hello_Event/Sender/Sender_exec.cpp: - * CIAO/examples/Hello_Event/Sender/Sender_exec.h: - * CIAO/examples/Hello_Event/step-by-step.html: - * CIAO/tests/Bug_3834_Regression/CompA_exec.cpp: - * CIAO/tests/Bug_3834_Regression/CompA_exec.h: - * CIAO/tests/Bug_3834_Regression/CompB_exec.cpp: - * CIAO/tests/Bug_3834_Regression/CompB_exec.h: - * CIAO/tests/CIF/Component/CIF_Component_exec.cpp: - * CIAO/tests/CIF/Component/CIF_Component_exec.h: - * CIAO/tests/Collocation/Receiver/Receiver_exec.cpp: - * CIAO/tests/Collocation/Sender/Sender_exec.h: - * CIAO/tests/DAnCE/Components/ProcessColocation_exec.h: - * CIAO/tests/DAnCE/Components/Progressive_exec.cpp: - * CIAO/tests/DAnCE/Components/Progressive_exec.h: - * CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp: - * CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h: - * CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - * CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h: - * CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp: - * CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h: - * CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp: - * CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h: - * CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp: - * CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h: - * CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp: - * CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h: - * CIAO/tests/DAnCE/Threading/Component1/Component1_exec.cpp: - * CIAO/tests/DAnCE/Threading/Component1/Component1_exec.h: - * CIAO/tests/DAnCE/Threading/Component2/Component2_exec.cpp: - * CIAO/tests/DAnCE/Threading/Component2/Component2_exec.h: - * CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.cpp: - * CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h: - * CIAO/tests/Minimum/Receiver/Receiver_exec.cpp: - * CIAO/tests/Minimum/Receiver/Receiver_exec.h: - * CIAO/tests/Minimum/Sender/Sender_exec.cpp: - * CIAO/tests/Minimum/Sender/Sender_exec.h: - * CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp: - * TAO/DevGuideExamples/AMH/AMH_Messenger_i.h: - * TAO/DevGuideExamples/AMH/Messenger_i.cpp: - * TAO/DevGuideExamples/AMH/Messenger_i.h: - * TAO/DevGuideExamples/AMH_AMI/inner_i.h: - * TAO/DevGuideExamples/AMH_AMI/middle_i.cpp: - * TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp: - * TAO/DevGuideExamples/GettingStarted/Messenger_i.h: - * TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp: - * TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h: - * TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp: - * TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h: - * TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp: - * TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h: - * TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp: - * TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h: - * TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp: - * TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h: - * TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp: - * TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h: - * TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp: - * TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h: - * TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp: - * TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h: - * TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp: - * TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h: - * TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp: - * TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h: - * TAO/DevGuideExamples/RTCORBA/Messenger_i.h: - * TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp: - * TAO/DevGuideExamples/SmartProxies/Messenger_i.h: - * TAO/docs/Security/Conformance.html: - * TAO/docs/Security/Download.html: - * TAO/docs/Security/FAQ.html: - * TAO/docs/Security/SSLIOP-USAGE.html: - * TAO/docs/Security/SSLIOP.html: - * TAO/docs/Security/Security_Service.html: - * TAO/docs/Security/index.html: - * TAO/docs/minimumTAO.html: - * TAO/docs/pluggable_protocols/index.html: - * TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html: - * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html: - * TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html: - * TAO/docs/tutorials/Quoter/Simple/Persistent/index.html: - * TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp: - * TAO/interop-tests/AnyTypeCode/tao/Demo_i.h: - * TAO/interop-tests/wchar/interop_wchar_i.h: - * TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp: - * TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h: - * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp: - * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp: - * TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp: - * TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp: - * TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp: - * TAO/tao/AnyTypeCode/Typecode_typesA.h: - * TAO/tao/AnyTypeCode/WrongTransactionA.cpp: - * TAO/tao/AnyTypeCode/WrongTransactionA.h: - * TAO/tao/Object_KeyC.cpp: - * TAO/tao/Object_KeyC.h: - * TAO/tao/PI/PolicyFactoryA.cpp: - * TAO/tao/PI/PolicyFactoryA.h: - * TAO/tao/PI/PolicyFactoryC.cpp: - * TAO/tao/PI/PolicyFactoryC.h: - * TAO/tao/PI/PolicyFactoryS.h: - * TAO/tao/PI_Server/ServerRequestInterceptorA.cpp: - * TAO/tao/PI_Server/ServerRequestInterceptorA.h: - * TAO/tao/PI_Server/ServerRequestInterceptorC.cpp: - * TAO/tao/PI_Server/ServerRequestInterceptorC.h: - * TAO/tao/PI_Server/ServerRequestInterceptorS.h: - * TAO/tao/PortableServer/PS_ForwardA.cpp: - * TAO/tao/PortableServer/PS_ForwardA.h: - * TAO/tao/PortableServer/PS_ForwardC.cpp: - * TAO/tao/PortableServer/PS_ForwardC.h: - * TAO/tao/PortableServer/PS_ForwardS.h: - * TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp: - * TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h: - * TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp: - * TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h: - * TAO/tao/RTCORBA/RT_ProtocolPropertiesS.h: - * TAO/tao/Typecode_typesC.cpp: - * TAO/tao/Typecode_typesC.h: - * TAO/tao/Typecode_typesS.h: - * TAO/tao/WrongTransactionC.cpp: - * TAO/tao/WrongTransactionC.h: - * TAO/tao/WrongTransactionS.h: - * TAO/tests/Bug_1495_Regression/test_i.h: - * TAO/tests/Bug_2188_Regression/broken_i.cpp: - * TAO/tests/Bug_2188_Regression/broken_i.h: - * TAO/tests/Bug_3766_Regression/TestI.cpp: - * TAO/tests/Bug_3766_Regression/TestI.h: - * TAO/tests/ORB_init/Portspan/simpleI.cpp: - * TAO/tests/ORB_init/Portspan/simpleI.h: - -commit f0f8061a94d4d20276bb855bf45373397f278b88 -Author: Johnny Willemsen -Date: Fri Dec 5 09:46:30 2014 +0100 - - Moved all changelogs to the ChangeLogs archive directory, release script - will generate a changelog for each release - * ACE/ChangeLog -> ACE/ChangeLogs/ChangeLog-2014b: - * CIAO/ChangeLog -> CIAO/ChangeLogs/ChangeLog-2014b: - * DAnCE/ChangeLog -> DAnCE/ChangeLogs/ChangeLog-2014b: - * TAO/ChangeLog -> TAO/ChangeLogs/ChangeLog-2014b: - Moved. - -commit 9416c4b877c0a39b260dcca042995bdb90adc742 -Author: Johnny Willemsen -Date: Fri Nov 14 09:03:21 2014 +0000 - - Fri Nov 14 08:14:44 UTC 2014 Johnny Willemsen - - * NEWS: - Updated for next release diff --git a/CIAO/ChangeLogs/CIAO-1_3_2 b/CIAO/ChangeLogs/CIAO-1_3_2 deleted file mode 100644 index 6347fb4d627..00000000000 --- a/CIAO/ChangeLogs/CIAO-1_3_2 +++ /dev/null @@ -1,255 +0,0 @@ -commit e0c46f9452917282db4e88e9c0d51d72f4aafc41 -Author: Johnny Willemsen -Date: Tue May 5 17:12:22 2015 +0200 - - Mention Shapes interop fixes - * CIAO/NEWS: - -commit b4ca591baeee935fe431c5235518538338799308 -Merge: 56091ec d713960 -Author: Johnny Willemsen -Date: Tue Apr 28 17:40:07 2015 +0200 - - Merge branch 'master' of git://github.com/DOCGroup/ATCD - -commit 56091ec04aaa174530b0027ac3f6702869fb13cb -Author: Johnny Willemsen -Date: Tue Apr 28 13:12:02 2015 +0200 - - Use a bounded string to match the RTI DDS UI - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - -commit 2525e19f6d65fa9a5bb9efa9b3642459d49d08dc -Author: Johnny Willemsen -Date: Fri Apr 17 11:35:55 2015 +0200 - - Corrected executable bit - -commit 14925c7e938611e3d328a3e2db8ba30f4a9b8da1 -Author: Johnny Willemsen -Date: Mon Apr 13 14:40:30 2015 +0200 - - Executable bit - -commit 3cc55b395c4ff501799c5bb82ef69e36c5f11a72 -Author: marcelsmit -Date: Thu Mar 12 09:33:32 2015 +0100 - - is_default_qos set to false. - - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: - -commit 9f0291524be7646f49e5e29d56c8d548f003f151 -Author: Marcel Smit -Date: Thu Mar 12 09:06:53 2015 +0100 - - Set is_default_qos to false. One should explicitly set the qos_profile string in the deployment - plan. Since this is consistently done, we can set the is_default_qos to false. - - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml: - -commit 614a53d6ae063edda770c385fae7e757f73a5d8f -Author: Adam Mitz -Date: Mon Mar 2 11:56:25 2015 -0600 - - Added to .gitignore files based on what was generated during a build - -commit 5d7b031e2f9b2793e51cc591e16b5ddec7ce6c0a -Author: Adam Mitz -Date: Mon Mar 2 11:29:09 2015 -0600 - - Added .gitignore files based on svn:ignore properties - -commit 4a3ce425d65c7da274d65d89c0cee53c14fe101c -Author: Johnny Willemsen -Date: Wed Jan 7 20:14:23 2015 +0100 - - removed id and shorter headers - -commit 3378cfa045cab63e02223ffe4f11794a338c05a6 -Author: Johnny Willemsen -Date: Wed Jan 7 19:58:50 2015 +0100 - - Shorter header - -commit 91ec92bc2e0052c8ab2a6bdfd2da3069218a6422 -Author: Johnny Willemsen -Date: Wed Jan 7 19:58:17 2015 +0100 - - Shorter header - -commit 8ff95cb206cb5bdbad270e244b562e4bd8df82d3 -Author: Johnny Willemsen -Date: Wed Jan 7 19:55:43 2015 +0100 - - Shorter headers - -commit 2bcc8e5c24190d4519adee50e21a2c2ee570bd38 -Author: Johnny Willemsen -Date: Wed Jan 7 19:55:18 2015 +0100 - - Shorter headers - -commit e0cbd2706b515bc7cd2590af30fb3253e0c5b559 -Author: Johnny Willemsen -Date: Wed Jan 7 19:50:05 2015 +0100 - - Removed id tag from mwc files - -commit 4dbc901534957272603a84d7a72c9f9dde292a0d -Author: Johnny Willemsen -Date: Wed Jan 7 19:41:56 2015 +0100 - - Shorten file headers - -commit 22d7fb7eebc9c4ca1cdd4637a4f1daacc0a530ac -Author: Johnny Willemsen -Date: Wed Jan 7 19:39:53 2015 +0100 - - Shorten file headers - -commit aa92464eac39bfb6acbc27a877f8765f1d7b8489 -Author: Johnny Willemsen -Date: Wed Jan 7 19:29:31 2015 +0100 - - Zap id tag from .txt files - -commit 50713a94ac4d7d8d97a1f82ca95dc80969763219 -Author: Johnny Willemsen -Date: Wed Jan 7 19:23:15 2015 +0100 - - Replace pidl and GNU files - -commit e76c0ec84f136b31c92c9da86b97eaf0ebb61cbb -Author: Johnny Willemsen -Date: Wed Jan 7 18:56:29 2015 +0100 - - Replaced README files - -commit b422ba6462486c0fff96575cf8f30a7579a3a217 -Author: Johnny Willemsen -Date: Wed Jan 7 18:55:38 2015 +0100 - - Replaced cdp files - -commit b4e516ee293e47146e144f35baff6150ea11e3a4 -Author: Johnny Willemsen -Date: Wed Jan 7 17:06:33 2015 +0100 - - Id tag from CIAO and DAnCE - -commit 169db677980c71427658d590f1d7d2f5365a94b9 -Author: Johnny Willemsen -Date: Wed Jan 7 16:56:24 2015 +0100 - - Perl files - -commit d3a107625182634ae0be8f003d9130f8bb5c3567 -Author: Johnny Willemsen -Date: Wed Jan 7 16:40:30 2015 +0100 - - Handle perl files - -commit a15fbbb314fa9c27f7823a6ce77f307e7b048724 -Author: Johnny Willemsen -Date: Wed Jan 7 16:26:58 2015 +0100 - - Also handle mpb files - -commit 31233b7514d981674e787e3b69cf4b54a77117e5 -Author: Johnny Willemsen -Date: Wed Jan 7 16:17:55 2015 +0100 - - Zapped c-style id tag with no space between // and $Id$ - -commit 7b07caedd286b60f2ed3d99d78f3d4407511d936 -Author: Johnny Willemsen -Date: Wed Jan 7 16:15:20 2015 +0100 - - Remove doxygen style Id tag with two space before $Id# - -commit c88815f2039e7152d735c18650c102df84d9aa36 -Author: Johnny Willemsen -Date: Wed Jan 7 16:12:49 2015 +0100 - - Removed single line Id tag - -commit 0fbdabcd0a8970712cbbdef06465d061a4ec13c4 -Author: Johnny Willemsen -Date: Wed Jan 7 16:11:17 2015 +0100 - - Zapped two line id tags - -commit e1c9cd39aa8c1b7f8a1749d2a22b451d114bb0e3 -Author: Johnny Willemsen -Date: Wed Jan 7 16:08:29 2015 +0100 - - Removed a lot of old Id tags - -commit 0e6203659f85d3d23bcb769f5d384d13b0caa70f -Author: Johnny Willemsen -Date: Wed Jan 7 15:59:09 2015 +0100 - - Zapped Id tag - -commit f86011a8ac05229f47fad5b9d87a905edff2a834 -Author: Johnny Willemsen -Date: Fri Jan 2 12:35:21 2015 +0100 - - Updated copyright year - * ACE/AUTHORS: - * ACE/COPYING: - * CIAO/COPYING: - * DAnCE/COPYING: - * TAO/COPYING: - -commit 073c9cd5877ca4889d14c86b586af5297165bba8 -Author: Johnny Willemsen -Date: Mon Dec 29 12:02:23 2014 +0100 - - Changes to make x.3.1 public - * ACE/NEWS: - * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: - * ACE/docs/Download.html: - * ACE/docs/bczar/bczar.html: - * ACE/etc/index.html: - * CIAO/NEWS: - * DAnCE/NEWS: - * TAO/NEWS: diff --git a/CIAO/ChangeLogs/CIAO-1_3_3 b/CIAO/ChangeLogs/CIAO-1_3_3 deleted file mode 100644 index 87efafb110e..00000000000 --- a/CIAO/ChangeLogs/CIAO-1_3_3 +++ /dev/null @@ -1,56 +0,0 @@ -commit 006534e2c5070472f5ae630018a904191dbf42a1 -Author: Johnny Willemsen -Date: Tue Sep 15 18:26:19 2015 +0200 - - Use separate instead of seperate - * ACE/ace/Functor_String.h: - * ACE/ace/WFMO_Reactor.h: - * ACE/tests/Env_Value_Test.cpp: - * ACE/tests/Proactor_Scatter_Gather_Test.cpp: - * ACE/tests/Service_Config_DLL.h: - * CIAO/docs/TODO.html: - * DAnCE/dance/DAnCE_LocalityManager.idl: - * TAO/TAO-INSTALL.html: - * TAO/docs/releasenotes/index.html: - * TAO/examples/AMH/Sink_Server/Base_Server.h: - * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h: - * TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h: - * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp: - * TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h: - * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp: - * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h: - * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp: - * TAO/tao/Asynch_Reply_Dispatcher_Base.cpp: - * TAO/tao/GIOP_Message_Base.cpp: - * TAO/tao/ORB_Core.cpp: - * TAO/tao/Remote_Invocation.cpp: - * TAO/tao/Transport_Connector.cpp: - * TAO/tao/params.cpp: - * TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h: - -commit 1497ecf2c616fcf1e8ddd1182bdd139daade656f -Author: Johnny Willemsen -Date: Wed Jul 8 09:33:37 2015 +0200 - - Removed verbatim section, that is already done in the ndds base projects - * CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb: - -commit 68bb2cb2d2bd3d3df268ab86eb4feb51cf874ef2 -Author: Johnny Willemsen -Date: Tue Jul 7 17:08:28 2015 +0200 - - Added mention of NDDSSCRIPTDIR - * CIAO/NEWS: - -commit 049c2cbbb808ca8a8ae30e3a33321397fe69bd74 -Author: Johnny Willemsen -Date: Thu May 7 10:33:17 2015 +0200 - - Make x.3.2 public and prepare for next release - * ACE/NEWS: - * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: - * ACE/docs/Download.html: - * ACE/docs/bczar/bczar.html: - * CIAO/NEWS: - * DAnCE/NEWS: - * TAO/NEWS: diff --git a/CIAO/ChangeLogs/ChangeLog-2004a b/CIAO/ChangeLogs/ChangeLog-2004a deleted file mode 100644 index e344fe85bee..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2004a +++ /dev/null @@ -1,5390 +0,0 @@ -Fri Jul 30 18:29:54 2004 Ossama Othman - - * ciao/Servant_Impl_T.cpp (get_all_facets, get_all_consumers): - - Fixed another instance of incorrect emulated exception - parameters. The method definitions incorrectly used a default - valued parameters. - - Fixed unused parameter warnings. - -Fri Jul 30 17:29:18 2004 Ossama Othman - - * NEWS: Added CIAO 0.4.2 noteworthy items. - -Thu Jul 29 16:54:01 2004 Ossama Othman - - * DAnCE/ciao/Servant_Impl_T.cpp (get_all_facets): - (get_all_consumers): - - Fixed incorrect emulated exception parameters. The method - definitions incorrectly used a default valued parameters. - - Fixed unused parameter warnings. - -Thu Jul 29 16:47:56 2004 Ossama Othman - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl - (get_nodeapp_manager): - - Removed emulated exception parameter. The corresponding method - declaration in the header doesn't have such a parameter. Fixes - a compile-time problem. - -Thu Jul 29 14:28:55 2004 Ossama Othman - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - (createPackage, deletePackage, findPackageByName): - - Fixed emulated exception macro usage. Addresses compile-time - problems in MSVC++ 6 builds. - -Tue Jul 27 14:48:10 2004 Tao Lu - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Removed the emulated exception parameter from the destructor - so the file will be compiled when the exception is turned off. - -Tue Jul 27 09:58:58 2004 Arvind S. Krishna - - * DAnCE/NodeApplication/NodeApplication.mpc: - Rearranged the order of libraries to fix link errors in static - configurations. - -Mon Jul 26 11:08:14 2004 Arvind S. Krishna - - * DAnCE/tests/Config_Handlers/handler_test.mpb: - Added CIAO_DnC_Client to resolve link errors - -Mon Jul 26 11:06:38 2004 Arvind S. Krishna - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - Added ACE_INLINE for the get_nodeapp_ref method to resolve - linking errors in the builds with static configurations - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - changed changed nade_app_manager to node_app_manager! - - * DAnCE/NodDaemon/NodeDaemon.mpc: - Resolved link errors - -Sun Jul 25 22:13:48 2004 Balachandran Natarajan - - * Release: - - Makefile with release information. - -Sun Jul 25 22:15:03 2004 Balachandran Natarajan - - * ChangeLog: - -Sat Jul 24 20:57:03 2004 Krishnakumar B - - * docs/releasenotes/dance.html: Updated the release notes for - DAnCE. - -Fri Jul 23 23:43:01 2004 Nanbor Wang - - I didn't get around to send the following to Venkita before he - left for vacation so I'm checking them in here. - - * tests/RTCCM/Priority_Test/README: - * tests/RTCCM/Priority_Test/descriptors/README: Documentation for - running the simple Priority tests applications. - -Tue Jul 20 16:03:14 2004 Krishnakumar B - - * docs/releasenotes/dance.html: Updated the release notes for - DAnCE. - -Tue Jul 20 12:37:50 2004 Gan Deng - - * docs/releasenotes/dance.html - - Added this file to describe what the current status is - about the DAnCE. - -Mon Jul 19 14:16:10 2004 Krishnakumar B - - * ciao/ServerActivator_Impl.cpp (init): Use the argument - spawn_delay to set the value of the delay in seconds that the - ServerActivator waits for the ComponentServer to come up. This - is needed when the ComponentServer is not able to come up before - the hardcoded value of 5 seconds passes by, which happens when - running the ComponentServer under Valgrind. - -Mon Jul 19 12:47:17 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - - Added ifr_client to Deployment_stub and Deployment_svnt. This - should fix VC6 build issues. - -Sun Jul 18 12:53:04 2004 Ossama Othman - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp (main): - - Fixed "better conversion sequence" warning by using component - reference ".in()" accessor. - -Thu Jul 15 21:52:12 2004 Johnnny Willemsen - - * DAnCE/NodeManager/NodeDaemon_Impl.h: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - Fixed incorrect doxygen file tag - -Wed Jul 14 10:40:41 2004 Ossama Othman - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - (init): - * DAnCE/NodeManager/NodeDaemon_Impl.cpp (preparePlan): - - Fixed "control reaches end of non-void function" warning. - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - (ExecutionManager_Impl): - * DAnCE/ciao/NodeApplication_Impl.cpp: - - Corrected emulated exception macro usage. - - Fixed "unused parameter" warning. - -Wed Jul 14 08:46:24 2004 Balachandran Natarajan - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - - Fixed the MPC files that were busted. - -Tue Jul 13 09:49:50 2004 Venkita Subramonian - - * docs/releasenotes/index.html: Updated release notes with - information on static configurator and Nanbor's examples for - composition of RT applications using real-time extensions in - CIAO. - -Tue Jul 13 04:27:19 2004 Ossama Othman - - * performance-tests/Protocols/Controller/Controller.cpp: - - Removed unused variable. - -Mon Jul 12 11:06:54 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: Fixed a few URLs. Thanks to - Matthew Gillen for reporting this. - -Sun Jul 11 06:07:12 2004 Johnny Willemsen - - * tools/XML_Helpers/Assembly_Handlers.inl: - * tools/XML_Helpers/RTConfig_Handlers.inl: - * tools/XML_Helpers/Softpkg_Handlers.inl: - Fixed compile errors in Borland build, use full namespaces for the - baseclass - -Fri Jul 9 20:36:14 2004 Balachandran Natarajan - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - - Fixed a warning. - -Fri Jul 9 20:21:46 2004 Balachandran Natarajan - - * performance-tests/Protocols/Receiver/Receiver_svnt.h: - * performance-tests/Protocols/Receiver/Receiver_svnt.cpp: - * performance-tests/Protocols/Sender/Sender_svnt.h: - * performance-tests/Protocols/Sender/Sender_svnt.cpp: - - Removed them from the repo. - -Thu Jul 8 17:16:34 2004 Jaiganesh B - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/tests/Config_Handlers/handler_test.mpb: - - Made changes to not build these when exceptions=0 - -Thu Jul 8 16:59:26 2004 Jaiganesh B - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - - Fix build errors. - -Thu Jul 8 16:53:06 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Moved the call to populate_port_tables() from the - component servant constructor to the end of - the ciao_postactivate() method in the component servant, - but it is commented out for now until related issues - in DaNCe are resolved. - -Thu Jul 8 16:46:55 2004 Jaiganesh B - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/ciao/NodeApp_CB_Impl.cpp: - * DAnCE/ciao/NodeApp_CB_Impl.h: - - Fixing build errors. - -Thu Jul 8 16:30:48 2004 Jaiganesh B - - * DAnCE/ciao/NodeApplication_Impl.cpp: - - Made changes to fix emulated build errors. - -Wed Jul 7 21:52:24 2004 Balachandran Natarajan - - * docs/releasenotes/index.html: - - Revamped to provide a new look. Has updated information. The - notes are missing a link to dance.html which should have - information about DAnCE. Tao will take care of that. - -Wed Jul 7 15:04:37 2004 Venkita Subramonian - - * examples/OEP/BasicSP/descriptors/test.rtd: - * examples/OEP/BasicSP/descriptors/svcmap.dat: - * examples/OEP/BasicSP/descriptors/RTsvc.conf: - * examples/OEP/BasicSP/descriptors/BasicSP-rt.cad: - - Added these files to be used in RT version of BasicSP. - - * examples/OEP/BasicSP/NOTE.txt: - - Updated notes on how to run with RTComponentServer. - -Wed Jul 7 14:35:33 2004 Venkita Subramonian - - * docs/static_ciao_contents.html: - * docs/static_config_example.html: - * docs/static_config_rtexample.html: - - Updated documentation for CIAO Static configurator. - -Wed Jul 7 12:22:04 2004 Jaiganesh B - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/Repository_Manager.cpp: - * DAnCE/RepositoryManager/Update_Plan.cpp: - * DAnCE/RepositoryManager/Repository_Manager_conf.h: - - Addressed Ossama Othman's code review comments. - Thanks Ossama. - -Wed Jul 7 11:42:15 2004 Tao Lu - - * docs/TODO.html: - Some cosmetic changes. - -Wed Jul 7 10:42:19 2004 Tao Lu - - * docs/releasenotes/switch.html: - * docs/releasenotes/index.html: - - Updated the file to follow the directory change for DAnCE. - Updated the link to the TODO list. - -Wed Jul 7 09:53:56 2004 Balachandran Natarajan - - * docs/TODO.html: - - Overhauled the TODO completely keeping in mind the latest - thoughts and forces. - - * docs/todo.html: - - Removed this from th erepository. - -Tue Jul 6 18:05:35 2004 Balachandran Natarajan - - * CIAO-INSTALL.html: - - Did a massive update to this since it was woefully outdated. - -Tue Jul 6 14:34:16 2004 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Comment out the "dump plan" debugging statement, coz the current - "DnC_dump" class is somewhat broken under VC71. - - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - - Fixed warnings due to lacking including header files. - - * DAnCE/ciao/CCM_Core.mpc - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - * DAnCE/NodeApplication/NodeApplication.mpc - - Fixed a bunch of linking errors under VC71. - - Now everything build fine under Windows with VC71. - -Tue Jul 6 14:22:00 2004 Balachandran Natarajan - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - * CIDLC/CIDLC.mpc: - - All of them require exceptions to be available. Therefore added - requires += exceptions. - - * CCF/CCF/CodeGenerationKit/IndentationXML.hpp: - - Remove the comma at the end of the enum declaration. - - - All the above should fix compilation errors in Full_Reactors - builds. - -Tue Jul 6 10:17:06 2004 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Removed unnecessary comments. - -Tue Jul 6 10:15:11 2004 Tao Lu - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp (CIAO): - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp (destroyManager): - - Deleted some comments which has been addressed already. - -Mon Jul 5 08:39:06 2004 Balachandran Natarajan - - * tools/Segment_Timer/Segment_Timer.cpp: - * tools/static_configurator/Static_Assembly_Parser.cpp: - - Fixed warnings that were caused from converting strings to - non-const char *. - -Mon Jul 5 08:36:07 2004 Balachandran Natarajan - - * tests/temp/README: - * tests/temp/assembly/README: - * tests/temp/assembly/client.cpp: - * tests/temp/assembly/control.idl: - * tests/temp/assembly/control.mpc: - * tests/temp/assembly/run_test.pl: - * tests/temp/assembly/server.cpp: - - Completely removed them. They were not supposed to be shipped or - built. We have better test programs for those features now. - -Mon Jul 5 08:27:39 2004 Balachandran Natarajan - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Added requires += qt - - * examples/handcrafted/BasicSP_EC/EC/EC.mpc: - * examples/handcrafted/BasicSP_EC2/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc: - - They should not be compiled inour daily builds at all. They are - not for that. - - * tests/RTCCM/DiffServ/Controller/Controller.mpc: - * tests/RTCCM/DiffServ/Receiver/Receiver.mpc: - * tests/RTCCM/DiffServ/Sender/Sender.mpc: - - Change the library names. Else they clash with other things in - the build system. - -Sun Jul 4 22:13:37 2004 Balachandran Natarajan - - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h: - - Added ciao_preactivate () and ciao_postactivate () methods. - - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Sender/Sender.mpc: - - Did the following - - (1) Changed the name of the shared object to Protocol_*_stub and - Protocol_*_svnt. This was needed since there are other examples - that have named the libraries as Sender_stub and - Receiver_stub. Since all of these libraries are written to - $ACE_ROOT/lib, one library overwrites the other and all hell - breaks loose. - - (2) The executor librares are not being compiled now. We have - used the requires += dummy to prevent them from compiling. The - executor code depends on a header file that hasn't been checked - in. I am informing the code author about this. Till the author - fixes the code, the executor code will not be compiled. - - * performance-tests/Protocols/Controller/Controller.mpc: - - They now link to Protocol_*_stubs. - - -Sun Jul 4 19:05:35 2004 Balachandran Natarajan - - * examples/handcrafted/BasicSP_EC/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC/EC/EC.mpc: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC2/EC/EC.mpc: - - Do not compile these. They wouldn't compile at all. These are - useful examples that are needed for EC integration. - -Sun Jul 4 18:59:09 2004 Balachandran Natarajan - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - - No need to register value factories explicitly. They are now - generated in the servant code. - -Sun Jul 4 18:40:10 2004 Balachandran Natarajan - - * performance-tests/Protocols/Receiver/ReceiverImpl.ccd - * performance-tests/Protocols/Receiver/Receiver_svnt.h - * performance-tests/Protocols/Sender/SenderImpl.ccd - * performance-tests/Protocols/Sender/Sender_svnt.h: - - Removed the generated code form the repository. - -Sun Jul 4 11:14:03 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - - Restructured things so that CIAO_DnC_Server doesn't need to be - linked with stub projects. - - * DAnCE/ciao/Container_Base.h: - - Added an include for the xport file. - -Sun Jul 4 10:17:52 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - - The deployment_stub should depend on the CIAO_DnC_Server. This - would need some restructuring. I will do this shortly. - -Sun Jul 4 09:07:20 2004 Balachandran Natarajan - - * CIAO.mwc: - - Added DAnCE and removed DnC - - * DAnCE/RepositoryManager/Repository_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Fixed warnings in our daily builds. - - * DAnCE/NodeManager/NodeDaemon.mpc: - - Use CIAO_DnC_Server instead of CIAO_Server. - - * DAnCE/ciao/CCM_Core.mpc: - - Removed unneeded dependancies. - -Sat Jul 3 10:03:22 2004 Tao Lu - - * DAnCE/ciao/Deployment_Base.idl: - * DAnCE/ciao/Deployment_Data.idl: - * DAnCE/ciao/Deployment.idl: - The original Deployment.idl is splited into the above 3 files to - get rid of the VC warning. - - * DAnCE/ciao/Deployment_Ex.idl: - This file is removed due to the bad name. - - * DAnCE/ciao/CCM_Core.idl: - The MPC file is changed to follow the above changes. - -Thu Jul 1 16:27:07 2004 Jaiganesh B - - * CIAOTAO.mwc: - * DAnCE/tests/Config_Handlers/handler_test.mpb: - - Updated mpc to build the new DAnCE directory. - -Thu Jul 1 16:19:21 2004 Jaiganesh B - - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/tests/Config_Handlers/handler_test.mpb: - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl: - - Updated the files to include the right header files. - -Thu Jul 1 16:01:12 2004 Jaiganesh B - - * DADAnCE/Deployment.xsd - * DAnCE/Deployment.mwc: - * DAnCE/Deployment.xsd.orig: - * DAnCE/XMI.xsd: - * DAnCE/XMI.xsd.orig: - * DAnCE/Config_Handlers/Any_Handler.cpp: - * DAnCE/Config_Handlers/Any_Handler.h: - * DAnCE/Config_Handlers/Basic_Handler.cpp: - * DAnCE/Config_Handlers/Basic_Handler.h: - * DAnCE/Config_Handlers/CAD_Handler.cpp: - * DAnCE/Config_Handlers/CAD_Handler.h: - * DAnCE/Config_Handlers/CEPE_Handler.h - * DAnCE/Config_Handlers/CEPE_Handler.cpp: - * DAnCE/Config_Handlers/CPK_Handler.cpp: - * DAnCE/Config_Handlers/CPK_Handler.h: - * DAnCE/Config_Handlers/CPR_Handler.cpp: - * DAnCE/Config_Handlers/CPR_Handler.h: - * DAnCE/Config_Handlers/Cap_Handler.cpp: - * DAnCE/Config_Handlers/Cap_Handler.h: - * DAnCE/Config_Handlers/CompImplDesc_Handler.cpp: - * DAnCE/Config_Handlers/CompImplDesc_Handler.h: - * DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp: - * DAnCE/Config_Handlers/CompIntrDesc_Handler.h: - * DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp: - * DAnCE/Config_Handlers/CompPkgDesc_Handler.h: - * DAnCE/Config_Handlers/Config_Error_Handler.cpp: - * DAnCE/Config_Handlers/Config_Error_Handler.h: - * DAnCE/Config_Handlers/Config_Handler_export.h: - * DAnCE/Config_Handlers/Config_Handlers.mpc: - * DAnCE/Config_Handlers/DT_Handler.cpp: - * DAnCE/Config_Handlers/DT_Handler.h: - * DAnCE/Config_Handlers/Deployment.h: - * DAnCE/Config_Handlers/DnC_Dump.cpp: - * DAnCE/Config_Handlers/DnC_Dump.h: - - Checked in all the XML handlers needed by DAnCE. - -Thu Jul 1 15:54:15 2004 Jaiganesh B - - * DAnCE/Config_Handlers/Domain_Handler.cpp: - * DAnCE/Config_Handlers/Domain_Handler.h: - * DAnCE/Config_Handlers/ERE_Handler.cpp: - * DAnCE/Config_Handlers/ERE_Handler.h: - * DDAnCE/Config_Handlers/IAD_Handler.h - * DAnCE/Config_Handlers/IAD_Handler.cpp: - * DAnCE/Config_Handlers/ID_Handler.cpp: - * DAnCE/Config_Handlers/ID_Handler.h: - * DAnCE/Config_Handlers/IR_Handler.cpp: - * DAnCE/Config_Handlers/IR_Handler.h: - * DAnCE/Config_Handlers/MID_Handler.cpp: - * DAnCE/Config_Handlers/MID_Handler.h: - * DAnCE/Config_Handlers/NIA_Handler.cpp: - * DAnCE/Config_Handlers/NIA_Handler.h: - * DAnCE/Config_Handlers/PCI_Handler.cpp: - * DAnCE/Config_Handlers/PCI_Handler.h: - * DAnCE/Config_Handlers/PC_Handler.cpp: - * DAnCE/Config_Handlers/PC_Handler.h: - * DAnCE/Config_Handlers/Plan_Handler.cpp: - * DAnCE/Config_Handlers/Plan_Handler.h: - * DAnCE/Config_Handlers/Process_Element.cpp: - * DAnCE/Config_Handlers/Process_Element.h: - * DAnCE/Config_Handlers/Process_Element_T.cpp: - * DAnCE/Config_Handlers/Process_Element_T.h: - * DAnCE/Config_Handlers/Property_Handler.cpp: - * DAnCE/Config_Handlers/Property_Handler.h: - * DAnCE/Config_Handlers/RS_Handler.cpp: - * DAnCE/Config_Handlers/RS_Handler.h: - * DAnCE/Config_Handlers/RUK_Handler.cpp: - * DAnCE/Config_Handlers/RUK_Handler.h: - * DAnCE/Config_Handlers/Requirement_Handler.cpp: - * DAnCE/Config_Handlers/Requirement_Handler.h: - * DAnCE/Config_Handlers/SPK_Handler.cpp: - * DAnCE/Config_Handlers/SPK_Handler.h: - * DAnCE/Config_Handlers/SP_Handler.cpp: - * DAnCE/Config_Handlers/SP_Handler.h: - * DAnCE/Config_Handlers/TPD_Handler.cpp: - * DAnCE/Config_Handlers/TPD_Handler.h: - * DAnCE/Config_Handlers/Utils.cpp: - * DAnCE/Config_Handlers/Utils.h: - * DAnCE/Config_Handlers/XercesString.cpp: - * DAnCE/Config_Handlers/XercesString.h: - - First cut check-in for XML handlers. - - - -Thu Jul 1 15:51:14 2004 Jaiganesh B - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - * DAnCE/DomainApplicationManager/Deployment_Configuration.inl: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Export.h: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.inl: - * DAnCE/ExecutionManager/ExecutionManager.idl: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.inl: - * DAnCE/ExecutionManager/ExecutionManager_stub_export.h: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Checking in the DomainApplicationManager and ExecutionManager - interfaces. - -Thu Jul 1 15:47:45 2004 Jaiganesh B - - * DAnCE/NodeApplication/NodeApplication.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/CIAO_NAM_Export.h: - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DAnCE/NodeManager/NodeDaemon.idl: - * DAnCE/NodeManager/NodeDaemon.mpc: - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - * DAnCE/NodeManager/NodeDaemon_Impl.h: - * DAnCE/NodeManager/NodeDaemon_Impl.inl: - * DAnCE/NodeManager/NodeDaemon_stub_export.h: - * DAnCE/NodeManager/Node_Daemon.cpp: - - Checked in the NodeApplication, NodeApplicationManager - and NodeManager code. - -Thu Jul 1 15:45:48 2004 Jaiganesh B - - * DAnCE/RepositoryManager/RepositoryManager.idl: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/Repository_Manager.cpp: - * DAnCE/RepositoryManager/Update_Plan.cpp: - * DAnCE/RepositoryManager/Update_Plan.h: - - Moved the RepositoryManager directory here. - -Thu Jul 1 15:40:06 2004 Jaiganesh B - - * DAnCE/ciao/CCM_Base.idl: - * DAnCE/ciao/CCM_Component.idl: - * DAnCE/ciao/CCM_Container.idl: - * DAnCE/ciao/CCM_Container_Ex.idl: - * DAnCE/ciao/CCM_Core.mpc: - * DAnCE/ciao/CCM_Event.idl: - * DAnCE/ciao/CCM_Transaction.idl: - * DAnCE/ciao/CIAO_Client_Export.h: - * DAnCE/ciao/CIAO_Container_Export.h: - * DAnCE/ciao/CIAO_Server_Export.h: - * DAnCE/ciao/CIAO_Value.idl: - * DAnCE/ciao/CIAO_common.h: - * DAnCE/ciao/Client_init.cpp: - * DAnCE/ciao/Client_init.h: - * DAnCE/ciao/Components.idl: - * DAnCE/ciao/ComponentsC.h: - * DAnCE/ciao/ComponentsS.h: - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Container_Base.inl: - * DAnCE/ciao/Container_Base.pidl: - * DAnCE/ciao/Cookies.cpp: - * DAnCE/ciao/Cookies.h: - * DAnCE/ciao/Cookies.inl: - * DAnCE/ciao/CosPersistentState.idl: - * DAnCE/ciao/Deployment.idl: - * DAnCE/ciao/Deployment_Core.idl: - * DAnCE/ciao/Deployment_stub_export.h: - * DAnCE/ciao/Deployment_svnt_export.h: - * DAnCE/ciao/NodeApp_CB_Impl.cpp: - * DAnCE/ciao/NodeApp_CB_Impl.h: - * DAnCE/ciao/NodeApplication_CallBack.idl: - * DAnCE/ciao/NodeApplication_Impl.cpp: - * DAnCE/ciao/NodeApplication_Impl.h: - * DAnCE/ciao/NodeApplication_Impl.inl: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - * DAnCE/ciao/Server_init.cpp: - * DAnCE/ciao/Server_init.h: - * DAnCE/ciao/Version.h: - - Moving DnC/ciao over here. - -Thu Jul 1 15:37:33 2004 Jaiganesh B - - * DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.h: - * DAnCE/tests/Config_Handlers/Handler_Test.i: - * DAnCE/tests/Config_Handlers/Handler_Tests.mpc: - * DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/handler_test.mpb: - - Checking in the tests for the XML handlers. - -Thu Jul 1 15:29:57 2004 Jaiganesh B - - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe.ccd: - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cid: - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cpd: - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Deployment.xsd: - * DAnCE/tests/Config_Handlers/HUDisplay/Domain.cdd: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS.ccd: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS.cid: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS.cpd: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS_Exec.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS_Stub.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cdp: - * DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cid: - * DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cpd: - * DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.pcd: - * DAnCE/tests/Config_Handlers/HUDisplay/Libraries.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.ccd: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cid: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cpd: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer.ccd: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer.cid: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer.cpd: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer_Exec.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer_Stub.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/XMI.xsd: - * DAnCE/tests/Config_Handlers/HUDisplay/package.tpd: - - Checking in the HUDisplay deployment descriptors. - -Thu Jul 1 15:26:54 2004 Jaiganesh B - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DAnCE/tests/NodeApplicationTest/README: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_stub_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_svnt_export.h: - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl: - * DAnCE/tests/scripts/BasicSP/basicsp.dat: - - First cut checkins for new DAnCE directory. - -Thu Jul 1 14:46:24 2004 Jaiganesh B - - * DnC/Config_Handlers/Plan_Handler.cpp: - - Removed includes to Process_Basic_Type.h. - -Thu Jul 1 13:20:08 2004 Jaiganesh B - - * DnC/Config_Handlers/Plan_Handler.cpp: - - Removed includes to Process_Basic_Type.h - -Thu Jul 1 12:16:41 2004 Arvind S. Krishna - - * DnC/ExecutionManager/Execution_Manager.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - * DnC/NodeManager/Node_Daemon.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - - Addressed comments left by Ossama after his code review. - -Thu Jul 1 12:02:05 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CPR_Handler.cpp: - * DnC/Config_Handlers/Cap_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/Config_Handlers.mpc: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/IR_Handler.cpp: - * DnC/Config_Handlers/NIA_Handler.cpp: - * DnC/Config_Handlers/PCI_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Process_Basic_Type.h: - * DnC/Config_Handlers/Process_Basic_Type.i: - * DnC/Config_Handlers/Process_Element_T.cpp: - * DnC/Config_Handlers/TPD_Handler.cpp: - * DnC/Config_Handlers/Utils.cpp: - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/Process_Basic_Type.h: - * DnC/Config_Handlers/Process_Basic_Type.i: - - Moved the code in Process_Basic_Type.h and - Process_Basic_Type.i to Utils.h and Utils.cpp, - as all the utility functions are defined - in that file. - -Thu Jul 1 11:37:14 2004 Tao Lu - - * docs/todo.html: - Added two bullets in the Todo list. - -Thu Jul 1 11:06:42 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element_T.cpp: - * DnC/Config_Handlers/Process_Element_T.h: - - Added the files to follow ACE coding standards. - - * DnC/Config_Handlers/Process_Element.tpp: - * DnC/Config_Handlers/Process_Element.i: - - Removed these files, as they were not following the - ACE standards. - - The code in the above files have been moved to - Process_Element_T.cpp and Process_Element_T.h. - -Thu Jul 1 10:56:28 2004 Tao Lu - - * docs/releasenotes/index.html: - * docs/todo.html: - - Updated the todo list. - -Wed Jun 30 22:29:51 2004 Tao Lu - - * docs/releasenotes/switch.html: - * docs/releasenotes/index.html: - Updated the release note. I will work on the to-do list - as well. - -Wed Jun 30 18:01:58 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed another bug in the receptacle code generation. Thanks to - Gary Duzan for reporting the problem . - -Wed Jun 30 17:16:53 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.tpp: - - Added code to catch DOM exceptions. - -Wed Jun 30 17:00:10 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Added code to catch parser exceptions for - incorrect URls - -Wed Jun 30 13:32:08 2004 Tao Lu - - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - - Removed "after += CIAO_DnC_Container" from the stub project. - -Wed Jun 30 13:14:50 2004 Tao Lu - - * DnC/ciao/CCM_Core.mpc: - - Added -St to Deployment_stub probject to reduce the size of - generated code. - -Wed Jun 30 10:59:55 2004 Balachandran Natarajan - - * CIAO.mwc: - * CIAOTAO.mwc: - - Added the new DnC directories. - - * DnC/ciao/CCM_Core.mpc: - - Changed the name of the libraries generated. We should not - overwrite the original ones. - - * DnC/Config_Handlers/Config_Handlers.mpc: - * DnC/DomainApplicationManager/DomainApplicationManager.mpc: - * DnC/ExecutionManager/ExecutionManager.mpc: - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - - Use the new libraries. - -Wed Jun 30 09:26:42 2004 Jeff Parsons - - * examples/Hello/Sender/starter.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.h: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/BasicSP/EC/controller.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * examples/OEP/Display/RateGen/controller.cpp: - - Changes to eliminate build warnings (mostly assignments of - const char* to char*) and cosmetic changes. - -Wed Jun 30 08:37:15 2004 Jeff Parsons - - * examples/Hello/Receiver/Receiver_exec.cpp: - - In Receiver_exec_i::ccm_activate(), changed the construction of - the argv argument passed to ORB_init() to eliminate a const - char* to char* conversion warning. - -Tue Jun 29 15:34:00 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - We were not setting the sequence length when we were iterating - over the sequence of connections for a "uses multiple" - case. Thanks Ed Mulholland for reporting this. - -Tue Jun 29 01:40:25 2004 Tao Lu - - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/NodeApplicationManager/ImplementationInfo.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/ciao/Container_Base.cpp: - * DnC/ciao/NodeApplication_Impl.cpp: - * DnC/ciao/NodeApplication_Impl.h: - * DnC/ciao/NodeApplication_Impl.inl: - - Fixed some of Ossama's comments, added exception catching clauses - in NodeApplication. - -Tue Jun 29 06:18:12 UTC 2004 Johnny Willemsen - - * performance-tests/Protocols/Controller/Controller.mpc: - Changed project name to avoid duplicate project names - -Mon Jun 28 11:58:01 2004 Jaiganesh B - - * DnC/tests/RobotAssembly/RobotAssembly.mpc: - * DnC/tests/RobotAssembly/RobotAssembly.mwc: - * DnC/tests/RobotAssembly/RobotAssembly_stub_export.h: - * DnC/tests/RobotAssembly/RobotAssembly_svnt_export.h: - * DnC/tests/RobotAssembly/Robot_Base.idl: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.cidl: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.idl: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface.mpc: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.cpp: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec.h: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_exec_export.h: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_stub_export.h: - * - DnC/tests/RobotAssembly/HumanMachineInterface/HumanMachineInterface_svnt_export.h: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.cidl: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.idl: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions.mpc: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.cpp: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec.h: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_exec_export.h: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_stub_export.h: - * - DnC/tests/RobotAssembly/ManagementWorkInstructions/ManagementWorkInstructions_svnt_export.h: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.cidl: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.idl: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager.mpc: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.cpp: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec.h: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_exec_export.h: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_stub_export.h: - * - DnC/tests/RobotAssembly/PalletConveyorManager/PalletConveyorManager_svnt_export.h: - * DnC/tests/RobotAssembly/RobotManager/RobotManager.cidl: - * DnC/tests/RobotAssembly/RobotManager/RobotManager.idl: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.cidl: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.idl: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager.mpc: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.cpp: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec.h: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_exec_export.h: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_stub_export.h: - * - DnC/tests/RobotAssembly/WatchSettingManager/WatchSettingManager_svnt_export.h: - * DnC/tests/RobotAssembly/RobotManager/RobotManager_svnt_export.h: - * DnC/tests/RobotAssembly/RobotManager/RobotManager_stub_export.h: - * DnC/tests/RobotAssembly/RobotManager/RobotManager_exec_export.h: - * DnC/tests/RobotAssembly/RobotManager/RobotManager.mpc: - * DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.cpp: - * DnC/tests/RobotAssembly/RobotManager/RobotManager_exec.h: - - RobotAssembly example deployment scenario files. - -Mon Jun 28 11:33:00 2004 Emre Turkay - - * DnC/Deployment.mwc: - - DnC tests projects reincluded to the compilation. - - * DnC/tests/Config_Handlers/handler_test.mpb: - - Added after statement to ensure Config_Handlers is compiled before - compiling handler_tests. - -Mon Jun 28 11:18:00 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/DnC_Dump.h: - - Fixed the VC6 errors by excluding the DnC dump functionality on the - compilers ACE_HAS_BROKEN_NESTED_TEMPLATES. - -Mon Jun 28 10:44:00 2004 Emre Turkay - - * DnC/tests/Config_Handlers/Handler_Test.cpp: - * DnC/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp: - * DnC/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp: - * DnC/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp: - * DnC/tests/Config_Handlers/Domain_Handler_Test.cpp: - * DnC/tests/Config_Handlers/Handler_Test.h: - * DnC/tests/Config_Handlers/IAD_Handler_Test.cpp: - * DnC/tests/Config_Handlers/PC_Handler_Test.cpp: - * DnC/tests/Config_Handlers/Plan_Handler_Test.cpp: - * DnC/tests/Config_Handlers/handler_test.mpb: - - Fixed the VC6 errors by excluding the DnC tests on the - compilers ACE_HAS_BROKEN_NESTED_TEMPLATES. - -Mon Jun 28 10:40:00 2004 Emre Turkay - - * DnC/tests/Config_Handlers/RobotAssembly/README.html: - - Deleted "file://" from -p & -d options of executor. - -Mon Jun 28 08:03:25 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed a bug with code generation for uses multiple. Thanks to Ed - Mulholland for reporting the problem. - -Mon Jun 28 00:18:04 2004 Irfan Pyarali - - * CIAO/performance-tests/Protocols: - - Added new test. Closely mirrors - $TAO_ROOT/performance-tests/Protocols but uses CCM components - rather that TAO applications. - -Sun Jun 27 12:59:04 2004 Jaiganesh B - - * DnC/tests/scripts/BasicSP/basicNodeDaemon.pl: - * DnC/tests/scripts/BasicSP/basicsp.dat: - * DnC/tests/scripts/RobotAssembly/robotNodeDaemon.pl: - * DnC/tests/scripts/RobotAssembly/robotassembly.dat: - - Added the scripts directory to help in the integrated - testing. - -Sun Jun 27 12:50:12 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/HUDisplay/Deployment.xsd: - * DnC/tests/Config_Handlers/HUDisplay/XMI.xsd: - - Checked in the schema files into the repository to assist - unit and integration testing. - -Sun Jun 27 12:20:23 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp: - - Updated the plan descriptor to use just two nodes rather - than five. - -Sun Jun 27 11:56:55 2004 Balachandran Natarajan - - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - - Fixed compile errors in our daily builds. - -Fri Jun 25 23:59:00 2004 Gan Deng - - * Process_Element.cpp - * Process_Element.h - * Process_Element.i - * Process_Element.tpp - - Re-organize the code to avoid sutble potential problems. - Bala made above changes on my machine. - -Fri Jun 25 17:35:00 2004 Emre Turkay - - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - - Fixed compilation problems with VC6. Varibles defined in for loop - remain persistant out of scope of the for loop. - -Fri Jun 25 10:51:26 2004 Balachandran Natarajan - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed compilation problems with VC6. To put it short VC6 just - cannot handle templates properly. Thanks to gan Deng for reporting - the problem. - -Thu Jun 24 17:25:36 2004 Jaiganesh B - - * DnC/ciao/NodeApplication_Impl.cpp: - - Added ACE_TRY clock to the code. - -Thu Jun 24 17:13:20 2004 Balachandran Natarajan - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Reverted changes to - - "Fri Jun 4 18:16:47 2004 Jeff Parsons - " to get things going on VC6 builds. - - Added changes to ensure that there is a gap between "<" brackets - for templates and the scoping operator "::" Thanks to Ed - Mulholland for reporting the problem. - - * DnC/ciao/Servant_Impl_T.cpp: - * DnC/ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - - Do not use traits as template parameters. VC6 cannot just handle - all this. Thanks to Theckla Louchios - for reporting the problem. - -Thu Jun 24 16:40:53 2004 Tao Lu - - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/RepositoryManager/Repository_Manager.cpp: - Some more changes for VC6. - -Thu Jun 24 15:34:53 2004 Tao Lu - - * CIAOTAO.mwc - Reversed the change to avoid trouble for people who don't use - the new DnC framework. - -Thu Jun 24 15:17:45 2004 Balachandran Natarajan - - * DnC/Config_Handlers/Config_Handlers.mpc - * DnC/Config_Handlers/DnC_Dump.cpp - * DnC/Config_Handlers/DnC_Dump.h - * DnC/Config_Handlers/Process_Element.tpp - * DnC/Config_Handlers/Utils.cpp - * DnC/Config_Handlers/XercesString.cpp - * DnC/DomainApplicationManager/DomainApplicationManager.mpc - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/ExecutionManager/ExecutionManager.mpc - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DnC/NodeManager/NodeDaemon.mpc - - Checked in some changes to make DnC compile under VC6. - -Thu Jun 24 14:49:44 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Commented out the dump functions. - -Thu Jun 24 08:10:09 2004 Balachandran Natarajan - - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - - Added requires += dnc to the projects. - -Wed Jun 23 16:52:50 2004 Emre Turkay - - * DnC/tests/Config_Handlers/RobotAssembly/README.html: - - Fixed links. - -Wed Jun 23 16:19:25 2004 Emre Turkay - - * DnC/tests/Config_Handlers/RobotAssembly/README.html: - - Committed the README file which desribes how to compile/run the - RobotAssembly example. - -Wed Jun 23 15:33:06 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.inl - - Added "debug level" controlled debugging statements. - Addressed Ossama's comments. Thanks Ossama! - -Wed Jun 23 13:52:06 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/RobotAssembly/ACE.iad: - * DnC/tests/Config_Handlers/RobotAssembly/CIAO.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/DefaultConfiguration.pcd: - * DnC/tests/Config_Handlers/RobotAssembly/Deployment.xsd: - * DnC/tests/Config_Handlers/RobotAssembly/DeploymentPlan.cdp: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.ccd: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cid: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface.cpd: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_exec.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_stub.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/HumanMachineInterface_svnt.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.ccd: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cid: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions.cpd: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_exec.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_stub.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/ManagementWorkInstructions_svnt.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.ccd: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cid: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager.cpd: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_exec.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_stub.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/PalletConveyorManager_svnt.iad: - * DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cid: - * DnC/tests/Config_Handlers/RobotAssembly/RobotAssembly.cpd: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager.ccd: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cid: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager.cpd: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager_exec.iad: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager_stub.iad: - * DnC/tests/Config_Handlers/RobotAssembly/RobotManager_svnt.iad: - * DnC/tests/Config_Handlers/RobotAssembly/TAO.iad: - * DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.ccd: - * DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cid: - * DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager.cpd: - * - DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_exec.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_stub.iad: - * - DnC/tests/Config_Handlers/RobotAssembly/WatchSettingManager_svnt.iad: - * DnC/tests/Config_Handlers/RobotAssembly/XMI.xsd: - * DnC/tests/Config_Handlers/RobotAssembly/package.tpd: - - Added the robot assembly example descriptors. - -Wed Jun 23 13:44:37 2004 Arvind S. Krishna - - * DnC/Config_Handlers/ExecutionManager/ExecutionManager_Impl.cpp: - - Fixed a compilation error. - -Wed Jun 23 13:24:23 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Process_Element.h: - - Added missing includes to fix compilation errors. - -Wed Jun 23 13:07:13 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to fix memory leaks. - -Wed Jun 23 13:05:04 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to fix some memory leaks. - -Wed Jun 23 12:31:14 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to allow "read local URL" work in - Windows machines as well. - -Wed Jun 23 11:48:10 2004 Emre Turkay - - * DnC/Config_Handlers/Process_Element.h: - * DnC/Config_Handlers/Process_Element.i: - * DnC/Config_Handlers/Process_Element.tpp: - - The functions and classes are placed in the deployment namespace. - -Wed Jun 23 03:14:16 2004 Ossama Othman - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.inl: - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/NodeApplicationManager/ImplementationInfo.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - * DnC/RepositoryManager/Update_Plan.cpp: - * DnC/ciao/Container_Base.cpp: - * DnC/ciao/Container_Base.h: - * DnC/ciao/Cookies.cpp: - * DnC/ciao/Deployment_Core.idl: - * DnC/ciao/NodeApp_CB_Impl.cpp: - * DnC/ciao/NodeApp_CB_Impl.h: - * DnC/ciao/NodeApplication_Impl.cpp: - * DnC/ciao/NodeApplication_Impl.h: - * DnC/ciao/NodeApplication_Impl.inl: - * DnC/ciao/Servant_Impl_Base.cpp: - * DnC/ciao/Servant_Impl_T.cpp: - - Performed a code review and left comments for DnC developers. - -Tue Jun 22 18:05:19 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Added comment about the requirement of boost 1.30.2 in order - to build CCF/CIDLC on Windows. - Thanks to Valery for catching this. - -Tue Jun 22 10:38:58 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Added a missing _duplicate () in the connect_emittype () calls. - -Mon Jun 21 17:46:32 2004 Jaiganesh B - - * DnC/RepositoryManager/Update_Plan.cpp: - - Made changes to fix a run-time error. - -Fri Jun 18 16:40:14 2004 Emre Turkay - - * examples/OEP/BasicSP/README.html: - - ".exe" extensions are deleted, because they are not exist in - linux - -Fri Jun 18 16:18:42 2004 Jaiganesh B - - * DnC/RepositoryManager/Update_Plan.cpp: - - Added comments in the code to assist code review. - -Fri Jun 18 15:49:17 2004 Balachandran Natarajan - - * CCF/Documentation/Build.html: - - Cleaned links up a bit. - -Fri Jun 18 14:39:39 2004 Emre Turkay - - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - - CIAO_Container is added as an "after" dependency for the - NodeAppTest_RoundTrip_stub. - -Fri Jun 18 14:14:12 2004 Emre Turkay - - * examples/OEP/BasicSP/README.html: - - Moved the file from Display directory to BasicSP directory. - -Fri Jun 18 14:05:27 2004 Emre Turkay - - * examples/OEP/Display/README.html: - - The file describing how to build and run the example according to - the new DnC spec is added. - -Fri Jun 18 13:34:16 2004 Gan Deng - - * DomainApplicationManager/DomainApplicationManager.mpc - * ExecutionManager/ExecutionManager.mpc - * NodeManager/NodeDaemon.mpc - * RepositoryManager/Repository_Manager.cpp - - Fixed linking problems in Windows. Added debug/test - capabilities by remotely shutdown ExecutionManager. - -Fri Jun 18 11:59:56 2004 Tao Lu - - * docs/tutorial/Hello/hello_exec.cpp: - * docs/tutorial/Hello/hello_exec.h: - Updated these files to follow up the changes in CIDLC. - -Fri Jun 18 11:56:09 2004 Jaiganesh B - - * DnC/RepositoryManager/Update_Plan.cpp: - * DnC/RepositoryManager/Update_Plan.h: - - Helper files to update the deployment plan from the package - configuration IDL data structure. - - Made changes to follow DOC group standard of never a function - more than a page. - -Fri Jun 18 09:36:13 2004 Balachandran Natarajan - - * CCF/Documentation/Build.html: - - Updated the file with a link to Win32 zip files for the Utility - library. - -Thu Jun 17 16:59:21 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/RepositoryManager/Repository_Manager.cpp: - * DnC/RepositoryManager/Update_Plan.cpp: - * DnC/RepositoryManager/Update_Plan.h: - - Moved all the plan handler helper functions to a new - file Update_Plan.cpp. - -Thu Jun 17 16:02:16 2004 Tao Lu - - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - Added one in. () to the debug call. - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/NodeApplicationManager/ImplementationInfo.cpp - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DnC/RepositoryManager/Repository_Manager.cpp - * DnC/ciao/Deployment_Core.idl - * DnC/ciao/NodeApplication_Impl.cpp - * DnC/ciao/NodeApplication_Impl.h - Added the support for ComponentIOR. Also adjusted the start - process which is essential to BasicSP. - -Thu Jun 17 16:00:01 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/HUDisplay/Airframe.cid: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/GPS.cid: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cid: - * DnC/tests/Config_Handlers/HUDisplay/Libraries.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cid: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer.cid: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad: - - Updated the BasicSP scenario example descriptors. - -Thu Jun 17 13:24:01 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Added some comments onto the code. - -Wed Jun 16 17:12:21 2004 Gan Deng - - * DnC/ExecutionManager/ExecutionManager.mpc - * DnC/NodeManager/NodeDaemon.mpc - * DnC/RepositoryManager/RepositoryManager.mpc - - Fixed export library problems in Windows. Added necessary build - dependency settings. - -Wed Jun 16 16:33:13 2004 Arvind S. Krishna - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Updated mpc file to link to the ExecutionManager and NodeDaemon - stubs as operations on these entities are used within the - executor. - - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/NodeDaemon_stub_export.h: - * DnC/NodeManager/Node_Daemon.cpp: - - Added stub macros to generate stub libraries - - * DnC/ExecutionManager/ExecutionManager.mpc: - * DnC/ExecutionManager/ExecutionManager_stub_export.h: - - Stub exports for ExecutionManager. - -Wed Jun 16 15:18:21 2004 Gan Deng - - * DnC/RepositoryManager/RepositoryManager.mpc: - - Fixed linking errors by adding NodeManager and ExecutionManager - stub code into the project settings. - -Wed Jun 16 12:48:11 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to use ACE_Hash_Map instead of std::map. - -Wed Jun 16 12:02:12 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made substantial changes to populate the DeploymentPlan - IDL data structure from the PackageConfiguration data - structure. - - This change enables the DnC framework to have a much shorter - version of the DeploymentPlan XML descriptor, as we can get - the needed information from the PackageConfiguration IDL - data structure and not from the XML descriptors itself. - -Wed Jun 16 11:24:13 2004 Emre Turkay - * DnC/Config_Handlers/RUK_Handler.h: - * DnC/Config_Handlers/NIA_Handler.h: - * DnC/Config_Handlers/MID_Handler.h: - * DnC/Config_Handlers/IR_Handler.h: - * DnC/Config_Handlers/IAD_Handler.h: - * DnC/Config_Handlers/DnC_Dump.h: - * DnC/Config_Handlers/Basic_Handler.h: - - Comments, etc. - -Tue Jun 15 20:53:28 2004 Irfan Pyarali - - * tools/ServerActivator/ServerActivator_test_client.cpp: - - Added missing include file. - - * tools/Segment_Timer/Segment_Timer.cpp: - - Commented out debug statement since the division in it was - failing to compile on Windows. - - * tools/RTComponentServer/RTServer_Impl.cpp (init): - - Indent fixes. - - * tests/RTCCM/DiffServ/descriptors/run_test.pl: - - Remove assembly descriptor file also. - -Tue Jun 15 15:27:08 2004 Gan Deng - - * Dnc/NodeApplication/NodeApplication.cpp - * Dnc/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * Dnc/NodeApplicationManager/NodeApplicationManager_Impl.h - * Dnc/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/ExecutionManager/ExecutionManager_Impl.cpp - * Dnc/NodeManager/NodeDaemon_Impl.cpp - * Dnc/NodeManager/NodeDaemon_Impl.h - * Dnc/NodeManager/Node_Daemon.cpp - * DnC/ciao/NodeApp_CB_Impl.cpp - * DnC/ciao/NodeApp_CB_Impl.h - - Fixed memory leak problems. Now "NodeDaemon" process and - "NodeApplication" process should have no memomry leak problem. - Further test will be based on deploying and tearing down a - deploymentplan many times and try to find memory leak. - -Tue Jun 15 10:48:08 2004 Gan Deng - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Let the object reference narrow down to ExecutionManager - instead of ExecutionManagerDameon. - -Mon Jun 14 15:01:08 2004 Gan Deng - - * DnC/RepositoryManager/Repository_Manager.cpp: - * DnC/ExecutionManager/Execution_Manager.cpp - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/DomainApplicationManager/Deployment_Configuration.cpp - - Fixed memory leak problems. Now ExecutionManager "process" should - have no memomry leak at all. Further test will be on "NodeDaemon" - process, which will detect memory management problem for NodeApplicationManager - as well. - -Mon Jun 14 14:24:08 2004 Gan Deng - - * DnC/NodeManager/Node_Daemon.cpp: - * examples/OEP/BasicSP/EC/client.cpp - - Added missing header file "ace/OS_NS_unistd.h" which contains - hostname function. - -Sun Jun 13 16:13:08 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Some cosmetic changes. - -Sun Jun 13 17:55:01 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to check if we have a wrong URL to - start parsing the deployment plan. - -Sat Jun 12 23:17:08 2004 Tao Lu - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/ImplementationInfo.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/NodeManager/NodeDaemon_Impl.inl: - * DnC/RepositoryManager/Repository_Manager.cpp: - * DnC/ciao/NodeApp_CB_Impl.cpp: - * DnC/ciao/NodeApp_CB_Impl.h: - - Debugged on Windows with Visual Studio + Purify. Now - Every thing should be fine and people could start to - do their own code revision. - - @@Note: If you want to make any change other than - syntactic Changes please be careful and make sure you - don't break anything. - - Now I am moving to add support for Properties. - Things we need for the Demo. - 1. ComponentIOR registration. - 2. Component Attribute initialization. - -Sat Jun 12 16:51:11 2004 Jaiganesh B - - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/TPD_Handler.cpp: - - Made some coding standard changes. - -Fri Jun 11 20:34:12 2004 Tao Lu - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h - * DnC/ExecutionManager/ExecutionManager_Impl.cpp - * DnC/ExecutionManager/ExecutionManager_Impl.h - * DnC/ExecutionManager/ExecutionManager_Impl.inl - * DnC/NodeApplication/NodeApplication.cpp - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl - * DnC/NodeManager/NodeDaemon_Impl.cpp - * DnC/NodeManager/NodeDaemon_Impl.h - * DnC/NodeManager/NodeDaemon_Impl.inl - * DnC/RepositoryManager/Repository_Manager.cpp - * DnC/ciao/Deployment_Core.idl - * DnC/ciao/NodeApplication_Impl.cpp - * DnC/ciao/NodeApplication_Impl.h - - Many Changes of the files. Now on linux it runs up to 3 times - correctly and hangs on the fourth time. I am moving to windows - for this now. Don't commit any change till I send out - notification email, please! - -Fri Jun 11 18:58:04 2004 Gan Deng - - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/Utils.cpp: - - Last ChangeLog: - - Fri Jun 11 17:31:04 2004 Arvind S. Krishna - - Reverted the changes back to an earlier version since parse_href_tags - is used by other classes, and last change caused compilation error. - -Fri Jun 11 17:31:04 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/Utils.cpp: - - Removed un-used methods create_document, parse_href_tags from - the Utils directory. - -Fri Jun 11 16:59:35 2004 Gan Deng - - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp: - - Deleted the extension name ".so" for all library artifacts, since - this stuff is not platform generic. - -Fri Jun 11 16:46:25 2004 Jaiganesh B - - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Process_Basic_Type.i: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made some more coding standard changes. - -Fri Jun 11 16:12:54 2004 Jaiganesh B - - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/CPR_Handler.cpp: - * DnC/Config_Handlers/DT_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/IR_Handler.cpp: - * DnC/Config_Handlers/MID_Handler.cpp: - * DnC/Config_Handlers/NIA_Handler.cpp: - * DnC/Config_Handlers/PCI_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - - Made some more coding standard compliance changes. - -Fri Jun 11 15:44:00 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CEPE_Handler.cpp: - * DnC/Config_Handlers/Cap_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/Config_Error_Handler.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/MID_Handler.h: - * DnC/Config_Handlers/Process_Element.tpp: - - Made some more coding standards compliance changes. - -Fri Jun 11 14:50:42 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made some more coding standard changes. - -Fri Jun 11 14:15:04 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Made some cosmetic changes. - -Fri Jun 11 13:07:35 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Uncommented some code which was accidentally - commented in my previous commit. - -Fri Jun 11 12:55:49 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.tpp: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes to free up memory created by XMLString:: - transcode operations. - -Fri Jun 11 12:07:27 2004 Emre Turkay - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Process_Element.i: - * DnC/Config_Handlers/Process_Element.tpp: - * DnC/Config_Handlers/Utils.cpp: - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Deleted the duplicate definition of create_doc & create_doc is - replaced with create_parser. - -Fri Jun 11 00:10:42 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Utils.cpp: - * DnC/Config_Handlers/Utils.h: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Fixed segmentation faults, traced during integration - teting. - -Thu Jun 10 18:38:46 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Any_Handler.cpp: - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/Utils.cpp: - * DnC/Config_Handlers/Handler_Test.i: - - Fixed errors based on errors discovered using Purify - -Thu Jun 10 18:24:58 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.tpp: - - More memory leaks fixed. - -Thu Jun 10 18:12:44 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/RS_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.cpp: - - Finally, Config_Handler directory compiles correctly - -Thu Jun 10 18:06:52 2004 Arvind S. Krishna - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/Utils.cpp: - - Fixed compilation errors from improper use of XMLString::release. - -Thu Jun 10 18:05:09 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/RS_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.cpp: - - More memory leaks fixed. - -2004-06-10 turkaye - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - - Memory leak problem with XMLString::transcode () is solved. - -Thu Jun 10 17:46:10 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Utils.cpp: - * DnC/Config_Handlers/TPD_Handler.cpp: - - Fixed memory leaks pertaining to ACE_TString making copies of - dynamically allocated memory. The memory supplied to ACE_TString - has to be deleted! Fixed memory for these. - -Thu Jun 10 17:44:57 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/RS_Handler.cpp: - * DnC/Config_Handlers/Requirement_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.cpp: - - More memory leaks fixes. - -Thu Jun 10 17:27:35 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Utils.cpp: - - Fixed some memory leaks as well!! - -Thu Jun 10 17:26:25 2004 Jaiganesh B - - * DnC/Config_Handlers/Process_Element.cpp: - - Fixed memory leaks. - -Thu Jun 10 14:06:03 2004 Jeff Parsons - - * ciao/Servant_Impl_T.cpp: - * DnC/ciao/Servant_Impl_T.cpp: - - Modified code that passed _var.out() to ACE_NEW_RETURN, - since sometimes on Windows platforms, for whatever - reason Var_Base::out() will be called after the - allocation, effectively cancelling it out. It is - alwas safe to declare a pointer, pass it to ACE_NEW_* - and then assign it to a _var, so that is what is - done now in get_all_facets() and get_all_consumers(). - -Thu Jun 10 10:17:00 2004 Tao Lu - - * DnC/ciao/Container_Base.h: - Followed up a Jeff's Change in the old ciao. - - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/RepositoryManager/Repository_Manager.cpp: - * DnC/NodeManager/Node_Daemon.cpp: - * DnC/ciao/NodeApplication_Impl.cpp: - * DnC/DomainApplicationMananger/NodeApplicationManager_Impl.cpp: - - Many adjustments, bug fixing, added missing functionalities. - This is not a working version now. - -Wed Jun 9 11:17:31 2004 Gan Deng - - * DnC/DomainApplicationManager_Impl.cpp - - Fixed a bug which is caused by initialzing ulong sequence type. - -Tue Jun 8 20:53:12 2004 Tao Lu - - * DnC/NodeApplicationManager/ImplementationInfo.cpp: - * DnC/NodeApplicationManager/ImplementationInfo.h: - Added these files. - - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - Changed MPC file reflect the changes. - - Seems MPC doesn't support template very well for GCC. The - dependency is not set at all. I have no choice but to switch to - normal operator overlaoding. - -Tue Jun 8 19:54:03 2004 Tao Lu - - * DnC/ciao/CCM_Core.mpc: - * DnC/ciaoImplementation.h: - Removed this file also changed MPC file. - -Tue Jun 8 14:15:31 2004 Gan Deng - - * DnC/DomainApplicationManager_Impl.cpp - - Tested it and it could split plan well and also contact - NodeDaemon without problem. - - Fixed a bug caused by not using a reference. - -Tue Jun 8 17:18:28 2004 Tao Lu - - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/ciao/CCM_Core.mpc: - Fixed another set of linking problem about export macros. - -Tue Jun 8 14:15:31 2004 Gan Deng - - * DnC/RepositoryManager/RepositoryManager.mpc: - - Added missing library CIAO_Server. - -Tue Jun 8 15:50:28 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Added duplicate for one return value. - -Tue Jun 8 15:00:30 2004 Emre Turkay - - * DnC/Config_Handlers/TPD_Handler.h: - * DnC/Config_Handlers/TPD_Handler.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - - Added TopLevelDescription handler. - -Tue Jun 8 14:29:01 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - - Made changes to read the top level package URL - and create the PackageConfiguration IDL data structure. - -Tue Jun 8 14:15:31 2004 Gan Deng - - * DnC/Config_Handlers/Utils.h: - - Fixed the Windows export library problem. - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - - Added "return" to those unimplemented functions to makde the - compiler happy. - -Tue Jun 8 14:10:08 2004 Tao Lu - - * DnC/ciao/CCM_Core.mpc: - Fixed source file placement. - -Tue Jun 8 10:35:32 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Added dump function to dump connections. - -Tue Jun 8 10:16:48 2004 Arvind S. Krishna - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Added diagnostic comments to aid in debugging during execution - of the Executor. - -Tue Jun 8 09:55:41 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Commented out certain un-necessary DEBUG statements. - -Tue Jun 8 02:53:32 2004 Tao Lu - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - Rewritten the connection part of the interface. - Enhanced the performace by avoiding excessive deep copy and - better condition branching. Also added exception mechanism in - the connction part. - -Mon Jun 7 21:22:03 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - Finished this interface implementation. - - * DnC/ciao/ImplementationInfo.h: - Added this file containing the templated helper operators. - -Mon Jun 7 15:44:51 2004 Arvind S. Krishna - - * DnC/ExecutionManager/Execution_Manager.cpp: - * DnC/ExecutionManager/ExecutionManager.mpc: - - First cut at writing the executor that is used to start - deployment process and terminate it. Changed the mpc file to - rename the generated executable to be named executor as - described in the specification. - -Mon Jun 7 14:23:38 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Fixed an error causing segmentation fault by changing - Dump_Obj::desc_map_ template argument from "const char*" - to "std::string". - - -Mon Jun 7 12:10:31 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - The PortConnectionDescription structure a PortKind variable change the - code to make the connection decisions based on value of that variable. - Also change the connection fields values which will be passed to - finishLaunch() to make the NodeApplication work. - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Change the definition type of the variable from const reference - to just regular object mapped from IDL struct type. - -Mon Jun 7 01:40:57 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - Finished the creat_connctions method. - Partially finished the startLaunch method. - - * DnC/ciao/NodeApplication_Impl.h: - * DnC/ciao/NodeApplication_Impl.cpp: - * DnC/ciao/NodeApplication_Impl.inl: - Finished implementing the NodeApplication interface. - Added the finish launch method. - -Sun Jun 6 21:13:27 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - - Removed generation of a template parameter to the Servant_Impl - base class that was removed from the CIAO_Server library in - - Fri Jun 4 18:16:47 2004 Jeff Parsons - -Sat Jun 5 23:26:53 2004 Tao Lu - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Tweaked a bit of the code to make it compile. - - Gan, Please look at my comments in the code. - -Sat Jun 5 17:24:21 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Change the order of member initialization in the constructors of - AttributeEmitter and ReadonlyAttributeEmitter to match a recent - change in the order of their class members. - -Sat Jun 5 16:45:14 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Updated repository manager to return the PackageConfiguration - element created while parsing the top level package - URL. - -Sat Jun 5 15:04:15 2004 Jaiganesh B - - * DnC/RepositoryManager/Repository_Manager.cpp: - - Updated the repository manager to dump out the - top level package and the deployment plan. - -Sat Jun 5 14:59:47 2004 Tao Lu - - * DnC/tests/NodeApplicationTest/README: - Added this readme file for user to understand the testing scenario. - - -Sat Jun 5 14:46:12 2004 Tao Lu - - * ./DnC/ciao/Servant_Impl_Base.h: - - Cosmetic changes. - - * DnC/ciao/Servant_Impl_T.cpp: - * DnC/ciao/Servant_Impl_T.h: - - Removed one of the template parameters and used instead - the typedefs generated by the IDL compiler for interfaces. - - Followed Jeff Parson's Changes. Hopefully we can merge the two - ciao directories soon so I don't have to duplicate the commit - every time after Jeff makes changes. - -Fri Jun 4 18:16:47 2004 Jeff Parsons - - * ciao/Servant_Impl_Base.h: - - Cosmetic changes. - - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - - Removed one of the template parameters and used instead - the typedefs generated by the IDL compiler for interfaces. - - * CIDLC/ServantSourceGenerator.cpp: - - Moved the call to populate_port_tables() from ciao_postactivate() - to the servant constructor. - -Fri Jun 4 17:19:44 2004 Krishnakumar B - - * DnC/tests/Config_Handlers/HUDisplay/Airframe.ccd: - * DnC/tests/Config_Handlers/HUDisplay/Airframe.cid: - * DnC/tests/Config_Handlers/HUDisplay/Airframe.cpd: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/Domain.cdd: - * DnC/tests/Config_Handlers/HUDisplay/GPS.ccd: - * DnC/tests/Config_Handlers/HUDisplay/GPS.cid: - * DnC/tests/Config_Handlers/HUDisplay/GPS.cpd: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cdp: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cid: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.cpd: - * DnC/tests/Config_Handlers/HUDisplay/HUDisplay.pcd: - * DnC/tests/Config_Handlers/HUDisplay/Libraries.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay.ccd: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cid: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay.cpd: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer.ccd: - * DnC/tests/Config_Handlers/HUDisplay/Timer.cid: - * DnC/tests/Config_Handlers/HUDisplay/Timer.cpd: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Exec.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Stub.iad: - * DnC/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad: - * DnC/tests/Config_Handlers/HUDisplay/package.tpd: - - Moved the descriptor files needed to test BasicSP from my - homepage to the CVS repository. The Config_Handlers should be - able to build a tree starting from package.tpd. Not sure, if it - works that way now. - -Fri Jun 4 15:54:09 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Cosmetic and other minor changes to generated code. - -Fri Jun 4 15:38:18 2004 Gan Deng - - * DnC/ciao/Deployment_Core.idl - - Change the "Connection" IDL type by replacing the "string name" - field with three more fields, i.e., "string instanceName", - "string portName" and "CCMComponentPortKind kind". We feel the - old one in DnC spec is not well defined and make the run-time - thing harder. - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Finished all the functionality to handle connections and all - other things required. - -Fri Jun 4 15:32:50 2004 Tao Lu - - * DnC/tests/NodeApplicationTest/RoundTripEI.idl: - Removed this file. - - * DnC/tests/NodeApplicationTest/RoundTrip_exec.h: - * DnC/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - Changed these files to get the get_all_facets test working. - Note: I have changed the component implementation to the new - executor mapping that Boris proposed. It's not a must in this - example but we can use it later as a tutorial for our users. - - * DnC/tests/NodeApplicationTest/run_test_ex.pl: - * DnC/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - Added these two files to test the get_all_facets function. - -Fri Jun 4 15:02:15 2004 Jaiganesh B - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc: - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made changes so that RepositoryManager can dump out the - PackageConfiguration elements. - -Fri Jun 4 11:42:18 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added functions to handle connections. Get rid of the - field from the hash map table since they don't need to be maintained - any more. - - -Fri Jun 4 11:37:51 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed a bug in code generation for the port table population - method check in with - - Thu Jun 3 12:35:51 2004 Jeff Parsons - - and changed code generation of facet servant classes to be - a template class with a dummy argument. Immediately below - the declaration, we generate a typedef to the actual - facet servant class name, using int as the template argument. - Because the facet servant class name is based only on the - underlying interface type, this change prevents link errors - when components in other translation units use the same - interface type for a facet, since the compiler will use - only one symbol for all the template instantiations, and - it is legal to typedef something more than once if it is - aliased to the same type. Finally, added checks to ensure - that the facet servant class is generated only once in - each translation unit, by allowing the underlying interface - AST node to be traversed by the facet class code emitter - only once. - -Fri Jun 4 11:40:18 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Clean-up of the unused, commented out code sections. - -Fri Jun 4 11:31:09 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Made changes to fix "Ref" variables. - -Fri Jun 4 11:22:46 2004 Tao Lu - - * DnC/ciao/Deployment_Core.idl: - * DnC/ciao/Deployment.idl: - Changed the connection struct definition to better suite our - needs. - -Fri Jun 4 11:19:45 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Fixed the dump function for Deployment::SubcomponentPortEndpoint. - Prints out the instanceRef. - -Fri Jun 4 10:46:42 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Made changes to fix dumping of some "Ref" variables. - -Fri Jun 4 09:53:14 2004 Emre Turkay - - * DnC/Config_Handlers/tckind_names.h: - * DnC/Config_Handlers/tckind_names.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - - Deleted the files which initially written for dumping out the - ComponentPropertyDescription::type. It is handled as a big - switch section in DnC_Dump.cpp. - -Fri Jun 4 09:52:28 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Removed the check_plan_validity () method and added its - functionality in the get_plan_info () method. This eliminates - the need to have a separate loop to iterate over the list of - names to populate the NodeManager references, now this step is - done within a single loop. - -Thu Jun 3 17:28:49 2004 Tao Lu - - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - Formatted the output a bit to make the message more reflective. - - * DnC/ciao/CCM_Core.mpc: - Moved the callback implementation from deployment servant to - stub. - -Thu Jun 3 16:25:58 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Added the dump code for ComponentPropertyDescription::type (CORBA::TypeCode). - -Thu Jun 3 16:15:41 2004 Jeff Parsons - - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/ciao/CCM_Core.mpc: - - Some tweaks to the MPC files. - -Thu Jun 3 16:10:11 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Forgot to remove generated members of the servant class that - have been moved to the base classes. - -Thu Jun 3 16:07:35 2004 Emre Turkay - - * DnC/Config_Handlers/DnC_Dump.h: - * DnC/Config_Handlers/DnC_Dump.cpp: - - Added the methods required to dump referenced values - correctly. Dump functions are chaged accordingly. - -Thu Jun 3 14:19:31 2004 Arvind S. Krishna - - * DnC/ExecutionManager/ExecutionManager.mpc: - * DnC/ExecutionManager/Execution_Manager.cpp: - - Removed CIAO::Server_init () method calls from the server, as - this server does not need capabilities for explicitly processing - valuetypes. These calls are already present in NodeApplication - entity. - -Thu Jun 3 12:35:51 2004 Jeff Parsons - - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - New files added to CIAO_Server. A template base class is now - inserted into the inheritance hierarchy between the skeleton - class of the component's equivalent interface and the - servant class generated by the CIDL compiler. This template - class also has a non-template base class to hold code that - is based neither on the template parameters or on the - inheritance chain. These two classes will hold code common - to all generated servant classes, templatized for the - skeleton class type, the executor type and the context type. - So far, only get_all_facets() and get_all_consumers() have - been factored out and implemented. - - * ciao/CCM_Core.mpc: - - Changes to reflect the items above. Also added -Sc to the - generated IDL compiler command line of each project to - suppress the generation of the TIE classes. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Change to reflect the items listed above, and also a new - method to populate tables in class Servant_Impl_Base that - store port descriptions. So far the event consumers and - the facets of the component are stored. - -Thu Jun 3 12:37:21 2004 Arvind S. Krishna - - * DnC/NodeManager/Node_Daemon.cpp: - - Used OS_NS_stdio.h header file for fopen fclose methods defined - in ACE_OS namespace. - -Thu Jun 3 10:51:32 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeDaemon.idl: - - Changed #include "Deployment.idl" to "#include - ciao/Deployment.idl" to conform to the DnC include format. - -Wed Jun 2 23:26:41 2004 Tao Lu - - * DnC/Config_Handlers/CompImplDesc_Handler.h: - * DnC/Config_Handlers/DnC_Dump.h: - * DnC/ExecutionManager/ExecutionManager.mpc: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - * DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DnC/tests/NodeApplicationTest/run_test_simple.pl: - - Updated these files to make it work with the new directory - structure. - - Now, Let me explain the issue. - When I started implement the new DnC spec I was forced to change - some of the CIAO core implementations. The one very important - CIAO session container implementation is changed but not - significantly. However because we use MPC templates extensively - in CIAO some of the legacy mpb files is causing some trouble. I - catched this mistake when I was actually using some of the newly - provided functionalities in the conatainer, the red light - showed itself as a run time relocation error. - - Another driving force of these change is from CIDLC. Since in - the generated code ciao/*** is used as the include file name, - there is no way that I can make the new container implementation - link with the servant project of the component implementation. - -Wed Jun 2 23:21:37 2004 Tao Lu - - * DnC/ciao/CCM_Base.idl: - * DnC/ciao/CCM_Component.idl: - * DnC/ciao/CCM_Container.idl: - * DnC/ciao/CCM_Container_Ex.idl: - * DnC/ciao/CCM_Core.mpc: - * DnC/ciao/CCM_Event.idl: - * DnC/ciao/CCM_Transaction.idl: - * DnC/ciao/CIAO_Client_Export.h: - * DnC/ciao/CIAO_Container_Export.h: - * DnC/ciao/CIAO_Server_Export.h: - * DnC/ciao/CIAO_Value.idl: - * DnC/ciao/CIAO_common.h: - * DnC/ciao/CVS: - * DnC/ciao/Client_init.cpp: - * DnC/ciao/Client_init.h: - * DnC/ciao/Components.idl: - * DnC/ciao/ComponentsC.h: - * DnC/ciao/ComponentsS.h: - * DnC/ciao/Container_Base.cpp: - * DnC/ciao/Container_Base.h: - * DnC/ciao/Container_Base.inl: - * DnC/ciao/Container_Base.pidl: - * DnC/ciao/Cookies.cpp: - * DnC/ciao/Cookies.h: - * DnC/ciao/Cookies.inl: - * DnC/ciao/CosPersistentState.idl: - * DnC/ciao/Deployment.idl: - * DnC/ciao/Deployment_Core.idl: - * DnC/ciao/Deployment_stub_export.h: - * DnC/ciao/Deployment_svnt_export.h: - * DnC/ciao/NodeApp_CB_Impl.cpp: - * DnC/ciao/NodeApp_CB_Impl.h: - * DnC/ciao/NodeApplication_CallBack.idl: - * DnC/ciao/NodeApplication_Impl.cpp: - * DnC/ciao/NodeApplication_Impl.h: - * DnC/ciao/NodeApplication_Impl.inl: - * DnC/ciao/Server_init.cpp: - * DnC/ciao/Server_init.h: - * DnC/ciao/Version.h: - - Added these files to replace the files in the old DnC/Core directory. - -Wed Jun 2 22:55:57 2004 Tao Lu - - * DnC/Core/CCM_Base.idl: - * DnC/Core/CCM_BaseS.cpp: - * DnC/Core/CCM_BaseS.h: - * DnC/Core/CCM_Component.idl: - * DnC/Core/CCM_ComponentS.cpp: - * DnC/Core/CCM_ComponentS.h: - * DnC/Core/CCM_Container.idl: - * DnC/Core/CCM_ContainerS.cpp: - * DnC/Core/CCM_Container_Ex.idl: - * DnC/Core/CCM_Container_ExS.cpp: - * DnC/Core/CCM_Core.mpc: - * DnC/Core/CCM_Event.idl: - * DnC/Core/CCM_EventS.cpp: - * DnC/Core/CCM_EventS.h: - * DnC/Core/CCM_Transaction.idl: - * DnC/Core/CCM_TransactionS.cpp: - * DnC/Core/CIAO_Client_Export.h: - * DnC/Core/CIAO_Container_Export.h: - * DnC/Core/CIAO_Server_Export.h: - * DnC/Core/CIAO_Value.idl: - * DnC/Core/CIAO_ValueS.cpp: - * DnC/Core/CIAO_ValueS.h: - * DnC/Core/CIAO_common.h: - * DnC/Core/Client_init.cpp: - * DnC/Core/Client_init.h: - * DnC/Core/Components.idl: - * DnC/Core/Container_Base.cpp: - * DnC/Core/Container_Base.h: - * DnC/Core/Container_Base.inl: - * DnC/Core/Container_Base.pidl: - * DnC/Core/Cookies.cpp: - * DnC/Core/Cookies.h: - * DnC/Core/Cookies.inl: - * DnC/Core/CosPersistentState.idl: - * DnC/Core/CosPersistentStateS.cpp: - * DnC/Core/Deployment.idl: - * DnC/Core/DeploymentS.cpp: - * DnC/Core/Deployment_Core.idl: - * DnC/Core/Deployment_stub_export.h: - * DnC/Core/Deployment_svnt_export.h: - * DnC/Core/GNUmakefile: - * DnC/Core/GNUmakefile.CIAO_Client: - * DnC/Core/GNUmakefile.CIAO_Container: - * DnC/Core/GNUmakefile.CIAO_Server: - * DnC/Core/GNUmakefile.Deployment_stub: - * DnC/Core/GNUmakefile.Deployment_svnt: - * DnC/Core/NodeApp_CB_Impl.cpp: - * DnC/Core/NodeApp_CB_Impl.h: - * DnC/Core/NodeApplication_CallBack.idl: - * DnC/Core/NodeApplication_Impl.cpp: - * DnC/Core/NodeApplication_Impl.h: - * DnC/Core/NodeApplication_Impl.inl: - * DnC/Core/Object_Set_T.cpp: - * DnC/Core/Object_Set_T.h: - * DnC/Core/Object_Set_T.inl: - * DnC/Core/Server_init.cpp: - * DnC/Core/Server_init.h: - * DnC/Core/Version.h: - * DnC/Core/: - - Removed all these files to avoid the suite the change of the - directory. Note: now DnC/Core is replaced by DnC/ciao. - -Wed Jun 2 21:54:51 2004 Jeff Parsons - - * ciao/CCM_Base.idl: - - Fixed identifier of a member of PortDescription - changed - 'Name' to 'name', to conform to the CCM spec. - -Wed Jun 2 19:22:29 2004 Venkita Subramonian - - * ChangeLog: - - Forgot to add change description for the previous change. - -Wed Jun 2 19:07:01 2004 Venkita Subramonian - - * ciao/CIAO_Client_Export.h: - * ciao/CIAO_Container_Export.h: - * ciao/CIAO_Export.h: - * ciao/CIAO_Server_Export.h: - * examples/OEP/BasicSP/BasicSP_stub_export.h: - * examples/OEP/BasicSP/BasicSP_svnt_export.h: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec_export.h: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_stub_export.h: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt_export.h: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec_export.h: - * examples/OEP/BasicSP/BMDevice/BMDevice_stub_export.h: - * examples/OEP/BasicSP/BMDevice/BMDevice_svnt_export.h: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec_export.h: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_stub_export.h: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt_export.h: - * examples/OEP/BasicSP/EC/EC_exec_export.h: - * examples/OEP/BasicSP/EC/EC_stub_export.h: - * examples/OEP/BasicSP/EC/EC_svnt_export.h: - * tools/Segment_Timer/Segment_Timer_Export.h: - * tools/Simple_Component_Server/Simple_Server_Stub_Export.h: - * tools/XML_Helpers/XML_Helpers_Export.h: - - Regenerated these files with -s option to take care of static - builds on Windows. - -Wed Jun 2 18:57:29 2004 Tao Lu - - * DnC/Core/NodeApplication_Impl.cpp: - Fixed a few bugs inside. - - * DnC/tests/NodeApplicationTest/NodeAppTest.mpc: - * DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DnC/tests/NodeApplicationTest/run_test.pl: - * DnC/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - - Added a test to do a more complete test on NodeApplication. - Please note that there is a name change of files. The mpc file - explains very thing. - - * DnC/Core/Client_init.cpp: - I made the default value for debug_level 1, later we should - reverse the change. - -Wed Jun 2 18:37:24 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/Node_Daemon.cpp: - - Changes to ensure that the DomainApplicationManager is capable - of calling the NodeDaemon to spawn a NodeApplicationManager for - the corresponding application. - -Wed Jun 2 16:38:48 2004 Jaiganesh B - - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/MID_Handler.cpp: - * DnC/Config_Handlers/NIA_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - - Made changes to fix testing errors. - -Wed Jun 2 15:50:12 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc - - Added Config_Handlers library to fix linking probelm in Windows. - - * DnC/ExecutionManager/ExecutionManager.mpc - - Added ciao_deployment_stub and CIAO_Server libraries to fix - linking probelm in Windows. - - * DnC/RepositoryManager/RepositoryManager.mpc - - Added ciao_deployment_stub library to fix linking probelm in Windows. - - -Wed Jun 2 15:07:56 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Fixed errors in split_plan() function to make it work. - - -Wed Jun 2 12:30:56 2004 Jaiganesh B - - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/MID_Handler.cpp: - * DnC/Config_Handlers/NIA_Handler.cpp: - * DnC/Config_Handlers/PCI_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - - Made changes to fix some more testing errors. - -Wed Jun 2 11:51:57 2004 Arvind S. Krishna - - * DnC/ExecutionManager/Execution_Manager.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - - Fixed hashtable used within the ExcutionManager to check for - duplicates in the right manner. - -Wed Jun 2 10:31:27 2004 Tao Lu - - * DnC/tests/Config_Handlers/handler_test.mpb: - * DnC/Config_Handlers/Config_Handlers.mpc: - Updated these two file to make it compile with working on the - system like Debian or RedHat which have the pre-build binary - installed instead of xerces source. - -Wed Jun 2 00:48:30 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/Process_Element.i: - * DnC/Config_Handlers/Process_Element.tpp: - - Made changes to fix testing errors. - -Tue Jun 1 18:13:23 2004 Tao Lu - - * DnC/Core/NodeApplication_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Updated these two files to fix the bug related to nil (); - -Tue Jun 1 18:09:19 2004 Gan Deng - - * DnC/NodeManager/NodeDaemon.mpc - - Modify this to fix linking errors for missing library. - -Tue Jun 1 17:52:29 2004 Gan Deng - - * DnC/NodeApplicationManager/NodeApplicationManager.mpc - - Modify this to fix linking errors. - - -Tue Jun 1 17:39:57 2004 Jaiganesh B - - * DnC/Config_Handlers/CompPortDesc_Handler.cpp: - * DnC/Config_Handlers/CompPortDesc_Handler.h: - * DnC/Config_Handlers/CompPropDesc_Handler.cpp: - * DnC/Config_Handlers/CompPropDesc_Handler.h: - - Removed the above handlers as they are not used at all. - - * DnC/Config_Handlers/Config_Handlers.mpc: - - Updated the MPC file accordingly. - -Tue Jun 1 15:30:49 2004 Jaiganesh B - - * DnC/Config_Handlers/Basic_Handler.h: - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/Cap_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/CompPortDesc_Handler.cpp: - * DnC/Config_Handlers/Process_Element.i: - * DnC/Config_Handlers/Process_Element.tpp: - - Made changes to fix some testing errors - -Tue Jun 1 15:08:23 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeApplicationManager_Impl.h: - * DnC/NodeManager/NodeApplicationManager_Impl.cpp: - - Removed these files; New implementation present in - DnC/NodeApplicationManager directory - - * DnC/NodeManager/Node_Daemon.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/NodeDaemon.mpc: - - Changed the Node Manager to interact with the new - NodeApplication Manager implementation. - -Tue Jun 1 15:08:13 2004 Arvind S. Krishna - - * DnC/tests/NodeApplicationTest/run_test.pl: - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - - Added run_test.pl to run this test via scripts - -Tue Jun 1 14:48:01 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - Updated the class to cooperate with NodeManager. - There is some memory management and lifecycle of object issue - solved by this update. Basically speaking, since NodeManager is - a daemon (running forever if nothing went wrong) we have to make - sure that the NodeApplicationManager will be actually destroyed - when its not needed any more. This update enables us to do this - and prevented us from hacking the OMG IDL file. - -Tue Jun 1 12:36:10 2004 Jaiganesh B - - * DnC/Config_Handlers/Basic_Handler.cpp: - * DnC/Config_Handlers/Basic_Handler.h: - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CAD_Handler.h: - * DnC/Config_Handlers/CPR_Handler.h: - * DnC/Config_Handlers/Cap_Handler.h: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.h: - * DnC/Config_Handlers/CompIntrDesc_Handler.h: - * DnC/Config_Handlers/CompPkgDesc_Handler.h: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/IAD_Handler.h: - * DnC/Config_Handlers/IR_Handler.h: - * DnC/Config_Handlers/MID_Handler.h: - * DnC/Config_Handlers/NIA_Handler.h: - * DnC/Config_Handlers/PCI_Handler.h: - * DnC/Config_Handlers/PC_Handler.h: - * DnC/Config_Handlers/Plan_Handler.h: - * DnC/Config_Handlers/Process_Element.i: - - Made changes to fix testing errors. - -Tue Jun 1 12:09:18 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - Changed the init method to return a objectRef of - the NodeApplicationManager to make NodeManager happy. - -Tue Jun 1 11:40:29 2004 Gan Deng - - * DnC/Config_Handlers/Basic_Handler.h - * DnC/Config_Handlers/CompIntrDesc_Handler.h - * DnC/Config_Handlers/CompPkgDesc_Handler.h - * DnC/Config_Handlers/CompPortDesc_Handler.h - * DnC/Config_Handlers/CompPropDesc_Handler.h - * DnC/Config_Handlers/Config_Error_Handler.h - * DnC/Config_Handlers/DnC_Dump.h - * DnC/Config_Handlers/IAD_Handler.h - * DnC/Config_Handlers/IR_Handler.h - * DnC/Config_Handlers/MID_Handler.h - * DnC/Config_Handlers/NIA_Handler.h - * DnC/Config_Handlers/PCI_Handler.h - * DnC/Config_Handlers/PC_Handler.h - * DnC/Config_Handlers/RUK_Handler.h - - Fixed the export libary problem for Windows. - -Tue Jun 1 10:49:49 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - - Made changes to fix testing errors. - -Tue Jun 1 10:41:49 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - Finished the NodeApplicationManager except the connection - part. - -Tue Jun 1 10:16:21 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Export.h - - Added this file for Windows to export library. - - -Tue Jun 1 10:12:46 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager.idl: - * DnC/RepositoryManager/RepositoryManager.mpc: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/Repository_Manager.cpp: - - Made a first-cut check-i for repository manager. - -Tue Jun 1 10:01:25 2004 Venkita Subramonian - - * examples/OEP/BasicSP/BMDevice/BMDevice.cidl: - * examples/OEP/BasicSP/BMClosedED/BMClosedED.cidl: - - Included BasicSP.idl to fix problems during static linking. - -Tue Jun 1 00:42:56 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Process_Element.cpp: - - Made changes to fix some testing errors. - - -Tue Jun 1 00:32:22 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Process_Element.cpp: - - Made changes to fix some testing errors. - -Mon May 31 18:50:28 2004 Jaiganesh B - - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.cpp: - - Made changes to fix some testing errors. - -Mon May 31 18:27:47 2004 Venkita Subramonian - * tools/Segment_Timer/Segment_Timer.h: - * tools/static_configurator/Static_Configurator.cpp: - - Made some fixes related to DLL exports to get rid of - build errors on Windows. - -Mon May 31 18:25:30 2004 Jaiganesh B - - * DnC/Config_Handlers/Any_Handler.cpp: - * DnC/Config_Handlers/CPK_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - - Made some changes to fix some testing errors. - - -Mon May 31 17:18:55 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Any_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompPropDesc_Handler.cpp: - * DnC/Config_Handlers/DT_Handler.cpp: - * DnC/Config_Handlers/DT_Handler.h: - - Resolved Typecode and Any related errors relating to parsing the - Deployment plan. - -Mon May 31 16:33:16 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Added support for the emits-related navigation method, - and automatic registration of value factories for - event consumers. Also fixed bug in code generation - for uses multiple. - - * ciao/Container_Base.h: - - Added CIAO_REGISTER_OBV_FACTORY macro, used by the - CIDL compiler when generating factory registration - calls for event consumers. There is also a version of - this macro called CIAO_REGISTER_VALUE_FACTORY in - CIAO_common.h. This version takes an extra argument - which is an ORB pointer. This macro was separately - added, planning for the day when we may want - components to run with a separate process and/or ORB - from their containers. These two versions will have - to be reconciled at some point. - - * tools/Segment_Timer/Segment_Timer.mpc: - - Added the export file to the project. - - * tools/XML_Helpers/RTConfig_Handlers.cpp: - - Added some static casts to eliminate warnings on - MSVC. - -Mon May 31 16:19:17 2004 Tao Lu - - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - Updated this file. - - * DnC/NodeApplicationManager/CIAO_NAM_Export.h: - Added this export file. - - * DnC/NodeApplicationManager/NodeApplicationManager.cpp: - Removed this file since NodeApplicationManager will be - collocated with NodeManager. - - * DnC/NodeApplicationManager/CIAO_NodeApplicationManager.idl: - Removed this file since I have moved this into deployment_svnt - project. - - * DnC/Core/NodeApplication_Impl.cpp: - Changed from 0 to CORBA::Object::_nil () as return value. - -Mon May 31 15:18:25 2004 Arvind S. Krishna - - * DnC/test/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DnC/test/NodeApplicationTest/NodeApp_test_client.cpp: - * DnC/test/NodeApplicationTest/RoundTripEI.idl: - * DnC/test/NodeApplicationTest/RoundTrip_exec.cpp: - * DnC/test/NodeApplicationTest/RoundTrip_exec.h: - - Changed the idl interface to supports rather than provides as - this feature has not been implemented yet. - -Mon May 31 14:48:21 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Added export library thing for Windows. - - -Mon May 31 13:35:15 2004 Gan Deng - - * DnC/Config_Handlers/Config_Handlers.mpc: - - Added the missing dependency library to the mpc file, which - is CIAO_Server library. - -Mon May 31 13:10:15 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc: - - Added necessary dependency libraries to the mpc file, which - causes build probelm under Windows. - - * DnC/DomainApplication/DomainApplication_Impl.h - * DnC/DomainApplication/DomainApplication_Impl.cpp - - Removed these files since DomainApplication are now - combined with DomainApplicationManager. - - -Mon May 31 11:00:50 2004 Tao Lu - - * DnC/Core/NodeApplication_Impl.cpp: - Fixed one bug of the refence count of Component instance - objectRef. - -Mon May 31 00:40:25 2004 Tao Lu - - * DnC/Core/NodeApplication_Impl.cpp: - * DnC/Core/NodeApplication_Impl.h: - - Added component/home removal functionality. - Also added a install method which will be called by - NodeApplicationManager to install everything which belong - to the NodeApplication. - -Sun May 30 17:47:10 2004 Arvind S. Krishna - - * DnC/tests/NodeApplicationTest: - - Directory for testing CIAO's NodeApplication entity - - * DnC/tests/NodeApplicationTest/NodAppTest.mpc: - mpc file for this test case - - * DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DnC/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl: - * DnC/tests/NodeApplicationTest/RoundTripEI.idl: - - A simple component as a test case that provides an interface - LatencyTest which has a single operation defined that cubes a - long - - * DnC/tests/NodeApplicationTest/RoundTrip_stub_export.h: - * DnC/tests/NodeApplicationTest/RoundTrip_svnt_export.h: - * DnC/tests/NodeApplicationTest/RoundTrip_exec_export.h: - - Export files to keep windows happy - - * DnC/tests/NodeApplicationTest/RoundTrip_exec.h: - * DnC/tests/NodeApplicationTest/RoundTrip_exec.cpp: - - Component implementation definitions - - * DnC/tests/NodeApplicationTest/NodeApp_test_client.cpp: - - Client program that tries to install the RoundTrip home with the - NodeApplication aka ComponentServer, create the Component, - i.e. RoundTrip, and invoke the cube long operation. - - This test case exercises the call path for home installation, - component creation within the new DnC specification. This test - case should also have component removal operations, which will - be added as and when this is implemented in CIAO. - -Sun May 30 15:43:24 2004 Arvind S. Krishna - - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/NodeApplication/NodeApplication.cpp: - - Resolved compilation and link errors. Now the NodeApplication - can be started generating an ior! Next step will be to write a - test client to install homes and create components. - -Sun May 30 14:36:21 2004 Tao Lu - - * DnC/NodeApplication/NodeApplication.mpc: - * DnC/NodeApplication/NodeApplication.cpp: - * DnC/Core/Container_Base.h: - * DnC/Core/Container_Base.cpp: - * DnC/Core/Deployment_Core.idl: - * DnC/Core/NodeApplication_Impl.h: - * DnC/Core/NodeApplication_Impl.cpp: - - Updateed those files to finish home creation part. - -Sat May 29 15:25:22 2004 Jaiganesh B - - * DnC/RepositoryManager/RepositoryManager_Impl.h: - * DnC/RepositoryManager/RepositoryManager_Impl.cpp: - * DnC/RepositoryManager/RepositoryManager.mpc: - - First cut implementation of Repository Manager. - -Fri May 28 23:17:44 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeDaemon.idl: - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/Node_Daemon.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - - Fixed compilation and linking errors stemming from refactoring - DnC core to include the Deployment.idl files. Modified the - include paths as now these are autogenerated from the - ciao_deployment.mpb file - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Removed the getApplications () member function the the header - file. This is not present as a part of the interface. This - resolves link errors - - * DnC/ExecutionManager/ExecutionManager.mpc: - - Removed the unnecessary ciao_server target from the mpc file as - this library is not needed - -Fri May 28 10:18:45 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Fixed warnings resulting from non usage of .in () while - assigning to a _ptr from a _var. - - * DnC/DomaiinApplicationManager/DomainApplicationManager_Impl.inl: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Created file for storing inline functions - -Thu May 27 22:16:26 2004 Tao Lu - - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedEDE.idl: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDeviceE.idl: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplayE.idl: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay_svnt.h: - * examples/handcrafted/BasicSP_EC/EC/ECE.idl: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.cpp: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.h: - - Removed these files from the Repo. Please be careful when you - commit files and please double check EVEN you have done make - realclean! - - -Thu May 27 22:14:18 2004 Venkita Subramonian - - * tools/static_configurator/Static_Configurator.mpc: - * tools/static_configurator/Static_Configurator.h: - * tools/static_configurator/Static_Configurator.cpp: - * tools/static_configurator/Static_Assembly_Visitors.cpp: - * tools/static_configurator/Static_Assembly_Parser.cpp: - - Made changes related to performance measurement of static - configuration mechanisms. - - * tools/Segment_Timer/Segment_Timer_Export.h: - * tools/Segment_Timer/Segment_Timer.{cpp,h,mpc}: - * tools/Segment_Timer/README: - - Adding segment timer files. This class is used in the - performance measurements of static and dynamic configurations. - - * tools/RTComponentServer/RTComponentServer.mpc: - * tools/Assembly_Deployer/Assembly_Visitors.cpp: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - - Made changes related to performance measurement of dynamic - configuration mechanisms. - -Thu May 27 18:39:10 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Redefine the Hash map to make all the artifacts (NodeManager, - NodeApplicationManager, NodeApplication, Connections) handy - to use. Changed all the member functions to reflect this - change. - -Thu May 27 17:45:26 2004 Tao Lu - - * DnC/tests/Config_Handlers/handler_test.mpb: - - Added reqires dnc to stop the noise on the scoreboard. - -Thu May 27 22:10:27 2004 Emre Turkay - * DnC/Core/Deployment.idl: - - Added DeploymentPlan::UUID. - -Thu May 27 22:02:21 2004 Emre Turkay - * DnC/Config_Handlers/Plan_Handler.cpp: - - Added handler for DeploymentPlan::UUID - -Thu May 27 16:42:26 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added a check to make sure that duplicate NodeManager names are - not added to the internal hashmap maintained in this - entity. This ensures that the length always corresponds to the - unique set of node names. Thanks to Gan Deng for pointing this - out. - -Thu May 27 16:38:19 2004 Boris Kolpackov - - * DnC/Deployment.xsd: Added UUID element to deploymentPlan. - - -Thu May 27 13:03:02 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added the get_plan_info () method, that parses the plan - according to the individual nodes on which the plan needs to be - deployed. Also changed internal tables to use ACE_Vector to - store plan related information. - -Thu May 27 11:02:47 2004 Arvind S. Krishna - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added two new operations get_uuid and set_uuid that will help - the ExecutionManager associating the DomainApplicationManager - with a concrete DeploymentPlan passed. These are defined on the - servant only. - - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - - Implementation of Deployment::ExecutionManager interface. This - has now been integrated with the DomainApplicationManager. - - * DnC/DomainApplicationManager/Deployment_Configuration.h: - - Removed "#include Core/.." as now the include paths are - generated from the deployment_svnt.mpb - - * DnC/ExecutionManager/Execution_Manager.cpp: - * DnC/ExecutionManager/ExectionManager.idl: - - CIAO's implementation of ExecutionManager Daemon - interface. Added a shutdown () method for clean release of - resources associated with the Daemon - - * DnC/ExecutionManager/ExecutionManager.mpc: - - mpc file to generate Makefiles! - -Wed May 26 17:08:21 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.h - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Changed the member functions signature in accordance with the - modified DomainApplicationManager IDL interface. - - -Wed May 26 16:24:54 2004 Gan Deng - - * DnC/Core/Deployment.idl - - Modified the IDL interface of the DomainApplicationManager, - which now integrates the functionality of both - DomainApplicationManager and DomainApplication in the original - DnC spec. The old DomainApplication interface is deleted. - -Wed May 26 11:33:11 2004 Gan Deng - - * DnC/Core/CCM_Core.mpc - - Added necessary library (TAO_Valuetype) to the Deployment_stub - project. Removed the unnecessary Deployment_CoreC.cpp file which - caused linking error. - -Wed May 26 11:15:23 2004 Gan Deng - - * DnC/Core/NodeApplication_Impl.cpp - - Fixed linking errors because the "start" method on the - NodeApplication used a wrong function signature. - -Wed May 26 11:06:23 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.mpc - * DnC/DomainApplicationManager/Deployment_Configuration.inl - - Added these two files. - -Wed May 26 11:03:23 2004 Gan Deng - - * DnC/Core/CCM_Core.mpc - - Fixed typo in this mpc file. - -Wed May 26 10:14:23 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager_Impl.* - - Fixed the compiling errors. More functinality will be - added soon. - - * DnC/DomainApplicationManager/Deployment_Configuration.* - - Added this helper class to deal with deployment topology - data file. - - -Tue May 25 22:40:23 2004 Tao Lu - - * DnC/Core/NodeApp_CB_Impl.cpp: - * DnC/Core/NodeApp_CB_Impl.h: - * DnC/Core/NodeApplication_CallBack.idl: - Added these files for NodeApplication callback interface. - - * DnC/Core/CCM_Core.mpc: - Updated the file to reflect above changes. - -Tue May 25 13:05:35 2004 Tao Lu - - * DnC/Deployment.idl: - * DnC/Property.idl: - * DnC/Deployment.mpc: - * DnC/Deployment_stub_export.h: - * DnC/Deployment_stub_export.h: - * DnC/Core/Container_Impl.h: - * DnC/Core/Container_Impl.inl: - * DnC/Core/Container_Impl.cpp: - * DnC/Core/CCM_Deplyment.idl: - - Removed these files. Everything is moved into the DnC/Core - directory, also the Deployment.idl is splited into - Deployment.idl and Deployment_Core.idl. The first one contains - information needed for DnC runtime except NodeApplication. - The latter file combines the old Container with NodeApplication. - - * DnC/Core/Deployment.idl: - * DnC/Core/Deployment_Core.mpc: - * DnC/Core/Deployment_stub_export.h: - * DnC/Core/Deployment_stub_export.h: - * DnC/Core/NodeApplication_Impl.h: - * DnC/Core/NodeApplication_Impl.inl: - * DnC/Core/NodeApplication_Impl.cpp: - Added these files. - - * DnC/Core/CCM_Core.mpc: - This file updated to reflect the chages above. - - The idea is to use the old container as the NodeApplication and - the ComponentServer. This implies that new process will be - spawned upon new NodeApplication is created. - - In turn the NodeApplicationManager will be collocated with - NodeManager. - - These changes give us advantages for implementing the spec in an - effecient way without inccuring much confilicts with the Spec. - - -Tue May 25 12:06:37 2004 Venkita Subramonian - - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Controllers/Controller_exec.{cpp,h}: - * tests/RTCCM/Priority_Test/Controllers/Rate_Controller.{cpp,h}: - - Fixed compile errors regarding pure virtual functions not being - implemented. Added empty method definitions for ciao_preactivate - and ciao_postactivate. - -Tue May 25 12:08:48 2004 Arvind S. Krishna - - * DnC/NodeManager/Node_Daemon.cpp: - - Removed repetitive registration with the IORTable - -Tue May 25 12:02:52 2004 Boris Kolpackov - - * DnC/Deployment.xsd: - - Initial set of "normalization" changes. - - - * DnC/Deployment.xsd.orig: - * DnC/XMI.xsd.orig: - - Added backup copies. - -Mon May 24 14:13:51 2004 Gan Deng - - * DnC/DomainApplicationManager/DomainApplicationManager.h: - * DnC/DomainApplicationManager/DomainApplicationManager.cpp: - - * DnC/DomainApplication/DomainApplication.h: - * DnC/DomainApplication/DomainApplication.cpp: - - Added these files. - - -Mon May 24 21:18:07 2004 Tao Lu - - * examples/Hello/descriptors/run_test_remote.pl: - * examples/Hello/descriptors/run_test_default.pl: - - Updated the test script since Assembly_Deployer takes - two more command line options. - -Mon May 24 19:44:32 2004 Jaiganesh B - - * DnC/Config_Handlers/ADD_Handler.*: - * DnC/Config_Handlers/ACD_Handler.*: - * DnC/Config_Handlers/APM_Handler.*: - * DnC/Config_Handlers/CRDD_Handler.*: - * DnC/Config_Handlers/DP_Handler.*: - * DnC/Config_Handlers/IDD_Handler.*: - * DnC/Config_Handlers/IRDD_Handler.*: - * DnC/Config_Handlers/MDD_Handler.*: - * DnC/Config_Handlers/PCD_Handler.*: - * DnC/Config_Handlers/PPM_Handler.*: - * DnC/Config_Handlers/PSPE_Handler.*: - * DnC/Config_Handlers/PSPR_Handler.*: - * DnC/Config_Handlers/RDD_Handler.*: - * DnC/Config_Handlers/SID_Handler.*: - * DnC/Config_Handlers/SPE_Handler.*: - * DnC/Config_Handlers/SPR_Handler.*: - - Removed the above mentioned handlers as they are - not used. - -Mon May 24 11:50:15 2004 Jaiganesh B - - * DnC/Config_Handlers/Plan_Handler.cpp: - - Added changes to reflect the changes made in the IDL file. - - -Sun May 23 14:31:51 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeDaemon.mpc: - - Added exename flag to set the right executable name to be generated - -Sun May 23 13:32:34 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/NodeApplicationManager_Impl.h: - * DnC/NodeManager/NodeApplicationManger_Impl.cpp: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/Node_Daemon.cpp: - - Got the call-chain working, wherein, a preparePlan call to the - Daemon creates a NodeApplication Manager and passes along the - plan as well. Next, now the Daemon, depending on the command - line argument passed can also register with the Naming Service - using the node-name as the context. This enables multiple - NodeManagers to be activated on different hosts. An simple IOR - based scheme will not work in this case. - -Fri May 21 20:12:43 2004 Arvind S. Krishna - - * DnC/NodeManager/NodeDaemon.idl: - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/Node_Daemon.cpp: - * DnC/NodeManager/NodeApplicationManager_Impl.h: - * DnC/NodeManager/NodeApplicationManager_Impl.cpp: - - Updated these files inline with the Specification i.e. removed - un-necessary methods along with making the - NodeApplicationManager a CORBA::Object rather than a CORBA - server. In this case, the NodeManager, i.e. the NodeDaemon, will - share the same ORB with the the Application Manager. Further, - the mpc file was updated to make things compile and link - properly. - -Thu May 20 23:29:54 2004 Jaiganesh B - - * DnC/Deployment.xsd: - Uploaded the new schema. - -Thu May 20 19:28:20 2004 Tao Lu - - * DnC/Core/CCM_Core.mpc - * DnC/Core/CCM_Deployment.idl - * DnC/Core/ComponentServer_Impl.cpp - * DnC/Core/ComponentServer_Impl.h - * DnC/Core/ComponentServer_Impl.inl - * DnC/Core/Container_Impl.cpp - * DnC/Core/Container_Impl.h - - Removed the ComponentInstallation interfaces. - Now the CORE of new CIAO should be fixed. - -Thu May 20 18:54:01 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Updated the IDL for Component Data Model changes. - -Thu May 20 14:44:48 2004 Irfan Pyarali - - * tests/RTCCM/DiffServ/Controller/Controller.cpp: - - No RT-isms necessary anymore. - -Thu May 20 14:31:20 2004 Irfan Pyarali - - * tests/RTCCM/DiffServ/descriptors/rtsvc.conf: - - This file is no longer needed. - - * tests/RTCCM/DiffServ/descriptors/run_test.pl: - - No need to specify rtsvc.conf file. - - * tools/RTComponentServer/RTComponentServer.cpp (main): - - No need to check that multiple priorities are supported. Some - servers can do with one priority. - -Thu May 20 13:40:25 2004 Irfan Pyarali - - * tests/RTCCM/DiffServ/Sender/Sender.mpc: - * tests/RTCCM/DiffServ/Sender/Custom_Network_Priority_Mapping.cpp: - - Simply refer to the same files in TAO/tests/RTCORBA/Diffserv - instead of making a copy here. - - * tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp: - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - * tests/RTCCM/DiffServ/descriptors/run_test.pl: - - Minor fixes. - -Thu May 20 11:34:33 2004 Irfan Pyarali - - * tools/ComponentServer/ComponentServer.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.cpp: - - Added missing include file. - - * tests/RTCCM/DiffServ/descriptors/run_test.pl: - - Added new assembly deployer option. - - * tests/RTCCM/DiffServ/descriptors/rtsvc.conf: - - Added FIFO scheduling option. - - * tests/RTCCM/DiffServ/Controller/Controller.cpp (svc): - - Minor fixes. - -Thu May 20 10:36:23 2004 Tao Lu - - * DnC/Core/CCM_Base.idl - * DnC/Core/CCM_Component.idl - * DnC/Core/CCM_Container.idl - * DnC/Core/CCM_Container_Ex.idl - * DnC/Core/CCM_Core.mpc - * DnC/Core/CCM_Deployment.idl - * DnC/Core/CCM_Event.idl - * DnC/Core/CCM_Transaction.idl - * DnC/Core/CIAO_Client_Export.h - * DnC/Core/CIAO_Container_Export.h - * DnC/Core/CIAO_Server_Export.h - * DnC/Core/CIAO_Value.idl - * DnC/Core/CIAO_common.h - * DnC/Core/Client_init.cpp - * DnC/Core/Client_init.h - * DnC/Core/ComponentInstallation_Impl.cpp - * DnC/Core/ComponentInstallation_Impl.h - * DnC/Core/ComponentInstallation_Impl.inl - * DnC/Core/ComponentServer_Impl.cpp - * DnC/Core/ComponentServer_Impl.h - * DnC/Core/ComponentServer_Impl.inl - * DnC/Core/Component_Base.idl - * DnC/Core/Components.idl - * DnC/Core/Container_Base.cpp - * DnC/Core/Container_Base.h - * DnC/Core/Container_Base.inl - * DnC/Core/Container_Base.pidl - * DnC/Core/Container_Impl.cpp - * DnC/Core/Container_Impl.h - * DnC/Core/Container_Impl.inl - * DnC/Core/Cookies.cpp - * DnC/Core/Cookies.h - * DnC/Core/Cookies.inl - * DnC/Core/CosPersistentState.idl - * DnC/Core/Object_Set_T.cpp - * DnC/Core/Object_Set_T.h - * DnC/Core/Object_Set_T.inl - * DnC/Core/Server_init.cpp - * DnC/Core/Server_init.h - * DnC/Core/Version.h - - Finished refactoring the Core part of CIAO. - -Wed May 19 15:15:21 2004 Irfan Pyarali - - * tests/RTCCM/DiffServ: - - Added a new DiffServ test. This test is similar to the - RTCORBA/DiffServ test but uses components instead of a client - and server. - - Here are the new files: - - - Controller/Controller.cpp - - Controller/Controller.mpc - - Receiver/Receiver.cidl - - Receiver/Receiver.idl - - Receiver/Receiver.mpc - - Receiver/Receiver_exec.cpp - - Receiver/Receiver_exec.h - - Receiver/Receiver_exec_export.h - - Receiver/Receiver_stub_export.h - - Receiver/Receiver_svnt_export.h - - Sender/Custom_Network_Priority_Mapping.cpp - - Sender/Custom_Network_Priority_Mapping.h - - Sender/Sender.cidl - - Sender/Sender.idl - - Sender/Sender.mpc - - Sender/Sender_exec.cpp - - Sender/Sender_exec.h - - Sender/Sender_exec_export.h - - Sender/Sender_stub_export.h - - Sender/Sender_svnt_export.h - - common/DiffServ.idl - - common/DiffServ.mpc - - common/DiffServ_stub_export.h - - common/DiffServ_svnt_export.h - - descriptors/CIAO_Installation_Data.ini - - descriptors/Receiver.csd - - descriptors/Receiver.ssd - - descriptors/Sender.csd - - descriptors/Sender.ssd - - descriptors/default.cad - - descriptors/remote.cad - - descriptors/rtsvc.conf - - descriptors/test.dat - -Tue May 18 23:20:10 2004 Jaiganesh B - - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.h: - * DnC/Config_Handlers/Config_Handlers.mpc: - - Updated for handling HREF and IDREF tags. - -Tue May 18 14:43:51 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Property_Handler.h: - * DnC/Config_Handlers/Property_Handler.cpp: - - Revoked previous commit. - -Tue May 18 14:25:25 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Property_Handler.h: - * DnC/Config_Handlers/Property_Handler.cpp: - - Added a xercesc::DOMNode * as a formal argument. Though this - argument is unnecessary in the process_property () function, - this was necessary to have a common signature for all the - process_* functions, so that they could be templatized. - -Tue May 18 12:01:14 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CAD_Handler.h: - - Updated to handle HREF and IDREF tags. - -Tue May 18 06:30:12 UTC 2004 Johnny Willemsen - - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - Fixed typos in this MPC file - -Tue May 18 00:54:00 2004 Jaiganesh B - - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CAD_Handler.h: - * DnC/Config_Handlers/Config_Handlers.mpc: - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Deployment.idl: - - Made a change to the IDL for the ComponentDataModel - elements. - - Updated the affected handlers. - -Mon May 17 22:15:11 2004 Venkita Subramonian - - * docs/index.html: - * docs/EnvVars.html: - - Left over files from RTCIAO-tests branch merge. Thanks to - Nanbor for pointing this out. - -Mon May 17 21:07:25 2004 Venkita Subramonian - - * tools/static_configurator/Static_Assembly_Visitors.h: - * tools/static_configurator/Static_Configurator.cpp: - * tools/static_configurator/Static_Configurator.mpc: - - Fixed some compile errors because of a typo. - -Mon May 17 19:29:43 2004 Venkita Subramonian - - * tools/RTComponentServer/RTServer_Impl.cpp: - * tools/RTComponentServer/RTServer_Impl.h: - * tools/RTComponentServer/RTServer_Impl.inl: Added extra - parameters to RTContainer_Impl, RTSession_Container and - ComponentServer_Impl ctors for static configuration. - - * tools/static_configurator/Static_Assembly.h: - * tools/static_configurator/Static_Assembly_Visitors.cpp: - * tools/static_configurator/Static_Assembly_Visitors.h: - * tools/static_configurator/Static_Configurator.cpp: - * tools/static_configurator/Static_Configurator.h: - * tools/static_configurator/Static_Configurator.mpc: - - Changes to statically parse .rtcad files and generate main - driver for static RTCCM applications. - -Mon May 17 16:16:37 2004 Venkita Subramonian - - Merging RTCIAO-tests branch to the main trunk. This branch - contained the RTCCM tests from Nanbor (nanbor@txcorp.com). - - * ciao/CIAO_common.h: - * ciao/Client_init.cpp: Minor modifications to CIAO core. Addition - of CIAO_debug_level. - - * ciao/ComponentInstallation_Impl.cpp: - * ciao/ServerActivator_Impl.cpp: - * ciao/ServerActivator_Impl.h: Addition of extra command line - flags to be passed on to the component server during its spawning. - - * tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd: - * tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd: - * tests/RTCCM/Priority_Test/descriptors/Worker.ssd: - * tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini: - * tests/RTCCM/Priority_Test/descriptors/Controller.csd: - * tests/RTCCM/Priority_Test/descriptors/Controller.ssd: - * tests/RTCCM/Priority_Test/descriptors/RTsvc.conf: - * tests/RTCCM/Priority_Test/descriptors/svcmap.dat: - * tests/RTCCM/Priority_Test/descriptors/test.dat: - * tests/RTCCM/Priority_Test/descriptors/test.rtd: - * tests/RTCCM/Priority_Test/descriptors/basic-remote.cad: - * tests/RTCCM/Priority_Test/descriptors/basic_remote.pl: - * tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd: - * tests/RTCCM/Priority_Test/descriptors/basic_test.pl: - * tests/RTCCM/Priority_Test/descriptors/bench.conf: - * tests/RTCCM/Priority_Test/descriptors/Controller25.csd: - * tests/RTCCM/Priority_Test/descriptors/Controller50.csd: - * tests/RTCCM/Priority_Test/descriptors/Controller75.csd: - * tests/RTCCM/Priority_Test/descriptors/demo-25.cad: - * tests/RTCCM/Priority_Test/descriptors/demo-50.cad: - * tests/RTCCM/Priority_Test/descriptors/demo.cad: - * tests/RTCCM/Priority_Test/descriptors/no-rt-3rates.cad: - * tests/RTCCM/Priority_Test/descriptors/rate_test.pl: - * tests/RTCCM/Priority_Test/descriptors/remote.dat: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-dec.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-high-inc.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-dec.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-low-inc.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-dec.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rate-rt-mid-inc.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rates-dec.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rates-inc.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad: - * tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad: - * tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd: - - New files for running the test. - - * tests/RTCCM/Priority_Test/Priority_Test.mpc: - * tests/RTCCM/Priority_Test/Workers/Worker.mpc: - * tests/RTCCM/Priority_Test/Controllers/Controller.mpc: Manually - changed the generated MPC files as the "depends" keyword is - depricated by "after" in MPC, and the dependencies is broken in - earlier changes in MPC generator scripts. - - * tests/RTCCM/Priority_Test/Priority_Test.idl: Changed the use of - "unsigned long" type to "long". CIDL compiler doesn't seem to - support unsigned long yet. - - * tests/RTCCM/Priority_Test/Workers/Worker.idl: Fixed a typo. - - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.h: - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.h: Fixed a - couple of compilation errors and changed some operation - signatures to match the interface change in Priority_Test.idl. - - * tests/RTCCM/Priority_Test/Priority_Test.idl: - * tests/RTCCM/Priority_Test/Controllers/Controller.cidl: - * tests/RTCCM/Priority_Test/Controllers/Controller.idl: - * tests/RTCCM/Priority_Test/Controllers/Controller.mpc: - * tests/RTCCM/Priority_Test/Controllers/ControllerEI.idl: - * tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp: - * tests/RTCCM/Priority_Test/Controllers/Controller_exec.h: - * tests/RTCCM/Priority_Test/Controllers/Controller_exec_export.h: - * tests/RTCCM/Priority_Test/Controllers/Controller_stub_export.h: - * tests/RTCCM/Priority_Test/Controllers/Controller_svnt_export.h: - * tests/RTCCM/Priority_Test/Controllers/Pulser.cpp: - * tests/RTCCM/Priority_Test/Controllers/Pulser.h: - * tests/RTCCM/Priority_Test/Controllers/Rate_Controller.h: - * tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp: - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.h: - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.h: - * tests/RTCCM/Priority_Test/Workers/README: - * tests/RTCCM/Priority_Test/Workers/Worker.cidl: - * tests/RTCCM/Priority_Test/Workers/Worker.idl: - * tests/RTCCM/Priority_Test/Workers/Worker.mpc: - * tests/RTCCM/Priority_Test/Workers/WorkerEI.idl: - * tests/RTCCM/Priority_Test/Workers/Worker_exec_export.h: - * tests/RTCCM/Priority_Test/Workers/Worker_stub_export.h: - * tests/RTCCM/Priority_Test/Workers/Worker_svnt_export.h: - * tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd: - * tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd: - * tests/RTCCM/Priority_Test/descriptors/Worker.ssd: - - New files for test Worker components. - - * tests/RTCCM/Priority_Test/Priority_Test.idl: - * tests/RTCCM/Priority_Test/Priority_Test.mpc: - * tests/RTCCM/Priority_Test/Priority_Test_stub_export.h: - * tests/RTCCM/Priority_Test/Priority_Test_svnt_export.h: - - Added files for RTCCM Priority_Test project. - - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/BasicSP/EC/EC_exec.cpp: - * examples/OEP/BasicSP/EC/client.cpp: - * examples/OEP/BasicSP/EC/controller.cpp: - * examples/OEP/Display/GPS/GPS_exec.cpp: - * examples/OEP/Display/GPS/GPS_tracing_exec.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - - Added CIAO::debug_level to facilitate conditional printing of - debug messages. - - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - - Setting CIAO_ROOT if not already set. - - * tools/Assembly_Deployer/Assembly_Deployer.cpp: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Impl.h: - * tools/Assembly_Deployer/Assembly_Impl.inl: - * tools/Assembly_Deployer/Assembly_Visitors.cpp: - * tools/RTComponentServer/ComponentServer_Task.cpp: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/ServerActivator/ServerActivator.cpp: - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/RTConfig_Handlers.cpp: - * tools/XML_Helpers/Svcconf_Handler.cpp: - - Minor changes including adding CIAO::debug_level. - - * tools/ComponentServer/ComponentServer.cpp: Changes to run - component server in SCHED_FIFO class. - - * tools/Daemon/CIAO_Daemon.cpp: Added command line processing for - extra command-line argument for component server process. - - * tools/XML_Helpers/XMLHelpers.mpc: Added ciao_client to the base - project list so as to link in the CIAO::debug_level feature. - -Mon May 17 19:01:36 2004 Tao Lu - - * DnC/ExecutionManager/ExecutionManager_Impl.cpp: - * DnC/ExecutionManager/ExecutionManager_Impl.h: - * DnC/ExecutionManager/ExecutionManager_Impl.inl: - * DnC/NodeApplicationManager/CIAO_NodeApplicationManager.idl: - * DnC/NodeApplicationManager/NodeApplicationManager.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager.mpc: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DnC/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DnC/NodeManager/NodeDaemon.idl: - * DnC/NodeManager/NodeDaemon.mpc: - * DnC/NodeManager/NodeDaemon_Impl.cpp: - * DnC/NodeManager/NodeDaemon_Impl.h: - * DnC/NodeManager/NodeDaemon_Impl.inl: - * DnC/NodeManager/Node_Daemon.cpp: - Added these files. - - * DnC/Node/NodeApplicationManager_Impl.h - * DnC/Node/NodeApplication_Impl.h - Removed these files. - -Mon May 17 16:17:40 2004 Jaiganesh B - - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.h: - - Updated the handler to handle updated IDREFs. - -Mon May 17 10:11:46 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Plan_Handler.h: - * DnC/Config_Handlers/Domain_Handler.h: - - Replaced the use of a Synch_Mutex with that of a Null_Mutex as - there will not be multiple threads parsing the handler. - -Mon May 17 11:24:11 UTC 2004 Johnny Willemsen - - * DnC/Config_Handlers/Plan_Handler.h: - Fixed fuzz error - -Sun May 16 12:39:40 2004 Arvind S. Krishna - - * DnC/Config_Handlers/DnC_Dump.h: - * DnC/Config_Handlers/DnC_Dump.cpp: - - Added dump functions to print out values encoded within a - CORBA::Any. Currently, this handles only basic types, support - for types encoded using CORBA::DnyAny needs to be incorporated. - -Sun May 16 01:17:44 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Changed the data structures needed by the Execution - data model, to conform to the model given in the - specification - - * DnC/Config_Handlers/Plan_Handler.cpp: - * DnC/Config_Handlers/Plan_Handler.h: - * DnC/Config_Handlers/Config_Handlers.mpc: - * DnC/Config_Handlers/Domain_Handler.cpp: - - Added a new top level handler for the DeploymentPlan. - - Since the IDL changed, i had to change 11 other handlers - and included them within the top level handler. - - Updated the .mpc file accordingly. - -Fri May 14 20:53:37 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Separated the data model definitions from the - management model definitions. - -Fri May 14 15:28:56 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/tests/Config_Handlers/Domain_Handler_Test.cpp: - - Updated Domain_Handler_Test.cpp to use the dump - functions within the DnC_Dump.cpp rather than the - functions from Domain_Handler.cpp. - - Removed the unnecessary functions from the Domain_Handler.cpp. - -Fri May 14 15:13:17 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - * DnC/Config_Handlers/DnC_Dump.h: - - Added the dump functions for the Domain Handler. - -Fri May 14 12:17:55 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Requirement_Handler.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.cpp: - * DnC/Config_Handlers/RS_Handler.cpp: - - Among, the common data type handlers, the aforementioned four - handlers need to handle elements that can be referenced via - tags and tags. In this commit, I have addressed - parsing tags, next, more complicated step will be to - handle tags. - -Thu May 13 22:56:22 2004 Arvind S. Krishna - - * DnC/Config_Handlers/DnC_Dump.cpp: - - Filled in the dump_* functions that pertain to common - elements. Howerver, dumping data stored in a CORBA::Any would - not be possible unless we know what value is stored in the first - place! Hence, we may need to re think this approach for Anys. - - * DnC/Requirement_Handler.cpp: - - Updated the handler to process the tag added to the - Deployment schema. - -Thu May 13 19:46:24 2004 Krishnakumar B - - * DnC/Deployment.xsd: Reverted an accidental check-in that - introduced a bogus schema. - -Thu May 13 17:50:16 2004 Arvind S. Krishna - - * DnC/Deployment.xsd: - - Added the name attribute for the Deployment:Requirement complex - type defined in the schema. This was present in the model but - not in the schema and necessitated this addition. - -Thu May 13 15:13:50 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/Domain_Handler_Test.cpp: - * DnC/tests/Config_Handlers/Domain_Handler_Test.mpc: - - Added the test to test the Domain Handler. - -Thu May 13 14:27:14 2004 Jaiganesh B - - * DnC/Config_Handlers/CompPortDesc_Handler.cpp: - * DnC/Config_Handlers/Config_Handlers.mpc: - - Changed the library name from Config_Handers - to Config_Handlers in the .mpc file. - - Included scop resolution operators for all - class member function definitions in the .cpp file. - -Thu May 13 13:10:35 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Updated Domain_Handler to handle property and - satisfier property elements. - -Wed May 12 20:05:55 2004 Ossama Othman - - * examples/handcrafted/BasicSP_EC/EC/client.cpp: - - Corrected case of header file in #include directive. - "ace/Streams.h" -> "ace/streams.h". Blame it on MS Windows case - insenstivity. :-) - -Wed May 12 15:52:29 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/Utils.cpp: - - Added two utility methods create_document () and parse_href_tag - () that will allow creation of an iterator pointing to top of - the document as specified in the tag. Now all - handlers that need to handle definitions can make use of - this utility. - -Wed May 12 15:08:14 2004 Jeff Parsons - - * examples/Hello/Hello_Base/Hello_Base.mpc: - - Copied export macro settings from stub project to servant - project. The servant project had only one export macro - defined for both *C.h and *S.h files, and so was - clobbering the stub export macro already generated. - -Wed May 12 14:25:00 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Added some more general functions. - -Wed May 12 13:51:37 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Added some general functions which other handlers could - use. - -Wed May 12 12:59:21 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Added dump functions for the structures. - -Wed May 12 12:44:40 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Made changes to handle HREF tags within - another referenced document. - -Wed May 12 00:06:26 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Made changes to handle HREF tags. - -Tue May 11 22:58:35 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changes to support multiplex uses ports in components. - Thanks to Bala Natarajan for - writing the hand-crafted version of the servant glue - code. - -Tue May 11 22:55:22 2004 Jeff Parsons - - * examples/OEP/BasicSP/BasicSP.mpc: - - Fixed IDL compiler command line options so the stub and - skeleton export macros will get generated correctly regardless - of the order of execution of the stub and skeleton project - generation. - -Tue May 11 16:12:07 2004 Arvind S. Krishna - - * DnC/Config_Handlers/DT_Handler.h: - * DnC/Config_Handlers/DT_Handler.cpp: - - Added CORBA::TypeCode::duplicate for basic type codes as the - individual handlers and IDL structures will be releasing the - typecodes generated. - - * DnC/Config_Handlers/Any_Handler.h: - * DnC/Config_Handlers/Any_Handlers.cpp: - - Insted of requiring that each top level handler pass an ORB - reference to the Any handler, now the Any handler calls ORB init - There is not additional overhead other than the call as the same - ORB reference is returned each time from the ORB table - - * DnC/Config_Handlers/Config_Handlers.mpc: - - Added targets Any_Handler.cpp and DT_Handler.cpp - -Tue May 11 12:51:14 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/Domain_Handler.cpp: - - Changed the interface of the functions process_domain_node - and process_domain_bridge. - -Tue May 11 12:25:39 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Fixed bug in home operation emitter. - -Tue May 11 11:17:25 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Any_Handler.h: - * DnC/Config_Handlers/Any_Handler.cpp: - - Any handler that processes schema definitions of the type - ... . Currently, this handler supports only built-in - types. Issues pertaining to specifying properties in IDL (typed) - v/s specifying them in schema (dynamic) as an Any are being - examined - -Tue May 11 10:45:55 2004 Boris Kolpackov - - * CCF/CCF/IDL3/LexicalAnalyzer.cpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/SemanticAction/Uses.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp: - * CCF/CCF/IDL3/SemanticGraph/Component.cpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/Traversal/Component.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Support for uses multiple. - -Tue May 11 01:47:27 2004 Krishnakumar B - - * DnC/Config_Handlers/XercesString.cpp (Config_Handler): When - changing the function used to compare strings from - XMLString::equals() to XMLString::compareIString(), a check on - the return value equal to zero is needed to ensure similar - semantics. - -Tue May 11 00:18:58 2004 Krishnakumar B - - * DnC/Config_Handlers/XercesString.cpp (Config_Handler): Changed - the comparison function to use case-insensitive comparison, as - case doesn't make sense while comparing XML strings. - -Mon May 10 23:35:25 2004 Jaiganesh B - - * DnC/tests/Config_Handlers/Domain_Handler_Test.cpp: - - Added a new test to test the Domain Handler, which - parses the D&C specification's DomainDescriptor. - -Mon May 10 22:40:37 2004 Jaiganesh B - - * DnC/Config_Handlers/DnC_Dump.cpp: - * Dnc/Config_Handlers/DnC_Dump.h: - * DnC/Config_Handlers/Config_Handlers.mpc: - - I moved DnC_Dump.{h,cpp} from DnC/ to - DnC/Config_Handlers - -Mon May 10 19:04:57 2004 Arvind S. Krishna - - * DnC/Config_Handlers/DT_Handler.h: - * DnC/Config_Handlers/DT_Handlers.cpp: - - Type code operations especially creation of dynamic typecodes - require operations defined in the ORB interface. Hence, instead - of calling ORB::init within this common handlers, changed the - interface of the process_DataType method to require a - CORBA::ORB_ptr. Also modularized the creation of typecodes into - process_basic_tc, process_enum_tc etc depending on the *type* of - typecode to be created - - * DnC/Config_Handlers/Utils.h: - * DnC/Config_Handlers/Utils.cpp: - - Added helper methods that allow coversion to CORBA::* types from - string values. These helper methods will be used by the Any - handler to insert the required values into a CORBA::Any object - dynamically. - -Mon May 10 18:56:11 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/Domain_Handler.cpp: - - Made changes to handle the "Property" elements. - -Mon May 10 18:21:34 2004 Arvind S. Krishna - - * DnC/Config_Handlers/DT_Handler.h: - * DnC/Config_Handlers/DT_Handler.cpp: - Data_Type handler class that parses the .. tags - in the Deployment schema. - -Mon May 10 13:42:04 2004 Arvind S. Krishna - - * DnC/Config_Handlers/Domain_Handler.cpp: - Removed the trailing #endif as the corresponding #ifndef was - removed earlier. - -Sun May 9 19:28:56 2004 Jaiganesh B - - * DnC/Domain_Handler.cpp: - - Made some changes to the dump function to print the - contents of the data structure. - -Sun May 9 17:32:11 2004 Arvind S. Krishna - - * DnC/Config_Handlers/ACD_Handler.cpp: - * DnC/Config_Handlers/ADD_Handler.cpp: - * DnC/Config_Handlers/APM_Handler.cpp: - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/Cap_Handler.cpp: - * DnC/Config_Handlers/CEPE_Handler.cpp: - * DnC/Config_Handlers/CompImplDes_Handler.cpp: - * DnC/Config_Handlers/CompIntrDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/CompPortDesc_Handler.cpp: - * DnC/Config_Handlers/Config_Error_Handler.cpp: - * DnC/Config_Handlers/CPR_Handler.cpp: - * DnC/Config_Handlers/CRDD_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/DP_Handler.cpp: - * DnC/Config_Handlers/ERE_Handler.cpp: - * DnC/Config_Handlers/IAD_Handler.cpp: - * DnC/Config_Handlers/IDD_Handler.cpp: - * DnC/Config_Handlers/ID_Handler.cpp: - * DnC/Config_Handlers/IRDD_Handler.cpp: - * DnC/Config_Handlers/IR_Handler.cpp: - * DnC/Config_Handlers/MDD_Handler.cpp: - * DnC/Config_Handlers/MID_Handler.cpp: - * DnC/Config_Handlers/NIA_Handler.cpp: - * DnC/Config_Handlers/PCD_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/PCI_Handler.cpp: - * DnC/Config_Handlers/PPM_Handler.cpp: - * DnC/Config_Handlers/Property_Handler.cpp: - * DnC/Config_Handlers/PSPE_Handler.cpp: - * DnC/Config_Handlers/PSPR_Handler.cpp: - * DnC/Config_Handlers/RDD_Handler.cpp: - * DnC/Config_Handlers/Requirement_Handler.cpp: - * DnC/Config_Handlers/RS_Handler.cpp: - * DnC/Config_Handlers/SID_Handler.cpp: - * DnC/Config_Handlers/SPE_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.cpp: - * DnC/Config_Handlers/SPK_Handler.cpp: - * DnC/Config_Handlers/SPR_Handler.cpp: - Removed all #ifndef definitions that hide multiple includes from - the .cpp files. These implementations being non-templatized will - not be included in any header files. Hence the guard for - multiple inclusions should not be present in them similar to - other .cpp files in TAO. - -Sun May 9 14:07:10 2004 Jaiganesh B - - * DnC/Deployment.idl: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - - Made changes to the IDL and supported the same in my - XML handlers. - -Sun May 9 13:06:48 2004 Tao Lu - - * DnC/Deployment.mpc: - * DnC/Config_Handlers/Config_Handlers.mpc: - Added requries += dnc to avoid unintentional build of DnC - directory. - -Sun May 9 09:08:06 2004 Balachandran Natarajan - - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.h: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/OEP/BasicSP/EC/EC_exec.cpp: - * examples/OEP/BasicSP/EC/EC_exec.h: - * examples/OEP/Display/GPS/GPS_exec.cpp: - * examples/OEP/Display/GPS/GPS_exec.h: - * examples/OEP/Display/GPS/GPS_tracing_exec.cpp: - * examples/OEP/Display/GPS/GPS_tracing_exec.h: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.h: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.h: - - More fixes to the executors. - -Sun May 9 07:46:35 2004 Balachandran Natarajan - - * ciao/CCM_Component.idl: - * ciao/CCM_Container.idl: - - Added CIAO specific operations ciao_practivate () and - ciao_postactivate () which would allow the deployment - infrastructure to invoke them before and after ccm_activate - (). There are more elegant methods to do this, but for want of - time we will just stick to this. We can revisit this later if - needed. There is a need for such things in some projects that we - are working on to initialize a few things upfront and tear them - later. The downside of this is that the executors need to - implement ciao_preactivate () and ciao_postactivate (). I think - there is a good idea to avoid that. We will visit that soon. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added code generation for ciao_preactivate () and - ciao_postactivate (). - - * tools/Assembly_Deployer/Assembly_Impl.cpp: - - Cosmetic fix. - - * tools/Assembly_Deployer/Assembly_Visitors.h: - - Added a typedef for the iterator in the CIAO::Assembly_Context - struct. - - * tools/Assembly_Deployer/Assembly_Visitors.cpp: - - Iterate over the CCMObject references and call preactivate, - activate and postactivate on all of them one after another. - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - - Added the preactivate and postactivate calls. - -Sat May 8 15:19:18 2004 Jaiganesh B - - * DnC/Config_Handlers/ACD_Handler.cpp: - * DnC/Config_Handlers/ADD_Handler.cpp: - * DnC/Config_Handlers/APM_Handler.cpp: - * DnC/Config_Handlers/CAD_Handler.cpp: - * DnC/Config_Handlers/CPR_Handler.cpp: - * DnC/Config_Handlers/CRDD_Handler.cpp: - * DnC/Config_Handlers/CompImplDesc_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - * DnC/Config_Handlers/CompPortDesc_Handler.cpp: - * DnC/Config_Handlers/Config_Handlers.mpc: - * DnC/Config_Handlers/DP_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/IDD_Handler.cpp: - * DnC/Config_Handlers/IRDD_Handler.cpp: - * DnC/Config_Handlers/MDD_Handler.cpp: - * DnC/Config_Handlers/MID_Handler.cpp: - * DnC/Config_Handlers/PCD_Handler.cpp: - * DnC/Config_Handlers/PCI_Handler.cpp: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/PPM_Handler.cpp: - * DnC/Config_Handlers/PSPE_Handler.cpp: - * DnC/Config_Handlers/PSPR_Handler.cpp: - * DnC/Config_Handlers/RDD_Handler.cpp: - * DnC/Config_Handlers/SID_Handler.cpp: - * DnC/Config_Handlers/SPE_Handler.cpp: - * DnC/Config_Handlers/SPR_Handler.cpp: - - Removed unnecessary declaration of ACE_DECLARE_NEW_CORBA_ENV - -Sat May 8 14:53:33 2004 Jaiganesh B - - * DnC/Config_Handlers/Domain.cpp: - - Added a sample "main" program to test the Domain_Handler - wrriten to parse the DomainDescriptor. - -Sat May 8 14:50:26 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Added a missing structure member infoProperty - to the structure Domain. - -Fri May 7 20:38:15 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - A fix for generated code for inherited home factory operations. - It makes use of the fact that a derived home must manage a - component that is derived from the component its base home - manages. This means that the corresponding executor classes - have the same inheritance relationships. When a call is - made to a base home factory operation on a derived home, - the derived home's managed component will be returned as - a base component reference. Operations called on this - component will end up in the derived component executor - (the user must implement the inherited operations, although - the implementation may be different than that in the - base component executor). - -Fri May 7 17:19:02 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Filled in some missing items in generation of facet, component - and home servant classes, and of component context classes. - These missing items included some cases of code generation for - things inherited from the base home or the base component, such - as regular operations, attribute operations, port operations, - and home factory operations, as well as operations and attributes - of supported interfaces and their ancestors. Note that there - is still a problem with compiling home factory operations - inherited from a base home, but this problem will be fixed - with the upcoming refactoring of the CIAO-specific - _ciao_activate_component() and _ciao_passivate_component() - methods in the home servant class. This fix closes [BUGID:1800]. - -Fri May 7 14:46:54 2004 Ossama Othman - - * GNUmakefile: - - Removed this GNUmakefile. It must now be generated by MPC. - -Fri May 7 13:17:10 2004 Jaiganesh B - - * DnC/ConFig_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/Resource_Handler.cpp: - * DnC/Config_Handlers/SR_Handler.cpp: - - Updated the handlers to handler href, xmi:id cases. - -Fri May 7 12:53:34 2004 Tao Lu - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - Fixed a bug for using MPC to build CCF. - -Fri May 7 12:44:42 2004 Arvind S. Krishna - - * DnC/Config_Handlers/RS_Handler.cpp: - - Modified the handler to parse out of order schema - definitions. Now parsing is independent of the appearance of the - schema elements as it should be. - -Thu May 6 16:20:00 2004 Arvind S. Krishna - - * DnC/Config_Handlers/SP_Handler.cpp: - - Added functionality to parse the schema definitions when the - individual elements appear in no specific order. - -Mon May 3 23:04:13 2004 Ossama Othman - - * CIAO-INSTALL.html: - - Corrected typo. - -Mon May 3 23:17:31 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Changed the datatype from ULongSeq to StringSeq - in the following structures: - - SharedResource, Node, Interconnect and Bridge. - -Mon May 3 22:44:09 2004 George Edwards - - * DnC/Deployment.idl: - - Fixed ComponentPortDescription struct to comply with new spec. - - * DnC/Deployment.mpc: - - Added DnC_Dump.cpp to Deployment_stub project. - - * DnC/DnC_Dump.h: - * DnC/DnC_Dump.cpp: - - Added dump functions for PackageConfiguration, - ComponentPackageDescription, PackagedComponentImplementation, - ComponentPortDescription, and ComponentPropertyDescription. - -Mon May 3 00:00:00 2004 Ossama Othman - - * Makefile*: - - Removed all Makefiles. GNUmakefiles must now be generated by - MPC. - -Sat May 1 22:37:33 2004 Ossama Othman - - * Makefile: - * GNUmakefile: - - Renamed "Makefile" to "GNUmakefile" to make it obvious to - users that GNU Make is required to parse the file. - -Fri Apr 30 17:46:09 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Implemented supporting of forward declared interfaces. - Also some minor tweaking for Intel C++. - -Fri Apr 30 13:08:04 2004 Gan Deng - - * DnC/DnC_Dump.h: - * DnC/DnC_Dump.cpp: - - Added these two new files. These two files created a - DnC_Dump class which is used to print out the contents - of various IDL data structures. - -Thu Apr 29 22:56:04 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Rolled back some changes made on the TargetDataModel - structures. - -Thu Apr 29 22:34:41 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Changed all the structures in the TargetData Model - to match what is given in the spec. - -Thu Apr 29 22:26:05 2004 Jaiganesh B - - * DnC/Deployment.idl: - - Made a change in the structure Domain - to add a new field info_property - which is of the type Properties. - -Thu Apr 29 18:46:51 2004 Jaiganesh B - - * DnC/Config_Handlers/Config_Error_Handler.h: - * DnC/Config_Handlers/Config_Error_Handler.cpp: - - Generic Error Handler class for the main functions - which we will be writing to dump out the IDL - data structures populated by the XML handlers. - -Thu Apr 29 18:09:41 2004 Jaiganesh B - - * DnC/Deployment.xsd: - - Fixed a type "xsl" tp "xsd" - -Thu Apr 29 17:47:04 2004 Jaiganesh B - - * DnC/Deployment.xsd: - * DnC/XMI.xsd: - - Updated the schemaLocation attribute within the - Deployment.xsd schema and - added the appropriate XMI.xsd file. - -Thu Apr 29 06:13:23 2004 Aniruddha Gokhale - - * DnC/Deployment.idl: - struct ComponentImplementationDescription: Added new field called - infoProperty of type Properties (Issue 5967). - - struct ImplementationRequirement: added a new struct (Issue 6392) - - * Dnc/ConfigHandlers/CompImplDesc_Handler.cpp: - Fixed compilation errors due to incorrect naming usage of a typedef. - -Mon Apr 26 23:40:27 2004 Balachandran Natarajan - - * ciao/Cookies.cpp: - * ciao/Cookies.h: - * ciao/Cookies.inl: - - Subtle changes to improve interoperability. - - Problem: We, for some unknown reason, created a proprietary - cookie called CIAO::Map_Key_Cookie (which inherited from an IDL - type CIAO::Cookie) and used that as a concrete implementation of - Components::Cookie. - - Context: Though this would work, this breaks interoperability - when the Cookies are send on the wire. The remote target tries - to unmarshal the CIAO::Cookie valuetype as a Component::Cookie - which fails miserably. - - Solution: Deprecate this proprietary IDL type CIAO::Cookie and - make Map_Key_Cookie inherit directly from Component::Cookie. - - Made some changes to the interface to return a bool instead of - an int. - - * ciao/CIAO_Value.idl: - - Added note for deprecation. - - * CIDLC/ServantSourceGenerator.cpp: - - The call to Map_Key_Cookie::extract () should check for a false - instead of -1. - - * tools/Assembly_Deployer/Assembly_Impl.cpp: - - The call to Map_Key_Cookie::extract () should check for a false - instead of -1. - - Thanks to Ed Mulholland and Jacques Kerner for reporting the - problem. - -Mon Apr 26 17:35:29 2004 George Edwards - - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - - Made changes to fix compilation errors. - -Mon Apr 26 12:19:56 2004 Jaiganesh B - - * DnC/Config_Handlers/IC_Handler.cpp: - - Made changes to fix some compiler issues. - -Mon Apr 26 12:13:36 2004 Jaiganesh B - - * DnC/Config_Handlers/Bridge_Handler.h: - * DnC/Config_Handlers/Bridge_Handler.h: - * DnC/Config_Handlers/IC_Handler.cpp: - * DnC/Config_Handlers/IC_Handler.h: - * DnC/Config_Handlers/Node_Handler.h: - * DnC/Config_Handlers/Node_Handler.cpp: - * DnC/Config_Handlers/Resource_Handler.cpp: - * DnC/Config_Handlers/Resource_Handler.h: - * DnC/Config_Handlers/SR_Handler.h: - * DnC/Config_Handlers/SR_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - - Made changes to fix some compiler issues. - -Mon Apr 26 11:50:48 2004 Jaiganesh B - - * DnC/Config_Handlers/Bridge_Handler.h: - * DnC/Config_Handlers/Bridge_Handler.cpp: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/IC_Handler.cpp: - * DnC/Config_Handlers/IC_Handler.h: - * DnC/Config_Handlers/Node_Handler.h: - * DnC/Config_Handlers/Resource_Handler.cpp: - * DnC/Config_Handlers/Resource_Handler.h: - * DnC/Config_Handlers/SR_Handler.h: - - Made changes to fix some compiler issues. - -Mon Apr 26 08:57:37 2004 Aniruddha Gokhale - - * DnC/Config_Handlers/Config_Handlers.mpc: - Added Cap_Handler.cpp - Added CompIntrDesc_Handler.cpp - Added CompPortDesc_Handler.cpp - Added IAD_Handler.cpp - Added IR_Handler.cpp - Added NIA_Handler.cpp - - * DnC/Config_handlers/SR_Handler.cpp: - Included SP_Handler.h - Fixed undefined variables and conversion from string to long - - * DnC/Config_handlers/Node_Handler.cpp: - Fixed errors arising out of using same name for variables of - different types in the same scope (one defined in the parameter - and another as a loop variable). - - Fixed errors in type coversion. - - * DnC/Config_handlers/Resource_Handler.cpp: - Fixed errors in type coversion. - - * DnC/Config_handlers/MID_Handler.cpp: - Fixed an error due to incorrect number of parameters - - * DnC/Config_handlers/DP_Handler.cpp: - Fixed an error due to incorrect number of parameters and - incorrect file name inclusion. - - -Mon Apr 26 14:04:32 UTC 2004 Johnny Willemsen - - * ciao/CCM_Core.mpc: - CIAO_Server must link with CIAO_Container. Not doing so causes link - errors with Borland. - -Mon Apr 26 09:33:12 UTC 2004 Johnny Willemsen - - * DnC/Config_Handlers/Config_Handlers.mpc: - Removed not needed / after $(CIAO_ROOT)/DnC in includes. This gave - problems with Borland - -Sun Apr 25 07:42:06 2004 Aniruddha Gokhale - - * DnC/Config_Handlers/Config_Handlers.mpc: - Added Bridge_Handler.cpp - Added Domain_Handler.cpp - Added IC_Handler.cpp - Added Node_Handler.cpp - Added Resource_Handler.cpp - Added SR_Handler.cpp - - -Sat Apr 24 23:43:13 2004 Jaiganesh B - - * DnC/Config_Handlers/Bridge_Handler.cpp: - * DnC/Config_Handlers/Bridge_Handler.h: - * DnC/Config_Handlers/Domain_Handler.h: - * DnC/Config_Handlers/Domain_Handler.cpp: - * DnC/Config_Handlers/IC_Handler.h: - * DnC/Config_Handlers/IC_Handler.cpp: - * DnC/Config_Handlers/Node_Handler.h: - * DnC/Config_Handlers/Node_Handler.cpp: - * DnC/Config_Handlers/Resource_Handler.h: - * DnC/Config_Handlers/Resource_Handler.cpp: - * DnC/Config_Handlers/SR_Handler.h: - * DnC/Config_Handlers/SR_Handler.cpp: - - Added the following handlers belonging to the - Target Data Model. - -Sat Apr 24 23:13:56 2004 Aniruddha Gokhale - - * DnC/Deployment.idl: - struct ComponentPackageReference: Added two new fields called - requiredUUID and requiredName of type string (Issue 6047). - - * DnC/Config_Handler/SPE_Handler.h: - * DnC/Config_Handler/SPE_Handler.cpp: - * DnC/Config_Handler/ACD_Handler.h: - * DnC/Config_Handler/ACD_Handler.cpp: - * DnC/Config_Handler/APM_Handler.h: - * DnC/Config_Handler/APM_Handler.cpp: - * DnC/Config_Handler/MID_Handler.h: - * DnC/Config_Handler/MID_Handler.cpp: - Enclosed these into the CIAO namespace - - Removed needless copies by having the parent (caller) provide - the memory for the child (callee) to populate it. - - Other cosmetic changes, fixing typos. - - * DnC/Config_Handler/PC_Handler.cpp: - * DnC/Config_Handler/PCI_Handler.cpp: - Fixed undefined variables. - - * DnC/Config_Handler/CAD_Handler.h: - * DnC/Config_Handler/CAD_Handler.cpp: - XML handlers for the ComponentAssemblyDescription artifact of - the Component Data Model. - - * DnC/Config_Handler/SID_Handler.h: - * DnC/Config_Handler/SID_Handler.cpp: - XML handlers for the ComponentPackageReference artifact of - the Component Data Model. - - * DnC/Config_Handler/CPR_Handler.h: - * DnC/Config_Handler/CPR_Handler.cpp: - XML handlers for the ComponentPackageReference artifact of - the Component Data Model. - - * DnC/Config_Handler/SPR_Handler.h: - * DnC/Config_Handler/SPR_Handler.cpp: - XML handlers for the SubcomponentPropertyReference artifact of - the Component Data Model. - - * DnC/Config_Handler/CompImplDesc_Handler.h: - * DnC/Config_Handler/CompImplDesc_Handler.cpp: - XML handlers for the ComponentImplementationDescription artifact of - the Component Data Model. - - * DnC/Config_Handler/DP_Handler.cpp: - Renamed included file CID_Handler.h to CompIntfDesc_Handler.h - since there was a name clash. - - * DnC/Config_Handler/Config_Handlers.mpc: - Fixed the CONFIG_HANDLER_BUILD_DLL typo - Added ACD_Handler.cpp - Added APM_Handler.cpp - Added CAD_Handler.cpp - Added MID_Handler.cpp - Added SPE_Handler.cpp - Added CompImplDesc_Handler.cpp - Added CompPkgDesc_Handler.cpp - Added PC_Handler.cpp - Added PCI_Handler.cpp - Added SID_Handler.cpp - Added CPR_Handler.cpp - Added SPR_Handler.cpp - Reincluded DP_Handler.cpp - -Sat Apr 24 22:25:55 2004 George Edwards - - Added files: - * DnC/Config_Handlers/PCI_Handler.h: - * DnC/Config_Handlers/PCI_Handler.cpp: - - Added new handlers for PackagedComponentImplementation. - -Sat Apr 24 21:22:48 2004 George Edwards - - Added files: - * DnC/Config_Handlers/PC_Handler.h: - * DnC/Config_Handlers/PC_Handler.cpp: - * DnC/Config_Handlers/CompPkgDesc_Handler.h: - * DnC/Config_Handlers/CompPkgDesc_Handler.cpp: - - Added new handlers for PackageConfiguration and - ComponentPackageDescription. - -Sat Apr 24 16:02:03 2004 Jaiganesh B - - * DnC/Config_Handler/Domain_Handler.h: - - Added a header file for the new handler about to - be written. - - This handler will parse the "Domain" type - defined in the Deployment.xsd schema of the - DnC specification. - -Sat Apr 24 10:46:14 2004 Arvind S. Krishna - - * DnC/Config_Handler/PCD_Handler.cpp: - * DnC/Config_Handler/ERE_Handler.h: - * DnC/Config_Handler/ERE_Handler.cpp: - - Missed out on these handlers in my earlier commit. Made the same - changes as listed earlier for these handlers as well - -Fri Apr 23 19:45:53 2004 Arvind S. Krishna - - * DnC/Config_Handler/ADD_Handler.cpp: - * DnC/Config_Handler/DP_Handler.cpp: - * DnC/Config_Handler/CRDD_Handler.cpp: - * DnC/Config_Handler/IDD_Handler.cpp: - * DnC/Config_Handler/IRDD_Handler.cpp: - * DnC/Config_Handler/MDD_Handler.cpp: - * DnC/Config_Handler/RDD_Handler.cpp: - * DnC/Config_Handler/PCD_Handler.cpp: - * DnC/Config_Handler/DP_Handler.cpp: - - Eliminated the additional copy incurred when sequences are - populated by de-referencing pointer to sequence return - type. This fixes Andy's comments in the files that unearthed - this problem. Please grep for Arvind: comments to see how the - problem has been fixed - - * DnC/Config_Handler/Config_Handlers.mpc: - - Commented out DP_Handler.cpp from the list of files to be - compiled as it requires CID.h file that is not yet written! This - ensures that the Handlers build. - - * DnC/Config_Handler/Any_Handler.h: - * DnC/Config_Handler/CEPE_Handler.h: - * DnC/Config_Handler/ID_Handler.h: - * DnC/Config_Handler/Property_Handler.h: - * DnC/Config_Handler/RS_Handler.h: - * DnC/Config_Handler/SP_Handler.h: - * DnC/Config_Handler/SPK_Handler.h: - * DnC/Config_Handler/Requirement_Handler.h: - - Changed the interfaces of each process_ methods to - take a reference to the required return type rather than return - a pointer to the allocated return value. This change was - necessary to accommodate the use-cases defined in top level - handlers. - - * DnC/Config_Handler/Any_Handler.cpp: - * DnC/Config_Handler/CEPE_Handler.cpp: - * DnC/Config_Handler/ID_Handler.cpp: - * DnC/Config_Handler/Property_Handler.cpp: - * DnC/Config_Handler/RS_Handler.cpp: - * DnC/Config_Handler/SP_Handler.cpp: - * DnC/Config_Handler/SPK_Handler.cpp: - * DnC/Config_Handler/Requirement_Handler.cpp: - - Removed all memory allocation for the return types within the - Common element handler implementations. In the current use case, - all the return types are passed in as references. Therefore, it - is now the responsibility of the caller to allocate memory for - the corresponding data-types. - -Fri Apr 23 10:57:26 2004 Aniruddha Gokhale - - * DnC/Deployment.idl: - struct ConnectionResourceDeploymentDescription: Added a new struct - and corresponding unbounded sequence (Issue 6392). - - struct PlanSubcomponentPropertyReference: Replaced instanceRef - field with a field called instance of type - InstanceDeploymentDescription. - - struct PlanSubcomponentPortEndpoint: Replaced instanceRef and - kind fields with a field called instance of type - InstanceDeploymentDescription. - - struct PlanConnectionDescription: Added a field called - deployedResource of type ConnectionResourceDeploymentDescriptions. - - * DnC/Config_Handler/IRDD_Handler.h: - * DnC/Config_Handler/IRDD_Handler.cpp: - XML handlers for the InstanceResourceDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/IDD_Handler.h: - * DnC/Config_Handler/IDD_Handler.cpp: - XML handlers for the InstanceDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/IRDD_Handler.h: - * DnC/Config_Handler/IRDD_Handler.cpp: - XML handlers for the ConnectionResourceDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/PCD_Handler.h: - * DnC/Config_Handler/PCD_Handler.cpp: - XML handlers for the PlanConnectionDescription artifact of - the Execution Model. - - * DnC/Config_Handler/PSPE_Handler.h: - * DnC/Config_Handler/PSPE_Handler.cpp: - XML handlers for the PlanSubcomponentPortEndpoint artifact of - the Execution Model. - - * DnC/Config_Handler/PPM_Handler.h: - * DnC/Config_Handler/PPM_Handler.cpp: - XML handlers for the PlanPropertyMapping artifact of - the Execution Model. - - * DnC/Config_Handler/PSPR_Handler.h: - * DnC/Config_Handler/PSPR_Handler.cpp: - XML handlers for the PlanSubcomponentPropertyReference artifact of - the Execution Model. - - * DnC/Config_Handler/Config_Handlers.mpc: - Added IDD_Handler.cpp - Added IRDD_Handler.cpp - Added CRDD_Handler.cpp - Added PCD_Handler.cpp - Added PSPE_Handler.cpp - Added PPM_Handler.cpp - Added PSPR_Handler.cpp - -Fri Apr 23 04:40:12 2004 Aniruddha Gokhale - - * DnC/Deployment.idl: - struct DeploymentPlan: Added a field called infoProperty of type - Properties (Issue 5967) - - struct ArtifactDeploymentDescription: Added a field called - deployedResource of type ResourceDeploymentDescriptions - (Issue 6392) - - struct ArtifactDeploymentDescription: Changed the field type for - location from string to CORBA::StringSeq (Issue 5957, 6053). - - struct ArtifactDeploymentDescription: Moved it around to - overcome forward declarations. - - struct MonolithicDeploymentDescription: Changed the field name - from artifactRef to artifact and changed its type from - CORBA::ULongSeq to ArtifactDeploymentDescriptions (Issue 5957) - - struct ResourceDeploymentDescription: Added a new struct and - corresponding unbounded sequence (Issue 6392). - - enum ResourceUsageKind: Added a new enum (Issue 6392). - - struct InstanceResourceDeploymentDescription: Added a new struct - and corresponding unbounded sequence (Issue 6392). - - * DnC/Config_Handler/DP_Handler.h: - * DnC/Config_Handler/DP_Handler.cpp: - Added handling of "infoProperty" (Issue 5967) - Other cosmetic changes, such as fixed usage of an undefined - variable - - * DnC/Config_Handler/ADD_Handler.h: - * DnC/Config_Handler/ADD_Handler.cpp: - XML handlers for the ArtifactDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/MDD_Handler.h: - * DnC/Config_Handler/MDD_Handler.cpp: - XML handlers for the MonolithicDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/RDD_Handler.h: - * DnC/Config_Handler/RDD_Handler.cpp: - XML handlers for the ResourceDeploymentDescription artifact of - the Execution Model. - - * DnC/Config_Handler/Config_Handlers.mpc: - Added ADD_Handler.cpp - Added MDD_Handler.cpp - Added RDD_Handler.cpp - -Thu Apr 22 22:18:04 2004 Jeff Parsons - - * ciao/CCM_Component.idl: - - Added 'typeprefix Components "omg.org";' inside the - Components module. All openings of an IDL module must - have the same prefix, and the openings of the Components - module in other IDL file have this prefix. - -Thu Apr 22 21:32:39 2004 Aniruddha Gokhale - - * DnC/Deployment.idl: - Added a "string UUID;" field (Issue 6047) to the DeploymentPlan - structure. The spec shows UUID as an attribute, which serves as - the unique identfier of a plan. However, the spec does not - include it in the IDL nor the schema. I decided to add it for now. - - * DnC/Config_Handler/DP_Handler.h: - * DnC/Config_Handler/DP_Handler.cpp: - XML handlers for the DeploymentPlan artifact of the Execution Model. - - * DnC/Config_Handler/Config_Handlers.mpc: - Added DP_Handler.cpp - -Thu Apr 22 15:36:14 2004 Arvind S. Krishna - - * DnC/Config_Handler/Config_Handlers.mpc - * DnC/Config_Handler/Property_Handler.cpp: - * DnC/Config_Handler/Property_Handler.h: - * DnC/Config_Handler/Requirement_Handler.h: - * DnC/Config_Handler/Requirement_Handler.cpp: - * DnC/Config_Handler/SPK_Handler.h: - * DnC/Config_Handler/SPK_Handler.cpp: - XML handlers for common elements present in schema definitions. - -Thu Apr 22 11:35:42 2004 Arvind S. Krishna - - * DnC/Config_Handler/CEPE_Handler.h: - * DnC/Config_Handler/CEPE_Handler.cpp: - * DnC/Config_Handler/ERE_Handler.h: - * DnC/Config_Handler/ERE_Handler.cpp: - * DnC/Config_Handler/ID_Handler.h: - * DnC/Config_Handler/ID_Handler.cpp: - * DnC/Config_Handler/RS_Handler.h: - * DnC/Config_Handler/RS_Handler.cpp: - * DnC/Config_Handlers/SP_Handler.h: - * DnC/Config_Handler/SP_Handler.cpp: - Correct ::Deployment namespace definitions to Deployment:: as it - need not always start from the root. Changed ACE_NEW_RETURN - macros to ACE_NEW_THROW_EX as exceptions are going to be used as - default meachnism to flag errors. Thanks to Kitty for pointing - these two changes. - -Wed Apr 21 22:35:07 2004 Arvind S. Krishna - - * DnC/Config_Handler/Config_Handlers.mpc: - Modified the mpc file to include handlers that compile as a test - * DnC/Config_Handler/ID_Handler.h: - * DnC/Config_Handler/ID_Handler.cpp: - * DnC/Config_Handler/CEPE_Handler.h: - * DnC/Config_Handler/CEPE_Handler.cpp: - * DnC/Config_Handler/RS_Handler.h: - * DnC/Config_Handler/RS_Handler.cpp: - * DnC/Config_Handler/SP_Handler.h: - * DnC/Config_Handler/SP_Handler.cpp: - * DnC/Config_Handler/Utils.h: - * DnC/Config_Handler/Utils.cpp: - * DnC/Config_Handler/Any_Handler.h: - Handlers for common elements; each handler handles a separate - type - * DnC/Config_Handler/Config_Handler_export.h: - Export files for all the handlers - -Wed Apr 21 22:27:34 2004 Arvind S. Krishna - - * DnC/Deployment.mpc: - Changed the export tags from all-caps to mixed mode - * DnC/Deployment_stub_export.h: - * DnC/Deployment_svnt_export.h: - Re-generated the export files accordingly - -Wed Apr 21 13:08:50 2004 Gan Deng - - * DnC/Config_Handlers/APM_Handler.cpp - Fixed a typo. - -Wed Apr 21 12:33:11 2004 Arvind S. Krishna - - * DnC/Deployment.mwc: - * DnC/Deployment.mpc: - Workspace and Project files for generating stubs and skeletons - for Deployment.idl file - - * DnC/Deployment_stub_export.h: - * DnC/Deployment_svnt_export.h: - Export macros for Deployment stub and skeleton files - -Wed Apr 21 10:53:50 2004 Gan Deng - - * DnC/Deployment.idl: - - Fixed the error in the "struct SubcomponentPortEndpoint" - definition in the IDL file. - -Wed Apr 21 10:33:50 2004 Tao Lu - - * DnC/Deployment.idl: - * DnC/DnC_*: - - Switched back the the OMG IDL DnC file. - -Tue Apr 20 21:37:26 2004 Arvind S. Krishna - - * Dnc/Config_Handlers/Config_Handlers.mpc: - Changed the file to generate shared library rathern than an - executable. - -Tue Apr 20 20:29:37 2004 Arvind S. Krishna - - * Dnc/Config_Handlers/Config_Handers.mpc: - - mpc file for the DnC configuration handlers - -Tue Apr 20 17:11:35 2004 Irfan Pyarali - - * examples/Hello/Sender/Sender_exec.h (Sender_Impl): - - The second constructor also needed the same fix. - -Tue Apr 20 15:50:07 2004 Irfan Pyarali - - * examples/Hello/Sender/Sender_exec.h (Sender_Impl): - - was getting initialized properly causing a crash - later in the execution. - -Mon Apr 19 18:04:11 2004 Gan Deng - - * DnC/Config_Handlers/ACD_Handler.cpp - * DnC/Config_Handlers/ACD_Handler.h - * DnC/Config_Handlers/APM_Handler.cpp - * DnC/Config_Handlers/APM_Handler.h - * DnC/Config_Handlers/MID_Handler.cpp - * DnC/Config_Handlers/MID_Handler.h - * DnC/Config_Handlers/SPE_Handler.cpp - * DnC/Config_Handlers/SPE_Handler.h - - XML handlers for below XML data types respectively: - - "AssemblyConnectionDescription " - "AssemblyPropertyMapping" - "MonolithicImplementationDescription" - "SubcomponentPortEndpoint" - - * DnC/Config_Handlers/XercesString.cpp - * DnC/Config_Handlers/XercesString.h - - Helper class for using Xerces library to write XML handlers. - -Mon Apr 19 14:50:11 2004 Krishnakumar B - - * DnC/Config_Handlers: Created new directory for adding the - handlers for the Deployment & Configuration Specification. - -Thu Apr 15 18:13:29 2004 Irfan Pyarali - - * CIAO-INSTALL.html (HREF): - - Fixed link to binary files. - -Mon Apr 12 14:40:32 2004 Tao Lu - - * docs/index.html: - - fixed a broken link. - diff --git a/CIAO/ChangeLogs/ChangeLog-2004b b/CIAO/ChangeLogs/ChangeLog-2004b deleted file mode 100644 index 233cfed69fc..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2004b +++ /dev/null @@ -1,2250 +0,0 @@ -Tue Dec 28 19:50:06 2004 Balachandran Natarajan - - * Release: - - Updated the name of the target for generating the textual - version of CIAO-INSTALL.html file. - -Sat Dec 25 20:55:55 2004 Balachandran Natarajan - - * Release: - - Added INSTALL target which generates textual version of - CIAO-INSTAll.html for the release. - -Sat Dec 25 15:01:40 2004 Balachandran Natarajan - - * CIDLC/ExecImplSourceGenerator.cpp: - - Got rid of unused environment variable warnings in the generated - code. - -Wed Dec 22 06:53:30 2004 Chad Elliott - - * tests/CIDL/CodeGen/CodeGen.mpc: - - Make sure that CodeGen_stub gets built before CodeGen_exec. - -Tue Dec 21 11:29:03 2004 Gan Deng - - * tools/Segment_Timer/Segment_Timer.h - - Increased the value of the macro MAX_READINGS, since the - current value is too small and caused core dump for even - 50 connections. Thanks Roland Schmmack - for reporting this bug! - -Mon Dec 20 17:27:01 2004 Gan Deng - - * DAnCE/ciao/CCM_Core.mpc - * ciao/Deployment_Core.idl - * ciao/NodeApplication_Impl.cpp - * ciao/NodeApplication_Impl.h - * ciao/NodeApplication_Impl.inl - - Reverted changes back because of the check-in mistake I just made. - -Mon Dec 20 16:32:54 2004 Nanbor Wang - - * DAnCE/Config_Handlers/Config_Handlers.mpc: Added include path to - self for XSC_Config_Handlers project.. - -Wed Dec 15 13:48:44 2004 Chad Elliott - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Get rid of build warnings from gcc 3.3. - -Tue Nov 30 21:41:58 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - More use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. - -Tue Nov 30 21:03:00 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - Another use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. - -Tue Nov 30 20:39:26 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - Used ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. - -Tue Nov 30 20:22:19 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - Fixes for VC6. - -Wed Nov 24 09:47:58 2004 Chad Elliott - - * examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp: - - Added static_cast from double to int to avoid build warnings from - g++. - -Wed Nov 17 17:46:44 2004 Jeff Parsons - - * examples/Hello/Receiver/Receiver.idl: - - Added 'uses multiple' receptacle to test code generation - and compilation. - -Sat Nov 13 18:04:36 2004 Jaiganesh B - - * DAnCE/examples/Hello/Hello_Base/Hello_Base.idl: - * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc: - * DAnCE/examples/Hello/Hello_Base/Hello_Base_stub_export.h: - * DAnCE/examples/Hello/Hello_Base/Hello_Base_svnt_export.h: - * DAnCE/examples/Hello/Receiver/Receiver.cidl: - * DAnCE/examples/Hello/Receiver/Receiver.idl: - * DAnCE/examples/Hello/Receiver/Receiver.mpc: - * DAnCE/examples/Hello/Receiver/Receiver_exec.cpp: - * DAnCE/examples/Hello/Receiver/Receiver_exec.h: - * DAnCE/examples/Hello/Receiver/Receiver_exec_export.h: - * DAnCE/examples/Hello/Receiver/Receiver_stub_export.h: - * DAnCE/examples/Hello/Receiver/Receiver_svnt_export.h: - * DAnCE/examples/Hello/Sender/Sender.cidl: - * DAnCE/examples/Hello/Sender/Sender.idl: - * DAnCE/examples/Hello/Sender/Sender.mpc: - * DAnCE/examples/Hello/Sender/Sender_exec.cpp: - * DAnCE/examples/Hello/Sender/Sender_exec.h: - * DAnCE/examples/Hello/Sender/Sender_exec_export.h: - * DAnCE/examples/Hello/Sender/Sender_stub_export.h: - * DAnCE/examples/Hello/Sender/Sender_svnt_export.h: - * DAnCE/examples/Hello/Sender/starter.cpp: - * DAnCE/examples/Hello/descriptors/Deployment.xsd: - * DAnCE/examples/Hello/descriptors/Domain.cdd: - * DAnCE/examples/Hello/descriptors/Hello.cdp: - * DAnCE/examples/Hello/descriptors/Hello.cid: - * DAnCE/examples/Hello/descriptors/Hello.cpd: - * DAnCE/examples/Hello/descriptors/Hello.pcd: - * DAnCE/examples/Hello/descriptors/Libraries.iad: - * DAnCE/examples/Hello/descriptors/Receiver.ccd: - * DAnCE/examples/Hello/descriptors/Receiver.cid: - * DAnCE/examples/Hello/descriptors/Receiver.cpd: - * DAnCE/examples/Hello/descriptors/Receiver_Exec.iad: - * DAnCE/examples/Hello/descriptors/Receiver_Stub.iad - * DAnCE/examples/Hello/descriptors/Receiver_Svnt.iad: - * DAnCE/examples/Hello/descriptors/Sender.ccd: - * DAnCE/examples/Hello/descriptors/Sender.cid: - * DAnCE/examples/Hello/descriptors/Sender.cpd: - * DAnCE/examples/Hello/descriptors/Sender_Exec.iad: - * DAnCE/examples/Hello/descriptors/Sender_Stub.iad: - * DAnCE/examples/Hello/descriptors/Sender_Svnt.iad: - * DAnCE/examples/Hello/descriptors/XMI.xsd: - * DAnCE/examples/Hello/descriptors/hello.dat: - * DAnCE/examples/Hello/descriptors/package.tpd: - - Added another version of the Hello example - in the DanCE/examples directory. - - This example will use the DanCE framework for - deploying the components used in the example. - -Sat Nov 13 13:17:48 2004 Gan Deng - - * NEWS - - Added the Real-time Event Channel integration plan into - the NEWS file. - -Fri Nov 12 06:21:03 2004 Chad Elliott - - * tests/RTCCM/Priority_Test/Controllers/Pulser.h: - * tests/RTCCM/Priority_Test/Controllers/Pulser.cpp: - - Changed the open and close method of the Pulser class to match - the signature of the ACE_Task_Base. - -Thu Nov 11 17:17:48 2004 Arvind S. Krishna - - * ciao/Servant_Activator.cpp: - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * DAnCE/examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * docs/tutorial/Hello/hello_exec.cpp: - Fixed warnings in the scoreboard from RH8 NoInline build - - Thu Nov 11 11:24:05 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - In the generated servant method populate_port_tables(), - added the line 'ACE_ENV_ARG_NOT_USED;' to avoid an - unused parameter warning if there happens to be no - populating to be done in this genrated method. - -Thu Nov 11 10:50:45 2004 Jeff Parsons - - * CIDLC/ExecImplSourceGenerator.cpp: - - Fixed incorrect generation of environment arg macro. - Thanks to Chad Elliott for - pointing out the mistake. - -Thu Nov 11 09:46:58 2004 Chad Elliott - - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Sender/Sender.mpc: - * tests/RTCCM/DiffServ/Controller/Controller.mpc: - - Added requires += exceptions for these projects. - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - - Removed ACE_CHECK's which caused compilation errors when - exceptions=0 was set. - -Thu Nov 11 14:40:12 UTC 2004 Johnny Willemsen - - * DAnCE/ciao/Servant_Activator.cpp: - * docs/tutorial/Hello/hello_exec.cpp: - Fixed unused parameter warnings in emulated exception build - -Tue Nov 9 14:20:31 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed incorrect code generation for home factory operations. - Thanks to Chad Elliott for pointing - out the mistake. This fixes [BUGID:1977]. - -Mon Nov 8 12:58:24 2004 Chad Elliott - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - - Fixed build ordering to match library requirements. - - * ciao/StandardConfigurator_Impl.h: - - Removed the StandardConfigurator_Impl:: prefix on the configure - method (gcc 3.4.1 did not like it). - -Fri Nov 5 09:55:28 2004 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTrip/client.cpp: - - The svc.conf file passed in to the client was not being passed - to the ORB as ACE::Get_Opt ate up the argument before being - passed to the client ORB. This fixes this error at the client - side temporarily by initializing the ORB before parsing the - arguments. Thanks to Abhi for reporting - this. - -Thu Nov 4 09:31:29 2004 Jaiganesh B - - * DAnCE/RepositoryManager/Update_Plan.cpp: - - Made changes to fix some build warnings. - Thanks to Chad Elliot for reporting - this warning. - -Wed Nov 3 16:32:54 2004 Jeff Parsons - - * CIDLC/ExecutorMappingGenerator.cpp: - - Added generation of newline before each operation - parameter so each one will be on a separate line. - It was discovered that the VC 7.1 lexer truncates lines - longer than 1024 characters. - -Wed Nov 3 22:32:18 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - VC6 error fixes. Grr...! - -Wed Nov 3 12:38:21 2004 Jaiganesh B - - * DAnCE/RepositoryManager/Update_Plan.cpp: - * DAnCE/RepositoryManager/Update_Plan.h: - - Made changes to handle multiple component instances - deployment. - -Tue Nov 2 17:26:42 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed the emitters for supported operations to include - abstract interfaces in their traversals. - -Tue Nov 2 09:59:15 2004 Jeff Parsons - - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - - Fixed some regular expressions, used to generate the servant - header file ifdef guard and export macros, to recognize the - file extension .cdl in addition to the existing patterns for - .cidl and .idl. These particular regular expressions were - overlooked in the checkin of - - Thu Sep 30 11:03:20 2004 Jeff Parsons - -Tue Nov 2 04:45:44 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Addressing compile errors in Borland. Thanks to Johnny for the - suggestion. - -Mon Nov 1 15:09:12 UTC 2004 Johnny Willemsen - - * VERSION: - Fixed description and mailing lists to use - -Fri Oct 29 17:18:51 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp (namespace): - - Fixed some weird VC6 issues reported by Theckla - Louchios. - -Fri Oct 29 10:44:52 2004 Jeff Parsons - - * DAnCE/RepositoryManager/Repository_Manager.cpp; - - Cosmetic changes. - -Mon Oct 25 07:31:12 UTC 2004 Johnny Willemsen - - * DAnCE/RepositoryManager/Repository_Manager.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Impl.cpp: - Use ACE auto_ptr instead of std::auto_ptr to fix compile problems - with vc6. - -Fri Oct 22 11:49:25 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - - Reversed this change "Thu Oct 21 18:37:12 2004 Gan Deng - " - -Fri Oct 22 08:16:12 UTC 2004 Johnny Willemsen - - * tests/RTCCM/DiffServ/Controller/Controller.mpc: - Added DiffServ_Stub to the libs part, this should fix the link errors - in the CBX Static Release build - -Fri Oct 22 07:51:12 UTC 2004 Johnny Willemsen - - * tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h: - Used ACE_AS_STATIC_LIBS to check whether we need to build a DLL - or not, TAO_AS_STATIC_LIBS was used, but this project isn't - dependent on TAO, just on ACE - -Thu Oct 21 18:37:12 2004 Gan Deng - - * DAnCE/Config_Handlers/Config_Handlers.mpc - - Put the xerces-c library into "lib +=" to avoid - linking to the wrong library. - -Wed Oct 13 06:37:12 UTC 2004 Johnny Willemsen - - * tests/RTCCM/Priority_Test/Workers/Worker.mpc - * tests/RTCCM/Priority_Test/Controllers/Controller.mpc: - Added Priority_Test_stub to the libs, this should fix the link errors - in the borland builds - - * tests/CIDL/CodeGen/CodeGen.mpc: - Added CIDL_Basic_stub to the libs, this should fix the link errors - in the borland builds - -Tue Oct 12 09:07:12 UTC 2004 Johnny Willemsen - - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - Removed / at the end of the includes part, this should fix the - compile error in the Borland builds - -Mon Oct 11 23:41:16 2004 Balachandran Natarajan - - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - - Fixed typos that broke the builds. - -Mon Oct 11 11:02:41 2004 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/IndentationIDL.hpp: - - Put double new line after `}'. - - * CIDLC/cidlc.cpp: - - Print build date and time in --version. - -Mon Oct 11 10:08:48 2004 Gan Deng - - * DAnCE/examples/BasicSP/Readme.html - - Update the README file for running the example. - -Sun Oct 10 10:45:48 2004 Balachandran Natarajan - - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - - Fix for some typos which broke the daily builds. - -Sun Oct 10 02:47:21 2004 Balachandran Natarajan - - * DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.h: - * DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp: - - Fix for MSVC6 build errors. They compile fine on MSVC6 now. I am - just hoping that this fix also addresses compile errors in - Borland. The Borland compilation errors are also similar to the - MSVC6 errors and hence the hope! - -Sun Oct 10 00:21:39 2004 Balachandran Natarajan - - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc: - - Fixed a typo. - -Sat Oct 9 23:43:52 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/Plan_Handler.cpp: - - Fixed a compilation error in Borland builds. - - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc: - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc: - * DAnCE/examples/BasicSP/EC/EC.mpc: - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - - Added missing libraries. They have been wrong for a very long - time. Thanks to Borland builds for catching these. I am sure - there are a few more and I will allow one more build to catch - them. - - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.h: - - Fixed warnings due to hidden virtual functions. - - -Sat Oct 9 14:29:41 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Added a .in () to the _var variable used in push_event (). - - * DAnCE/Config_Handlers/XercesString.cpp: - * DAnCE/Config_Handlers/XercesString.h: - - Removed an unnecessary operator== which was confusing some - compilers. - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/Repository_Manager.cpp: - - Changed the wrong exceptions that were being thrown. - - * DAnCE/examples/BasicSP/EC/EC_exec.cpp: - * DAnCE/examples/BasicSP/EC/EC_exec.h: - * examples/OEP/BasicSP/EC/EC_exec.cpp: - * examples/OEP/BasicSP/EC/EC_exec.h: - - The declaration of open () and close () was hiding the base - class methods. Changed the name of the functions. - - The above changes should fix part of the errors from the Borland - builds. - -Thu Oct 7 03:17:54 2004 Balachandran Natarajan - - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/ccd.xsd: - * docs/schema/cdp.xsd: - - Updated to be more compliant with the DnC spec. - -Wed Oct 6 16:10:27 2004 Will Otte - - * docs/schema/ciaopolicy.xsd: - - Finished filling out the policy schema. - -Sun Oct 03 09:38:03 2004 Nanbor Wang - - * DAnCE/Config_Handlers/XSCRT/Elements.hpp: - * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: - * DAnCE/Config_Handlers/XSCRT/Parser.hpp: - * DAnCE/Config_Handlers/XSCRT/Traversal.hpp: - * DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp: - * DAnCE/Config_Handlers/pcd.hpp: - * DAnCE/Config_Handlers/iad.hpp: - * DAnCE/Config_Handlers/cpd.hpp: - * DAnCE/Config_Handlers/cid.hpp: - * DAnCE/Config_Handlers/cdp.hpp: - * DAnCE/Config_Handlers/cdd.hpp: - * DAnCE/Config_Handlers/Deployment.hpp: - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/Config_Handlers/ccd.hpp: - * DAnCE/Config_Handlers/toplevel.hpp: Change to include XSCRT - headers as "user libraries" instead of . - -Sun Oct 03 09:18:05 2004 Nanbor Wang - - * DAnCE/tests/Config_Handlers/handler_test.mpb: Changed to use the - xerces base project that Johnny added. The base project - correctly uses lit_libs to include xerces. - -Thu Sep 30 14:49:23 2004 Jeff Parsons - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - - Removed identifiers of unused args. - - * CIDLC/RepositoryIdGenerator.cpp: - - Extended generator to compute repo ids for - homes and components. - - * CIDLC/DescriptorGenerator.cpp: - - Changed code to use the context value set by the expanded - repo id generator and removed code to compute repo id - in this generator. - -Thu Sep 30 11:03:20 2004 Jeff Parsons - - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added handling of file extension .cdl, as found in - spec documents. - -Thu Sep 30 09:16:52 2004 Nanbor Wang - - * CCF/Config.rules: Added new definitions to actually add the - boost and utility related directives into compiler/linker - flags. - -Thu Sep 30 09:55:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/DnC_Dump_T.h: - Fixed fuzz error - -Wed Sep 29 17:30:25 2004 Irfan Pyarali - - * performance-tests/Protocols: - - - Minor changes were made to the Sender to in lieu of some - interface changes. - - - run_test.pl was changed so that a simple version of the test - can be executed. - - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - - Removed "dummy" label so that it is included in nightly builds. - - * performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini: - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/descriptors/Receiver.csd: - * performance-tests/Protocols/descriptors/Receiver.ssd: - * performance-tests/Protocols/descriptors/Sender.csd: - * performance-tests/Protocols/descriptors/Sender.ssd: - - Sender_* was changed to Protocols_Sender_* and Receiver_* was - changed to Protocols_Receiver_*. - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Protocols/Sender/Sender.mpc: - - Custom_Network_Priority_Mapping.cpp was included directly. If - listed as a source file that is not in the current directory, - mpc mucks the object file location. - - * performance-tests/Protocols/descriptors/Receiver.csd: - * performance-tests/Protocols/descriptors/Receiver.ssd: - * performance-tests/Protocols/descriptors/Sender.csd: - * performance-tests/Protocols/descriptors/Sender.ssd: - - Hello was changed to Protocols. - - * tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini: - * tests/RTCCM/DiffServ/Sender/Sender.mpc: - * tests/RTCCM/DiffServ/descriptors/Receiver.csd: - * tests/RTCCM/DiffServ/descriptors/Receiver.ssd: - * tests/RTCCM/DiffServ/descriptors/Sender.csd: - * tests/RTCCM/DiffServ/descriptors/Sender.ssd: - - Sender_* was changed to DiffServ_Sender_* and Receiver_* was - changed to DiffServ_Receiver_*. - - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - * tests/RTCCM/DiffServ/Sender/Sender.mpc: - - Custom_Network_Priority_Mapping.cpp was included directly. If - listed as a source file that is not in the current directory, - mpc mucks the object file location. - - * tests/RTCCM/DiffServ/descriptors/Receiver.csd: - * tests/RTCCM/DiffServ/descriptors/Receiver.ssd: - * tests/RTCCM/DiffServ/descriptors/Sender.csd: - * tests/RTCCM/DiffServ/descriptors/Sender.ssd: - - Hello was changed to DiffServ. - - * tests/RTCCM/DiffServ/Controller/Controller.mpc: - - "requires" directive was incorrect. Correct directive is - "after". - -Wed Sep 29 19:20:19 2004 Balachandran Natarajan - - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp: - * DAnCE/examples/BasicSP/EC/EC_svnt.cpp: - * DAnCE/examples/BasicSP/EC/EC_svnt.h: - - Removed them from the main trunk. - -Wed Sep 29 14:39:29 2004 Balachandran Natarajan - - The dump function was too complicated not compiling on many - platforms cleanly. This effort is to simplify the dump functions - so that we can compile on many platforms. - - * DAnCE/Config_Handlers/DnC_Dump.cpp: - * DAnCE/Config_Handlers/DnC_Dump.h: - - Moved template functions out of the class. - - * DAnCE/Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Config_Handlers/DnC_Dump_T.h: - - New files for the template functions. - - * DAnCE/Config_Handlers/Dump_Obj.cpp: - * DAnCE/Config_Handlers/Dump_Obj.h: - - Utility functions have been moved here. - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - New files added to the build. - -Wed Sep 29 07:51:12 UTC 2004 Johnny Willemsen - - * ciao/Servant_Activator.h: - * DAnCE/ciao/Servant_Activator.h: - Added missing prama pop - -Wed Sep 29 07:09:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/Utils.h: - Added missing include of ace/post.h - -Mon Sep 27 17:57:08 2004 Krishnakumar B - - * DAnCE/examples/BasicSP/BasicSP.mpc: - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc: - * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc: - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc: - * DAnCE/examples/BasicSP/EC/EC.mpc: - - Fixed the MPC files to refer to the version of DAnCE libraries - instead of the old CIAO libraries. - -Mon Sep 27 22:41:52 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Remove calling Home_Servant_impl_Base () directly. - - * DAnCE/ciao/Home_Servant_Impl_Base.cpp: - * DAnCE/ciao/Home_Servant_Impl_Base.h: - * ciao/Home_Servant_Impl_Base.cpp: - * ciao/Home_Servant_Impl_Base.h: - - Provided a default constructor with explicit keyword. This - should help VC6 and Borland compilers to compile the generated - servants just fine. - -Mon Sep 27 19:45:04 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Remove calling Context_Impl_Base () and Servant_Impl_Base () - directly. - - * DAnCE/ciao/Context_Impl_Base.cpp: - * DAnCE/ciao/Context_Impl_Base.h: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - Added a explicit default constructor so that they are not called - implicitly when derived classes are instantiated. - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - - Checking in the change mentioned before just now, since it - fell trhough the cracks. - -Mon Sep 27 15:41:20 2004 Balachandran Natarajan - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - - Export the class out for Win32 builds. - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - - Removed a strange character frm the mpc file. - -Mon Sep 27 15:26:46 2004 Balachandran Natarajan - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - Added a new exception specification to correct an error in BCB6 - builds. - - * DAnCE/ciao/CCM_Core.mpc: - - Deployment_stub should link with CIAO_DnC_Client. - -Mon Sep 27 12:56:12 UTC 2004 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/Config_Handlers/Config_Handlers.mpc: - Instead of adding all xerces stuff to the project itself, inherit - from the new xerces base project - -Mon Sep 27 12:02:12 UTC 2004 Johnny Willemsen - - * DAnCE/NodeManager/NodeDaemon.mpc: - Instead of adding ifr_client to libs, use the - corresponding base projects - -Mon Sep 27 11:54:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - Instead of adding the valuetype and ifr_client to libs, use the - corresponding base projects - -Mon Sep 27 08:54:12 UTC 2004 Johnny Willemsen - - * DAnCE/examples/BasicSP/EC/EC_exec.cpp: - Added missing ACE_TRY_CHECK - -Mon Sep 27 08:03:12 UTC 2004 Johnny Willemsen - - * ciao/Context_Impl_Base.cpp: - Use false instead of FALSE. - -Wed Sep 22 17:46:14 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Removed unused parameter identifiers and fixed the order of some - class member initializations. - -Tue Sep 21 13:28:40 2004 Jeff Parsons - - * docs/value_factory_registration.html: - - New documentation file, describing the behavior of the CIDL - compiler with respect to automatic generation of code to - register valuetype factories for eventtypes referenced by - 'consumes' declarations in a component. - -Tue Sep 21 13:04:39 2004 Jeff Parsons - - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added code to check an eventtype used as an event consumer - in a component for the presence of an operation or - factory. If either is found, code generation for registering - the associated _init class with the container's ORB is skipped. - Also added command line option to toggle off generation of - the factory registration in all cases. Thanks to - Vasili Goutas for the posting to the ciao-users - mailing list that prompted us to make the CIDL compiler - smarter and more friendly with regard to this feature. - -Tue Sep 21 13:00:33 2004 Jeff Parsons - - * CCF/CCF/IDL3/IDL3.vcproj: - - Added new files create by Boris for eventtype factory support. - - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - - Fixed search-and-replace error in EventTypeFactory constructor - that had it inheriting from itself. - -Tue Sep 21 11:08:20 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/ValueType.hpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/SemanticAction.hpp: - * CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.hpp: - * CCF/CCF/IDL3/Traversal/EventType.hpp: - - Added support for eventtype factories. - -Tue Sep 21 07:39:12 UTC 2004 Johnny Willemsen - - * DAnCE/ciao/Context_Impl_Base.cpp: - Use false instead of FALSE. - -Mon Sep 20 18:47:47 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - - Use lit_libs for xercesc as suggested by Chad Elliott. - - * performance-tests/Protocols/Sender/Sender.idl: - - Fixed the IDL to compile with the latest changes to IDL - compiler. - -Mon Sep 20 18:43:12 UTC 2004 Johnny Willemsen - - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - Added strategies as base project - -Mon Sep 20 11:37:12 UTC 2004 Johnny Willemsen - - * DAnCE/ciao/StandardConfigurator_Impl.h: - Removed not needed qualifier, and fixed incorrect Id tag - -Sun Sep 19 19:12:22 2004 Balachandran Natarajan - - * DAnCE/ciao/Deployment.idl: - - Fixed variable name that differ by case from the data type. - -Fri Sep 17 16:46:32 2004 Jeff Parsons - - * CIDLC/CIDLC.sln: - - Added the 5 projects from CCF.sln so the CIDL compiler can be - built from scratch in a single MSVC 7.1 Solution. - -Fri Sep 17 08:27:57 2004 Balachandran Natarajan - - * DAnCE/ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.cpp: - - Use false instead of FALSE. This should fix compile errors in - debian full reactor builds. - -Fri Sep 17 13:22:12 UTC 2004 Johnny Willemsen - - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - Use ciao_server as base - -Thu Sep 16 10:15:04 2004 Jeff Parsons - - * DAnCE/ciao/Servant_Impl_Base.h: - - Added inheritance to Servant_Impl_Base of - POA_Components::CCMObject to bring it in sync with the - version in regular CIAO/ciao. - - * DAnCE/ciao/Servant_Impl_T.h: - - Made inheritance of Servant_Impl_Base virtual, to bring it - in sync with the version in regular CIAO/ciao. - -Thu Sep 16 08:44:12 UTC 2004 Johnny Willemsen - - * DAnCE/ciao/Servant_Activator.cpp: - * CIAO/ciao/Servant_Activator.cpp: - Fixed compile errors in Borland build - -Tue Sep 14 20:43:31 2004 Jeff Parsons - - * ciao/Context_Impl_Base.h: - * DAnCE/ciao/Context_Impl_Base.h: - - Moved a sufficiently substantial included file above the - #pragma once directive, so that some compilers will not - complain that it's obsolete. - -Tue Sep 14 15:02:24 2004 Jeff Parsons - - * DAnCE/ciao/Context_Impl_Base.cpp: - * DAnCE/ciao/Context_Impl_Base.h: - * DAnCE/ciao/Context_Impl_T.cpp: - * DAnCE/ciao/Context_Impl_T.h: - * DAnCE/ciao/Home_Servant_Impl_Base.cpp: - * DAnCE/ciao/Home_Servant_Impl_Base.h: - * DAnCE/ciao/Home_Servant_Impl_T.cpp: - * DAnCE/ciao/Home_Servant_Impl_T.h: - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.h: - * ciao/Context_Impl_T.cpp: - * ciao/Context_Impl_T.h: - * ciao/Home_Servant_Impl_Base.cpp: - * ciao/Home_Servant_Impl_Base.h: - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.h: - - New files, duplicated in CIAO/ciao and - CIAO/DAnCE/ciao, containing base classes - for the CIDL-compiler-generated context - and home servant classes. A template class - sits in the hierarchy between the generated - class and its skeleton base class (in the - case of the home servant) or its executor - base (in the case of the context). The - template class also inherits from a - non-template class which is used to hold - members and operations not using any template - parameters. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * DAnCE/ciao/CCM_Core.mpc: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - * ciao/CCM_Core.mpc: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - - Modified existing files to correspond with the - new files described above and: - - - Added implementations for the component servant - operations provide_facet(), get_named_facets(), - get_consumer() and get_named_consumers(). - - - Added inheritance of CCMObject to the non-template - base class, to enable operations in the template - base class, which used no template parameters but - which were there only to be in the inheritance - hierarchy from skeleton to generated servant, to - be moved to the non-template base class, and - thus not be reinstantiated with every new type. - - - Moved operations from generated code to one of - the two base classes. - -Mon Sep 13 13:18:33 2004 Gan Deng - - * RepositoryManager/Update_Plan.h - - Fixed a waring in Windows build by changing "class" to "struct" - in forward declaration. - - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - - Changed the output stub, servant, and executor library names - for all the components in BasicSP example. The reason is - becasue all the DnC descriptors are tightly coupled with the - output library names. I might come back switch this change - back since this will conflict with the BasicSP example in - CIAO_ROOT/examples. - -Mon Sep 13 13:07:33 2004 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Fixed a bug inside create_connections () method. - -Mon Sep 13 15:16:33 2004 Balachandran Natarajan - - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - - Fixed the paths in the scripts. - -Mon Sep 13 07:11:06 2004 Balachandran Natarajan - - * DAnCE/ciao/Port_Activator.h: - * DAnCE/ciao/Servant_Activator.cpp: - * ciao/Port_Activator.h: - * ciao/Servant_Activator.cpp: - - Fixes for MSVC++ compilation errors. Inspite of being careful I - introduced a couple of VC++ anathemas. - -Mon Sep 13 06:16:31 2004 Balachandran Natarajan - - * DAnCE/ciao/Container_Base.cpp: - * ciao/Container_Base.cpp: - - Fixed wrong ACE_CHECK usage. This should fix compilation errors - in Full_Reactors build. - -Mon Sep 13 04:20:44 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - - Removed iorinterceptor and objreftemplate from CIAO_DnC_Server - project. No reason to believe that they need thes. This should - hopefully remove the warnings in our daily builds. - - * examples/Hello/Sender/Sender_exec.cpp: - - Added a simple debug statement. - - * performance-tests/Benchmark/Benchmark.mpc: - - Tried fixing the link errors on the scoreboard. - -Mon Sep 13 03:50:08 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Container_Base.inl: - * DAnCE/ciao/Port_Activator.cpp: - * DAnCE/ciao/Port_Activator.h: - * DAnCE/ciao/Port_Activator_T.cpp: - * DAnCE/ciao/Port_Activator_T.h: - * DAnCE/ciao/Servant_Activator.cpp: - * DAnCE/ciao/Servant_Activator.h: - - Replicated changes to DAnCE. DAnCE testing hasn't been completed - yet. - -Sun Sep 12 22:10:38 2004 Balachandran Natarajan - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changes to the CIDL which uses the servant and port activators - checked in now. - -Mon Sep 13 03:00:52 2004 Balachandran Natarajan - - To overcome the long standing problem in DAnCE, we are now making - the facet and consumer servants to be on demand activatable. This - would make sure that application level ports are not activated - until used. This should help address the problems between DAnCE - and existing way of doing things. These changes should be useful - even after old CIAO is removed since we want to give existing - component applications the same activation semantics with DAnCE. - - This checkin addresses old CIAO. DAnCE and CIDLC changes will come - in soon. - - * ciao/Servant_Activator.cpp: - * ciao/Servant_Activator.h: - - New files for facet and consumer activations. We now have a - seperate servant activator for facet and consumer ports. The - servant activator acts like a factory activating the right port - activators which can create the right servant for every port. - - * ciao/Port_Activator.cpp: - * ciao/Port_Activator.h: - * ciao/Port_Activator_T.cpp: - * ciao/Port_Activator_T.h: - - Concrete port activators for every port. - - * ciao/CCM_Core.mpc: - - Added the new files for building. - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Container_Base.inl: - - Changes to the Container to use the above servant activator. The - continer creates the servant activator and sets that in the POA - meant for facet and consumers. - -Fri Sep 10 23:08:15 2004 Balachandran Natarajan - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - - Reverted this change "Sat Sep 11 03:35:24 2004 Balachandran - Natarajan " - -Fri Sep 10 22:53:58 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - * ciao/CCM_Core.mpc: - - Linked with TAO_Utils library - -Sat Sep 11 03:35:24 2004 Balachandran Natarajan - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - - Removed install_servant () since it is not used. - -Fri Sep 10 22:28:45 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Changes to accomodate the accessor renaming. - -Sat Sep 11 03:22:06 2004 Balachandran Natarajan - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Container_Base.inl: - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Container_Base.inl: - - Made a few changes. They are - - . Added a second POA into the container. One of the POA's will - host the component and the other POA will host the facet and - consumer servants. Obviously the two POA's have different sets - of policies. The new POA is primarily targeted to activate - facet and consumer servants on demand. - - . Renamed the accessor to the ORB and POA. Made them const - methods - - . Improved documentation and a number of costeic changes. - - - * DAnCE/RepositoryManager/Repository_Manager.cpp: - * DAnCE/RepositoryManager/Update_Plan.cpp: - * DAnCE/RepositoryManager/Update_Plan.h: - - BUnch of cosmetic changes to be conformant with ACE+TAI coding - guidelines. - - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_T.cpp: - - Fixed simple compilation errors and warnings. - -Thu Sep 9 17:07:59 2004 Jeff Parsons - - * tests/IDL3/Events/Abstract/Abstract.idl: - - Uncommented IDL testing multiple inheritance of eventtypes. - -Thu Sep 9 10:30:22 2004 Jeff Parsons - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * ciao/Container_Base.cpp: - - Added generate_reference() method to DAnCE version of - Container_Base, and fixed ACE_CHECK macro mistake in - both versions. - -Wed Sep 8 11:52:45 2004 Jeff Parsons - - * DAnCE/ciao/Servant_Impl_Base.h: - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Updated files with changes made to the corresponding files - in regular CIAO/ciao. - -Tue Sep 7 22:14:43 2004 Ossama Othman - - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Fixed unused argument warnings. - -Tue Sep 7 15:48:19 2004 Jeff Parsons - - * DAnCE/ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.cpp: - - Cosmetic changes. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - - Moved several methods from the generated servant class to the - template Servant_Impl base class. - -Tue Sep 7 10:44:10 2004 Jeff Parsons - - * CIDLC/CIDLC.mpc: - * CIDLC/CIDLC.vcproj: - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/RepositoryIdGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/cidlc.cpp: - - - Updated the RepositoryIdGenerator and re-added the source - and header files to the build. This generator creates - repository ids for interfaces and eventtypes, and stores - them internally in a context variable for later access - in code generation. It also handles modifications to the - repository ids stemming from 'typeprefix' or 'typeid' - declarations. - - - Added generation of 'provide__i' and - 'get_consumer__i' methods in the servant, - which create dummy object references and store them in the - appropriate port table in the servant base class. - - - Re-implemented the generated 'provide_' and - 'get_consumer_' methods. They now - use the container's POA to activate the dummy objects - created by the corresponding _i methods described above. - The activation takes place upon the first outside access - of these objects. If an object has already been activated, - it will simply be found in its port table and returned. - Thanks to Bala for the prototype code for this feature. - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - - Added 'generate_reference' utility method called by the - '_i' methods described above. - - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - Added 'lookup_facet' and 'lookup_consumer' methods used in - generated servant code to determine if a desired object has - been activated already (and added to a port table) or not. - -Mon Aug 30 12:52:28 2004 Balachandran Natarajan - - * performance-tests/Benchmark/Benchmark.mpc: - - Fixes for link errors in the daily builds - -Sun Aug 29 19:25:21 2004 Balachandran Natarajan - - * tools/XML_Helpers/XMLHelpers.mpc: - - Fix for link errors in Debian_Core builds. - -Sun Aug 29 19:02:42 2004 Balachandran Natarajan - - * DAnCE/ciao/CCM_Core.mpc: - - Added valuetype seperately to the Deployment_svnt project. - -Sun Aug 29 18:10:13 2004 Balachandran Natarajan - - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h: - * DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h: - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h: - * DAnCE/examples/BasicSP/EC/EC_svnt.h: - - These files should not be in the repository. - -Sat Aug 28 18:44:00 2004 Balachandran Natarajan - - * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc: - - Fixed a compile erros in the daily builds. - -Sat Aug 28 09:22:15 2004 Balachandran Natarajan - - * DAnCE/examples/BasicSP/BasicSP.mpc: - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc: - * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc: - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc: - * DAnCE/examples/BasicSP/EC/EC.mpc: - - Fixed the project names and shared librray names so that they - don't collide with the regual BasicSP test. Ideally there - shouldn't be any duplicate code. I waill talk to Gan about - this. - -Thu Aug 26 16:45:10 2004 Jeff Parsons - - * tests/IDL3/Lookup/README: - * tests/IDL3/Lookup/lookup_test.idl: - * tests/IDL3/Lookup/lookup_test.mpc: - - New files, a test for the IDL compiler lookup of declarations - in base interfaces, valuetypes, components, and homes, and - in supported interfaces, referenced by the local name in the - derived IDL type. Thanks to Boris Kolpackov - for reporting the bug and for - providing an example IDL file that illustrates the various - cases. - -Thu Aug 26 13:24:40 2004 Gan Deng - - * DAnCE/examples/BaiscSP/*.*: - - Created above directory and subdictories to add an example for - using DAnCE. - -Thu Aug 26 12:28:40 2004 Jeff Parsons - - * CIDLC/CIDLC.vcproj: - - Added missing files to project. - -Thu Aug 26 11:25:39 2004 Jeff Parsons - - * tests/CIDL/CodeGen/CodeGen.mpc: - - Changed dependency from ciao_server to ciao_servant. - -Wed Aug 25 11:28:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/DnC_Dump.h: - Removed not needed qualifier - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Removed not needed ; after namespace closure - -Wed Aug 25 11:24:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Error_Handler.h: - Removed not needed ; after namespace closure - -Tue Aug 24 11:31:12 UTC 2004 Johnny Willemsen - - * DAnCE/Config_Handlers/Config.h: - Removed not needed ; after namespace closure - -Mon Aug 23 21:47:10 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/XSCRT/Elements.hpp: - * DAnCE/Config_Handlers/XSCRT/Elements.ipp: - * DAnCE/Config_Handlers/XSCRT/Elements.tpp: - * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: - * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp: - * DAnCE/Config_Handlers/XSCRT/Parser.hpp: - * DAnCE/Config_Handlers/XSCRT/Parser.ipp: - * DAnCE/Config_Handlers/XSCRT/Parser.tpp: - * DAnCE/Config_Handlers/XSCRT/Traversal.hpp: - * DAnCE/Config_Handlers/XSCRT/Traversal.ipp: - * DAnCE/Config_Handlers/XSCRT/Traversal.tpp: - * DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp: - * DAnCE/Config_Handlers/XSCRT/XMLSchema.ipp: - * DAnCE/Config_Handlers/XSCRT/XMLSchema.tpp: - - Added XSCRT 0.0.4 into the repository to compile the handlers. - -Mon Aug 23 21:32:50 2004 Balachandran Natarajan - - * CIDLC/TypeNameEmitter.cpp: - - Fixed a compiler error in the daily builds showing up from a - non-const declaration of a char * for extraction into an Any. - - * DAnCE/Config_Handlers/Config.h: - - Deployment.h has been renamed to Config.h - - * DAnCE/Config_Handlers/Process_Element.h: - * DAnCE/Config_Handlers/Basic_Handler.h: - - Include Config.h - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/Config_Handlers/Deployment.cpp: - * DAnCE/Config_Handlers/Deployment.hpp: - * DAnCE/Config_Handlers/ccd.cpp: - * DAnCE/Config_Handlers/ccd.hpp: - * DAnCE/Config_Handlers/cdd.cpp: - * DAnCE/Config_Handlers/cdd.hpp: - * DAnCE/Config_Handlers/cdp.cpp: - * DAnCE/Config_Handlers/cdp.hpp: - * DAnCE/Config_Handlers/cid.cpp: - * DAnCE/Config_Handlers/cid.hpp: - * DAnCE/Config_Handlers/cpd.cpp: - * DAnCE/Config_Handlers/cpd.hpp: - * DAnCE/Config_Handlers/iad.cpp: - * DAnCE/Config_Handlers/iad.hpp: - * DAnCE/Config_Handlers/pcd.cpp: - * DAnCE/Config_Handlers/pcd.hpp: - * DAnCE/Config_Handlers/toplevel.cpp: - * DAnCE/Config_Handlers/toplevel.hpp: - * DAnCE/Config_Handlers/Config_Handlers.mpc: - - Generated code from XSC which is going to be used for the next - generation handlers. They have been added in the MPC but guarded - with requires += dummy_label since they give lot of warnings. - -Mon Aug 23 08:02:12 UTC 2004 Johnny Willemsen - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - Fixed typo in vpath - -Sun Aug 22 22:23:12 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - - Fixed VC6 compilation errors. - -Mon Aug 23 01:07:24 2004 Balachandran Natarajan - - * DAnCE/ciao/StandardConfigurator_Impl.cpp: - * ciao/StandardConfigurator_Impl.cpp: - - Fixed unused variable warnings. - -Sun Aug 22 21:28:34 2004 Balachandran Natarajan - - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * DAnCE/ciao/StandardConfigurator_Impl.cpp: - * DAnCE/ciao/StandardConfigurator_Impl.h: - * DAnCE/ciao/CCM_Core.mpc: - - Added these files to the DAnCE builds. These were from the - following change - - Tue Aug 17 14:29:00 2004 Jules White - - * ciao/CCM_Core.mpc: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/StandardConfigurator_Impl.h: - - Fixed compilation errors in builds where exceptions have been - turned off. - -Sun Aug 22 22:11:49 2004 Balachandran Natarajan - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed redeclaration error in VC6 builds. - -Sun Aug 22 20:08:10 2004 Balachandran Natarajan - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed unused variable warnings in the generated code. - -Sun Aug 22 17:06:44 2004 Balachandran Natarajan - - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed unused variable warnings in our daily builds. - -Sun Aug 22 16:26:01 2004 Balachandran Natarajan - - * performance-tests/Protocols/Receiver/Receiver.mpc: - - Fixed a compile error in our daily builds. - -Fri Aug 20 16:01:55 2004 Jeff Parsons - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Fixed typo in source file name. - -Fri Aug 20 10:39:12 UTC 2004 Johnny Willemsen - - * DAnCE/ciao/Container_Base.h: - Fixed compile errors - -Fri Aug 20 07:32:12 UTC 2004 Johnny Willemsen - - * ciao/Container_Base.h: - Fixed compile errors - -Thu Aug 19 17:13:22 2004 Jeff Parsons - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added code generation for the set_attributes() method called - on the servant by the deployer. - -Thu Aug 19 16:09:45 2004 Balachandran Natarajan - - * DAnCE/ciao/Container_Base.h: - * ciao/Container_Base.h: - - Fixed a compilation error reported by Roland Schimmack - -Thu Aug 19 08:44:12 UTC 2004 Johnny Willemsen - - * PROBLEM-REPORT-FORM: - Ask for the default.features file used by MPC. - -Wed Aug 18 14:21:12 UTC 2004 Johnny Willemsen - - * DAnCE/NodeManager/NodeDaemon_Impl.h: - Added missing pragma pop - -Tue Aug 17 14:29:00 2004 Jules White - - * CIAO/ciao/Servant_Impl_Base.h: - * CIAO/ciao/Servant_Impl_Base.cpp: - Added a method to create and return the StandardConfigurator for a component. - Overrided _default_POA so that it returns the POA of the servant's container. - - * CIAO/ciao/StandardConfigurator_Impl.h: - * CIAO/ciao/StandardConfigurator_Impl.cpp: - Created an implementation of the StandardConfigurator interface. - -Mon Aug 16 22:15:52 2004 Balachandran Natarajan - - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - - Fixed compilation errors in builds where exceptions have been - turned off. - -Mon Aug 16 22:09:52 2004 Balachandran Natarajan - - * performance-tests/Protocols/Sender/Sender.mpc: - - Fix for link errors on the scoreboard. - -Mon Aug 16 21:01:49 2004 Balachandran Natarajan - - * performance-tests/Benchmark/Benchmark.mpc: - - Fix for link errors on the scoreboard. - -Mon Aug 16 16:44:13 2004 J.T. Conklin - - * CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp: - * CIAO/DAnCE/NodeManager/Node_Daemon.cpp: - * CIAO/DAnCE/ciao/CCM_Container.idl: - * CIAO/ciao/CCM_Container.idl: - Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...". - -Mon Aug 16 16:36:49 2004 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Changed conversion for eventtypes to generate, instead of the - original eventtype, a valuetype with Components::EventBase added - to its inheritance list. This is completely equivalent to the - original eventtype and has the advantage that it eliminates the - need to use the -Sm option (disabling CCM equivalent IDL - preprocessing) when running the IDL compiler on a converted - file. Thanks to Bala Natarajan for - the suggestion. - -Mon Aug 16 14:14:15 2004 Balachandran Natarajan - - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl: - - Do not do the compile the implied data part of the IDL. - -Mon Aug 16 12:42:59 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/CAD_Handler.h: - * DAnCE/Config_Handlers/CEPE_Handler.h: - * DAnCE/Config_Handlers/CPK_Handler.h: - * DAnCE/Config_Handlers/CPR_Handler.h: - * DAnCE/Config_Handlers/Cap_Handler.h: - * DAnCE/Config_Handlers/CompIntrDesc_Handler.h: - * DAnCE/Config_Handlers/CompPkgDesc_Handler.h: - * DAnCE/Config_Handlers/DT_Handler.h: - * DAnCE/Config_Handlers/Domain_Handler.h: - * DAnCE/Config_Handlers/ERE_Handler.h: - * DAnCE/Config_Handlers/IAD_Handler.h: - * DAnCE/Config_Handlers/ID_Handler.h: - * DAnCE/Config_Handlers/IR_Handler.h: - * DAnCE/Config_Handlers/MID_Handler.h: - * DAnCE/Config_Handlers/NIA_Handler.h: - * DAnCE/Config_Handlers/PCI_Handler.h: - * DAnCE/Config_Handlers/PC_Handler.h: - * DAnCE/Config_Handlers/Plan_Handler.h: - * DAnCE/Config_Handlers/Process_Element.h: - * DAnCE/Config_Handlers/Property_Handler.h: - * DAnCE/Config_Handlers/RS_Handler.h: - * DAnCE/Config_Handlers/RUK_Handler.h: - * DAnCE/Config_Handlers/Requirement_Handler.h: - * DAnCE/Config_Handlers/SPK_Handler.h: - * DAnCE/Config_Handlers/SP_Handler.h: - * DAnCE/Config_Handlers/TPD_Handler.h: - * DAnCE/Config_Handlers/Utils.h: - - Use ciao/ to include any header files from core ciao. - - * DAnCE/ciao/CCM_Core.mpc: - * DAnCE/tests/Config_Handlers/handler_test.mpb: - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - - Use the right libraries for linking. This should probably - address some of the core build errors on the scoreboard. - -Sun Aug 15 18:32:49 2004 Jeff Parsons - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h: - * tools/IDL3_to_IDL2/be_extern.h: - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/be_helper.h: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - * tools/IDL3_to_IDL2/README: - - New files implementing a tool that inputs an IDL file with IDL3 - constructs and generates another IDL file with the IDL3 - constructs converted to the spec-defined IDL2 equivalents. Using - the generated file instead of the original one in applications - will allow the developer to reference the IDL2 equivalent types - in application IDL, rather than just in C++ code as before. - The generated IDL file has a '_IDL2' suffix added to the - original file name just before the '.idl' extension. - -Sun Aug 15 09:17:59 2004 Balachandran Natarajan - - * performance-tests/Benchmark/Benchmark.mpc: - - Added missing libraries as reported by our daily builds. - -Sun Aug 15 09:12:36 2004 Balachandran Natarajan - - * DAnCE/tests/Config_Handlers/handler_test.mpb: - - Fixed the handlers to link in CIAO_DnC_Container too. - -Sat Aug 14 14:44:24 2004 Balachandran Natarajan - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - - Do not include /usr/lib to be in libpaths. This is odd and - shouldn't be there at the application level. Applications should - only be bothered about using $XERCESCROOT and the like. If the - application doesn't specify the compiler, linker and the loader - knows where to pick things from. - -Sat Aug 14 14:07:53 2004 Aniruddha Gokhale - - * DAnCE/NodeManager/Node_Daemon.cpp: - - Included "ace/os_include/os_netdb.h since otherwise the - MAXHOSTNAMELEN constant was not found. - -Sat Aug 14 15:36:28 2004 Balachandran Natarajan - - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - * DAnCE/NodeManager/NodeDaemon_Impl.h: - * DAnCE/NodeManager/Node_Daemon.cpp: - - Cosmetic fixes for fuzz errors and other simple fixes for the - daily builds. - - * DAnCE/NodeManager/README: - - Added a README file in the directory. - -Sat Aug 14 04:20:44 2004 Balachandran Natarajan - - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ciao/ComponentsC.h: - * ciao/ComponentsC.h: - - Removed a trailing ; at the end of namespace closure. g++-3.4.1 - starts getting seizures once it locates a trailing ;. - -Sat Aug 14 03:29:18 2004 Balachandran Natarajan - - * DAnCE/tests/Config_Handlers/handler_test.mpb: - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - * tools/XML_Helpers/XMLHelpers.mpc: - - Tried fixing some warnings and errors in the builds. I am not - able to reproduce it and so I am taking a blind shot. - -Thu Aug 12 14:14:00 Jules White - - * docs/schema/cdp.xsd: - * docs/schema/Modified_Deployment.xsd: - - Changed the schema so that it was more compliant with the spec. - -Thu Aug 12 15:25:44 2004 Balachandran Natarajan - - * DAnCE/NEWS: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - - Updates at this - -Thu Aug 12 11:35:44 2004 Balachandran Natarajan - - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - - Propogating the changes from "Mon Aug 9 11:38:04 2004 Jeff - Parsons " to DAnCE. - - * DAnCE/tests/Config_Handlers/Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.h: - - Cleaned up things so that it is more portable. - - * DAnCE/tests/Config_Handlers/handler_test.mpb: - - Put Handler_Test as a template file. - -Thu Aug 12 16:20:19 2004 Balachandran Natarajan - - * DAnCE/tests/Config_Handlers/Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.h: - * DAnCE/tests/Config_Handlers/Handler_Test.i: - - Fixed fuzz errors. - -Wed Aug 11 22:37:31 2004 Balachandran Natarajan - - * DAnCE/NodeManager/Node_Daemon.cpp: - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - - Fixed fuzz errors. - -Wed Aug 11 22:15:26 2004 Balachandran Natarajan - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - - Fixed yet another problem with MPC file. Should by now compile - clean on the scoreboard. Let us see hwo it goes. - -Wed Aug 11 20:08:58 2004 Balachandran Natarajan - - * CIDLC/CIDLC.mpc: - - Fixed library paths. This seems to have been busted. - -Wed Aug 11 14:38:00 2004 Balachandran Natarajan - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Made certain parts exception safe and fixed fuzz errors. - - * tests/CIDL/CodeGen/CodeGen.mpc: - - The MPC file was busted which lead to errors in the daily - builds. - - * tests/RTCCM/DiffServ/Receiver/Receiver.mpc: - - Fixed errors in he MPC file. - - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - - Fixed fuzz errors. - -Wed Aug 11 12:45:09 2004 Balachandran Natarajan - - * CIDLC/CIDLC.mpc: - - Added new files startting with Exec* into the CIDLC project. - - * CIAOTAO.mwc: - - Added tests section to the above file. - -Wed Aug 11 15:08:44 2004 Balachandran Natarajan - - * tests/CIDL/CodeGen/CodeGen.mpc: - - Fix for the compilation errors in the daily builds. - -Mon Aug 9 11:38:04 2004 Jeff Parsons - - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_T.h: - - Moved the body of the destructor and the same_component() - method from the generated servant class to the base class. - -Sat Aug 7 17:55:59 2004 Balachandran Natarajan - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - - Prevented compilation errors if CIDL is not built. - -Sat Aug 7 16:43:45 2004 Balachandran Natarajan - - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/IDL3/Homes/Basic/Basic.mpc: - - Changed the name of the stub library and project names. There - was a clash in project and library names. - -Thu Aug 5 17:42:56 2004 Jeff Parsons - - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplGenerator.hpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.hpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.hpp: - - New files, which generate empty executor implementation - classes (with spec-defined operations filled in and - IDL operations and attributes marked for the developer - to fill in). This generation is optional, triggered by - the CIDL compiler command line option --gen-exec-impl. - Two other options --exec-hdr-file-suffix and --exec-src-file-suffix, - can override the default generated file extensions of - _exec.h and _exec.cpp. Tao others, --exec-hdr-file-regex and - --exec-src-file-regex, allow replacement of default generated - filenames by pattern matching with regular expressions. - And finally, two more, --exec-export-include, - overrides the default generated export macro header file, - and --exec-export-macro, overrides the default generated - export macro for the executor implementation file. - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - * CIDLC/cidlc.cpp: - - - Added generation of (unimplemented) home finder - operations. - - - Filled gaps and organized the command line options - for servant filename suffixes and regular expressions - to replace default generated filenames. - - - Added a new type name emitter that generates the - appropriate NULL return value for any type. - - * tests/CIDL/CodeGen/Basic.idl: - * tests/CIDL/CodeGen/Basic_stub_export.h: - * tests/CIDL/CodeGen/Basic_svnt_export.h: - * tests/CIDL/CodeGen/CodeGen.cidl: - * tests/CIDL/CodeGen/CodeGen.idl: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/CIDL/CodeGen/CodeGen_exec_export.h: - * tests/CIDL/CodeGen/CodeGen_stub_export.h: - * tests/CIDL/CodeGen/CodeGen_svnt_export.h: - * tests/CIDL/CodeGen/README: - - New test, for servant and executor implemtation code - generation of the CIDL compiler. This test target - correct code generation for many component-specific - features of IDL - catching operations and attributes - for supported interfaces, operations and attributes - for parents of supported interfaces, home operations - from base homes, inherited home factory and finder - operations, etc. The object of the test is to check - that the generated code builds and links successfully. - -Thu Aug 5 15:49:10 2004 Ossama Othman - - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - - Made destructors in reference count enabled classes protected to - enforce proper memory management through the reference counting - mechansism (i.e. prevent directly calling operator delete() on - the reference counted object). - - (cube_long): - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp (cube_long): - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h - (makeCall): - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp - (makeCall): - - Added missing emulated exception parameter. Fixes compile-time - errors in emulated exception builds. - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp - (ccm_activate): - - Corrected emulated excepton parameter. Fixes a compile-time - error in emulated exception builds. - - * performance-tests/Protocols/Controller/Controller.mpc: - * tests/RTCCM/DiffServ/Receiver/Receiver.mpc - (DiffServ_Receiver_exec): - * tests/RTCCM/DiffServ/Sender/Sender.mpc (DiffServ_Sender_exec): - - Added missing "requires += exceptions". These tests will not - compile in emulated exception configurations. - - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp - (get_latency): - - Fixed unused parameter warning in emulated exception builds. - -Thu Aug 5 11:48:49 2004 Ossama Othman - - * performance-tests/Protocols/Controller/Controller.mpc: - - Corrected library link order. Addresses undefined reference - link-time errors in static builds. - - * tools/XML_Helpers/XMLHelpers.mpc (Helper_Test): - - Added missing TAO_IFR_Client library to "libs" variable. - Addresses undefined reference link-time errors in static - builds. - -Thu Aug 5 13:28:49 2004 Will Otte - - * docs/schema/ciaopolicy.xsd: - - Schema describing ORB policy configurations. - -Thu Aug 5 11:56:03 2004 Jeff Parsons - - * CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp: - - Changed template template parameter of class Implanter from - "Buffer" to "BufferType" because the former was causing a - problem with VC 7.1 clashing with a class Buffer in another - file. - -Thu Aug 5 08:48:50 2004 Krishnakumar B - - * CIAO-INSTALL.html: Updated to reflect dependency on Xerces and - native exceptions. - -Wed Aug 4 22:50:17 2004 Ossama Othman - - * examples/Hello/Sender/Sender.mpc (Hello_Starter): - * performance-tests/Protocols/Controller/Controller.mpc (perf): - * tools/XML_Helpers/XMLHelpers.mpc (Helper_Test): - - Fixed static build link-time errors caused by not linking the - appropriate libraries. - -Wed Aug 4 22:31:24 2004 Ossama Othman - - * docs/tutorial/Hello/client.cpp (main): - - Fixed typo that caused a syntax error. - -Wed Aug 4 17:24:18 2004 Ossama Othman - - * examples/OEP/Display/RateGen/RateGen_exec.cpp (create): - * performance-tests/Benchmark/LatencyTest.cpp (makeCall): - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp - (makeCall): - * tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp - (create): - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp: - * tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp: - - Fixued unused parameter warnings. - - * docs/tutorial/Hello/hello_exec.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - - Fixed emulated exception usage. - - Fixed unused argument warnings. - - * docs/tutorial/Hello/client.cpp (main): - * docs/tutorial/Hello/simple_client.cpp (main): - * performance-tests/Benchmark/Multi_Threaded/client.cpp (main): - * performance-tests/Benchmark/RoundTrip/client.cpp (main): - * performance-tests/Benchmark/RoundTripClient/client.cpp (main): - - Fixed CORBA::ORB_init() arguments in emulated exception case. - - Added missing ACE_TRY_CHECK after CORBA::ORB_init() call. - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp - (start): - - Fixed emulated exception usage. - - Added missing emulated exception parameter. Fixes a - compile-time error. - - Fixed unused parameter warnings. - - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - - Include "ace/OS_NS_unistd.h" to pull in ACE_OS::sleep() - declaration. - - * tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp: - - Include "ace/OS_NS_stdio.h" to pull in ACE_OS::snprintf() - declaration. - - Fixed unused parameter warnings. - -Wed Aug 4 16:43:43 2004 Ossama Othman - - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp - (push_Refresh): - - Fixed emulated exception usage. - - Fixed unused parameter warnings. - - * examples/OEP/BasicSP/EC/EC_exec.cpp (pulse): - - Added missing ACE_TRY_CHECK emulated exception macro. Fixes - warning about unused "ACE_TRY_LABEL" label. - - * examples/OEP/Display/RateGen/client.cpp: - - Include "ace/OS_NS_unistd.h" to pull in ACE_OS::sleep() - declaration. - - * examples/Hello/Receiver/Receiver_exec.cpp (ccm_activate): - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp - (ccm_activate): - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp (ccm_activate): - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp - (ccm_activate): - * examples/OEP/Display/GPS/GPS_exec.cpp (get_MyLocation, posx): - (posy, create): - * examples/OEP/Display/GPS/GPS_tracing_exec.cpp (get_MyLocation): - (posx, posy, create): - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp - (ccm_activate): - * examples/OEP/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp - (execute): - * examples/OEP/Display/NavDisplayGUI_exec/NodeItem.cpp (moveBy): - * examples/OEP/Display/NavDisplayGUI_exec/QuitCmd.cpp (execute): - - Fixed unused parameter warnings. - -Wed Aug 4 11:16:47 2004 Will Otte - - * Components/ComplexComponent/Attributes/Attributes.idl: - * Homes/Attributes/HomeAttributes.idl: - * ImpliedIDL/Components/Basic/ICBasic.idl: - * Homes/Finder/Finder.idl: - * ImpliedIDL/Components/EventSink/ICEventSink.idl: - * ImpliedIDL/Components/EventSource/ICEventSource.idl: - * ImpliedIDL/Components/Receptacles/ICReceptacles.idl: - - Addressed some build errors on the Fuzz build. - - * Components/ComplexComponent/Attributes/AttributesS.cpp: - * Components/ComplexComponent/EventSink/EventSinkS.cpp: - * Components/ComplexComponent/EventSource/EventSourceS.cpp: - * Components/ComplexComponent/Facets/FacetsS.cpp: - * Components/ComplexComponent/Receptacles/ReceptaclesS.cpp: - * Components/SimpleComponent/SimpleComponentS.cpp: - * Events/Abstract/AbstractS.cpp: - * Events/Regular/RegularS.cpp: - * Homes/Attributes/HomeAttributesS.cpp: - * Homes/Basic/BasicS.cpp: - * Homes/Factory/FactoryS.cpp: - * Homes/Finder/FinderS.cpp: - * Homes/Inheritance/InheritanceS.cpp: - * ImpliedIDL/Components/Basic/ICBasicS.cpp: - * ImpliedIDL/Components/EventSink/ICEventSinkS.cpp: - * ImpliedIDL/Components/EventSource/ICEventSourceS.cpp: - * ImpliedIDL/Components/Receptacles/ICReceptaclesS.cpp: - * ImpliedIDL/Events/EventsS.cpp: - * ImpliedIDL/Homes/HomesS.cpp: - - Removed a bunch of generated code from the repository. - -Tue Aug 3 20:18:48 2004 Balachandran Natarajan - - * docs/schema/cid.xsd: - * docs/schema/Deployment.xsd: - - Added some tweaks. - -Tue Aug 3 14:25:44 2004 Will Otte - - * IDL3/Components/ComplexComponent/Attributes/Attributes.idl: - * IDL3/Components/ComplexComponent/Attributes/Attributes.mpc: - * IDL3/Components/ComplexComponent/Attributes/AttributesS.cpp: - * IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h: - * IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h: - * IDL3/Components/ComplexComponent/EventSink/EventSink.idl: - * IDL3/Components/ComplexComponent/EventSink/EventSink.mpc: - * IDL3/Components/ComplexComponent/EventSink/EventSinkS.cpp: - * IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h: - * IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h: - * IDL3/Components/ComplexComponent/EventSource/EventSource.idl: - * IDL3/Components/ComplexComponent/EventSource/EventSource.mpc: - * IDL3/Components/ComplexComponent/EventSource/EventSourceS.cpp: - * IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h: - * IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h: - * IDL3/Components/ComplexComponent/Facets/Facets.idl: - * IDL3/Components/ComplexComponent/Facets/Facets.mpc: - * IDL3/Components/ComplexComponent/Facets/FacetsS.cpp: - * IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h: - * IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h: - * IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl: - * IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc: - * IDL3/Components/ComplexComponent/Receptacles/ReceptaclesS.cpp: - * IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h: - * IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h: - * IDL3/Components/SimpleComponent/SimpleComponent.idl: - * IDL3/Components/SimpleComponent/SimpleComponent.mpc: - * IDL3/Components/SimpleComponent/SimpleComponentS.cpp: - * IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h: - * IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h: - * IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h: - * IDL3/Events/Abstract/Abstract.idl: - * IDL3/Events/Abstract/Abstract.mpc: - * IDL3/Events/Abstract/AbstractS.cpp: - * IDL3/Events/Abstract/Abstract_stub_export.h: - * IDL3/Events/Abstract/Abstract_svnt_export.h: - * IDL3/Events/Regular/Regular.idl: - * IDL3/Events/Regular/Regular.mpc: - * IDL3/Events/Regular/RegularS.cpp: - * IDL3/Events/Regular/Regular_stub_export.h: - * IDL3/Events/Regular/Regular_svnt_export.h: - * IDL3/Homes/Attributes/HomeAttributes.idl: - * IDL3/Homes/Attributes/HomeAttributes.mpc: - * IDL3/Homes/Attributes/HomeAttributesS.cpp: - * IDL3/Homes/Attributes/HomeAttributes_stub_export.h: - * IDL3/Homes/Attributes/HomeAttributes_svnt_export.h: - * IDL3/Homes/Basic/Basic.idl: - * IDL3/Homes/Basic/Basic.mpc: - * IDL3/Homes/Basic/BasicS.cpp: - * IDL3/Homes/Basic/Basic_stub_export.h: - * IDL3/Homes/Basic/Basic_svnt_export.h: - * IDL3/Homes/Factory/Factory.idl: - * IDL3/Homes/Factory/Factory.mpc: - * IDL3/Homes/Factory/FactoryS.cpp: - * IDL3/Homes/Factory/Factory_stub_export.h: - * IDL3/Homes/Factory/Factory_svnt_export.h: - * IDL3/Homes/Finder/Finder.idl: - * IDL3/Homes/Finder/Finder.mpc: - * IDL3/Homes/Finder/FinderS.cpp: - * IDL3/Homes/Finder/Finder_stub_export.h: - * IDL3/Homes/Finder/Finder_svnt_export.h: - * IDL3/Homes/Inheritance/Inheritance.idl: - * IDL3/Homes/Inheritance/Inheritance.mpc: - * IDL3/Homes/Inheritance/InheritanceS.cpp: - * IDL3/Homes/Inheritance/Inheritance_stub_export.h: - * IDL3/Homes/Inheritance/Inheritance_svnt_export.h: - * IDL3/ImpliedIDL/Components/Basic/ICBasic.idl: - * IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc: - * IDL3/ImpliedIDL/Components/Basic/ICBasicS.cpp: - * IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h: - * IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h: - * IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl: - * IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc: - * IDL3/ImpliedIDL/Components/EventSink/ICEventSinkS.cpp: - * IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h: - * IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h: - * IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl: - * IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - * IDL3/ImpliedIDL/Components/EventSource/ICEventSourceS.cpp: - * IDL3/ImpliedIDL/Components: - - Various tests of compilation for IDL3 constructs. - -Tue Aug 3 18:36:10 2004 Balachandran Natarajan - - * docs/schema/README.html: - - File explaining what these new descriptors mean. - - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/Deployment.xsd: - * docs/schema/Modified_Deployment.xsd: - * docs/schema/Spec_Defined_Deployment.xsd: - * docs/schema/Spec_Defined_XMI.xsd: - * docs/schema/ccd.xsd: - * docs/schema/cdd.xsd: - * docs/schema/cdp.xsd: - * docs/schema/cid.xsd: - * docs/schema/cpd.xsd: - * docs/schema/iad.xsd: - * docs/schema/pcd.xsd: - * docs/schema/toplevel.xsd: - * docs/schema/unused_elements.xsd: - - Sets of schemata that will be used in DAnCE. The meaning of - these different schemata have been documented in the - README.html. - -Sun Aug 1 09:30:37 2004 Balachandran Natarajan - - * ChangeLogs: - - Created a new directory and moved a bunch of ChangeLog entries - there. - -Sat Jul 31 11:15:15 2004 Ossama Othman - - * CIAO version 0.4.2 released. - -Local Variables: -add-log-time-format: current-time-string -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2006a b/CIAO/ChangeLogs/ChangeLog-2006a deleted file mode 100644 index f2d22b3e963..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2006a +++ /dev/null @@ -1,8579 +0,0 @@ -Tue Apr 18 00:14:56 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - - Reverted back the two files I accidentally checked in, which - should have gone into a branch. :( - -Mon Apr 17 18:04:56 UTC 2006 William R. Otte - - * M docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/Display/HUDisplay.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/RateGen/RateGen.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * tools/Config_Handlers/Config_Handlers.mpc - - Linking fixes for OS X. - - -Mon Apr 17 02:33:44 UTC 2006 Wallace Zhang - - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc: - * tools/Config_Handlers/Config_Handlers.mpc: - - Avoids building with ace_for_tao. - -Fri Apr 14 14:50:47 UTC 2006 Wallace Zhang - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Swapping/Sender/Sender.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - - Avoids building with ace_for_tao. - -Thu Apr 13 19:18:22 UTC 2006 Wallace Zhang - - * docs/tutorials/Quoter/Simple/Broker/Broker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * performance-tests/Benchmark/Benchmark.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Minimum/Sender/Sender.mpc: - - Avoids building with ace_for_tao. - -Apr Thu 13 03:32:35 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Events.idl - - Removed this file. - - * ciaosvcs/Events/CIAO_Events.mpc - - Modified to put an empty segment of IDL_Files. - -Wed Apr 12 17:51:03 UTC 2006 Gan Deng - - * NEWS - - Updated the NEWS file. - -Wed Apr 12 14:47:14 UTC 2006 William R. Otte - - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeManager/Monitor.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - * ciaosvcs/Events/CIAO_Events.mpc - - Fixes for linking errors/warnings on OS X builds. - -Tue Apr 11 12:39:14 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Utils/Utils.mpc: - Use exceptions as base project - -Tue Apr 11 12:43:14 UTC 2006 Johnny Willemsen - - * ciao/Container_Base.cpp: - Small simplification - -Tue Apr 11 12:22:14 UTC 2006 Johnny Willemsen - - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc: - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc: - Updated base projects to get correct build order - -Tue Apr 11 08:43:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - Initialise pointers with 0 - -Tue Apr 11 06:54:14 UTC 2006 Johnny Willemsen - - * tests/Minimum/Minimum_Base/Minimum.mpc: - * tests/IDL3/Lookup/lookup_test.mpc: - * tests/IDL3/ImpliedIDL/Homes/Homes.mpc: - * tests/IDL3/ImpliedIDL/Events/Events.mpc: - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc: - * tests/IDL3/Homes/Inheritance/Inheritance.mpc: - * tests/IDL3/Homes/Finder/Finder.mpc: - * tests/IDL3/Homes/Factory/Factory.mpc: - * tests/IDL3/Homes/Basic/Basic.mpc: - * tests/IDL3/Homes/Attributes/HomeAttributes.mpc: - * tests/IDL3/Events/Regular/Regular.mpc: - * tests/IDL3/Events/Abstract/Abstract.mpc: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc: - * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc: - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * performance-tests/Protocols/common/Protocols.mpc: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Display/HUDisplay.mpc: - * examples/BasicSP/BasicSP.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Updated base projects to get correct build order - -Tue Apr 11 06:35:14 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - Use base projects to set dependencies - -Mon Apr 10 18:48:14 UTC 2006 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication.mpc: - Fixed base project - -Mon Apr 10 14:29:13 UTC 2006 Gan Deng - - * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp - - Modified to make _narrow to be called at the first step - when connecting supplier and config. Also modified to - make debug statements debug_level controlled. - -Mon Apr 10 12:31:14 UTC 2006 Johnny Willemsen - - * ciao/CCM_Core.mpc: - Removed commented out line - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - Updated base projects - -Mon Apr 10 11:51:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - Readded ciao_container_dnc - - * ciao/CCM_Core.mpc: - Use more base projects - - * DAnCE/Interfaces/Interfaces.mpc: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - Use other base projects to get correct build order - -Mon Apr 10 10:00:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - Removed ciao_container_dnc - -Mon Apr 10 09:38:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_Events.mpc: - Use ciao_rtevent_dnc as base - -Mon Apr 10 09:18:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_Events.mpc: - Use ciao_events_base_dnc as base project - -Mon Apr 10 09:15:14 UTC 2006 Johnny Willemsen - - * ciao/CCM_Core.mpc: - For Deployment_Stub use ciao_events_base_dnc and ciao_client_dnc - as base projects - -Mon Apr 10 08:50:14 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_Events.mpc: - Removed ciao_events_dnc as base project, we are building - this lib right now - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - Use base projects instead of libs - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - Remvoed ciao_events_dnc - -Sat Apr 8 15:39:14 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc - - Fixed a linking error in SuSE_CP_Static build. - -Fri Apr 7 04:09:33 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - - Fixed a bug in detecting External connection and Internal - connections. Earlier when an external component is detected, - not *all* connections associated with this components are - purged from the to-be-removed connections list. Added another - helper method to accomplish this task. - - Modified to enforce passivation occured on all components - before any connections are removed. - -Fri Apr 7 03:55:46 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Fixed a bug when redeploying components using the same set - of NodeManagers. Earlier when destroying applications or - components, internal components and external/shared components - are not all unbinded from the map, which causes duplicate - instance exception thrown. - -Thu Apr 6 16:01:30 UTC 2006 Jeff Parsons - - * CCF/CCF/CompilerElements/TokenStream.hpp: - - Added empty virtual destructor to template base class, to - eliminate bogus GCC warnings. - -Thu Apr 6 15:22:31 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Events.mpc - - Fixed linking errors on WinXP_BCB6_Pro_Dynamic_Release build. - - * examples/Hello/descriptors_shared_components/deploymentplan.cdp - * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp - - Modified to illustrate the shared components scenario. - -Thu Apr 6 14:54:59 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h - - Some cosmestic changes. - -Thu Apr 6 08:20:12 UTC 2006 Johnny Willemsen - - * ciao/CCM_Component.idl: - Removed the forward declaration of IRObject and just include - ciao/CCM_Component.idl. The forward declaration is causing - problems with the versioned namespace support, will investigate - this later - -Wed Apr 5 20:57:32 UTC 2006 Gan Deng - - * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp - - Make debug statement debug_level controlled. - -Wed Apr 5 18:49:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - Fixed compile errors - -Wed Apr 5 13:18:12 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h: - Fixed pragma once warning - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - Fixed conversion warning - -Wed Apr 5 12:24:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - Fixed compile errors - -Tue Apr 4 18:11:37 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h - - Fixed an warning in WinXP_BCB6_Pro_Dynamic_Debug build - by modifying the name of the original "init" method. - -Tue Apr 4 17:27:52 UTC 2006 xiong,ming - - * tools/Config_Handlers/CIAO_Events/test.cpp - - Fixed an warning. - -Mon Apr 3 20:00:11 UTC 2006 Jeff Parsons - - * CIDLC/Literals.hpp: - * CIDLC/Literals.cpp: - - Changed an enum value 'SIZE' to 'LIT_SIZE' to avoid an - apparent conflict with something in WinDef.h on - Windows. - -Thu Mar 30 18:28:32 UTC 2006 Gan Deng - - * ciao/Deployment_Events.idl - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp - - Fixed fuzz errors. - -Thu Mar 30 17:16:17 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Direct/* - - Removed all files under this directory since they are - no longer used. - -Thu Mar 30 17:23:12 UTC 2006 Gan Deng - - * tools/Config_Handlers/Config_Handlers.mpc - - Added link dependency to CIAO_Events_Handler project. - -Thu Mar 30 16:38:25 UTC 2006 Gan Deng - - * CIAO_DAnCE.mwc - * CIAO_TAO.mwc - * CIAO_TAO_DAnCE.mwc - - Added "ciaosvcs" into the workspace. - - * ciao/CCM_Core.mpc - * ciao/CCM_Event.idl - * ciao/Container_Base.cpp - * ciao/Container_Base.h - * ciao/Deployment_Core.idl - * ciao/Deployment_Data.idl - * ciao/Deployment_Events.idl - - Added an "CIAO_DnC_Events" project. Enhanced Deployment_Core.idl - to support configuring and deploying pub/sub services. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.inl - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Enhanced DAnCE to support pub/sub services integration. - - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h - * ciaosvcs/Events/CIAO_Events.idl - * ciaosvcs/Events/CIAO_Events.mpc - * ciaosvcs/Events/CIAO_Events_Export.h - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Export.h - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc - - Added CIAO_Event_Service support, which are some reusable - libraries and CORBA services that could be configured and - installed on demand through the DAnCE toolchain. - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/CIAOEvents.xsd - * docs/schema/cdp.xsd - - Enhanced XML schema to capture metadata information for - configuring and deploying pub/sub services. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/ESD_Handler.cpp - * tools/Config_Handlers/ESD_Handler.h - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h - * tools/Config_Handlers/CIAO_Events/test.cpp - - Added config handler support to accomodate the above changes. - - * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced - * examples/Hello/descriptors_events/ciao-events-example.ced - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp - - Added several examples to showcase the capability of CIAO - pub/sub services. - -Thu Mar 30 14:43:46 UTC 2006 Jeff Parsons - - * CIDLC/AttributeSourceEmitters_T.hpp: - - Added 'using namespace StringLiterals;' to this file. Thanks - to Nanbor Wang for pointing out that - this line is also necessary on some platforms, in addition - to the change of - - Wed Mar 29 20:29:40 UTC 2006 Jeff Parsons - -Wed Mar 29 20:29:40 UTC 2006 Jeff Parsons - - * CIDLC/AttributeSourceEmitters_T.hpp: - - Added #include of Literals.hpp. Some platforms are picking up - the declarations in this file without the explicit include, - others are not. - -Wed Mar 29 19:52:54 UTC 2006 Nanbor Wang - - * examples/Hello/descriptors_RTCCM/rt-config-example.csr: - Updated and element with more realistic - values. - -Wed Mar 29 04:40:58 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Added the functionality to honor command line arguments - and service configuration file options defined through - RT-CCM descriptors. - -Mon Mar 27 19:56:51 UTC 2006 Nanbor Wang - - * DAnCE/NodeApplication/NodeApplication.cpp (main): Added code to - print out commandline options of the NodeApplicaion. The print - out is available for CIAO_DEBUG_LEVEL > 9. - - * DAnCE/NodeApplication/Configuration_Factory.h: - * DAnCE/NodeApplication/Configuration_Factory.cpp: Changed - parse_args function to pass "argc" as reference to be consistent - with Arg_Shifter's signature. - - Double-check the "-o" flag first with exact string comparison - before extracting the parameter to avoid mistaking any of the - "-ORBxxx" command line flags as the "-o" flag. Thanks to Sandro - Andrade for reporting the bug. - -Mon Mar 20 22:35:47 UTC 2006 Jeff Parsons - - * ciao/Servant_Impl_Utils_T.cpp: - - - Added 'typename' qualifier when declaring instances - of an iterator for a templatized hash map, since gcc - reminds us that leaving the compiler to implicitly - determine if the scoped name denotes a member or a - type is deprecated. - - - Added an #include of Cookies.h, which is need by compilers - that don't require the template sourced to be included in - the header file. - -Sun Mar 19 20:37:47 UTC 2006 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Removed these files, their former contents are now divided - between CorbaTypenameEmitters.{hpp,cpp} and - UtilityTypeNameEmitters.{hpp,cpp}. - -Fri Mar 17 14:23:53 UTC 2006 Jeff Parsons - - * ciao/CCM_Core.mpc: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h - - - Changed port table types from - ACE_Hash_Map_Manager_Ex<> to ACE_Array_Map<>, - which is more lightweight and makes no - allocations if no entries are added to - the table. - - - Implemented spec-defined methods - get_all_receptacles(), get_all_publishers(), - and disconnect_consumer(). - - * ciao/Servant_Impl_Utils_T.cpp: - - New file, containing implementations of new - static template methods added to class - Servant_Impl_Base, which are called in - generated code as part of the implementation - of the spec-defined methods mentioned above. - - * CIDLC/AttributeHeaderEmitters.cpp: - * CIDLC/AttributeHeaderEmitters.hpp: - * CIDLC/AttributeSourceEmitters_T.hpp: - * CIDLC/CompositionEmitter.cpp: - * CIDLC/CompositionEmitter.hpp: - * CIDLC/CorbaTypeNameEmitters.cpp: - * CIDLC/CorbaTypeNameEmitters.hpp: - * CIDLC/EmitterBase.cpp: - * CIDLC/EmitterBase.hpp: - * CIDLC/EmitterContext.cpp: - * CIDLC/EmitterContext.hpp: - * CIDLC/InterfaceEmitter.cpp: - * CIDLC/InterfaceEmitter.hpp: - * CIDLC/ModuleEmitter.cpp: - * CIDLC/ModuleEmitter.hpp: - * CIDLC/OperationHeaderEmitters.cpp: - * CIDLC/OperationHeaderEmitters.hpp: - * CIDLC/ParameterEmitter_T.hpp: - * CIDLC/Upcase.hpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/UtilityTypeNameEmitters.hpp: - - New files, containing common code factored - out of the C++ source files below. - - * CIDLC/CIDLC.mpc: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - - Added new generated code as part of the - implementation of the spec-defined methods - mentioned above. - - - Added support for attribute exceptions in - code optionally generated for the stencil - executor implementation classes. - -Thu Mar 16 16:31:51 UTC 2006 Jeff Parsons - - * ciao/CCM_Component.idl: - - Added "omg.org" prefix to the recently added opening of the - CORBA module in this file. - -Tue Mar 14 10:10:58 UTC 2006 Nilabja Roy - - * DAnCE/NodeManager/MonitorController.h: - Reverting back to previous version to avoid conflicts - -Tue Mar 14 09:46:25 UTC 2006 Nilabja Roy - - * DAnCE/NodeManager/MonitorController.cpp: - Reverting back to previous version. Mistakenly added conflicted version. - -Thu Mar 9 09:18:58 2006 Douglas C. Schmidt - - * COPYING: Updated the date to include 2006. - Thanks to Alan Kierstead for - motivating the fix to this oversight. - -Thu Mar 09 08:55:12 UTC 2006 Johnny Willemsen - - * DAnCE/Interfaces/ExecutionManagerDaemon.idl: - * DAnCE/Interfaces/NodeManagerDaemon.idl: - New idl files, these are the same as there are now in the directory - but then just renamed to match the interfaces in these files and - then don't conflict with the ones I created in ciao. - - * DAnCE/Interfaces/ExecutionManager.idl: - * DAnCE/Interfaces/NodeManager.idl: - Removed, file names where not correct and now conflict with files in - the ciao directory - - * DAnCE/Interfaces/Interfaces.mpc: - Updated because of file renames - - * ciao/CCM_Base.idl: - Removed old comment - - * ciao/CCM_Component.idl: - Forward declare CORBA::IRObject instead of including the IFR_Client - idl file - - * ciao/Deployment_Base.idl: - Removed not needed include - - * ciao/Dynamic_Component_Activator.h: - Reordered includes - - * ciao/Swapping_Servant_Home_Impl_Base.h: - * ciao/Upgradeable_Context_Impl_T.h: - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - Added ciao/ as prefix for the includes - - * ciao/Upgradeable_Context_Impl_T.h: - Added private default constructor - - * ciao/Deployment.idl: - * ciao/DomainApplicationManager.idl: - * ciao/ExecutionManager.idl: - * ciao/NodeApplication_Callback.idl: - * ciao/NodeApplicationManager.idl: - * ciao/NodeManager.idl: - * ciao/RepositoryManager.idl: - * ciao/CCM_Core.mpc: - Splitted Deployment.idl in multiple files so that the linker - can decide not to link in a set of object files we don't need. - This will reduce footprint for several applications - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.{h.cpp}: - * DAnCE/TargetManager/Deployment_Configuration.h: - Updated for the idl subsetting of ciao/Deployment.idl. Also add ciao/ - prefix to several includes and try to cleanup a little. - - * DAnCE/RepositoryManager/RepositoryManager.idl: - * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl: - Renamed the first file to the second, matches the interface name. - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/PC_Updater.{h,cpp}: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Updated because of rename above - - * DAnCE/RTNodeApplication/senv.sh: - Removed this file, no need here. - - * DAnCE/RTNodeApplication/NodeApplication_Task.h: - No need for virtual inheritance, that consumes more footprint then - needed. - - * DAnCE/RTNodeApplication/NodeApplication_Task.cpp: - Reordered includes - -Wed Mar 08 15:58:12 UTC 2006 Johnny Willemsen - - * ciao/ServerResources.idl: - Fixed incorrect file header - -Wed Mar 08 14:01:12 UTC 2006 Johnny Willemsen - - * rules.ciao.GNU: - Added $(CIAO_ROOT)/ciao to LDFLAGS and $(CIAO) to INCLDIRS - as we do in rules.tao.GNU, this improves the footprint stats - -Mon Mar 06 16:16:12 UTC 2006 Johnny Willemsen - - * ciao/Swapping_Container.{h,cpp}: - Made serial_number_ unsigned and documented why it is static - - * performance-tests/Benchmark/LatencyTest.h: - Removed not needed msvc pragma push/pop - -Sun Mar 05 11:16:46 2006 Wallace Zhang - - * CIAO version 0.5 released. - -Thu Mar 2 17:50:36 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Struct.cpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - - Fixed a bug in the logic that determines completeness of recursive - structs and unions. - -Thu Mar 2 08:49:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeApplication/Container_Impl.cpp: - Replaced NULL with 0 - -Thu Mar 2 01:33:09 UTC 2006 Wallace Zhang - - * NEWS: - - Updated this file with info from Ming Xiong and Gan Deng. - -Wed Mar 1 22:34:52 UTC 2006 Wallace Zhang - - * NEWS: - - Updated the file with info from Ming Xiong. - -Wed Mar 1 19:34:12 UTC 2006 Johnny Willemsen - - * CIAO-INSTALL.html: - Updated rename of CIAOTAO.mwc to CIAO_TAO.mwc - -Wed Mar 1 15:02:10 UTC 2006 xiong,ming - - * DAnCE/NodeApplication/Container_Impl.h - * DAnCE/NodeApplication/Container_Impl.cpp - - Added codes to unregister with naming service when removing - components - -Tue Feb 28 18:46:42 UTC 2006 William R. Otte - - * DAnCE/Deployment.xsd - * DAnCE/Deployment.xsd.orig - * DAnCE/XMI.xsd - * DAnCE/XMI.xsd.orig - - Removed these schema files. They were misleading and useless. - -Fri Feb 24 21:21:02 UTC 2006 xiong,ming - - * tools/Config_Handlers/Config_Handlers.mpc - - Added a verbatim to disable hidden_visibility for Config_Handlers - -Fri Feb 24 18:54:52 UTC 2006 Stoyan Paunov - - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - some cosmetic changes - - * DAnCE/RepositoryManager/URL_Parser.h: - made the constructor protected and made the ACE_Singleton a friend - - * DAnCE/RepositoryManager/URL_Parser.cpp: - fixed a bug and improved the robustness of the code - -Fri Feb 24 09:38:12 UTC 2006 Johnny Willemsen - - * CIAO-INSTALL.html: - Fixed typo - -Thu Feb 23 23:35:59 UTC 2006 Chad Elliott - - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Sender/Sender.mpc: - - I was over zealous in my previous change. I shortened too many - project names (those that are defined in projects outside of these - mpc files). - -Wed Feb 22 16:38:32 UTC 2006 Chad Elliott - - * CIAO-INSTALL.html: - - Updated the documentation on how to build cidlc on Windows. - - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Sender/Sender.mpc: - - Shortened the project names in these MPC files to avoid fuzz - warnings. - -Wed Feb 22 01:11:59 UTC 2006 Gan Deng - - * DAnCE/NodeApplication/Container_Impl.cpp - - Fixed a bug about naming service registration. - Thanks Sandro Andrade for reporting - a bug about removing component error. - -Tue Feb 21 23:59:05 UTC 2006 Gan Deng - - * ciao/Deployment.idl - - Added a parameter to the perform_redeployment() operation - to the NodeApplicationManager interface to separate the - "installation of new components" from the "removal of - existing components". - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified the logic of perform_redeployment() functionality - to enforce correct order of ReDaC, which is: - (1) Install new components, - (2) Set up new connections, - (3) Remove old connections, and - (4) Remove old components. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - - Fixed a bug about removing components when using ReDaC. - In NodeApplicationManager, after the perform_redeployment() - call calls the remove_components() method to actually - destroy components from the component server, DAnCE NAM doesn't - unbind those components from the cached component_map_, hence - when the create_connections() method is called afterwords, - NAM tries to access the destroyed components to get - their port information, which causes the Object_Not_Exist - exception thrown. - - The fix will unbind the removed components from the - cached component map. However, the trick is that after - we unbind these components, the port iinformation of - these components are also lost, then the - DomainApplicaitonManager could not handle the - "removal" of connections correctly. - - The Right Fix is to enforce correct call sequence, which - are illustrated above. - Thanks Sandro Andrade for reporting - a bug about removing component error. - - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - - Added a component state map to keep track of component state - information. With this map, components will be activated - only when they are newly created, and will be passivated - only when they are currently active. This will also fix - a bug about the component initialization sequence. Earlier, - when components are installed, they are immediately activated - by explicitly calling ciao_preactivate, ciao_activate, and - ciao_postactivate on the comopnent object reference, - which is not compliant to the Spec defined semantics. - This fix shall ensure that the components are activated AFTER - their connections have been setup. - - * DAnCE/NodeApplication/Container_Impl.cpp - - Fixed a bug when passing object reference to a local function. - Earlier the memory of the object reference is released by - the callee, which causes the object reference becomes invalid - after the function returns. - -Tue Feb 21 19:43:11 UTC 2006 William R. Otte - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/Controller/Controller.mpc - - Added avoids+= ace_for_tao to two additional projects. - - * examples/Display/descriptors/EM.ior - * examples/Display/descriptors/GPS.ior - * examples/Display/descriptors/NavDisplay.ior - * examples/Display/descriptors/NavDisplayGUI.ior - - Removed these ior files. - -Tue Feb 21 17:40:20 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeManager/MonitorController.cpp: - - Fixed ACE_TRACE compilation error. - -Mon Feb 20 15:08:49 2006 Wallace Zhang - - * CIAO version 0.4.10 released. - -Mon Feb 20 19:48:12 UTC 2006 xiong,ming - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd - - Removed this file because it is generated - -Fri Feb 17 19:22:21 UTC 2006 Wallace Zhang - - * NEWS: - - Updated this file with more inputs. - -Thu Feb 16 15:04:12 UTC 2006 Johnny Willemsen - - * CIAO_DAnCE.mwc: - Fixed typo in this file - -Thu Feb 16 04:14:15 UTC 2006 William R. Otte - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - - Disabled building some project when ace_for_tao is set. - -Wed Feb 15 19:24:31 UTC 2006 William R. Otte - - * CIAO.mwc - - This file now builds all of CIAO. - - * CIAODAnCE.mwc - * CIAO_DAnCE.mwc - - Renamed this file to CIAO_DAnCE.mwc - - * CIAOTAO.mwc - * CIAO_TAO.mwc - - Renamed this file to CIAO_TAO.mwc. - - Thanks to Chad Elliott (elliott_c at ociweb dot com) for suggesting - these changes. - - * CIAO_TAO_DAnCE.mwc - - Removed the DAnCE/tests/Config_Handlers exclusion, as it no - longer exists. - -Wed Feb 15 07:35:12 UTC 2006 Johnny Willemsen - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - Replaced ACE cast macros with their C++ versions - -Wed Feb 15 07:28:12 UTC 2006 Johnny Willemsen - - * CIDLC/ServantSourceGenerator.cpp: - Fixed generation so that it compiles with Borland - -Tue Feb 14 23:01:46 UTC 2006 Gan Deng - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - - Fixed a bug when removing ReDaC components from the container. - This bug was caused by the container set indexing error when - handling newly installed components. - Thanks Sandro Andrade for reporting - this issue. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Some cosmetic changes. - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.h - - Added a const modifier in the constructor to ensure safety. - - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Fixed a bug when detecting whether a component is shared - by multiple assemblies. Earlier, when ReDaC is used, existing - components are wrongly treated as shared components. - -Tue Feb 14 22:02:59 UTC 2006 William R. Otte - - * CIAO_TAO_DAnCE.mwc - - Added naming service and Config_Handlers. - - * DAnCE/NodeManager/NodeManager.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - - Fixed link time warnings on OS X. - -Tue Feb 14 19:57:32 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - - Fixed a bug about when a component has a name with "Exec" - string in it, the _stub library could be picked up - incorrectly. - -Mon Feb 13 20:53:58 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - - Fixed a bug about removing existing components. Earlier - the logic in detecting "to-be-removed" components has - a bug. - -Mon Feb 13 20:11:35 UTC 2006 Gan Deng - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp - - Changed ACE_const_cast to c++ native const_cast since the - former one is deprecated. Also changed the implementation of - the acquireSession() logic, so the deadlock bug could - be reproduced. - -Mon Feb 13 20:01:38 UTC 2006 Gan Deng - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - - Cosmetics change. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - - Enhanced to call ccm_activate, ciao_preactivate, and - ciao_postactivate when installing new components. - Thanks Sandro Andrade for reporting - this issue. - - Also added the logic for remove_existing_components into - the class, which has not been integrated yet. - - Refactor the code by putting these logics into separate - methods to enhance readability. - -Mon Feb 13 17:12:09 UTC 2006 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager.cpp - - Fixed a bug about registering EM with naming service, originally - an invalid naming context is specified. Also allowed EM to both - register to naming service AND dump and IOR file. Thanks Sandro - Andrade for reporting this bug. - -Mon Feb 13 15:41:21 UTC 2006 Gan Deng - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp - - Fixed a warning about "deprecated conversion from string - constant to `char*' on RHEL_Static_GCC-3.4.2 build. - -Mon Feb 13 11:34:12 UTC 2006 Johnny Willemsen - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - Removed not allowed semicolon - -Mon Feb 13 09:22:12 UTC 2006 Johnny Willemsen - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - Fixed compile error in single threaded builds - -Mon Feb 13 08:32:12 UTC 2006 Johnny Willemsen - - * ciao/Server_init.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - Fixed conversion warnings - -Sat Feb 11 21:39:54 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h - - Fixed fuzz build erros. - -Sat Feb 11 21:26:08 UTC 2006 Gan Deng - - * tests/Bug_2130_Regression/descriptors/run_test.pl - - Fixed the command line option to start the NodeApplication - to enable real-time support. - Thanks Roland Schimmack for - reporting this error. - -Sat Feb 11 21:00:00 UTC 2006 xiong,ming - - * ciao/Server_init.cpp - - Removed an extra explicit qualification - -Sat Feb 11 18:49:21 UTC 2006 Johnny Willemsen - - * ciaosvcs/Events/CIAO_Events.mpc - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc - Removed these files to get at least our builds running again - -Fri Feb 10 16:11:35 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Events.mpc - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc - - Temporarily disable the build of these projects before - the integration effort is complete to avoid pollute - the scoreboard. - -Fri Feb 10 14:28:14 UTC 2006 xiong,ming - - * docs/tutorials/CoSMIC/01.html - * docs/tutorials/CoSMIC/02.html - * docs/tutorials/CoSMIC/index.html - * docs/tutorials/CoSMIC/Images/fig10.jpg - * docs/tutorials/CoSMIC/Images/fig11.jpg - * docs/tutorials/CoSMIC/Images/fig2.jpg - * docs/tutorials/CoSMIC/Images/fig4.jpg - * docs/tutorials/CoSMIC/Images/fig5.jpg - * docs/tutorials/CoSMIC/Images/fig6.jpg - * docs/tutorials/CoSMIC/Images/fig7.jpg - * docs/tutorials/CoSMIC/Images/fig8.jpg - * docs/tutorials/CoSMIC/Images/fig9.jpg - * docs/tutorials/CoSMIC/Model/Quoter.xme - - Updated the CoSMIC tutorial so that it is consistent with - the latest GME and CoSMIC. - -Fri Feb 10 11:15:12 UTC 2006 Johnny Willemsen - - * ciao/Port_Activator.h: - Doxygen improvements - - * ciao/NodeApp_CB_Impl.h: - Made destructor protected - - * ciao/Container_Base.{h,cpp}: - Made the refcount unsigned long, addressed several comments and - improved documentation - -Fri Feb 10 04:56:26 UTC 2006 Gan Deng - - * DAnCE/NodeApplication/Container_Impl.cpp - * DAnCE/NodeApplication/Container_Impl.h - * ciao/Server_init.cpp - * ciao/Server_init.h - - Added support for creating multicomponent naming context through - the deployment plan. Thanks Dipa Suri for - contributing a NameUtility class implementation. - - * ciaosvcs/Events/CIAO_Events.idl - * ciaosvcs/Events/CIAO_Events.mpc - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.cpp - * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h - - Added some files for event channel integration for CIAO. - More file check-ins are on the way. - -Thu Feb 9 23:38:19 UTC 2006 xiong,ming - - * TAO/CIAO/CIAOTAO.mwc - - Updated mwc to include some dependencies required by tests - and examples. - - * tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - * tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp - * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat - * tests/Bug_2130_Regression/descriptors/rt-config-example.csr - * tests/Bug_2130_Regression/descriptors/run_test.pl - * tests/Bug_2130_Regression/interfaces/ENW.idl - * tests/Bug_2130_Regression/interfaces/ENW.mpc - * tests/Bug_2130_Regression/interfaces/ENW_stub_export.h - * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h - - Added a new tests for Bug_2130. - Thanks Roland Schimmack for - providing this test case. - -Thu Feb 9 16:48:42 UTC 2006 Jeff Parsons - - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Removed all usage of internal 'idl_bool' typedef in the - IDL3 to IDL2 converter, consistently with the changes to - the TAO IDL compiler front end, which is used by this - tool. - -Thu Feb 9 16:33:45 UTC 2006 William Otte - - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.cpp - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/STD_PC_Intf.cpp - * tools/Config_Handlers/XML_File_Intf.cpp - - Added CIAO_TRACE statements to aid in debugging. - -Wed Feb 08 15:53:31 2006 Wallace Zhang - - * CIAO version 0.4.9 released. - -Tue Feb 7 16:10:10 UTC 2006 William Otte - - * DAnCE/NodeManager/NodeManager.mpc - - Fixed an ordering problem. - -Mon Feb 6 19:13:13 UTC 2006 William Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - - Fixed an export problem manifesting in VC8. - - * performance-tests/Benchmark/Benchmark.mpc - - Added an empty IDL_Files section to the servant to prevent - nmake from regenerating from the IDL file. - -Mon Feb 6 13:54:39 UTC 2006 Ossama Othman - - * ciao/ComponentsC.h: - - Place TAO namespace in this pre-generated stub header within a - TAO versioned namespace, as TAO_IDL does for all stubs. Fixes - build errors in versioned-namespace enabled builds. - -Mon Feb 6 13:33:54 UTC 2006 William Otte - - * DAnCE/NodeApplication/NoOp_Configurator.h - - Case sensitivity error from previous commit. - -Mon Feb 6 00:39:41 UTC 2006 William Otte - - * DAnCE/NodeApplication/Configurator_Factory.cpp - * DAnCE/NodeApplication/Configurator_Factory.h - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeApplication/NodeApplication_Core.h - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeManager/MonitorController.h - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeApplication/NoOp_Configurator.cpp - * DAnCE/NodeApplication/NoOp_Configurator.h - * DAnCE/NodeApplication/NoOp_Configurator_export.h - - Fixed linking errors on Borland 6. Mostly involved improper - symbol export control. - - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - - Added a fix for a broken include in Borland 6. - -Fri Feb 3 24:30:19 UTC 2006 Ossama Othman - - * ciao/CIAO_common.h: - - Removed extraneous "#" in "# #error" preprocessor directive. - - * ciao/Client_init.h: - - Moved CIAO namespace out of TAO-versioned namespace block. It - shouldn't have been there. Fixes namespace clashes in versioned - namespace enabled builds. - -Thu Feb 2 23:55:01 UTC 2006 William Otte - - * NEWS - - Updated the release notes. - -Thu Feb 2 22:59:23 UTC 2006 William Otte - - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - - Updated include from zziplib.h to zzip/zzip.h, as the former - is deprecated and absent in the most recent release. - -Thu Feb 2 15:49:31 2006 Douglas C. Schmidt - - * docs/tutorials/CoSMIC/01.html: Commited a fix for a typo detected by - Abdullah Sowayan and - fixed by Ming Xiong. - -Thu Feb 2 16:58:15 UTC 2006 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - * CIAODAnCE.mwc: - Removed Old_Config_Handlers and spec_RepositoryManager - -Thu Feb 2 16:31:15 UTC 2006 William Otte - - * DAnCE/NodeManager/BaseMonitor.h - * DAnCE/NodeManager/CIAO_Monitor.h - * DAnCE/NodeManager/MonitorCB.h - * DAnCE/NodeManager/MonitorController.cpp - * DAnCE/NodeManager/MonitorController.h - * DAnCE/TargetManager/DomainDataManager.h - - Removed extra ';' after closing braces on namespaces. - Was causing errors on GCC4 builds. - - * DAnCE/NodeManager/MonitorController.inl - - Removed this file, as it is no longer used. - -Wed Feb 1 21:21:35 UTC 2006 William Otte - - * DAnCE/NodeManager/BaseMonitor.h - * DAnCE/NodeManager/CIAO_Monitor.cpp - * DAnCE/NodeManager/CIAO_Monitor.h - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/NodeManager/MonitorCB.h - * DAnCE/NodeManager/MonitorController.cpp - * DAnCE/NodeManager/MonitorController.h - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManager_exec.h - - Wraps the TargetManager/Monitors inside the CIAO namespace. - Thanks to Nilabja Roy (nilabjar@dre.vanderbilt.edu) for - making these changes and thanks to Johnny for noticing this! - -Wed Feb 1 20:42:42 UTC 2006 William Otte - - * CIDLC/ServantSourceGenerator.cpp - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp - * tools/Config_Handlers/Utils/XercesString.cpp - * tools/Config_Handlers/Utils/XercesString.h - * tools/Config_Handlers/XMLSchema/Writer.hpp - - Fixes for warnings on ICC platforms. - -Wed Feb 1 14:38:12 UTC 2006 Johnny Willemsen - - * DAnCE/TargetManager/DomainDataManager.h: - Small doxygein improvement - -Wed Feb 1 04:32:38 UTC 2006 William Otte - - * RACE/Planner_Manager/Component/Planner_Manager.idl - - Resolve a linking error on Windows. - -Tue Jan 31 23:33:23 UTC 2006 William Otte - - * DAnCE/Old_Config_Handlers - * DAnCE/test/Config_Handlers_Tests - - Removed deprecated config handlers. - - * NEWS - - Commented on this removal. - -Tue Jan 31 21:51:52 UTC 2006 William Otte - - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_without_ns.pl - - Added a parameter to the NodeManagers to cause them to wait - up to 30 seconds for the NodeApplications to spawn before failing. - This should fix the hello test on several platforms. - -Tue Jan 31 21:29:06 UTC 2006 William Otte - - * examples/Hello/descriptors/run_test.pl - - Updated to force naming service to not use multicast, instead - using NameServiceIOR environment variable. - - * examples/Hello/descriptors/run_test_without_ns.pl - - Updated ports to reflect new NodeManagerMap. - -Tue Jan 31 15:11:29 UTC 2006 William Otte - - * RACE/Controller/Component/Controller.mpc - - Fixed linking errors on OS X. - -Tue Jan 31 14:41:31 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Fixed a couple of warning on SuSE_10_0_GCC4.0.2_x86_64_Valgrind - build. - -Tue Jan 31 11:42:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Fixed compile error with VxWorks 5.5.1 - -Mon Jan 30 22:43:26 UTC 2006 Stoyan Paunov - - * examples/Hello/descriptors/run_NodeDaemons.pl: - - Fixing this script so that the Hello example deploys successfully. - -Mon Jan 30 21:16:40 UTC 2006 Ming Xiong - - * docs/tutorials/CoSMIC/01.html - * docs/tutorials/CoSMIC/02.html - * docs/tutorials/CoSMIC/03.html - * docs/tutorials/CoSMIC/04.html - * docs/tutorials/CoSMIC/index.html - * docs/tutorials/CoSMIC/Icons/AddConnMode.gif - * docs/tutorials/CoSMIC/Icons/SetMode.gif - * docs/tutorials/CoSMIC/Images/fig1.jpg - * docs/tutorials/CoSMIC/Images/fig10.jpg - * docs/tutorials/CoSMIC/Images/fig11.jpg - * docs/tutorials/CoSMIC/Images/fig2.jpg - * docs/tutorials/CoSMIC/Images/fig3.jpg - * docs/tutorials/CoSMIC/Images/fig4.jpg - * docs/tutorials/CoSMIC/Images/fig5.jpg - * docs/tutorials/CoSMIC/Images/fig6.jpg - * docs/tutorials/CoSMIC/Images/fig7.jpg - * docs/tutorials/CoSMIC/Images/fig8.jpg - * docs/tutorials/CoSMIC/Images/fig9.jpg - * docs/tutorials/CoSMIC/Model/Quoter.xme - - Added CoSMIC tutorial for /docs/tutorials/Quoter/Simple - -Mon Jan 30 17:50:38 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - - Modified to inherit from dance_extension_stub project - so the included header file could be found. - -Mon Jan 30 17:35:12 UTC 2006 Gan Deng - - * DAnCE/Interfaces/Interfaces.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.h - - Fixed a linking error of NodeManager when trying to - link to IDL generated servant code. - - * DAnCE/NodeManager/CIAO_NodeManager_Export.h - * DAnCE/Interfaces/NodeManager_svnt_export.h - - Removed the first one and added the second one to - fix the linking error when trying to find entry - point for IDL compiler generated servant code. - -Mon Jan 30 05:07:09 UTC 2006 William Otte - - * examples/Hello/descriptors/NodeManagerMap.dat - - Corrected the ports to match those in the run_test.pl script. - -Mon Jan 30 01:59:23 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - - Cosmetic change. - - * DAnCE/NodeManager/NodeManager.mpc - - Fixed a typo. - -Mon Jan 30 01:47:21 UTC 2006 Gan Deng - - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/NodeManager_Export.h - - Added dll import/export mechanism into NodeManager library. - -Sat Jan 28 22:24:35 UTC 2006 William Otte - - * examples/Hello/descriptors/run_test.pl - - Corrected the name of the NodeManagerMap passed to ExecutionManager. - This was causing the test to fail across all platforms. - -Sat Jan 28 05:55:45 UTC 2006 William Otte - - * DAnCE/NodeManager/NodeManager.mpc - - Added a missing after clause. - -Fri Jan 27 22:42:47 UTC 2006 William Otte - - * RACE/Controller/Component/Controller.mpc - - Fixed linking errors on Windows. - -Fri Jan 27 20:58:19 UTC 2006 Gan Deng - - * tests/Bug_2130_Regression - - A place to host Bug 2130 test case. - -Fri Jan 27 20:42:47 UTC 2006 William Otte - - * tools/Config_Handlers/DnC_Dump_T.h - - Silenced warnings in solaris. - -Fri Jan 27 20:30:01 UTC 2006 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Fixed uninitialized variable warnings on Solaris GCC. - - *DAnCE/NodeManager/NodeManager.mpc - - Refactored the projects here so all files related to NodeManager - are only compiled once. - -Fri Jan 27 19:15:19 UTC 2006 Nilabja R - - * DAnCE/NodeManager/Monitor.mpc: Added the dependancy on - TargetManaer_stub - -Fri Jan 27 19:07:08 UTC 2006 William Otte - - * DAnCE/NodeManager/MonitorController.h - * DAnCE/NodeManager/MonitorController.inl - - Refined the fix in - Fri Jan 27 17:29:54 UTC 2006 William Otte - to use ACE_SYNCH_MUTEX. Thanks to Doug Schmidt for suggesting the - improvement. - -Fri Jan 27 17:35:55 UTC 2006 William Otte - - * RACE/Controller/Component/Controller.mpc - - Fixed linking errors on Mac OS X. - -Fri Jan 27 17:29:54 UTC 2006 William Otte - - * DAnCE/NodeManager/MonitorController.h - * DAnCE/NodeManager/MonitorController.inl - - Added preprocessor logic to fall back to an ACE_Mutex on - platforms that don't support ACE_Thread_Mutex. - -Fri Jan 27 16:59:11 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Fixed a couple of warnings on SuSE_10_0_GCC4.0.2_x86_64_Valgrind - build about pointer initialization. - -Thu Jan 26 23:48:47 UTC 2006 Gan Deng - - * examples/Hello/step-by-step.html - - Fixed a fuzz error about dependency on ~schmidt/ACE_wrappers. - -Thu Jan 26 19:25:06 UTC 2006 Gan Deng - - * DAnCE/TargetManager/TargetManager.mpc - - Added an empty IDL_Files segment to the _exec project, - which should clean up tons of Windows VC build erros - and warnings. - -Thu Jan 26 17:57:45 UTC 2006 Gan Deng - - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/NodeManager/NodeManager.mpc - - Modified to inherit from a base project dance_extension_stub.mpb - to avoid explicily included path specification. - -Thu Jan 26 10:25:12 UTC 2006 Johnny Willemsen - - * CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Fixed incorrect doxygen tag - - * CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - Added missing ACE_INLINE macro's - - -Thu Jan 26 01:44:15 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * ciao/Deployment.idl - - Fixed a bug of shared component capability. Originally, we - haven't differentiate between "shared components" and - "external components", so when a component ref count becomes - 0, the "shared components" will become empty, however, since - some components are installed remotely, removing it will - cause problem if we don't have such differentiation. - -Wed Jan 25 23:44:01 UTC 2006 Nishanth Shankaran - - * CIAOTAO.mwc: - * CIAO.mwc: - - Added RACE to the workspace. - -Wed Jan 25 22:47:30 UTC 2006 Gan Deng - - * CIAO_TAO_DAnCE.mwc - - Added another mwc file which builds ACE, TAO, CIAO, DAnCE - minium to run a CIAO simple example. - -Wed Jan 25 22:28:06 UTC 2006 Gan Deng - - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/NodeManager/NodeManager.mpc - - Added include+= to find header files and fixed a typo. - - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Fixed an error in Linux build. - -Wed Jan 25 22:11:23 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Changed order of the base member initialization list, which - should clear some warnings of the Linux builds. - -Wed Jan 25 21:32:44 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeManager/NodeManager.mpc - - Fixed dependency problems. - -Wed Jan 25 20:28:35 UTC 2006 Gan Deng - - * DAnCE/Interfaces/ExecutionManager.idl - * DAnCE/Interfaces/Interfaces.mpc - * DAnCE/Interfaces/README - * DAnCE/Interfaces/NodeManager.idl - * DAnCE/Interfaces/NodeManager_stub_export.h - * DAnCE/Interfaces/ExecutionManager_stub_export.h - - Added these files into a separate directory - called DAnCE/Interfaces to termporarily solve the MPC - directory dependency issue. - - * DAnCE/ExecutionManager/ExecutionManager.idl - * DAnCE/NodeManager/NodeManager.idl - - Removed these files. - - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.h - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - - Modified to accomodate the above refactoring work. - -Wed Jan 25 19:46:57 UTC 2006 Gan Deng - - * ciao/Deployment_common.h - - Added this new file, which is supposed to contain all the - reusable types/classes/methods across the DAnCE toolchain. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - - Modified the code to accomodate the above refactoring work. - - * DAnCE/TargetManager/DomainDataManager.cpp - - Got rid of a warning message about unreferenced variable. - - * DAnCE/DomainApplicationManager/DomainApplicationManage.mpc - - Added a dependency from DAM to ExecutionManager_stub project. - -Wed Jan 25 02:53:07 UTC 2006 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - * ciao/Deployment.idl - - Fixed a bug about destroying *ApplicationManagers. - This fix will ensure that DAM won't be destroyed if any - components managed by itself are still up and running. - -Wed Jan 25 01:41:53 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - - Some cosmetic changes. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Fixed a bug about when to killing a NodeApplication process. - - * ciao/Container_Base.cpp - - Comment out meaningless debug statement. - -Wed Jan 25 00:56:39 UTC 2006 Gan Deng - - * examples/Hello/descriptors/run_test_without_ns.pl - - Modified to use the correct NodeManagerMap.dat file. - -Wed Jan 25 00:47:02 UTC 2006 Gan Deng - - * examples/Hello/descriptors_RTCCM/RTsvc.conf - * examples/Hello/descriptors_RTCCM/input.csr - * examples/Hello/descriptors_RTCCM/rt-config-example.cdp - * examples/Hello/descriptors_RTCCM/rt-config-example.csr - * examples/Hello/descriptors_RTCCM/rt-example.cdp - * examples/Hello/descriptors_RTCCM/rt_run_test.pl - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp - - Create some new descriptors, reorganized them, and put - them into different directories. - -Wed Jan 25 00:23:02 UTC 2006 Gan Deng - - * CIAODAnCE.mwc - - Added another mwc file which only builds CIAO and DAnCE. - - * examples/Hello/step-by-step.html - - Fixed an error in this documentation page. - - * examples/Hello/descriptors/RTsvc.conf - * examples/Hello/descriptors/TestNodeManagerMap.dat - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp - * examples/Hello/descriptors/rt-config-example.cdp - * examples/Hello/descriptors/rt-config-example.csr - * examples/Hello/descriptors/rt-example.cdp - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp - * examples/Hello/descriptors/rt_run_test.pl - - Removed these descriptor files and put them into separate - directories to better organize things. - - * examples/Hello/descriptors_shared_components/deploymentplan.cdp - * examples/Hello/descriptors_shared_components/ - deploymentplan_shared_components.cdp - - Added a dedicated directory to put descriptors for shared - components scenario. - -Wed Jan 25 00:10:50 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/DAM_Map.cpp - * DAnCE/ExecutionManager/DAM_Map.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - - Added capabilities to handle adding/removing - connections between components in new assembly and existing/external - components in old assemblies. This involves putting - ExecutionManager as a coordinator for different DAMs. - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.h - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl - * DAnCE/NodeManager/NAM_Map.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/Node_Manager.cpp - - Added capabilities for handling shared components across - different assemblies. This involves putting NodeManager - as a local coordinator for different NAMs. - - * DAnCE/NodeApplication/NodeApplication.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - - Enhancement of adding/removing connections. - - * DAnCE/Plan_Launcher/DAM_Map.cpp - * DAnCE/Plan_Launcher/DAM_Map.h - - Removed from the repo, since they are located in the other - directory as well, and we can use relative path to point - to those existing files. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - - Enhanced to handle shared components scenario which interacts - with *managers. - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - - Fixed for working with the newly enhanced DAnCE toolchain. - - * ciao/Deployment.idl - - Adding enhancements for adding shared components capabilities - -Wed Jan 25 00:01:37 UTC 2006 Gan Deng - - * DAnCE/NodeManager/MonitorCB.cpp - - Fixed a warning about unreferenced variable in Windows build. - - * DAnCE/NodeManager/MonitorController.h - - Included header file missing path to its directory. - - * DAnCE/TargetManager/CmpClient.cpp - - Fixed a warning about unreferenced variable in Windows build. - -Mon Jan 23 23:10:32 UTC 2006 Stoyan Paunov - - - * DAnCE/spec_RepositoryManager/HTTP_Client.h: - * DAnCE/spec_RepositoryManager/HTTP_Client.cpp: - * DAnCE/spec_RepositoryManager/HTTP_Handler.h: - * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp: - * DAnCE/spec_RepositoryManager/Options.h: - * DAnCE/spec_RepositoryManager/Options.cpp: - * DAnCE/spec_RepositoryManager/PC_Updater.h: - * DAnCE/spec_RepositoryManager/PC_Updater.cpp: - * DAnCE/spec_RepositoryManager/PC_Updater_T.h: - * DAnCE/spec_RepositoryManager/PC_Updater_T.cpp: - * DAnCE/spec_RepositoryManager/README.txt: - * DAnCE/spec_RepositoryManager/RM_Helper.h: - * DAnCE/spec_RepositoryManager/RM_Helper.cpp: - * DAnCE/spec_RepositoryManager/RMadmin.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager.idl: - * DAnCE/spec_RepositoryManager/RepositoryManager.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/spec_RepositoryManager/URL_Parser.h: - * DAnCE/spec_RepositoryManager/URL_Parser.cpp: - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h: - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc: - - Removed these files. Zapping the DAnCE/spec_RepositoryManager/ - directory which used to hold the implementation of the - RepositoryManager while the ExecutionManager was in the - DAnCE/RepositoryManager/ directory. - -Mon Jan 23 22:41:49 UTC 2006 Stoyan Paunov - - * DAnCE/RepositoryManager/HTTP_Client.h: - * DAnCE/RepositoryManager/HTTP_Client.cpp: - * DAnCE/RepositoryManager/HTTP_Handler.h: - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater_T.h: - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - * DAnCE/RepositoryManager/README.txt: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.idl: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - - Moving what used to be DAnCE/spec_RepositoryManager directory to - the DAnCE/RepositoryManager directory. - -Mon Jan 23 22:14:06 UTC 2006 Stoyan Paunov - - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp: - - Adding couple more checks to increase robustness. - -Mon Jan 23 20:07:17 UTC 2006 William Otte - - * DAnCE/NodeManager/BaseMonitor.h - - Added a virtual destructor to resolve warnings. - - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/TargetManager_exec.cpp - - Fixed some problems caused by - Mon Jan 23 15:11:40 UTC 2006 William Otte - -Mon Jan 23 17:03:09 UTC 2006 Nishanth Shankaran - - * RACE/Controller/Component/Controller_svnt_export.h: - * RACE/Controller/Component/Controller_stub_export.h: - * RACE/Controller/Component/Controller_exec_export.h: - * RACE/Controller/Component/Controller_exec.h: - * RACE/Controller/Component/Controller_exec.cpp: - * RACE/Controller/Component/Controller.mpc: - * RACE/Controller/Component/Controller.idl: - * RACE/Controller/Component/Controller.cidl: - - Added IDL, CIDL, and MPC files for the RACE controller along with a - dummy implementation of the controller. - -Mon Jan 23 15:11:40 UTC 2006 William Otte - - * DAnCE/TargetManager/TargetManager.mpc - - Cleaned up the MPC file, fixed a linking error on OS X. - -Sat Jan 21 21:54:59 UTC 2006 Jeff Parsons - - * CIDLC/SizeTypeCalculator.cpp: - - Fixed a bug in size type calculation of nested structs and unions. - Thanks to Sandro Santos Andrade for - reporting the problem. - -Sat Jan 21 20:27:13 UTC 2006 Nilabja R - - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerExt.idl: - Added this file to include the facet for RACE Controller - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Added implementation for the facet serving the RACE Controller. - - -Sat Jan 21 02:04:15 UTC 2006 Nilabja R - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Removed trailing whitespaces and tabs - - * DAnCE/NodeManager/BaseMonitor.h: - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/MonitorCB.h: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - Removed system headers and replaced systme calls with ACE calls. - Also updated documentation with doxygen standard - - * DAnCE/TargetManager/TargetManager_exec.cpp: - Removed system headers and replaced systme calls with ACE calls. - Also updated documentation with doxygen standard - - * tools/Config_Handlers/DD_Handler.h: - * tools/Config_Handlers/DD_Handler.cpp: - Removed system headers and replaced systme calls with ACE calls. - Also updated documentation with doxygen standard - -Fri Jan 20 22:30:21 UTC 2006 Nilabja R - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - The include to NodeManagerC.h is removed since the dependency on - NodeManager_stub was removed. - -Fri Jan 20 20:33:23 UTC 2006 Nilabja R - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - Changed the Domain Application Manager to remove the dependency on - NodeManager_stub. - -Fri Jan 20 07:24:47 UTC 2006 Stoyan Paunov - - * DAnCE/spec_RepositoryManager/PC_Updater.h: - * DAnCE/spec_RepositoryManager/RMadmin.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/spec_RepositoryManager/URL_Parser.h: - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h: - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp: - - Improved the documentation, the output and added some minor features. - Changed all occurnences of 'new' to ACE_NEW in ZIP_Wrapper.cpp which - I had previously forgotten. - - * DAnCE/new_RepositoryManager/packages/inconsistent.cpk: - * DAnCE/new_RepositoryManager/packages/package.cpk: - - Removed these files. - -Thu Jan 19 01:29:58 UTC 2006 Stoyan Paunov - - * DAnCE/spec_RepositoryManager/HTTP_Handler.h: - * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp: - * DAnCE/spec_RepositoryManager/PC_Updater.h: - * DAnCE/spec_RepositoryManager/PC_Updater_T.h: - * DAnCE/spec_RepositoryManager/RM_Helper.h: - * DAnCE/spec_RepositoryManager/RM_Helper.cpp: - * DAnCE/spec_RepositoryManager/RMadmin.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/spec_RepositoryManager/URL_Parser.h: - * DAnCE/spec_RepositoryManager/URL_Parser.cpp: - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h: - - Changed all occurenced of new to ACE_NEW. Turned some documentation to - Doxygen style. Modified the URL_Parser singleton to use the ACE_Singleton - class. More changes on the way. - -Wed Jan 18 23:56:51 UTC 2006 Nilabja R - - * DAnCE/NodeManager/BaseMonitor.h: Corrected the file name in @file - - * DAnCE/TargetManager/CmpClient.cpp: Corrected the file name in @file - -Wed Jan 18 16:42:41 UTC 2006 Nilabja R - - * DAnCE/NodeManager/BaseMonitor.h:Added documentation, changed - function signature - * DAnCE/NodeManager/CIAO_Monitor.cpp:Removed system headers - * DAnCE/NodeManager/Monitor.mpc:Added cvs tag - * DAnCE/NodeManager/MonitorController.cpp:Removed sleep call - * DAnCE/NodeManager/NodeManager.mpc:Added after clause to compile - TargetManager_stub before - - * DAnCE/TargetManager/TM_Client.mpc:Added cvs tag - * DAnCE/TargetManager/TargetManager.mpc: Added cvs tag , - Removed Deployment_Configuration.cpp from TargetManager_exec - -Tue Jan 17 23:52:11 UTC 2006 Stoyan Paunov - - * DAnCE/spec_RepositoryManager/Options.h: - * DAnCE/spec_RepositoryManager/Options.cpp: - * DAnCE/spec_RepositoryManager/RMadmin.cpp: - - Took care of the todo's that Johnny suggested. Now using ACE_Singleton - parametrized with ACE_Null_Mutex. - -Tue Jan 17 21:07:12 UTC 2006 Johnny Willemsen - - * DAnCE/spec_RepositoryManager/HTTP_Client.h: - Layout change - * DAnCE/spec_RepositoryManager/HTTP_Handler.{h,cpp}: - Changed bytecount_ to size_t - -Tue Jan 17 21:03:12 UTC 2006 Johnny Willemsen - - * DAnCE/spec_RepositoryManager/Options.h: - Doxygen improvements - - * DAnCE/spec_RepositoryManager/Options.cpp: - Layout changes and add some todo's - -Tue Jan 17 19:31:56 UTC 2006 William Otte - - * tools/Config_Handlers/Config_Handlers.mpc - - Added a project inherit improperly removed by - Mon Jan 16 16:22:25 UTC 2006 Nilabja R - -Mon Jan 16 19:59:12 UTC 2006 Johnny Willemsen - - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h: - * DAnCE/spec_RepositoryManager/URL_Parser.h: - * DAnCE/spec_RepositoryManager/PC_Updater.h: - * DAnCE/spec_RepositoryManager/PC_Updater_T.cpp: - * DAnCE/spec_RepositoryManager/HTTP_Handler.h: - * DAnCE/spec_RepositoryManager/HTTP_Client.h: - Doxygen improvements - - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/spec_RepositoryManager/PC_Updater_T.h: - * DAnCE/spec_RepositoryManager/HTTP_Client.cpp: - * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp: - Layout changes - -Mon Jan 16 18:36:47 UTC 2006 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - - Addressed some warnings from the RHEL_Static_GCC-3.4.2 - build. - -Mon Jan 16 16:48:11 UTC 2006 Stoyan Paunov - - * DAnCE/spec_RepositoryManager/Options.h: - * DAnCE/spec_RepositoryManager/Options.cpp: - * DAnCE/spec_RepositoryManager/PC_Updater.cpp: - * DAnCE/spec_RepositoryManager/README.txt: - * DAnCE/spec_RepositoryManager/RMadmin.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager.cpp: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp: - - Added the newest changes to the RepoMan. This change add the - functionality that pertains to interface types. It is currently - disabled due to lack of support in the modeling tools for interfaces - for assemby-based interfaces. - - I still need to clean up some of the output and some of the code before - the release of the beta. - -Mon Jan 16 16:22:25 UTC 2006 Nilabja R - - * DAnCE/NodeManager/BaseMonitor.h: - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/Monitor.mpc: - * DAnCE/NodeManager/MonitorCB.h: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.inl: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - These files implement the Monitor within the - NodeManager implementation. - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/Deployment_Configuration.h: - * DAnCE/TargetManager/Deployment_Configuration.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.cidl: - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/TargetManager_exec_export.h: - * DAnCE/TargetManager/TargetManager_stub_export.h: - * DAnCE/TargetManager/TargetManager_svnt_export.h: - These files implement the Target Manager Implementation - - * DAnCE/TargetManager/descriptors/Domain.cdd: - * DAnCE/TargetManager/descriptors/NodeDetails.dat: - * DAnCE/TargetManager/descriptors/NodeManagerMap.dat: - * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - These are needed for the running of the TargetManager - - * ciao/CCM_Core.mpc: - * ciao/Deployment.idl: - * ciao/Deployment_Base.idl: - * ciao/Deployment_Data.idl: - * ciao/Packaging_Data.idl: - * ciao/ServerResources.idl: - Needs to be changed to resolve conflicts when compiling the - Target Manager cidl file - - * ciao/Target_Data.idl: - This is the file which contains declarations which has been - separated for the Target manager - - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DD_Handler.h: - * tools/Config_Handlers/DD_Handler.cpp: - These implement the extension to the config handlers for - the parsing of the Target data domain. - -Fri Jan 13 20:39:21 UTC 2006 William Otte - - * tools/Config_Handlers/XSCRT/Parser.hpp - * tools/Config_Handlers/XSCRT/XML.hpp - - Added a templated casting operator for Xerces types instead - of using standard dynamic_cast. Thanks to Ossama Othman - ossama at dre dot vanderbilt dot edu for suggesting this - fix. - - * CIAO-INSTALL.html - * NEWS - - The above changes removed the requirement for an RTTI enabled - version of Xerces. Updated these documents to reflect this. - -Thu Jan 12 21:40:47 UTC 2006 Gan Deng - - * examples/Hello/ReDaC-Usage.html - - Fixed some typos and an error. - -Tue Jan 10 22:34:22 UTC 2006 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - - Regenerated to reflect updates to schema in - Tue Jan 10 19:01:45 UTC 2006 William Otte - - * tools/Config_Handlers/Modified_Deployment.xsd - - Removed, as this file is obsolete, and schema should only exist in - CIAO_ROOT/docs/schema - -Tue Jan 10 22:05:17 UTC 2006 Gan Deng - - * examples/Hello/ReDaC-Usage.html - - Added a tutorial-like web page to showcase ReDaC service - of DAnCE. - - * NEWS - - Updated with DAnCE's recent enhancements. - -Tue Jan 10 19:01:45 UTC 2006 William Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/cdd.xsd - - Corrected incorrect cardinality on several target domain elements. - -Tue Jan 10 11:10:01 UTC 2006 Boris Kolpackov - - * NEWS: - - Updated with recent developments. - -Mon Jan 9 14:17:39 UTC 2006 Jeff Parsons - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * examples/Hello/descriptors/Receiver_Svnt.iad: - * examples/Hello/descriptors/Sender_Svnt.iad: - * examples/Hello/descriptors/flattened_deploymentplan.cdp: - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp: - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp: - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_remove.cdp: - * examples/Hello/descriptors/rt-config-example.cdp: - * examples/Hello/descriptors/rt-example.cdp: - - Updated occurrences of the string name of the servant executor - DLL extry point to correspond with the changes in - - Fri Jan 6 20:09:34 UTC 2006 Jeff Parsons - -Fri Jan 6 20:09:34 UTC 2006 Jeff Parsons - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changed the names of the generated extern C functions that - create the home and servant executors to incorportate the - entire scoped name of the class, to avoid name clashes - (since extern "C" functions link globally no matter what - scope they are declared in) when class names are - duplicated inside different nested namespaces. Thanks - to James Hill and Boris - Kolpackov for their help - with the problem. - - * DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad: - * DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl: - * docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp: - * examples/BasicSP/descriptors/Airframe_Svnt.iad: - * examples/BasicSP/descriptors/GPS_Svnt.iad: - * examples/BasicSP/descriptors/NavDisplay_Svnt.iad: - * examples/BasicSP/descriptors/Timer_Svnt.iad: - * examples/BasicSP/descriptors/flattened_deploymentplan.cdp: - - Updated the hand-crafted descriptor files in CIAO tests and - examples to reflect the changes above. - -Thu Jan 5 21:28:17 UTC 2006 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Fixed some warning in Boarland C++ builds. - -Thu Jan 5 00:53:30 UTC 2006 J.T. Conklin - - * ChangeLog: - - Untabify. - Delete-trailing-spaces. - - Changed "add-log-time-format" to a really ugly lambda expression - that formats changelog timestamps in UTC and works with both GNU - Emacs and XEmacs. - -Wed Jan 4 21:01:15 2006 Boris Kolpackov - - * ciao/CCM_Base.idl: - - Replaced #if !defined (CIAO_HAS_IMPORT_KEYWORD) with - #ifdef CIAO_HAS_IMPORT_KEYWORD. This will give CIDLC's - CPP a chance to handle it properly. - - * CCF/CCF/CompilerElements/Preprocessor.cpp: - - Fixed a bug in lexeme parsing. - -Wed Jan 4 11:39:59 2006 William Otte - - * ciao/CCM_Core.mpc - - Removed $CIAO_ROOT/DAnCE include, added CIAO_ROOT/ciao. - -Tue Jan 3 19:55:43 2006 Boris Kolpackov - - * CCF/CCF/CompilerElements/Preprocessor.cpp: - * CCF/CCF/CompilerElements/Preprocessor.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CIDLC/cidlc.cpp: - - Implemented support for basic preprocessor directives: - #ifdef, #ifndef, #else, and #endif as well as the -D - command-line option. Also added exception handlers for - filesystem exceptions. - - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.cpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - - Implemented incomplete struct and union semantics which - will appear in CORBA 3.1. - - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - - Code clean-ups. - -Fri Dec 30 11:56:12 UTC 2005 Johnny Willemsen - - * ciao/Dynamic_Component_Servant_Base.{h,cpp}: - Moved the default constructor to public again, vc8 needs it, no - idea why, have to recheck later - -Thu Dec 29 08:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Fixed implicit conversion warning - -Wed Dec 28 10:42:31 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/Old_Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - - Silenced some warnings from - Fri Dec 23 11:49:04 2005 Gan Deng - -Wed Dec 28 12:53:12 UTC 2005 Johnny Willemsen - - * ciao/Context_Impl_Base.{h,cpp}: - Readded the default constructor, some compilers need it, no idea - why, will sort this out later but this at least makes the scoreboard - less red - -Tue Dec 27 15:57:12 UTC 2005 Johnny Willemsen - - * ciao/Container_Base.{h,cpp}: - * ciao/Context_Impl_Base.{h,cpp}: - * ciao/Home_Servant_Impl_Base.{h,cpp}: - * ciao/Servant_Impl_Base.{h,cpp}: - * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}: - * ciao/Swapping_Servant_Home_Impl_T.h: - Moved the default constructor to the private section and removed - the implementation with the assert - -Tue Dec 27 15:08:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - Initialise pointer with 0 - - * DAnCE/NodeApplication/NodeApplication_Impl.{h,cpp,inl}: - Just declare the default constructor private, it seems not - to be used and the implementation was incorrect - -Fri Dec 23 11:49:04 2005 Gan Deng - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.inl - * DAnCE/NodeApplication/RTConfig_Manager.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp - * ciao/Container_Base.cpp - * ciao/Deployment.idl - * ciao/Deployment_Core.idl - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp - * examples/Hello/descriptors/flattened_deploymentplan_without_ns_remove.cdp - - Merged from CVS Branch CIAO_ReDAC_01. This merge enables DAnCE to - handle dynamic updating component assemblies as well as its - configurations on the fly. Major IDL changes include the following: - - 1) Modified the finishLaunch() operation on the DomainApplicationManager - interface by adding an additional boolean parameter to differentiate - whether this is for inital deployment or for redeployment. - - 2) Modified the finishLaunch() operation on the NodeApplicationManager - interface by adding an additional boolean parameter to differentiate - whether this is for inital deployment or for redeployment. - - 3) Added new operations perform_redeployment() to the ExecutionManager - interface and NodeApplicationManager interface. - -Fri Dec 23 13:47:12 UTC 2005 Johnny Willemsen - - * DAnCE/ComponentPackager/* - Removed all these files, this component was using ziparchive and - we didn't build it. After checking this with the DAnCE developers - the conclustion was to zap it - -Thu Dec 22 19:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.h: - Removed not needed msvc pragma push/pop - -Thu Dec 22 19:51:12 UTC 2005 Johnny Willemsen - - * DAnCE/ExecutionManager/DAM_Map.cpp: - Made variable const - -Thu Dec 22 19:47:12 UTC 2005 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Removed some old includes, make a variable const - - * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}: - Made get_default_node_manager_ior and get_node_manager_ior - const methods - -Thu Dec 22 19:43:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - Initialise pointers with 0 - - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - Removed include of cpp file in this file, this file is not - declaring a template - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Converted documentation to doxygen style - -Thu Dec 22 19:36:12 UTC 2005 Johnny Willemsen - - * DAnCE/ComponentPackager/ComponentPackager.mpc: - Use exceptions as base project - - * DAnCE/ComponentPackager/Component_Packager.cpp: - Converted some documentation to doxygen style - - * DAnCE/ComponentPackager/Base_Packager.cpp: - Fixed argument not used warnings - - * DAnCE/ComponentPackager/CPK_Packager.{h,cpp}: - Small cleanup - -Thu Dec 22 14:10:12 UTC 2005 Johnny Willemsen - - * DAnCE/ComponentPackager/Base_Packager.h: - Changed documentation to doxygen style - -Tue Dec 20 08:07:51 2005 Simon McQueen - - * CIAO version 0.4.8 released. - -Fri Dec 16 15:58:27 2005 Gan Deng - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - - Modified to fix a bug reported by Will Otte regarding - DAnCE's parsing of deployment plan to find component - servant and executor libraries. This is a temporary - workaround so even if a component name happens to - have "_exec" string inside it, DAnCE could still - work correctly to find the corresponding servant - and executor libraries. - -Fri Dec 16 14:57:21 2005 Gan Deng - - * ciao/Container_Base.cpp - * ciao/Container_Base.h - - Fixed a bug about RT-CCM. The bug creeped out when the - facet_consumer_poa_ is not configured properly to use - application specific real-time policies. Thanks to - Roland Schimmack for - reporting this bug. - -Tue Dec 13 12:13:26 2005 Douglas C. Schmidt - - * COPYING: Updated this file to mention compliance issues wrt the - new "The Energy Policy Act of 2005". Thanks to Malcolm Spence - for providing this. - -Tue Dec 13 09:07:21 2005 William Otte - - * CCF/Documentation/Build.html - * CIDLC/README.html - - Updates to the CIDLC build documentation. Thanks to James Hill - for completing this update. - -Mon Dec 12 13:20:00 UTC 2005 Simon Massey - - * NEWS: - - Added Nanbor's changes from the release notes. - -Fri Dec 9 13:39:10 2005 William Otte - - * tools/Config_Handlers/Any_Handler.h - - Added a missing include for the versioned namespace macros. - -Fri Dec 9 09:18:01 2005 William Otte - - * ciao/Server_init.h - - Added a missing include for the versioned namespace macros. - -Thu Dec 08 21:34:36 2005 Gan Deng - - * NEWS - - Updated the NEWS file to capture ReDaC stuff. - -Thu Dec 8 15:38:02 2005 Ossama Othman - - * DAnCE/Old_Config_Handlers/DT_Handler.h: - * ciao/Client_init.h: - * ciao/Context_Impl_T.h: - * ciao/Server_init.h: - * ciao/Upgradeable_Context_Impl_T.h: - * tools/Config_Handlers/Any_Handler.h: - - Fixed versioned namespace support. The versioning macros calls - around forward declarations in the CORBA namespace were - missing. - -Thu Dec 08 08:38:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Fixed compile errors with VxWorks - -Wed Dec 07 18:05:35 2005 Gan Deng - - * ciao/Deployment.idl - * ciao/Deployment_Core.idl - * doc/index.html - - Document CIAO specific interface extension/modifications. - -Wed Dec 7 12:41:22 2005 Boris Kolpackov - - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - - Fixed a bug in regular expressions that are used to get rid of - file suffixes. - -Tue Dec 06 12:33:27 2005 William Otte - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Fixed warnings in Borland. - -Tue Dec 6 16:14:01 UTC 2005 Jeff Parsons - - * ciao/Servant_Impl_T.cpp: - - Changed initialization of boolean class members from '0' - to 'false'. - - * ciao/Servant_Impl_T.h: - - Added comments to the executor and context class members, - providing info about where they are initialized. - -Mon Dec 5 14:43:48 2005 William Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc - - Removed superfluous dependancy on Xerces. - -Sun Dec 4 11:13:32 2005 William Otte - - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - * DAnCE/tests/Config_Handlers/handler_test.mpb - - Fix linking errors on Tiger. - -Fri Dec 2 11:25:48 2005 William Otte - - * DAnCE/RepositoryManager/RepositoryManager.idl - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/Repository_Manager.cpp - * DAnCE/RepositoryManager/Repository_Manager_conf.h - * DAnCE/RepositoryManager/Update_Plan.cpp - * DAnCE/RepositoryManager/Update_Plan.h - - Removed the deprecated RepositoryManager implementation. - - * NEWS - - Updated the NEWS file to reflect this. - -Thu Dec 1 10:16:46 2005 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Fixed some errors caused by previous commit. - -Thu Dec 1 12:57:12 UTC 2005 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Use 0 instead of NULL, NULL is not portable - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NAM_Map.cpp: - Initialise pointers with 0 and return false instead of 0 - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - Removed not needed msvc pragma push/pop - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Initialise pointers with 0 and removed some printf that seems some - left over debugging statements - -Wed Nov 30 16:24:43 2005 William Otte - - * docs/schema/xsc-banner.h - - Updated this file to reflect recent export macro changes. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Made a borland specific fix apply to all compilers, hopefully - fixing ICC builds. - -Wed Nov 30 12:30:59 2005 William Otte - - * examples/Hello/descriptors/flattened_deploymentplan.cdp - - Added metadata necessary to initialize an enum attribute. - -Wed Nov 30 08:06:00 UTC 2005 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - This project is deprecated according to Will, so added - requires+=dummy_label, it is up to the DAnCE people to - decide when they zap this from the archive - -Fri Nov 25 10:50:00 UTC 2005 Simon Massey - - * DAnCE/Old_Config_Handlers/XercesString.cpp - - Fixed prototype return type qualifier missmatch - -Thu Nov 24 16:04:05 2005 Gan Deng - - * tools/Config_Handlers/Config_Handlers.mpc - - Added the MPC base project dependency to typecodefactory, - and hopefully this should fix some linking erros on the - scoreboard. - -Thu Nov 24 11:25:09 2005 Gan Deng - - * DAnCE/Old_Config_Handlers/XercesString.h - - Fixed a warning, since declaring function return type - to be const is meaningless. - -Tue Nov 22 16:03:24 2005 Gan Deng - - * DAnCE/NodeApplication/Container_Impl.cpp - - Fixed a memory management related bug, we should not - explicitly call release() on the component object - reference of var type. - -Mon Nov 21 17:24:42 2005 Boris Kolpackov - - * NEWS: - - Updated with information about changes in CCF. - -Fri Nov 18 10:28:31 2005 William Otte - - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - - Quashed a link time warning on OS X. - -Thu Nov 17 18:13:28 UTC 2005 Jeff Parsons - - * examples/Swapping/Sender/Sender.mpc: - - Added a dependency of SenderE.idl on itself, to keep - VC8 from launching the IDL compiler on it until it - has been generated by the CIDL compiler. - -Thu Nov 17 09:53:35 2005 William Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Fixed warning about unused arguments - -Wed Nov 16 11:30:12 UTC 2005 Johnny Willemsen - - * examples/Swapping/Sender/Sender_exec.cpp: - Fixed warning in VxWorks build - -Mon Nov 14 22:43:09 2005 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp - * ciao/Deployment.idl - - Fixed some errors and warnings on the builds. - -Mon Nov 14 11:05:12 UTC 2005 Johnny Willemsen - - * examples/Display/RateGen/RateGen_exec.h: - * examples/BasicSP/EC/EC_exec.h: - Timer id's are long, not int - - * ciao/Servant_Activator.cpp: - Fixed 64bit conversion warnings - -Sun Nov 13 12:54:12 UTC 2005 Johnny Willemsen - - * examples/Swapping/Sender/Sender_exec_2.cpp: - * examples/Swapping/Sender/Sender_exec_1.cpp: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - Fixed warnings in VxWorks build - -Fri Nov 11 17:49:40 2005 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * ciao/Deployment.idl - - More stuff regarding dynamic assembly management. These - changes won't break existing initial deployment and - configuration. - -Fri Nov 11 12:37:00 2005 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - * ciao/Deployment.idl - * ciao/Deployment_Core.idl - - Added the DAnCE enhancements to support dynamic - assembly management and reconfiguration. No actual - implementation is there except some capability - in NodeApplication_Impl servant class. - -Thu Nov 10 17:13:20 2005 Gan Deng - - * ciao/Servant_Activator.cpp - - Enhanced a debug output message. - -Thu Nov 10 06:54:12 UTC 2005 Johnny Willemsen - - * ciao/Port_Activator_T.cpp: - Fixed warning in VxWorks build - -Tue Nov 8 22:13:50 2005 William Otte - - * DAnCE/NodeManager/NodeManager_Impl.cpp - * ciao/Container_Base.cpp - * ciao/Servant_Impl_Base.cpp - * ciao/Swapping_Servant_Home_Impl_T.cpp - * ciao/Upgradeable_Context_Impl_T.cpp - * examples/BasicSP/EC/EC.mpc - - Resolved some warnings in OS X relating to ambiguous conversions. - -Mon Nov 7 16:23:41 2005 William Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * performance-tests/Benchmark/Benchmark.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc - - Resolving linking errors on OS X. - -Mon Nov 7 14:00:31 2005 Nanbor Wang - - * NEWS: Added some new TO-DO items. - -Mon Nov 07 10:23:09 2005 Nanbor Wang - - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Fixed - incorrect usage of extracting a struct from an any. Thanks much - to Gan for helping with the debugging effort. - - * examples/Hello/descriptors/rt_run_test.pl: - * examples/Hello/descriptors/rt-example.cdp: Enabled the use of RT - policy sets and RT-enabled NodeApplication in the example by - default. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: Minor enhancement to - the debug messages. - -Fri Nov 04 16:44:29 2005 Gan Deng - - * DAnCE/NodeApplicationManager/ImplementtionInfo.cpp - - Changed to use the "copying" version of the Any insertion - operator. Thanks Jeff Parsons for the help on this. - -Thu Nov 03 15:34:39 2005 Gan Deng - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - - Fixed a bug which causes unknow exception when calling - startLaunch on NodeApplicationManager. - -Thu Nov 3 19:36:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Fixed implicit conversion warning in VxWorks build - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - Renamed global variable count to counter to fix clash with STL count - algoritm on VxWorks - -Thu Nov 03 11:14:52 2005 Nanbor Wang - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: Added a tad more and - improve existing debugging print out. - - * examples/Hello/descriptors/rt-example.cdp: - * examples/Hello/descriptors/rt-config-example.csr: - * examples/Hello/descriptors/rt_run_test.pl: Changed to use a - simpler version of DeploymentPlan for the test for now. - -Wed Nov 02 19:28:14 2005 Gan Deng - - * tools/Config_Handlers/RT-CCM/CB_Handler.cpp - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - - Fixed some bugs related to populating/displaying ServerResource - data structure. - -Wed Nov 02 14:55:14 2005 Nanbor Wang - - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Fixed strings - comparisons syntax. - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.h: Added a new - print_resource method and a bunch of debugging print out to help - debugging XML parsing and propagating. - - * examples/Hello/descriptors/RTsvc.conf: - * examples/Hello/descriptors/rt_run_test.pl: Added a RTsvc.conf - file to start up the NodeApplication in RT mode. - - * examples/Hello/descriptors/rt-config-example.csr: Made RT - resource definitions more realistic and added a new policy set - for debugging XML parsing. - -Wed Nov 02 07:09:10 2005 Nanbor Wang - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: Fixed - usage of strings. - -Tue Nov 01 22:41:04 2005 Nanbor Wang - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: Changed to - insert policy set name into ContainerPolicySet property instead - of the actual policy since we already have the policy set - definitions when creating the NodeApplication. - -Tue Nov 01 13:44:58 2005 Nanbor Wang - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.h: - * DAnCE/NodeApplication/RTConfig_Manager.inl: - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: - * DAnCE/NodeApplication/RTNodeApp_Configurator.h: Integrated - RTConfig_Manager with the RTNodeApp_Configurator. - -Mon Oct 31 22:37:42 2005 Nanbor Wang - - * DAnCE/NodeApplication/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.h: - * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.inl: - Added the RT configuration manager that keep track of all the RT - resources and policy sets in a NodeApplication. We still need - to hook this up in the RTNodeApp_Configurator. - -Mon Oct 31 11:22:41 2005 - - * examples/Hello/descriptors/rt-config-example.csr - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - - Fixed the descriptor by adding the server resource id tag. - -Sun Oct 30 22:49:52 2005 Nanbor Wang - - * DAnCE/NodeManager/Node_Manager.cpp: Fixed missing -a Get_Opt - parameter and usage text. "-a" is used to set the optional - command line flags for the NodeApplication. The logic was there - in the Get_Opt loop but the Get_Opt object was not set to parse - the flag and the usage text for Node_Manager didn't mention the - flag either. - - Eventually, the optional command line flags should really come - from the ServerResource XML file. - - * NodeApplicationManager/NodeApplicationManager_Impl.cpp: Added a - missing space to separate optional command line flags from the - default ones. The old one worked only when no optional - commandline flags are presented. - - * ciao/Deployment_Core.idl: Removed "init" method from the - Container interface since it is really implementation specific. - - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/Container_Impl.h: Changed the signature of - init method to take a PolicyList pointer directly since this is - what we really need to initialize a container. - - * DAnCE/NodeApplication/Configurator_Factory.h: Added comments - documentating how we should really support multiple external - configurator module and how it could be done. - - * DAnCE/NodeApplication/Configurator_Factory.cpp: Changed DLL open - to not closing down the DLL handle on exit. Otherwise, - NodeApplication can not shut down cleanly. - - * DAnCE/NodeApplication/NodeApp_Configurator.h: Commented on the - potential need for a finalizer method, or two. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: Added actual - hooks to process optional policies for RT support. - - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Added code to - parse the optional properties and manipulate RT resources and - policies. - -Sun Oct 30 10:27:27 2005 Nanbor Wang - - * DAnCE/NodeApplication/Configurator_Factory.cpp: Fixed a typo in - command line option flag. - -Fri Oct 28 12:30:06 2005 William Otte - - * DAnCE/NodeApplication/Configurator_Factory.cpp - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - - Scoreboard fixes. - -Thu Oct 27 21:06:39 2005 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - - Added support for indentation of function arguments. - -Thu Oct 27 00:29:11 2005 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeApplicationManager/ImplementationInfo.h - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - - Fixed some compilation and linking errors shown on the scoreboard, - particularly for Windows builds. - -Thu Oct 27 07:16:12 UTC 2005 Johnny Willemsen - - * rules.ciao.GNU: - When cmd is the shell, use a different way to get the CIAO versions - needed for building with VxWorks 5.5 with Windows as host - -Wed Oct 26 23:07:59 UTC 2005 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added backend support for the frontend features added by - Boris in - - Tue Oct 25 14:08:44 2005 Boris Kolpackov . - -Wed Oct 26 16:16:32 2005 Nanbor Wang - - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: - * DAnCE/NodeApplication/NodeApp_Configurator.h: Updated the - NodeApp_Configurator to support pre_orb_initialize and - post_orb_initialize methods which will be invoked before and - after ORB_init is called. - - * DAnCE/NodeApplication/NodeApplication.cpp: Moved ORB_init into - NodeApplication_Core object. - - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - * DAnCE/NodeApplication/NodeApplication_Core.h: - * DAnCE/NodeApplication/NodeApplication_Core.inl: Moved the - NodeApplication_Options and NoOp_Configurator classes into - Configurator_Factory.* file. Refactored NodeApplication_Core to - enable pre_orb_initialize and post_orb_initialize. - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - * DAnCE/NodeApplication/Configurator_Factory.h: Factored all the - NodeApp_Configurtor creation strategies and NodeApplication - configuration managements into these files. It also includes - the no-ops NodeApp_Configurator used by non-RT NodeApplication. - - We should extend the argument parsing logic to support - user-supplied NodeApp_Configurator at some point. - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/RTNA_Configurator_Export.h: - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: - * DAnCE/NodeApplication/RTNodeApp_Configurator.h: Added the - dynamic library for real-time configuration. The current - implementation set up the NodeApplication process by enabling - the RTCORBA support. We still need to add the capability to - parse and allocate RT resources and policies. - -Wed Oct 26 18:37:00 2005 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticGraph/Array.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: - * CCF/CCF/IDL2/SemanticGraph/String.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - - Corrected a left/right node mismatch in - type-arguments->specialization relation. - -Wed Oct 26 16:37:26 2005 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - - Clear array type before starting sequence, string, etc., - declarations. - -Tue Oct 25 14:08:44 2005 Boris Kolpackov - - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Array.cpp: - * CCF/CCF/IDL2/SemanticGraph/Array.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: - * CCF/CCF/IDL2/SemanticGraph/String.cpp: - * CCF/CCF/IDL2/SemanticGraph/String.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - * CCF/CCF/IDL2/Traversal/Array.cpp: - * CCF/CCF/IDL2/Traversal/Array.hpp: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL2/Traversal/IntExpression.hpp: - * CCF/CCF/IDL2/Traversal/Sequence.cpp: - * CCF/CCF/IDL2/Traversal/Sequence.hpp: - * CCF/CCF/IDL2/Traversal/String.cpp: - * CCF/CCF/IDL2/Traversal/String.hpp: - - Implemented the second part of the const expression support. - This includes bounded sequences, strings, and arrays. - -Mon Oct 24 09:36:28 2005 Venkita Subramonian - - * docs/static_dance.html: - - Corrected minor error with display of figures. - -Mon Oct 24 08:10:29 2005 Venkita Subramonian - - * DAnCE/NodeApplication/NodeApplication_Impl.{h,inl,cpp}: - * DAnCE/NodeApplication/Container_Impl.{h,inl,cpp}: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{cpp,inl,h}: - * DAnCE/NodeManager/NodeManager_Impl.{cpp,h}: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/StaticConfigurator/README: - * DAnCE/StaticConfigurator/StaticDAnCEParser.{cpp,mpc}: - * DAnCE/StaticConfigurator/StaticDAnCEApp.{cpp.tmpl,mpc.tmpl}: - * docs/static_dance.html: - * docs/imgs/dance_arch.{vsd,jpg}: - * docs/imgs/static_dance_arch.{vsd,jpg}: - * docs/imgs/static_dance_impl.{vsd,jpg}: - - Added Static D&C capability to CIAO. See - $CIAO_ROOT/docs/static_dance.html for further details. - -Fri Oct 21 13:58:13 2005 William Otte - - * tools/Config_Handlers/DynAny_Handler.mpc - - Modified to make this not build on systems built with minimum - corba. - -Fri Oct 21 09:56:10 2005 Nanbor Wang - - * DAnCE/RTNodeApplication/RTNodeApplication.mpc: Removed the MPC - file to prevent it from being built. - - * DAnCE/RTNodeApplication/REAME: Stated the directory has been - depricated. - -Fri Oct 21 13:11:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Fixed unitialized warnings - -Fri Oct 21 10:04:12 UTC 2005 Johnny Willemsen - - * DAnCE/Old_Config_Handlers/Process_Element_T.cpp: - Fixed 64bit warnings - -Thu Oct 20 09:07:21 2005 Nanbor Wang - - * DAnCE/NodeApplication/NodeApp_Configurator.{h,cpp}: - Actually, destructors can be pure virtual. They just can't be - defined in header files. - -Thu Oct 20 09:45:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApp_Configurator.{h,cpp}: - Destructor can't be pure virtual - -Wed Oct 19 15:03:56 2005 Nanbor Wang - - These changes are made to add support for RT-capable - NodeApplication. - - * ciao/CCM_Core.mpc: - * ciao/Container_Impl.h: - * ciao/Container_Impl.inl: - * ciao/Container_Impl.cpp: - * ciao/NodeApplication_Impl.h: - * ciao/NodeApplication_Impl.inl: - * ciao/NodeApplication_Impl.cpp: Moved NodeApplication and - Container interface implementations under DAnCE/NodeApplication/ - subdir. They are coupled with NodeApplication implementation - now. - - * DAnCE/NodeApplication/NodeApplication.mpc: Changed to - incorporate the following files/changes. - - * DAnCE/NodeApplication/NodeApp_Configurator.h: - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: Added abstract, - base NodeApp_Configurator class to define the interface for - configuring NodeApplication internal. - - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/NodeApplication/Container_Impl.inl: - * DAnCE/NodeApplication/Container_Impl.cpp: Moved from ciao/ - subdir. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.inl: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: Changed to - depend on a concrete NodeApp_Configurator to perform the - configuration. - - * DAnCE/NodeApplication/NodeApplication_Core.h: - * DAnCE/NodeApplication/NodeApplication_Core.inl: - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - * DAnCE/NodeApplication/NodeApplication.cpp: Restructured the - NodeApplication implementation so that the ORB event loop can be - run on the main thread or on a separate thread, using the FIFO - scheduling class. - - A new create_configurator method in NodeApplication_Core will - create the "right" concrete configurator based on the command - line flags. We will support a RT configuration soon. - Currently, there's only a NoOp_Configurator for running - NodeApplication without RT support. - - We will add the RT configuration as a dynamic library and will - hook it up via ACE_DLL in a few days. - -Tue Oct 18 16:50:24 2005 William Otte - - * NEWS - - Updated release notes. - -Mon Oct 17 13:21:59 2005 William Otte - - * docs/schema/ccd.xsd - - Updated to work with expected format for Repoman/ComponentPackager - -Fri Oct 14 17:22:59 2005 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - - Regerated with new version of XSC which implements some heavy - optimizations. - -Fri Oct 14 14:11:12 UTC 2005 Johnny Willemsen - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - Removed not needed ; - -Thu Oct 13 15:42:12 2005 William Otte - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp - - Various compile fixes for Borland. - - * tools/Config_Handlers/XMLSchema/Types.hpp - - Modified to use ACE typedefs for number types. - - * tools/Config_Handlers/XSCRT/Elements.hpp - - Removed unneeded non-const conversion operator which was causing - errors in Borland. - -Wed Oct 12 14:13:09 2005 William Otte - - * examples/Hello/Sender/Sender.idl - * examples/Hello/Sender/Sender_exec.cpp - * examples/Hello/Sender/Sender_exec.h - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp - - Example of initializing enumerated attributes. - -Wed Oct 12 15:08:31 UTC 2005 Jeff Parsons - - * tools/Config_Handlers/RT-CCM/TP_Handler.cpp: - - Changed the types of some static_casts on the rhs of - assignments to match the types on the lhs, eliminating - warnings from MSVC 7.1. - -Wed Oct 12 13:17:58 UTC 2005 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - - Removed generation of error message with code that attempts - to set an enum attribute value, and replace it with code - that extracts the enum value from the Any arguement. - -Wed Oct 12 08:38:12 UTC 2005 Johnny Willemsen - - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h: - Fixed fuzz check - -Tue Oct 11 16:37:01 2005 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Fixed a bug which broke the gaurantee that element order in the - XSC type would be the same as the element order in the instance - document. - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - - Fixed a runtime error and removed some debugging information. - -Mon Oct 10 17:37:20 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu - - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp - - reverted a change we made earlier to accomodate older verisons of ZZIPLIB - - -Mon Oct 10 15:46:57 2005 William Otte - - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp - - Trivial corrections for portability problems. - - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc - - Updated to properlly use base projects. - -Mon Oct 10 20:07:39 UTC 2005 Jeff Parsons - - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DynAny_Handler.mpc: - - Add export files to projects, and removed redundant - base projects. - - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp: - - Changed some static casts on the rhs of assignments to types - corresponding to the lhs, elminating warnings on MSVC 7.1. - -Mon Oct 10 15:05:00 2005 William Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/cdd.xsd - - Checking in some updated schema for domain information. - -Mon Oct 10 13:53:15 2005 Will Otte - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/DynAny_Handler.mpc - * tools/Config_Handlers/IDREF_Base.h - * tools/Config_Handlers/XSC_XML_Handlers_Export.h - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h - * tools/Config_Handlers/RT-CCM/CB_Handler.h - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - * tools/Config_Handlers/RT-CCM/CLA_Handler.h - * tools/Config_Handlers/RT-CCM/OC_Handler.h - * tools/Config_Handlers/RT-CCM/OR_Handler.h - * tools/Config_Handlers/RT-CCM/PM_Handler.h - * tools/Config_Handlers/RT-CCM/PS_Handler.h - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc - * tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - * tools/Config_Handlers/RT-CCM/TPL_Handler.h - * tools/Config_Handlers/RT-CCM/TP_Handler.h - * tools/Config_Handlers/RT-CCM/input.csr - * tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h - * tools/Config_Handlers/Utils/Utils.mpc - * tools/Config_Handlers/Utils/XML_Error_Handler.h - * tools/Config_Handlers/Utils/XML_Helper.h - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h - - Fixed messy export macro usage. This will clean up builds on - Windows. - -Sun Oct 9 19:22:44 CDT 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu - - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc - - Fixing a few includes after Will Otte's latest changes. - - -Sun Oct 9 09:51:41 2005 William Otte - - * tools/Config_Handlers/DynAny_Handler.mpc - - Moved this file down a level to make MPC stop complaining. - -Fri Oct 7 18:22:40 2005 William Otte - - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - - *Hopefully* fix compile problem on Windows. - -Fri Oct 7 18:25:11 2005 Will Otte - - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - - Fix runtime error. - -Fri Oct 7 16:18:40 2005 Will Otte - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h - - Fix for a compile problem. - -Fri Oct 7 14:25:09 2005 William Otte - - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h - * tools/Config_Handlers/Any_Handler.cpp - - Add support for using Dynamic Any. This will evolve in the coming - weeks into more complete support for complex types. - - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/ADD_Handler.h - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CCD_Handler.h - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.h - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/IDD_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.h - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.h - - Optimization made possible by improvements in XSC. - -Fri Oct 7 14:20:36 2005 Jaiganesh B - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added more debug statements. - -Fri Oct 7 19:14:29 UTC 2005 Jeff Parsons - - * CIAO-INSTALL.html: - - Updated CIDL compiler section with instructions for building - the CIDL compiler using MPC. - -Fri Oct 7 18:46:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.{h,inl}: - Removed inl file, it is empty - - * DAnCE/ExecutionManager/ExecutionManager_Impl.inl: - Removed, empty - -Thu Oct 6 16:52:21 2005 Jaiganesh B - - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added more debug statements and comments. - -Thu Oct 6 16:11:56 2005 Jaiganesh B - - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Added more debug statements and also comments in the code. - -Thu Oct 6 15:32:41 CDT 2005 Stoyan Paunov spaunov@isis.vanderbilt.edu - - * DAnCE/spec_RepositoryManager/PC_Updater.cpp - * DAnCE/spec_RepositoryManager/PC_Updater.h - * DAnCE/spec_RepositoryManager/PC_Updater_T.cpp - * DAnCE/spec_RepositoryManager/PC_Updater_T.h - - Added these files which implement a PackageConfiguration visitor. - The visitor helps deal with the internal complexity of the PackageConfiguration - and helps preseve my sanity ;) - - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h - - Some more code. With this the package distribution part of the RM - is ready. I still need to clean up a few details. This is coming soon. - - -Thu Oct 6 15:05:30 2005 Jaiganesh B - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Added debug statements and comments. - -Thu Oct 6 14:26:31 2005 Jaiganesh B - - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/Plan_Launcher/DAM_Map.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * ciao/Container_Impl.cpp: - * ciao/NodeApplication_Impl.cpp: - * ciao/Servant_Activator.cpp: - - Fixed the debug statements to look for critical levels - no more than 9. - -Thu Oct 6 14:00:16 2005 Jaiganesh B - - * ciao/Container_Base.cpp: - * ciao/Container_Impl.cpp: - - Added debug messages and comments. - -Thu Oct 6 12:30:40 2005 Jaiganesh B - - * ciao/NodeApplication_Impl.cpp: - - Added debug messages and comments. - -Thu Oct 6 08:00:12 UTC 2005 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Fixed compile problems - -Wed Oct 5 17:42:24 2005 William Otte - - * tools/Config_Handlers/Any_Handler.cpp - - Part of previous commit. - -Wed Oct 5 17:07:07 2005 William Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/cdd.xsd - - Moved recursive Domain data into cdd.xsd. This will hopefully - lessen the time required to compile. - - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/DataType_Handler.cpp - - Fixed some potential run-time bugs in Borland. Style - corrections. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/test.cdp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - - Regerated with new version of XSC. Major changes: - * Now only one accessor and one mutator per document element - * Changes in schema above. - -Wed Oct 5 14:44:31 2005 Jaiganesh B - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - - Added some debug statements and some optimization choices. - -Tue Oct 4 14:08:24 2005 William Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/unused_elements.xsd - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - - Updated to include domain information (ie, bridge, interconnect). - - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - - Cosmetic changes. - -Mon Oct 3 14:27:39 2005 William Otte - - * CIAO-INSTALL.html - - Updated install documentation to reflect the restructuring. - -Mon Oct 3 12:48:26 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Commented out some debugging information. - -Mon Oct 3 15:44:15 UTC 2005 Jeff Parsons - - * docs/Purify.html: - - Updated doc file with installation info and more info about - Purifying a spawned child process. - -Mon Oct 3 10:14:19 2005 William Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Corrected a bug in parameter checking. - - * DAnCE/NodeManager/Node_Manager.cpp - - Added documentation for the -d command line options. - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - - New functionality in the Config_Handlers. - -Mon Oct 3 10:00:08 2005 William Otte - - * bin/valgrind_nodedaemon.py - - Script to help launch nodemanager/nodeapplication under Valgrind. - -Mon Oct 3 000:31:09 UTC 2005 Jeff Parsons - - * docs/Purify.html: - - New file, documenting the use of Purify with CIAO and DAnCE. - -Sun Oct 2 22:24:15 UTC 2005 Jeff Parsons - - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - - Added include of RT-CCM/CIAOServerResources.hpp. - - * tools/Config_Handlers/DP_Handler.cpp: - - Added export macros to friend function declarations. - -Sat Oct 1 15:38:23 2005 William Otte - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/test.cpp - - Corrected the config handler test to properly test the handlers. - - * tools/Config_Handlers/PSPE_Handler.cpp - - Fixed a run-time bug that was causing corrupted plans in Borland - builds. - -Friday Sep 30 15:12:43 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc - * RACE/Planner_Manager/Component/Planner_Manager.mpc - * tests/IDL3/ImpliedIDL/All/all.mpc - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Fixes for compile problems in Borland6 - -Fri Sep 30 15:11:47 2005 Gan Deng - - * NEWS - - Updated the NEWS file. - -Fri Sep 30 07:53:47 2005 William Otte - - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp - - Should have been part of the previous commit. - -Thu Sep 29 18:11:25 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * ciao/Container_Impl.cpp - * ciao/NodeApplication_Impl.cpp - * ciao/Upgradeable_Context_Impl_T.cpp - - Fuzz errors. - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * tools/Config_Handlers/RT-CCM/Config_Handlers_Export.h - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - * tools/Config_Handlers/Utils/Config_Handlers_Export.h - - Correction for a emulated exception error. - -Thu Sep 29 13:01:23 2005 William Otte - - * ciao/Version.h - - Corrected the version number. - -Thu Sep 29 11:34:55 2005 William Otte - - * ciao/Swapping_Servant_Home_Impl_T.cpp - - Fixed build problem on non-exception systems. - -Thu Sep 29 07:28:12 UTC 2005 Johnny Willemsen - - * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp: - Fixed not used argument warning - -Thu Sep 29 06:44:12 UTC 2005 Johnny Willemsen - - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h: - Added missing pre.h - -Wed Sep 28 16:44:39 2005 Gan Deng - - * docs/schema/CIAOServerResources.xsd - - Updated to support RT-CCM. - -Wed Sep 28 14:44:39 2005 William Otte - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - New version of the XSC including additional features needed for - RT-CCM. - -Wed Sep 28 08:24:32 2005 William Otte - - * tools/Config_Handlers/Utils/Utils.mpc - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h - - Implemented a schema resolver so that the XML parser till grab the - schemata from $CIAO_ROOT/docs/schema. - - * docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd - * docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd - * examples/BasicSP/descriptors/Deployment.xsd - * examples/Display/descriptors/Deployment.xsd - * examples/Display/descriptors/Modified_Deployment.xsd - * examples/Hello/descriptors/Deployment.xsd - * examples/Hello/descriptors/Modified_Deployment.xsd - * examples/Hello/descriptors/XMI.xsd - * examples/Hello/descriptors/Deployment.xsd - * examples/Hello/descriptors/Modified_Deployment.xsd - * examples/Hello/descriptors/XMI.xsd - - Removed obsolete schemata. - - * examples/Display/descriptors/flattened_deploymentplan.cdp - * examples/Hello/descriptors/flattened_deploymentplan.cdp - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp - * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp - - Migrated these deployment plans to use Deployment.xsd and friends, - instead of Modified_Deployment.xsd. - - * NEWS - - Updated the NEWS to include this feature. - -Tue Sep 27 13:16:43 2005 William Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/Old_Config_Handlers/Config_Handlers.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/RTNodeApplication/RTNodeApplication.mpc - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc - * RACE/Output_Adapters/Base/Output_Adapter.mpc - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc - * ciao/CCM_Core.mpc - * examples/BasicSP/BasicSP.mpc - - Fixed a large number of deficiencies in our build structure. - More changes to come later. - -Tue Sep 27 11:10:37 2005 William Otte - - * NEWS - - Updated the news file. - -Tue Sep 27 10:51:20 2005 William Otte - - * bin/generate_component_mpc.pl - - Updated this script to bring it in line with modern CIAO. This - includes: - - - Base projects are now the _dnc variants - - Export files are now automatically generated. - -Tue Sep 27 14:26:44 2005 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/SemanticAction/Const.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/CIDL/Parser.cpp: - - Implemented first part of the const expression support. This - includes parser rules, semantic graph types and semantic - actions. Traversal types are still to be implemented. - -Tue Sep 27 06:42:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Fixed compile problem - - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp: - Removed using std::make_pair, this causes a crash of the BCB6 - compiler. It doesn't seem to cause issues with CBX, but it - seems the code wasn't really needed and now BCB6 is also happy - -Mon Sep 26 11:06:40 2005 William Otte - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - - Updates for compile problems in Borland. - -Mon Sep 26 11:06:40 2005 William Otte - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Cleared up some scoreboard errors. - -Sat Sep 24 20:44:20 2005 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * tools/Config_Handlers/Config_Handlers.mpc - - Fixed linking errors. - -Sat Sep 24 08:40:12 UTC 2005 Johnny Willemsen - - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc: - Added Id tag - -Sat Sep 24 02:37:20 2005 Gan Deng - - * ciao/Deployment.idl - * ciao/Deployment_Core.idl - * ciao/ServerResources.idl - - Enhanced to support RT-CCM feature. - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.h - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - - Refactor the NodeApplicationManager to populate the correct - node level deployment plan info, while taking into account - of the RT-CCM feature. - - * ciao/NodeApplication_Impl.cpp - * ciao/NodeApplication_Impl.h - - Modified to accomodate the change in IDL files. - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp - - Fixed these tests to make them run with the modified IDL - files. - - * DAnCE/examples/Hello/descriptors/rt-config-example.csr - * DAnCE/examples/Hello/descriptors/rt-config-example.cdp - - An example descriptor files to describe server resource, - and associate server resources and policy set defs with - the deployment plan. - - NOTE: All above code are tested working fine with the existing - examples. - -Fri Sep 23 10:05:18 2005 William Otte - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - * tools/Config_Handlers/Config_Handlers.mpc - - fixes for build problems. - -Thu Sep 22 16:21:12 2005 Gan Deng - - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Added error report message from the tool. - - * ciao/Container_Base.cpp - - Cosmetic change. - -Thu Sep 22 14:45:32 2005 William Otte - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/STD_CID_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.h - * tools/Config_Handlers/STD_CPD_Handler.cpp - * tools/Config_Handlers/STD_CPD_Handler.h - * tools/Config_Handlers/STD_PCD_Handler.cpp - * tools/Config_Handlers/STD_PCD_Handler.h - * tools/Config_Handlers/STD_PC_Intf.cpp - * tools/Config_Handlers/XML_File_Intf.cpp - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc - - Made these files consistent with the new Utils directory. - - * tools/Config_Handlers/Utils/Utils.mpc - * tools/Config_Handlers/Utils/XML_Error_Handler.cpp - * tools/Config_Handlers/Utils/XML_Error_Handler.h - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - * tools/Config_Handlers/Utils/XercesString.cpp - * tools/Config_Handlers/Utils/XercesString.h - - Moved common XML utilities to a separate directory. - -Thu Sep 22 13:21:12 2005 Gan Deng - - * ciao/CCM_Core.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc - - Put the ServerResources.idl into Deployment_stub project. Modified - other MPC project files to reflect this change. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Pass the infoProperty which contains the entire server resource - definitions to each individual child deployment plans. - - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - - NodeManager now validates the correctness of the individual local - dpeloyment plan. In particular, it tries to verify that all the - component instances within this child deployment plan have the same - "server_resource_id" assigned. - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp - - Added a NodeApplication test case, where multiple components could - be installed one-by-one through a serious of "install" invocations. - - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp - - Fixed a typo. - - - -Thu Sep 22 12:26:45 CDT 2005 Stoyan spaunov@isis.vanderbilt.edu - - * DAnCE/spec_RepositoryManager/ - * DAnCE/new_RepositoryManager/ - - Added the former, removed the latter. - - -Thu Sep 22 10:50:45 CDT 2005 Stoyan spaunov@isis.vanderbilt.edu - - - * DAnCE/spec_RepositoryManager/HTTP_Client.cpp - * DAnCE/spec_RepositoryManager/HTTP_Client.h - * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp - * DAnCE/spec_RepositoryManager/HTTP_Handler.h - * DAnCE/spec_RepositoryManager/Options.cpp - * DAnCE/spec_RepositoryManager/Options.h - * DAnCE/spec_RepositoryManager/README.txt - * DAnCE/spec_RepositoryManager/RepositoryManager.cpp - * DAnCE/spec_RepositoryManager/RepositoryManager.idl - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h - * DAnCE/spec_RepositoryManager/RMadmin.cpp - * DAnCE/spec_RepositoryManager/RM_Helper.cpp - * DAnCE/spec_RepositoryManager/RM_Helper.h - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc - * DAnCE/spec_RepositoryManager/spec_RepositoryManager.ncb - * DAnCE/spec_RepositoryManager/URL_Parser.cpp - * DAnCE/spec_RepositoryManager/URL_Parser.h - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h - - - Checked in these file and cleaned up *some* of the underlying mess due to previous - mix-ups. Many of the files are new. Some are newer versions of older files. - Previously there were 2 RM directories spec_RepositoryManager and - new_RepositoryManager. Someone had removed the spec* verion and checked in the - wrong files in the new* version (which used to be a non-spec compilent impl). - Apparently on top of that the two directories have been linked somehow! I will - check on what the reason for this is later. - - -Thu Sep 22 13:15:28 UTC 2005 Jeff Parsons - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Fixed typo. - -Wed Sep 21 15:32:38 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication.cpp - * DAnCE/RTNodeApplication/NodeApplication_Task.cpp - * DAnCE/RepositoryManager/Repository_Manager.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp - * ciao/Container_Base.cpp - * ciao/Container_Impl.cpp - * ciao/Servant_Activator.cpp - * ciao/Servant_Impl_T.cpp - * ciao/Swapping_Container.cpp - * ciao/Swapping_Servant_Home_Impl_T.cpp - * ciao/Upgradeable_Context_Impl_T.cpp - * docs/templates/CIAO_Glue_Session_Template.cpp - * examples/Hello/Sender/Sender_exec.cpp - * examples/Swapping/Receiver/Receiver_exec.cpp - * examples/Swapping/Sender/Sender_exec.cpp - * examples/Swapping/Sender/Sender_exec_1.cpp - * examples/Swapping/Sender/Sender_exec_2.cpp - - Fixed numerous emulated exception errors. - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - - removed obsolete EM implementation. - -Wed Sep 21 13:34:28 2005 Gan Deng - - * tools/Config_Handlers/RT-CCM/test.cpp - - Modified so the output XML file is based on the XSC dom document - instead from the input file directly. - -Tue Sep 20 21:58:23 UTC 2005 Jeff Parsons - - * tests/IDL3/ImpliedIDL/All/convert.idl: - - Modified valuetype declartion used as a primary key to - conform to the CCM spec section 61.7.2.1 listing - constraints on primary key types. - -Tue Sep 20 02:25:34 2005 William Otte - - * tools/Config_Handlers/Config_Handlers.mpc - - Quick fix for a build problem on Windows. A better solution - will follow when I check in my CIAO build system revamp. - -Tue Sep 20 10:19:46 2005 William Otte - - * tools/Config_Handlers/test.cdp - - A test deployment plan file that contains odd constructs. - Used for testing. - -Tue Sep 20 10:07:43 2005 William Otte - - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc - - Added a missing library. - -Tue Sep 20 09:50:28 2005 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to kill all NodeApplication processes when the deployment fails. - -Tue Sep 20 09:35:28 2005 William Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Added a missing library. - -Mon Sep 19 16:29:57 2005 William Otte - - * ADD_Handler.cpp - * Common.h - * IDD_Handler.cpp - * IDD_Handler.h - * IDREF_Base.cpp - * IDREF_Base.h - * IRDD_Handler.cpp - * IRDD_Handler.h - * MDD_Handler.cpp - * PSPE_Handler.cpp - * STD_CID_Handler.cpp - * XML_Error_Handler.cpp - - Added some improved error handling/reporting. Much more to come. - - * test.cpp - * RT-CCM/RT-CCM-Handlers.mpc - * RT-CCM/SRD_Handler.cpp - * RT-CCM/SRD_Handler.h - * Config_Handlers.mpc - * DP_Handler.cpp - - Added hooks for parsing ServerResources document into a deployment - plan. - - This is activated by adding an InfoProperty with name - "CIAOServerResources" with a value of a valid CSR file. - - Also enabled parsing of deployRequirements and infoProperties. - -Mon Sep 19 10:55:05 2005 William Otte - - * RACE/Input_Adapters/Base/Input_Adapter.mpc - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc - * RACE/Output_Adapters/Base/Output_Adapter.mpc - * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc - * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc - * RACE/Planner_Manager/Component/Planner_Manager.mpc - * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc - * RACE/Planners/Base/Planner.mpc - * RACE/Planners/Interface/Planner_Interface.mpc - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc - * RACE/common/RACE_common.mpc - * tools/Config_Handlers/RT-CCM/CLA_Handler.h - * tools/Config_Handlers/RT-CCM/OC_Handler.cpp - * tools/Config_Handlers/RT-CCM/OR_Handler.cpp - * tools/Config_Handlers/RT-CCM/OR_Handler.h - - Misc fuzz fixes. - -Fri Sep 16 09:54:44 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Emulated exception fixes. - -Thu Sep 15 07:29:03 2005 Douglas C. Schmidt - - * TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat: Make sure - there's a newline at the end of this file. Thanks to Zachi - Klopman for reporting this. - -Thu Sep 15 11:20:20 2005 CSET William Otte - - - * ciao/Container_Base.cpp - - Fix for compile error on platforms with emulated exceptions. - -Wed Sep 14 13:25:00 CEST 2005 William Otte - - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc - - Fix for a library ordering problem. - -Wed Sep 14 11:18:42 2005 CEST William Otte - - * tools/Config_Handlers/CIAOServerResources.cpp - * tools/Config_Handlers/CIAOServerResources.hpp - - Removed these from the repo to avoid confusion. - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Ported patches from: - Tue Sep 13 17:18:12 CEST 2005 William Otte - - which were made against the wrong file. Thanks to Gan Deng for - pointing this out. - -Wed Sep 14 13:28:14 2005 Gan Deng - - * examples/Hello/descriptors/run_NodeDaemons.pl - - Modified the relevant path due to the recent CIAO directory - reorganization. - - * examples/Hello/Sender/Sender.idl - * examples/Hello/Sender_exec.cpp - * examples/Hello/starter.cpp - - Added test for "readonly" attribute. - Fixed a bug of setting attribute through command line options - through the "starter" executable. Also, make the default ior - file name to be "Sender.ior" to make it consistent with the - output generated by DAnCE. Thanks Zacki - for reporting these. - - * examples/Hello/step-by-step.html - - Updated the documentation to run the example. - -Tue Sep 13 17:18:12 CEST 2005 William Otte - - * tools/Config_Handlers/CIAOServerResources.hpp - - Fixes for compile errors in: - . Especially strict C++ compilers - . Windows VC71 (hopefully) - -Tue Sep 13 17:05:31 2005 CEST William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - * ciao/Container_Base.cpp - * ciao/NodeApplication_Impl.cpp - - Folding in some of the error reporting work that I have been - working on for the past couple weeks. Most common deployment - errors are now reported through the plan_launcher. - -Tue Sep 13 16:55:15 CEST 2005 William Otte - - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.cpp - - Fixes for compile errors on both: - . 64 bit platforms - . GCC4 - -Tue Sep 13 16:01:35 CEST 2005 William Otte - - * tools/Config_Handlers/XMLSchema/Traversal.hpp - * tools/Config_Handlers/XMLSchema/TypeInfo.hpp - * tools/Config_Handlers/XMLSchema/Types.hpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - * tools/Config_Handlers/XSCRT/Elements.hpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp - * tools/Config_Handlers/XSCRT/Parser.hpp - * tools/Config_Handlers/XSCRT/Traversal.hpp - * tools/Config_Handlers/XSCRT/Writer.hpp - * tools/Config_Handlers/XSCRT/XML.hpp - * tools/Config_Handlers/XSCRT/XMLSchema.hpp - - Rolled back Stoyan's changes from the previous commit. The proper - fix for this problem would be to update the include paths in the - affected MPC files, which has the virtue of not breaking - builds on platforms with case-sensitive filesystems. - - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc - - Updated the include path to include the new config handlers directory. - -Mon Sep 12 17:34:47 CDT 2005 Stoyan Paunov - - * tools/Config_Handlers/XMLSchema/Traversal.hpp - * tools/Config_Handlers/XMLSchema/TypeInfo.hpp - * tools/Config_Handlers/XMLSchema/Types.hpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - * tools/Config_Handlers/XSCRT/Elements.hpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp - * tools/Config_Handlers/XSCRT/Parser.hpp - * tools/Config_Handlers/XSCRT/Traversal.hpp - * tools/Config_Handlers/XSCRT/Writer.hpp - * tools/Config_Handlers/XSCRT/XML.hpp - * tools/Config_Handlers/XSCRT/XMLSchema.hpp - - Fixed a number of problems related to Will's changes. The XSC_Config_Handler_Tests - project was not compiling. I had the same problem in RepositoryManager. Will had - changed the directory structure, but did not update any of the include paths. - Needless to say there were like 30-40 of those in the XSCRT and XMLSchema directories - -Fri Sep 9 12:35:20 2005 William Otte - - * tools/Config_Handlers/STD_IAD_Handler.cpp - * tools/Config_Handlers/STD_PCD_Handler.cpp - * tools/Config_Handlers/STD_PC_Intf.cpp - - Changed to comform with new refactoring. - -Fri Sep 9 12:32:14 2005 William Otte - - * ciao/CCM_Core.mpc - * ciao/Container_Base.cpp - * ciao/Deployment.idl - * ciao/Deployment_Core.idl - * ciao/Deployment_Data.idl - * ciao/Packaging_Data.idl - - Refactoring to support cidl compilation of deployment structures. - This refactoring should solve compilation errors in the config handlers. - -Wed Sep 7 16:31:12 UTC 2005 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Removed generation of export macro in the typedef of the - template class instantiation that defines a facet servant. - Thanks to Ossama Othman for - pointing out that typedefs need not be exported. - -Tue Sep 6 11:39:15 2005 William Otte - - * ciao/Deployment_Data.idl - - Commented out IDL that is unsupported by CIDLC. - - * RACE - - Added IDL for RACE. - -Tue Sep 6 09:58:12 2005 William Otte - - * examples/Hello/descriptors/run_test.pl - - Modified the script to fix the absolute path to the naming service - with a relative path. - -Fri Sep 2 17:38:31 2005 William Otte - - * performance-tests/Protocols/Controller/Controller.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * performance-tests/Protocols/common/Protocols.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - - Migrated to modern CIAO base projects. - -Fri Sep 2 16:41:08 2005 William Otte - - * performance-tests/Benchmark/Benchmark.mpc - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc - - Migrated to modern CIAO projects. - -Fri Sep 2 15:10:43 2005 William Otte - - * docs/tutorial - - Removed the obsolete hello tutorial. - -Fri Sep 2 15:04:00 2005 William Otte - - * tests/tests.mwc - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc - * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc - * tests/IDL3/Events/Abstract/Abstract.mpc - * tests/IDL3/Events/Regular/Regular.mpc - * tests/IDL3/Homes/Attributes/HomeAttributes.mpc - * tests/IDL3/Homes/Basic/Basic.mpc - * tests/IDL3/Homes/Factory/Factory.mpc - * tests/IDL3/Homes/Finder/Finder.mpc - * tests/IDL3/Homes/Inheritance/Inheritance.mpc - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc - * tests/IDL3/ImpliedIDL/Events/Events.mpc - * tests/IDL3/ImpliedIDL/Homes/Homes.mpc - * tests/IDL3/Lookup/lookup_test.mpc - - Updated to use dnc ciao base project. - - * tests/RTCCM - - Removed this test. - -Thu Sep 1 10:20:48 2005 William Otte - - CIAO Reorganization. Plese see tag before_ciao_reorg - to obtain the old version. - -Wed Aug 31 15:16:23 2005 William Otte - * DAnCE/Config_Handlers/RT-CCM/CB_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/PM_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/TPL_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/TP_Handler.cpp - - Fixes to satisfy a tempramental Borland compiler. - -Wed Aug 31 13:28:46 2005 William Otte - - * DAnCE/Config_Handlers/ADD_Handler.cpp - * DAnCE/Config_Handlers/ADD_Handler.h - * DAnCE/Config_Handlers/IDD_Handler.cpp - * DAnCE/Config_Handlers/IDD_Handler.h - * DAnCE/Config_Handlers/IDREF_Base.cpp - * DAnCE/Config_Handlers/IDREF_Base.h - * DAnCE/Config_Handlers/MDD_Handler.cpp - * DAnCE/Config_Handlers/MDD_Handler.h - * DAnCE/Config_Handlers/STD_CID_Handler.cpp - * DAnCE/Config_Handlers/STD_CID_Handler.h - - Simple refactoring to make the IDREF interface more generic. - - * DAnCE/Config_Handlers/XML_Helper.cpp - * DAnCE/Config_Handlers/XML_Helper.h - - Made empty document creation more generic. - - * DAnCE/Config_Handlers/RT-CCM/CB_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/CB_Handler.h - * DAnCE/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * DAnCE/Config_Handlers/RT-CCM/CIAOServerResources.hpp - * DAnCE/Config_Handlers/RT-CCM/CLA_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/CLA_Handler.h - * DAnCE/Config_Handlers/RT-CCM/OC_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/OC_Handler.h - * DAnCE/Config_Handlers/RT-CCM/OR_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/OR_Handler.h - * DAnCE/Config_Handlers/RT-CCM/PM_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/PM_Handler.h - * DAnCE/Config_Handlers/RT-CCM/PS_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/PS_Handler.h - * DAnCE/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc - * DAnCE/Config_Handlers/RT-CCM/SRD_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/SRD_Handler.h - * DAnCE/Config_Handlers/RT-CCM/TPL_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/TPL_Handler.h - * DAnCE/Config_Handlers/RT-CCM/TP_Handler.cpp - * DAnCE/Config_Handlers/RT-CCM/TP_Handler.h - * DAnCE/Config_Handlers/RT-CCM/input.csr - * DAnCE/Config_Handlers/RT-CCM/test.cpp - - The new RT-CCM handlers. These have yet to be integrated into the - main config_handler path. - - * DAnCE/ciao/CCM_Core.mpc - * DAnCE/ciao/ServerResources.idl - - Updates to the support the RT-CCM Handlers. - - * docs/schema/CIAOServerResources.xsd - - Corrected a few oversights. - -Wed Aug 31 09:49:28 2005 William Otte - - * DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp - - Workaround for a buggy Borland compiler. - -Tue Aug 30 14:33:08 2005 William Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - - Slight handcrafting to remove commas from the end of enumerator lists. - -Tue Aug 30 11:59:14 CDT 2005 William Otte - - * DAnCE/Config_Handlers/IRDD_Handler.h - * DAnCE/Config_Handlers/PCD_Handler.h - - Fixed a class/struct mismatch. - -Tue Aug 30 11:51:32 CDT 2005 William Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - * DAnCE/Config_Handlers/CIAOServerResources.cpp - * DAnCE/Config_Handlers/CIAOServerResources.hpp - * DAnCE/Config_Handlers/Deployment.cpp - * DAnCE/Config_Handlers/Deployment.hpp - * DAnCE/Config_Handlers/ccd.cpp - * DAnCE/Config_Handlers/ccd.hpp - * DAnCE/Config_Handlers/cdd.cpp - * DAnCE/Config_Handlers/cdd.hpp - * DAnCE/Config_Handlers/cdp.cpp - * DAnCE/Config_Handlers/cdp.hpp - * DAnCE/Config_Handlers/cid.cpp - * DAnCE/Config_Handlers/cid.hpp - * DAnCE/Config_Handlers/cpd.cpp - * DAnCE/Config_Handlers/cpd.hpp - * DAnCE/Config_Handlers/iad.cpp - * DAnCE/Config_Handlers/iad.hpp - * DAnCE/Config_Handlers/pcd.cpp - * DAnCE/Config_Handlers/pcd.hpp - * DAnCE/Config_Handlers/toplevel.cpp - * DAnCE/Config_Handlers/toplevel.hpp - - Fixes a large number of compiler warnings in Borland. - -Thu Aug 25 15:26:25 2005 Nanbor Wang - - * DAnCE/ciao/ServerResources.idl: Added the missing - attribute to ORS_ThreadpoolWithLanes struct. Thanks to Will - Otte for catching this. - -Wed Aug 24 20:41:59 UTC 2005 Jeff Parsons - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Removed commented-out code. - -Tue Aug 23 20:09:59 2005 Ossama Othman - - * DAnCE/Old_Config_Handlers/DT_Handler.h: - * DAnCE/RTNodeApplication/RTServer_Impl.h: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Context_Impl_Base.h: - * DAnCE/ciao/NodeApplication_Impl.h: - - Reordered include directives to make sure all necessary - non-dependent names are parsed before the templates that use - them. Addresses g++ 3.4.x or better compile-time errors. - -Tue Aug 23 19:29:12 UTC 2005 Johnny Willemsen - - * DAnCE/DeploymentManager/DeploymentManager.mpc: - Add dummy_label to all projects, this don't build, this is - the fast way to get the scoreboard green. Already one project - had this in the file. - -Mon Aug 22 10:59:18 2005 William Otte - - * DAnCE/DeploymentManager/DeploymentManager.cidl - * DAnCE/DeploymentManager/DeploymentManager.idl - * DAnCE/DeploymentManager/DeploymentManager.mpc - * DAnCE/DeploymentManager/DeploymentManager_Impl.cpp - * DAnCE/DeploymentManager/DeploymentManager_Impl.h - * DAnCE/DeploymentManager/DeploymentManager_exec_export.h - * DAnCE/DeploymentManager/DeploymentManager_stub_export.h - * DAnCE/DeploymentManager/DeploymentManager_svnt_export.h - - Preliminary skeleton for the DeploymentManager. - -Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/Any_Handler.cpp: - * DAnCE/Config_Handlers/DataType_Handler.cpp: - * DAnCE/Old_Config_Handlers/DT_Handler.cpp: - * DAnCE/ciao/ComponentsC.h: - * ciao/ComponentsC.h: - Updated for AnyTypeCode refactoring - -Tue Aug 16 15:16:10 2005 Nanbor Wang - - * docs/schema/CIAOServerResources.xsd: Changed to define most of - the RT policy details with "element"s instead of "attribute"s - since "attribute"s can be optional. Thanks to Will Otte for - pointing this out. - -Tue Aug 16 09:46:45 2005 William Otte - - * DAnCE/Config_Handlers/Config_Handlers.mpc - - Moved some changes in from the branch to correct errors from: - Mon Aug 15 12:03:43 2005 William Otte - -Mon Aug 15 12:03:43 2005 William Otte - - * DAnCE/Config_Handlers/ADD_Handler.cpp - * DAnCE/Config_Handlers/ADD_Handler.h - * DAnCE/Config_Handlers/CCD_Handler.cpp - * DAnCE/Config_Handlers/CCD_Handler.h - * DAnCE/Config_Handlers/CRDD_Handler.h - * DAnCE/Config_Handlers/DP_Handler.cpp - * DAnCE/Config_Handlers/DP_Handler.h - * DAnCE/Config_Handlers/DP_PCD_Handler.cpp - * DAnCE/Config_Handlers/DP_PCD_Handler.h - * DAnCE/Config_Handlers/IDD_Handler.cpp - * DAnCE/Config_Handlers/IDD_Handler.h - * DAnCE/Config_Handlers/IDREF_Base.cpp - * DAnCE/Config_Handlers/ID_Handler.h - * DAnCE/Config_Handlers/IRDD_Handler.cpp - * DAnCE/Config_Handlers/MDD_Handler.cpp - * DAnCE/Config_Handlers/MDD_Handler.h - * DAnCE/Config_Handlers/PCD_Handler.cpp - * DAnCE/Config_Handlers/PCD_Handler.h - * DAnCE/Config_Handlers/PSPE_Handler.cpp - * DAnCE/Config_Handlers/Req_Handler.cpp - * DAnCE/Config_Handlers/XML_Helper.cpp - * DAnCE/Config_Handlers/XML_Helper.h - * DAnCE/Config_Handlers/XercesString.cpp - * DAnCE/Config_Handlers/XercesString.h - * DAnCE/Config_Handlers/test.cpp - - Checked in support for IDL->XSC->XML mapping. Thanks to Lucas - Seibert for completing this work. - -Mon Aug 15 00:01:01 2005 Boris Kolpackov - - * CIDLC/cidlc.cpp: Made ErrorHandler auto-detach itself - from the stream when it is destroyed. This fixes the - segmentation fault on Solaris in libstdc++ termination code. - -Wed Aug 10 09:39:41 2005 William Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - * DAnCE/Config_Handlers/CIAOServerResources.cpp - * DAnCE/Config_Handlers/CIAOServerResources.hpp - * DAnCE/Config_Handlers/Deployment.cpp - * DAnCE/Config_Handlers/Deployment.hpp - * DAnCE/Config_Handlers/ccd.cpp - * DAnCE/Config_Handlers/ccd.hpp - * DAnCE/Config_Handlers/cdd.cpp - * DAnCE/Config_Handlers/cdd.hpp - * DAnCE/Config_Handlers/cdp.cpp - * DAnCE/Config_Handlers/cdp.hpp - * DAnCE/Config_Handlers/cid.cpp - * DAnCE/Config_Handlers/cid.hpp - * DAnCE/Config_Handlers/cpd.cpp - * DAnCE/Config_Handlers/cpd.hpp - * DAnCE/Config_Handlers/iad.cpp - * DAnCE/Config_Handlers/iad.hpp - * DAnCE/Config_Handlers/pcd.cpp - * DAnCE/Config_Handlers/pcd.hpp - * DAnCE/Config_Handlers/toplevel.cpp - * DAnCE/Config_Handlers/toplevel.hpp - - Regenerated with the latest CVS-head version of XSC. These support - a couple improvements that will aid in optimizing the config - handlers. - -Tue Aug 9 11:55:13 2005 Ming Xiong - - * docs/imgs/component-basic.png - * docs/imgs/CCM.vsd - - Updated CCM diagram to fix a interface naming error. - - -Tue Aug 9 10:02:13 2005 Douglas C. Schmidt - - * DAnCE/ComponentPackager/README.html: Improved the - documentation to point to the right directory for the Quoter - example. Thanks to Aldo Texier for - reporting this. - -Tue Aug 9 13:11:04 UTC 2005 Jeff Parsons - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - - Updated dependencies to reflect the recent name change from - NodeDaemon_stub to NodeManager_stub. - - * DAnCE/RepositoryManager/Repository_Manager.cpp: - - Updated identifier names to match the change from NodeDaemon - to ModeManager. - -Mon Aug 08 22:02:43 2005 Gan Deng - - * docs/EnvVars.html - * docs/index.html - * docs/Trace.html - * docs/imgs/DAnCE-Dynamic.png - * docs/imgs/DAnCE-Dynamic.sxd - - Beefed up the CIAO documentation page. These files are - checked in on behalf of Ming. Thanks Friedhelm Wolf - for contributing the DAnCE - interaction diagram. - -Mon Aug 8 18:50:36 2005 William Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeManager/NAM_Map.h - * DAnCE/NodeManager/NodeManager.idl - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.inl - * DAnCE/NodeManager/NodeManager_stub_export.h - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/NodeManager/README - * DAnCE/RTNodeApplication/README - - Changed all references to Node_Daemon to NodeManager to avoid - confusion, since these phrases are used interchangeably. - - * DAnCE/NodeManager/NodeDaemon.idl - * DAnCE/NodeManager/NodeDaemon.mpc - * DAnCE/NodeManager/NodeDaemon_Impl.cpp - * DAnCE/NodeManager/NodeDaemon_Impl.h - * DAnCE/NodeManager/NodeDaemon_Impl.inl - * DAnCE/NodeManager/NodeDaemon_stub_export.h - * DAnCE/NodeManager/Node_Daemon.cpp - - Removed these files to support the change above. - - * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl - * DAnCE/examples/Display/descriptors/basicNodeDaemon.pl - * DAnCE/examples/Hello/step-by-step.html - * DAnCE/examples/Hello/descriptors/run_NodeDaemons.pl - * DAnCE/examples/Hello/descriptors/run_test.pl - * DAnCE/examples/Hello/descriptors/run_test_without_ns.pl - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl - - Updated these scripts to call NodeManager instead of NodeDaemon. - -Fri Aug 5 11:45:13 2005 William Otte - - * DAnCE/Config_Handlers/CIAOServerResources.cpp - * DAnCE/Config_Handlers/CIAOServerResources.hpp - - XSC code generated from CIAOServerResources.xsd for RT-CCM - properties. - - * docs/schema/CIAOServerResources.xsd - - Fixed some namespace errors. - -Fri Aug 05 08:00:08 2005 Simon Massey - - * CIAO version 0.4.7 released. - -Wed Aug 3 12:34:12 UTC 2005 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Corrected order of the libraries to resolve static link - errors - -Tue Aug 2 08:36:40 2005 William Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Possiible fix for borlan build problem. - -Mon Aug 01 16:01:43 2005 Ming Xiong - - * ChangeLog - - Fixed several incorrect checkin date - -Mon Aug 01 14:55:43 2005 Ming Xiong - - * DAnCE/new_RepositoryManager/RepositoryManager_Impl.cpp - - Fixed a C4715 warning under MSVC7.1 - -Mon Aug 1 19:39:30 UTC 2005 Jeff Parsons - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Removed duplicate 'after' and 'libs' items, and added the - new export macro definition file (see below) to - Header_Files. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - - Added export macro to class declaration and include of export - macro definitin file. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h: - - New file to define the export macro for the Plan_Launcher_Impl - library. - -Sun Jul 31 21:56:43 2005 Ming Xiong - - * DAnCE/new_RepositoryManager/Options.h - - Improved documentation to meet the requirement of Doxygen - -Sun Jul 31 21:45:43 2005 Ming Xiong - - * DAnCE/new_RepositoryManager/RMadmin.cpp - - Fixed C4101 warnings in MSVC - -Sun Jul 31 21:26:43 2005 Ming Xiong - - * DAnCE/new_RepositoryManager/RMadmin.cpp - - Updated RMadmin.cpp to merge latest changes - -Fri Jul 29 15:02:43 2005 Gan Deng - - * DAnCE/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp - * DAnCE/examples/Hello/descriptors/run_test_without_ns.pl - - Added a flattened deployment plan and test script which - doesn't use naming service. - - * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp - - Documented the above another available test in the file. - -Fri Jul 29 09:30:43 2005 Nishanth Shanakran - - * NEWS: - - Added a brief description about Resource Allocation and Control - Engine (RACE). - -Fri Jul 29 06:56:12 UTC 2005 Johnny Willemsen - - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc: - Fixed fuzz error - -Thu Jul 28 23:00:11 2005 Ming Xiong - - * DAnCE/new_RepositoryManager/Options.cpp - * DAnCE/new_RepositoryManager/Options.h - * DAnCE/new_RepositoryManager/README.txt - * DAnCE/new_RepositoryManager/RepositoryManager.cpp - * DAnCE/new_RepositoryManager/RepositoryManager.idl - * DAnCE/new_RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/new_RepositoryManager/RepositoryManager_Impl.h - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.h - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc - - Checked in the changes to new_RepositoryManager - -Fri Jul 29 03:52:11 2005 William Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Made is such that Plan_Launcher_Impl library gets generated - and installed. - -Wed Jul 28 15:18:14 2005 Ming Xiong - - * docs\schema\Modified_Deployment.xsd - - Change the XML element order of IAD to conform to spec - -Wed Jul 27 19:20:14 2005 Gan Deng - - * NEWS - - Added news about naming service integration. - -Wed Jul 27 07:40:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/cid.cpp: - * DAnCE/Config_Handlers/cpd.cpp: - * DAnCE/Config_Handlers/iad.cpp: - Explicitly initialise base class - -Wed Jul 27 07:35:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/STD_IAD_Handler.h: - Fixed fuzz error - -Tue Jul 26 21:22:45 UTC 2005 Jeff Parsons - - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - - Added 'CIDL_' prefix to the scoped name of the exec impl class's - base class, in the impl class declaration inheritance list. This - file was overlooked when making similar changes to other exec - impl classes in CIAO tests and examples. - -Mon Jul 26 13:54:12 2005 Ming Xiong - - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - * docs/schema/iad.xsd - * docs/schema/Modified_Deployment.xsd - - Added for cid/cpd/iad(.xsd) and changed Modified_Deployment.xsd - accordingly.We will need href attribute in the repository manager process. - - * DAnCE/Config_Handlers/iad.cpp - * DAnCE/Config_Handlers/iad.hpp - * DAnCE/Config_Handlers/cid.cpp - * DAnCE/Config_Handlers/cid.hpp - * DAnCE/Config_Handlers/cpd.cpp - * DAnCE/Config_Handlers/cpd.hpp - - Regenerated xsc codes for updated schemas in CIAO/docs/schema/ - - * DAnCE/Config_Handlers/STD_CID_Handler.cpp - * DAnCE/Config_Handlers/STD_CID_Handler.h - * DAnCE/Config_Handlers/STD_CPD_Handler.cpp - * DAnCE/Config_Handlers/STD_CPD_Handler.h - * DAnCE/Config_Handlers/STD_IAD_Handler.cpp - * DAnCE/Config_Handlers/STD_IAD_Handler.h - * DAnCE/Config_Handlers/STD_PC_Intf.cpp - * DAnCE/Config_Handlers/STD_PC_Intf.h - * DAnCE/Config_Handlers/STD_PCD_Handler.cpp - * DAnCE/Config_Handlers/STD_PCD_Handler.h - * DAnCE/Config_Handlers/Config_Handlers.mpc - - Added new handlers for mapping Config_Handlers::PackageConfiguration to Deployment:PackageConfiguration. - Updated Config_Handlers.mpc accordingly - -Tue Jul 26 12:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/new_RepositoryManager/RMadmin.cpp: - Fixed vc71 warnings - -Tue Jul 26 10:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - Added some missing CORBA::string_dup calls, this fixes these - tests on Windows - -Tue Jul 26 07:32:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NodeDaemon_Impl.{h,cpp}: - Fixed warning and use doxygen comment style - -Mon Jul 25 22:14:20 UTC 2005 Jeff Parsons - - * CIDLC/SizeTypeCalculator.cpp: - - Fixed visitor to handle types declared inside the scope of - an interface, valuetype, or home. Thanks to Friedhelm Wolf - for reporting a CIDL compiler - problem with a struct declared inside an interface. - -Mon Jul 25 18:40:12 UTC 2005 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - Corrected NodeApplication path - -Mon Jul 25 08:39:12 UTC 2005 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - Made these tests independent of setting of CIAO_ROOT - -Sun Jul 24 07:45:19 2005 Gan Deng - - * DAnCE/NodeManager/NodeDaemon_Impl.cpp - - Fixed an exception emulation warning in Debian_Full_Reactor - build. - -Sun Jul 24 07:40:19 2005 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - - Enhanced error output information a little bit by - adding process ID and thread ID. - - * DAnCE/ciao/Container_Impl.cpp - - Fixed exception emulation warnings in Debian_Full_Reactor - build. - -Sun Jul 24 01:19:21 2005 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Fixed a bug (memory problem) in the plan_launcher which caused - the "tearing down" assembly failure. - - * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp - * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp - - Added a UUID tag to the flattened deployment plan. - -Sat Jul 23 23:11:21 2005 Gan Deng - - * DAnCE/tests/Minimum/Receiver/Receiver.mpc - * DAnCE/tests/Minimum/Sender/Sender.mpc - - Modified shared library names to fix some linking erros - on build scoreboard. - - * DAnCE/examples/Hello/descriptors/run_test.pl - - Fixed the script so naming service could be started - correctly. - - * DAnCE/examples/Hello/step-by-step.html - - Simple instruction about using naming service. - -Sat Jul 23 14:53:22 2005 Jaiganesh B - - * DAnCE/ciao/Port_Activator.cpp: - * DAnCE/ciao/Port_Activator.h: - * DAnCE/ciao/Servant_Activator.cpp: - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Added a method in Port_Activator to set the name of - port activator. The port activator is used to activate - the ports of the component. - - Fixed a incorrect delete call in the update_port_activator - function in Servant_Activator.cpp. This will fix the core - dump in the CIAO tests. - - Modified the calling sequence to deactivate ports when we - deactivate the component. - -Sat Jul 23 12:23:12 UTC 2005 Johnny Willemsen - - * DAnCE/ciao/Servant_Impl_Base.cpp: - Added several missing ACE_TRY_CHECK macros. - -Mon Jul 18 22:31:12 2005 Gan Deng - - * DAnCE/ciao/Container_Impl.cpp - - Fixed some compilation error about using NamingContextEx. - - * DAnCE/examples/Hello/descriptors/run_test.pl - - Fixed this script so naming service will be started - explicitly. Thanks Simon McQueen - for pointing the error. - -Mon Jul 18 22:31:12 2005 Gan Deng - - * DAnCE/ciao/Container_Impl.cpp - * DAnCE/ciao/Container_Impl.h - * DAnCE/ciao/CCM_Core.mpc - * DAnCE/ciao/NodeApplication_Impl.cpp - - Added support for registering components with naming service. - A system deployer could config such capability through XML tag - - * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp - * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp - - Added a couple of examples for using naming service by adding - some tag to the deployment plan descriptor. - -Fri Jul 15 23:50:12 2005 Gan Deng - - * NEWS: - Updated the NEWS file to include the result of our latest - discussion/plan about DAnCE. - -Fri Jul 15 10:02:12 UTC 2005 Johnny Willemsen - - * DAnCE/NodeManager/NAM_Map.h: - Fixed fuzz error - -Tue Jul 12 00:03:57 2005 Ming Xiong - - * docs/tutorials/Quoter/Simple/README.html - - Updated some directory information in this file since the quoter example has been - moved to new directory. - -Mon Jul 11 11:44:57 2005 Ming Xiong - - * TAO/CIAO/DAnCE/examples/Quoter/README.html - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.cidl - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.cpp - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.idl - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker.mpc - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.cpp - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec.h - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_exec_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_stub_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Broker/Broker_svnt_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.cidl - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.cpp - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.idl - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor.mpc - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec.h - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_exec_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_stub_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Distributor/Distributor_svnt_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base.idl - * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base.mpc - * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base_stub_export.h - * TAO/CIAO/DAnCE/examples/Quoter/Stock_Base/Stock_Base_svnt_export.h - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.ccd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.cid - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker.cpd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Exec.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Stub.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Broker_Svnt.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Deployment.xsd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.ccd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.cid - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor.cpd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Exec.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Stub.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Distributor_Svnt.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Domain.cdd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Libraries.iad - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cdp - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cid - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.cpd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.dat - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/Stock.pcd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/XMI.xsd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/package.tpd - * TAO/CIAO/DAnCE/examples/Quoter/descriptors/runNodeDaemons.pl - * TAO/CIAO/DAnCE/examples/Quoter/images/quoter.jpg - - Removed Quoter example in DAnCE/examples/ directory to avoid duplicate. The orignal - example could be found in CIAO/docs/tutorials/Quoter/Simple. - -Fri Jul 8 17:42:57 2005 Ming Xiong - - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h - * docs/tutorials/Quoter/Simple/Broker/Broker.mpc - * docs/tutorials/Quoter/Simple/Broker/Broker.idl - * docs/tutorials/Quoter/Simple/Broker/Broker.cidl - * docs/tutorials/Quoter/Simple/Broker/Broker.cpp - * docs/tutorials/Quoter/Simple/Broker/Broker_exec.h - * docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp - * docs/tutorials/Quoter/Simple/Broker/Broker_svnt_export.h - * docs/tutorials/Quoter/Simple/Broker/Broker_stub_export.h - * docs/tutorials/Quoter/Simple/Broker/Broker_exec_export.h - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc - * docs/tutorials/Quoter/Simple/Distributor/Distributor.idl - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp - * docs/tutorials/Quoter/Simple/Distributor/Distributor_svnt_export.h - * docs/tutorials/Quoter/Simple/Distributor/Distributor_stub_export.h - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec_export.h - * docs/tutorials/Quoter/Simple/descriptors/Broker.ccd - * docs/tutorials/Quoter/Simple/descriptors/Broker.cid - * docs/tutorials/Quoter/Simple/descriptors/Broker.cpd - * docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad - * docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad - * docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad - * docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd - * docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd - * docs/tutorials/Quoter/Simple/descriptors/Distributor.cid - * docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad - * docs/tutorials/Quoter/Simple/descriptors/Domain.cdd - * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp - * docs/tutorials/Quoter/Simple/descriptors/Libraries.iad - * docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd - * docs/tutorials/Quoter/Simple/descriptors/package.tpd - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl - * docs/tutorials/Quoter/Simple/descriptors/Stock.cdp - * docs/tutorials/Quoter/Simple/descriptors/Stock.cid - * docs/tutorials/Quoter/Simple/descriptors/Stock.cpd - * docs/tutorials/Quoter/Simple/descriptors/Stock.dat - * docs/tutorials/Quoter/Simple/descriptors/Stock.pcd - * docs/tutorials/Quoter/Simple/descriptors/XMI.xsd - - Created a new directory tutorials to hold multiple tutorial examples, added quoter - to this directory as simple quoter example. Will add a multiple receptacle quoter - example soon. - - -Fri Jul 8 17:13:57 2005 Ming Xiong - - * DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp - - Updated the plan so that it includes the base libraries as artifact. This - will help ComponentPackager to wrap up everything in the archive. - - -Fri Jul 8 15:49:57 2005 Ming Xiong - - * DAnCE/ComponentPackager/Base_Packager.h - * DAnCE/ComponentPackager/ComponentPackager.mpc - * DAnCE/ComponentPackager/CPK_Packager.cpp - * DAnCE/ComponentPackager/Package.xsd - * DAnCE/ComponentPackager/pdl.cpp - * DAnCE/ComponentPackager/pdl.hpp - * DAnCE/ComponentPackager/PDL_Handler.cpp - * DAnCE/ComponentPackager/PDL_Handler.h - * DAnCE/ComponentPackager/README.html - * DAnCE/ComponentPackager/Sample.pdl - - Updated ComponentPackager to support XSC, eliminating the coupling with - Old_Config_Handlers.Move the schema for .pdl file from Deployment.xsd to - Package.xsd so that it's independently helpful by itself. - -Fri Jul 8 09:43:57 2005 William Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - - Fixed a compile error on Debian Core. - -Thu Jul 7 23:38:32 UTC 2005 Gan Deng - - * docs/index.html - - Modofied this page a little bit to include our work in DAnCE. - -Wed Jul 6 17:21:58 UTC 2005 Jeff Parsons - - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - - Fixed incorrect syntax in ACE_THROW macro. - -Tue Jul 5 11:16:44 2005 William Otte - - * DAnCE/NodeManager/NAM_Map.h - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - - Fixed some misc fuzz errors. - -Tue Jul 5 16:01:39 UTC 2005 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - - Small change to the checkin of - - Mon Jul 4 22:50:17 UTC 2005 Jeff Parsons - - to emit an error message when attempting to set a wstring - attribute from a CCM property value, since wstrings are - not yet supported for this activity. - -Mon Jul 4 22:50:17 UTC 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Created a new code emitter that knows which types CIAO - supports as component attribute types (basic types) and - which it does not (everything else). In the former case, - when DAnCE is assigning attribute values from XML properties - - in set_attributes () - it emits the usual code delegating - the assignment to the specific attribute mutator method - based on a string compare of the given attribute name to - the known attribute names of that component. In the latter - case, it emits an error message, stating that this particular - IDL kind is not supported by CIAO as a component attribute - type. Thanks to Sunil Rottoo for - pointing out that trying to set the value of an unsupported - component attribute type from a DnC property value in XML - caused a crash. - -Mon Jul 4 09:15:12 UTC 2005 Johnny Willemsen - - * CIDLC/Literals.cpp: - * CIDLC/Literals.h:pp: - * CIDLC/ServantHeaderGenerator.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeManager/NodeDaemon_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/ciao/Container_Impl.h: - * DAnCE/ciao/Home_Servant_Impl_T.h: - * DAnCE/ciao/NodeApp_CB_Impl.h: - * DAnCE/ciao/NodeApplication_Impl.h: - * DAnCE/ciao/Servant_Impl_T.h: - * DAnCE/ciao/StandardConfigurator_Impl.h: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h: - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h: - * ciao/ComponentInstallation_Impl.h: - * ciao/ComponentServer_Impl.h: - * ciao/Container_Impl.h: - * ciao/HomeRegistrar_i.h: - * ciao/Home_Servant_Impl_T.h: - * ciao/Servant_Impl_T.h: - * ciao/ServerActivator_Impl.h: - * ciao/StandardConfigurator_Impl.h: - * docs/templates/CIAO_Glue_Session_Template.h: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h: - * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h: - * performance-tests/Benchmark/LatencyTest.h: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.h: - * tools/Assembly_Deployer/Assembly_Impl.h: - * tools/Assembly_Deployer/Assembly_Service_Impl.h: - * tools/Daemon/Daemon_Impl.h: - * tools/Simple_Component_Server/Simple_Server_i.h: - All servants are reference counted by default, no need anymore to - derive the servant from RefCountServantBase - -Sat Jul 2 12:16:49 2005 Cassia Tatibana - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - - Added CIAO_TRACE messages. - -Fri Jul 1 08:42:27 2005 William Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeDaemon_Impl.cpp - - Fixed compile errors with emulated exceptions turned on. - -Thu Jun 30 23:34:40 UTC 2005 Jeff Parsons - - * DAnCE/tests/Minimum/Receiver/Receiver_exec.cpp: - * DAnCE/tests/Minimum/Receiver/Receiver_exec.h: - * DAnCE/tests/Minimum/Sender/Sender_exec.cpp: - * DAnCE/tests/Minimum/Sender/Sender_exec.h: - - More overlooked changes to exec files corresponding to - CIDL compiler code generation changes of - - Wed Jun 22 23:20:04 UTC 2005 Jeff Parsons - -Thu Jun 30 12:36:06 2005 William Otte - - * DAnCE/Plan_Launcher/DAM_Map.cpp - * DAnCE/Plan_Launcher/DAM_Map.h - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Added DAM_Map to the Plan_Launcher directory, as make wouldn't - handle the relative reference properly. - -Thu Jun 30 09:29:24 2005 William Otte - - * DAnCE/new_RepositoryManager/RMadmin.cpp - * DAnCE/new_RepositoryManager/RepositoryManager.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.h - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h - - Fixed Doxygen documentation tags, fixed some indenting, - removed tabs. - -Thu Jun 30 09:59:17 2005 William Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - - Factored out the plan launcher capability into a shared library so - applications can use its functionality. - -Thu Jun 30 04:33:35 2005 ming xiong - - * DAnCE/ComponentPackager/Base_Packager.h - * DAnCE/ComponentPackager/CPK_Packager.cpp - * DAnCE/ComponentPackager/CPK_Packager.h - * DAnCE/ComponentPackager/PDL_Handler.cpp - * DAnCE/ComponentPackager/PDL_Handler.h - * DAnCE/ComponentPackager/Base_Packager.cpp - - Added a release operation for destructor of PDL_Handler;Changed the - definition of input parameter for CPK_Packager::createPackager to const - to indicate it can not be changed - -Thu Jun 30 00:37:35 EDT 2005 Stoyan Paunov - - * DAnCE/new_RepositoryManager/RMadmin.cpp - * DAnCE/new_RepositoryManager/RepositoryManager.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.h - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h - - removed the "@file" comments which apparently confuse Doxygen. - - -Wed Jun 29 17:00:57 2005 Cassia Tatibana - - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - - Added CIAO_TRACE messages. - -Wed Jun 29 16:38:42 2005 Ming Xiong - - * DAnCE/ComponentPackager/Base_Packager.h - * DAnCE/ComponentPackager/CPK_Packager.h - * DAnCE/ComponentPackager/CPK_Packager.h - - Changed a couplfe of places to meet the Doxygen test and TChar test for - bin/fuzz.pl - -Wed Jun 29 16:28:52 2005 William Otte - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NAM_Map.cpp - * DAnCE/NodeManager/NAM_Map.h - * DAnCE/NodeManager/NodeDaemon.mpc - * DAnCE/NodeManager/NodeDaemon_Impl.cpp - * DAnCE/NodeManager/NodeDaemon_Impl.h - * DAnCE/NodeManager/Node_Daemon.cpp - * DAnCE/ciao/Deployment.idl - - Merged dance_multiple_assemblies to main. This merge - contains code necessary to be able to deploy multiple assemblies - into a single NodeManager. - -Wed Jun 29 18:09:11 UTC 2005 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added check for successful opening of target file, which prevents - a crash when the file open is unsuccessful, for example when - write permissions are denied in the directory. Thanks to Will - Otte for pointing out the problem. - -Tue Jun 28 08:55:12 EDT 2005 Ming Xiong - - * DAnCE/ComponentPackager/Base_Packager.cpp - * DAnCE/ComponentPackager/Base_Packager.h - * DAnCE/ComponentPackager/CPK_Packager.cpp - * DAnCE/ComponentPackager/CPK_Packager.h - * DAnCE/ComponentPackager/ComponentPackager.mpc - * DAnCE/ComponentPackager/Component_Packager.cpp - * DAnCE/ComponentPackager/Modified_Deployment.xsd - * DAnCE/ComponentPackager/PDL_Handler.cpp - * DAnCE/ComponentPackager/PDL_Handler.h - * DAnCE/ComponentPackager/README.html - * DAnCE/ComponentPackager/Sample.pdl - * DAnCE/ComponentPackager/XercesString.cpp - * DAnCE/ComponentPackager/XercesString.h - - Added the files implementing ComponentPackager, for details - please read README.html - -Tue Jun 28 01:03:12 EDT 2005 Stoyan Paunov - - * TAO/CIAO/DAnCE/new_RepositoryManager/RMadmin.cpp - * TAO/CIAO/DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp - - removed the _O_* flags to ACE_OS::open (); - -Mon Jun 27 16:25:52 UTC 2005 Jeff Parsons - - * DAnCE/examples/Swapping/Sender/Sender_exec.cpp: - - Fixed cut-and-paste error. - -Mon Jun 27 07:04:01 2005 Chad Elliott - - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc: - * DAnCE/new_RepositoryManager/README.txt: - - Switch to using the existing zlib and zzip base projects. - -Sun Jun 26 23:53:23 EDT 2005 Stoyan Paunov - - * DAnCE/new_RepositoryManager/Modified_Deployment.xsd - * DAnCE/new_RepositoryManager/Options.cpp - * DAnCE/new_RepositoryManager/Options.h - * DAnCE/new_RepositoryManager/README.txt - * DAnCE/new_RepositoryManager/RMadmin.cpp - * DAnCE/new_RepositoryManager/RepositoryManager.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.h - * DAnCE/new_RepositoryManager/new_RepositoryManager.idl - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h - * DAnCE/new_RepositoryManager/packages/inconsistent.cpk - * DAnCE/new_RepositoryManager/packages/package.cpk - - Added these files to the head. The files are implementing the repository - manager. - - * DAnCE/new_RepositoryManager/Modified_Deployment.xsd - needed for the retrievePlan function that retrieves the Deployment plan - - * DAnCE/new_RepositoryManager/Options.cpp - * DAnCE/new_RepositoryManager/Options.h - options class for the RMadmin.cpp - - * DAnCE/new_RepositoryManager/README.txt - - * DAnCE/new_RepositoryManager/RMadmin.cpp - a sample client program. You can use it as an example on how to use the RM - - * DAnCE/new_RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/new_RepositoryManager/ZIP_Wrapper.h - The ZIP Wrapper class that allows read access to ZIP packages and CCM packages - that have the cpk extension. - - * DAnCE/new_RepositoryManager/RepositoryManager.cpp - * DAnCE/new_RepositoryManager/new_RepositoryManager.idl - * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.cpp - * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h - The Repository Manager implementation files - - * DAnCE/new_RepositoryManager/packages/inconsistent.cpk - * DAnCE/new_RepositoryManager/packages/package.cpk - couple of sample packages that I created manually to test the RM. - - -Fri Jun 24 14:36:02 2005 Cassia Tatibana - - * DAnCE/ciao/CIAO_common.h: - - Added definition for CIAO_TRACE. - -Fri Jun 24 14:21:31 UTC 2005 Jeff Parsons - - * docs/tutorial/Hello/hello_exec.cpp: - * docs/tutorial/Hello/hello_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.h: - * tests/RTCCM/DiffServ/Receiver/Receiver_exec.cpp: - * tests/RTCCM/DiffServ/Receiver/Receiver_exec.h: - * tests/RTCCM/DiffServ/Sender/Sender_exec.cpp: - * tests/RTCCM/DiffServ/Sender/Sender_exec.h: - - More fixes to hand-written executor code to bring the file up - to date with the recent changes in generated code. These were - overlooked in - - Wed Jun 22 23:20:04 UTC 2005 Jeff Parsons - -Wed Jun 22 23:20:04 UTC 2005 Jeff Parsons - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.h: - * DAnCE/examples/Display/RateGen/RateGen_exec.h: - * DAnCE/examples/Hello/Receiver/Receiver_exec.cpp: - * DAnCE/examples/Hello/Receiver/Receiver_exec.h: - * DAnCE/examples/Hello/Sender/Sender_exec.cpp: - * DAnCE/examples/Hello/Sender/Sender_exec.h: - * DAnCE/examples/Quoter/Broker/Broker_exec.cpp: - * DAnCE/examples/Quoter/Broker/Broker_exec.h: - * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp: - * DAnCE/examples/Quoter/Distributor/Distributor_exec.h: - * DAnCE/examples/Swapping/Receiver/Receiver_exec.cpp: - * DAnCE/examples/Swapping/Receiver/Receiver_exec.h: - * DAnCE/examples/Swapping/Sender/Sender_exec.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * docs/releasenotes/index.html: - - Eliminated generation of the CIAO_GLUE_-prefixed namespace - and replaced it with a namespace constructed from the - composition local name and a CIDL_ prefix. Whereas the - previos namespace was always at global scope, the new one - will be generated inside namespaces mapped from IDL module - declarations, if the composition is declared inside any. - These changes were motivated by an example sent in by - Will Otte , where the composition - was declared inside several nested modules, and the generated - code would not compile. The new namespace encloses - - - the component servant - - the home servant - - the facet servants, if any - - the executor interface in the executor IDL file - - optionally generated executor impl classes - - Minor changes were required to existing executor impl - files as a result of the changes to generated code. - -Wed Jun 22 10:59:00 2005 Gary Maxey - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - Updated visitor for valuebox support. - -Mon Jun 20 18:10:12 UTC 2005 Johnny Willemsen - - * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/MapView_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel_moc.cpp: - Removed these files, these are generated and shouldn't be in the - archive - -Mon Jun 20 09:29:00 2005 Gary Maxey - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h - Add visitor for valuebox support. - -Sun Jun 19 20:18:50 2005 Ming Xiong - - * NEWS: - - Updated NEWS on upcoming support for Component Packaging - -Thu Jun 16 21:46:10 2005 Gan Deng - - * DAnCE/examples/Display/descriptors/Modified_Deployment.xsd - * DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd - * docs/schema/Modified_Deployment.xsd - - Modified the element type - to allow having unbounded number of elements. - Thanks Will Chai to report this problem. - -Wed Jun 15 14:46:00 2005 Gautam Thaker - - * DAnCE/examples/Hello/step-by-step.html: - - Fixed a typo regarding name of script "run_NodeDaemons.pl" and - one other sentence fragement. - -Mon Jun 13 13:44:41 2005 Emre Turkay - - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - - Fixed a typo. - -Thu Jun 4 14:36:00 UTC 2005 Ming Xiong - - * DAnCE/examples/Quoter/Distributor/Distributor_exec.h - * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp - - Fixed a virtual hiding warning reported on WinXP_BCB6_Pro_Dynamic_Debug - -Thu Jun 9 09:31:28 2005 Simon McQueen - - * NEWS: - - Updated with late release note submissions. - -Wed Jun 08 08:50:35 2005 Simon McQueen - - * CIAO version 0.4.6 released. - -Wed Jun 8 11:21:50 2005 Simon McQueen - - * NEWS: - - Updated with release note entries. - -Mon Jun 6 12:33:16 2005 Simon McQueen - - * DAnCE/examples/Display/GPS/GPS.mpc: - - Added HUDisplay_DnC_svnt to after tag for project GPS_DnC_svnt - to fix build error on BCB 6 dynamic build. - - -Thu Jun 2 22:56:11 UTC 2005 Gan Deng - - * DAnCE/examples/Quoter/README.html - - Added a link to the CoSMIC quoter tutorial page hosted by - Ming Xiong. - - * NEWS - - Updated NEWS file. - -Tue May 31 22:46:06 UTC 2005 Jeff Parsons - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - - Eliminated unused arguments. - -Mon May 30 15:22:16 2005 Emre Turkay - - * DAnCE/Config_Handlers/XML_File_Intf.h: - * DAnCE/Config_Handlers/DP_Handler.h: - - auto_ptr is changed with ACE_Auto_Ptr, auto_ptr does not have - reset in VC6. - -Mon May 30 17:59:28 UTC 2005 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - - Fixed incorrect code generation in *_svnt.cpp file for - attribute assignment of sequence types. Thanks to Sunil Rottoo - for reporting the problem. - -Mon May 30 12:19:42 2005 Jaiganesh B - - * DAnCE/ciao/Port_Activator_T.cpp: - * DAnCE/ciao/Servant_Activator.cpp: - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Made use of ACE_ENV macros to fix Debian Full Reactor - build errors. - -Fri May 27 23:35:23 2005 Jaiganesh B - - * DAnCE/ciao/Container_Impl.cpp: - * DAnCE/ciao/Container_Impl.h: - * DAnCE/ciao/Home_Servant_Impl_T.cpp: - * DAnCE/ciao/Home_Servant_Impl_T.h: - - Changed the structure of the utility maps that maintain - the component references, to use "_var" instead of "_ptr" - in order to facilitate effective memory destructions. - -Fri May 27 20:26:33 2005 Emre Turkay - - * CCF/CCF/CCF.sln: - * CCF/Example/Example.sln: - * CIDLC/CIDLC.sln: - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CCF/CCF/CompilerElements/CompilerElements.vcproj: - * CCF/CCF/IDL2/IDL2.vcproj: - * CCF/CCF/IDL3/IDL3.vcproj: - * CCF/Example/CIDL/LocalExecutorMapping/LocalExecutorMapping.vcproj: - * CCF/Example/CodeGenerationKit/Indentation/IDL/IDL.vcproj: - * CIDLC/CIDLC.vcproj: - - Deleted MSVC solution and project files, these are generated by the - mwc. - -Fri May 27 13:41:20 2005 Jaiganesh B - - * DAnCE/ciao/Port_Activator.h: - * DAnCE/ciao/Port_Activator_T.cpp: - * DAnCE/ciao/Port_Activator_T.h: - * DAnCE/ciao/Servant_Activator.cpp: - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Added support for deactivating facets and event consumers - when a component is getting deactivated. This fixes - couple of memory leaks in the DAnCE deployment scenarios. - - -Thu May 26 22:55:26 2005 Jaiganesh B - - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Added code to deactivate facets when component - is getting removed. - -Thu May 26 20:41:04 2005 Jaiganesh B - - * DAnCE/ciao/Home_Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - - Added support for the component servants to inherit - from RefCountServantBase, to allow freeing up of - servants in a more standard and effective manner. - - Added support functions in Servant_Impl_T class to - clean up the component executor memory. - - Added support functions in Home_Servant_Impl_T and - Servant_Impl_Base classes to uninstall components - by executing operations like ccm_remove () in the - right order. - - Finally fixed couple of memory leaks with respect - to cleaning up component servants and component - executors. - - Thanks to Steve Baker - for reporting the problem. - -Thu May 26 21:09:22 2005 Gan Deng - - * tools/Simple_Component_Server/Simple_Component_Server.mpc - - Put an empty IDL_Files segment in the - "Simple_Component_Server" project so the IDL - file is not picked up automatically. Thanks to Will Chai - for reporting this. - - * NEWS - * DAnCE/NEWS - - Merged these two files and deleted the DAnCE/NEWS file, - since these two files serve similar purposes. - -Thu May 26 14:46:53 CDT 2005 Will Otte - - * DAnCE/NodeManager/NodeDaemon_Impl.cpp - - Fixed a memory leak which would cause NodeManagers to leak - when destroyed. - -Thu May 26 07:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/examples/Quoter/Broker/Broker.cpp: - Fixed doxygen file tag - -Wed May 25 11:05:05 2005 Ming Xiong - - * DAnCE/examples/Quoter/Stock_Base/Stock_Base.mpc: - * DAnCE/examples/Quoter/Stock_Base/Stock_Base.idl: - * DAnCE/examples/Quoter/Stock_Base/Stock_Base_svnt_export.h: - * DAnCE/examples/Quoter/Stock_Base/Stock_Base_stub_export.h: - * DAnCE/examples/Quoter/Broker/Broker.mpc: - * DAnCE/examples/Quoter/Broker/Broker.idl: - * DAnCE/examples/Quoter/Broker/Broker.cidl: - * DAnCE/examples/Quoter/Broker/Broker.cpp: - * DAnCE/examples/Quoter/Broker/Broker_exec.h: - * DAnCE/examples/Quoter/Broker/Broker_exec.cpp: - * DAnCE/examples/Quoter/Broker/Broker_svnt_export.h: - * DAnCE/examples/Quoter/Broker/Broker_stub_export.h: - * DAnCE/examples/Quoter/Broker/Broker_exec_export.h: - * DAnCE/examples/Quoter/Distributor/Distributor.mpc: - * DAnCE/examples/Quoter/Distributor/Distributor.idl: - * DAnCE/examples/Quoter/Distributor/Distributor.cidl: - * DAnCE/examples/Quoter/Distributor/Distributor.cpp: - * DAnCE/examples/Quoter/Distributor/Distributor_exec.h: - * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp: - * DAnCE/examples/Quoter/Distributor/Distributor_svnt_export.h: - * DAnCE/examples/Quoter/Distributor/Distributor_stub_export.h: - * DAnCE/examples/Quoter/Distributor/Distributor_exec_export.h: - * DAnCE/examples/Quoter/descriptors/Broker.ccd: - * DAnCE/examples/Quoter/descriptors/Broker.cid: - * DAnCE/examples/Quoter/descriptors/Broker.cpd: - * DAnCE/examples/Quoter/descriptors/Broker_Exec.iad: - * DAnCE/examples/Quoter/descriptors/Broker_Stub.iad: - * DAnCE/examples/Quoter/descriptors/Broker_Svnt.iad: - * DAnCE/examples/Quoter/descriptors/Deployment.xsd: - * DAnCE/examples/Quoter/descriptors/Distributor.ccd: - * DAnCE/examples/Quoter/descriptors/Distributor.cid: - * DAnCE/examples/Quoter/descriptors/Distributor.cpd: - * DAnCE/examples/Quoter/descriptors/Distributor_Exec.iad: - * DAnCE/examples/Quoter/descriptors/Distributor_Stub.iad: - * DAnCE/examples/Quoter/descriptors/Distributor_Svnt.iad: - * DAnCE/examples/Quoter/descriptors/Domain.cdd: - * DAnCE/examples/Quoter/descriptors/flattened_deploymentplan.cdp: - * DAnCE/examples/Quoter/descriptors/Libraries.iad: - * DAnCE/examples/Quoter/descriptors/Modified_Deployment.xsd: - * DAnCE/examples/Quoter/descriptors/package.tpd: - * DAnCE/examples/Quoter/descriptors/runNodeDaemons.pl: - * DAnCE/examples/Quoter/descriptors/Stock.cdp: - * DAnCE/examples/Quoter/descriptors/Stock.cid: - * DAnCE/examples/Quoter/descriptors/Stock.cpd: - * DAnCE/examples/Quoter/descriptors/Stock.dat: - * DAnCE/examples/Quoter/descriptors/Stock.pcd: - * DAnCE/examples/Quoter/descriptors/XMI.xsd: - - Added a Quoter example for DAnCE - -Wed May 25 11:13:19 2005 Jaiganesh B - - * DAnCE/ciao/Servant_Impl_Base.cpp: - - Added code to call ccm_remove () on the executor - before removing the component. - - Thanks to Steven Baker for - identifying the problem. - -Wed May 25 10:52:39 2005 Cassia Tatibana - - * DAnCE/examples/Display/HUDisplay.idl: - * DAnCE/examples/Display/HUDisplay.mpc: - * DAnCE/examples/Display/HUDisplay_stub_export.h: - * DAnCE/examples/Display/HUDisplay_svnt_export.h: - * DAnCE/examples/Display/README.html: - * DAnCE/examples/Display/GPS/GPS.cidl: - * DAnCE/examples/Display/GPS/GPS.idl: - * DAnCE/examples/Display/GPS/GPS.mpc: - * DAnCE/examples/Display/GPS/GPSEI.idl: - * DAnCE/examples/Display/GPS/GPS_exec.cpp: - * DAnCE/examples/Display/GPS/GPS_exec.h: - * DAnCE/examples/Display/GPS/GPS_exec_export.h: - * DAnCE/examples/Display/GPS/GPS_stub_export.h: - * DAnCE/examples/Display/GPS/GPS_svnt_export.h: - * DAnCE/examples/Display/GPS/GPS_tracing_exec.cpp: - * DAnCE/examples/Display/GPS/GPS_tracing_exec.h: - * DAnCE/examples/Display/NavDisplay/NavDisplay.cidl: - * DAnCE/examples/Display/NavDisplay/NavDisplay.idl: - * DAnCE/examples/Display/NavDisplay/NavDisplay.mpc: - * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.cpp: - * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.h: - * DAnCE/examples/Display/NavDisplay/NavDisplay_exec_export.h: - * DAnCE/examples/Display/NavDisplay/NavDisplay_stub_export.h: - * DAnCE/examples/Display/NavDisplay/NavDisplay_svnt_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/Command.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/DetailView_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/MapView.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/MapView.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/MapView_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_exec_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_stub_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_svnt_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_stub_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_svnt_export.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavUnit.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/NavUnit.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/NodeItem_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/QuitCmd.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/QuitCmd.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/RootPanel_moc.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/Worker.cpp: - * DAnCE/examples/Display/NavDisplayGUI_exec/Worker.h: - * DAnCE/examples/Display/NavDisplayGUI_exec/trolltech.gif: - * DAnCE/examples/Display/NavDisplayGUI_exec/worldmap1.gif: - * DAnCE/examples/Display/NavDisplayGUI_exec/worldmap1.xpm: - * DAnCE/examples/Display/RateGen/RateGen.cidl: - * DAnCE/examples/Display/RateGen/RateGen.idl: - * DAnCE/examples/Display/RateGen/RateGen.mpc: - * DAnCE/examples/Display/RateGen/RateGen_exec.cpp: - * DAnCE/examples/Display/RateGen/RateGen_exec.h: - * DAnCE/examples/Display/RateGen/RateGen_exec_export.h: - * DAnCE/examples/Display/RateGen/RateGen_stub_export.h: - * DAnCE/examples/Display/RateGen/RateGen_svnt_export.h: - * DAnCE/examples/Display/RateGen/controller.cpp: - * DAnCE/examples/Display/descriptors/Deployment.xsd: - * DAnCE/examples/Display/descriptors/EM.ior: - * DAnCE/examples/Display/descriptors/GPS.ior: - * DAnCE/examples/Display/descriptors/Modified_Deployment.xsd: - * DAnCE/examples/Display/descriptors/NavDisplay.ior: - * DAnCE/examples/Display/descriptors/NavDisplayGUI.ior: - * DAnCE/examples/Display/descriptors/NodeManagerMap.dat: - * DAnCE/examples/Display/descriptors/RateGen.ior: - * DAnCE/examples/Display/descriptors/XMI.xsd: - * DAnCE/examples/Display/descriptors/basicNodeDaemon.pl: - * DAnCE/examples/Display/descriptors/flattened_deploymentplan.cdp: - - Ported the Display example in CIAO to DAnCE. - -Tue May 24 22:23:48 2005 Gan Deng - - * DAnCE/examples/Hello/step-by-step.html - - Fixed a typo in the command line option. Thanks to Will Chai - for reporting this. - -Tue May 24 00:23:26 2005 Emre Turkay - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - - Changed the mpc files to use the cidlc.mpb. - -Sun May 22 21:23:48 2005 Gan Deng - - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp - - Modified the operation from <_ciao_passivate> to - due to my earlier interface changes. - -Sun May 22 11:29:36 2005 Jaiganesh B - - * DAnCE/ciao/Container_Base.cpp: - - Fixed a memory leak in the container code to - delete the ServantActivator pointer. - -Sat May 21 16:08:48 2005 Gan Deng - - * DAnCE/ciao/Deployment_Core.idl - - Added operation on the NodeApplication interface, - which is useful for enforce the correct component deactivation - sequence. - - * DAnCE/ciao/Deployment.idl - - Moved the StopError exception definition and put into the - Deployment_Core.idl, since operation needs - such exception declaration. - - * DAnCE/ciao/CCM_Component.idl - - Added operation to the CCM_Object interface. - - * DAnCE/ciao/NodeApplication_Impl.cpp - * DAnCE/ciao/NodeApplication_Impl.h - - Implementation of the above added operation . - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to call before calling . - - * DAnCE/RepositoryManager/Repository_Manager.cpp - - Modified the Repository_Manager/executor to invoke - separately from invoking finishLaunch. - - * DAnCE/ciao/Servant_Impl_Base.cpp - - Removed the call of from the - Servant_Impl_Base::remove() function since this will be - called separately on the whole assembly, i.e. passivate ALL - components in the assembly before removing components. - - * DAnCE/ciao/Servant_Impl_T.cpp - * DAnCE/ciao/Servant_Impl_T.h - - Changed the operation name from "_ciao_passivate" to - "ciao_passivate", in order to make it to be the implementation - of the operation added on the CCM_Object - interface. - -Sat May 21 14:39:48 2005 Gan Deng - - * DAnCE/ciao/Deployment_Core.idl - - Added and - operations on the NodeApplication interface, which is useful - for enforce the correct component activation operation - sequence. - - * DAnCE/ciao/NodeApplication_Impl.cpp - * DAnCE/ciao/NodeApplication_Impl.h - - Implemented the above operations. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - - Modified it to call ciao_preactivate and ciao_postactivate - on NodeApplications accordingly - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - - Modified to disable the "start" while "finishLaunch", since - it is the application developer's control to invoke start - operation in the whole assembly. - - * DAnCE/ciao/Container_Base.cpp - * DAnCE/ciao/Container_Impl.cpp - - Put some debug output into the CIAO_DebugLevel control - - * DAnCE/examples/Hello/Sender/Sender_exec.cpp - - Cosmetic changes. - -Tue May 17 20:49:48 UTC 2005 Jeff Parsons - - * tests/IDL3/ImpliedIDL/All/all.mpc: - * tests/IDL3/ImpliedIDL/All/convert.idl: - * tests/IDL3/ImpliedIDL/All/pass_through.idl: - * tests/IDL3/ImpliedIDL/All/include.idl: - * tests/IDL3/ImpliedIDL/All/README: - - New files comprising a test for the tao_idl3_to_idl2 - executable. The test executes tao_idl3_to_idl2 on the - listed IDL files, then executes the TAO IDL compiler on - the resulting IDL files. The resulting C++ code is compiled, - and if there are no errors or warnings in this last step, - the test is a success. - -Tue May 17 07:51:47 2005 Ossama Othman - - * DAnCE/Old_Config_Handlers/Process_Element.h: - * DAnCE/Old_Config_Handlers/Process_Element.cpp: - - Fixed unresolved symbol link error. - -Mon May 16 21:29:49 2005 Ossama Othman - - * DAnCE/Old_Config_Handlers/Process_Element.cpp: - * DAnCE/ciao/Home_Servant_Impl_T.cpp (remove_component): - - Fixed syntax errors. - -Mon May 16 12:06:51 2005 Ossama Othman - - * DAnCE/Config_Handlers/XSCRT/Elements.hpp (~IndentityProvider): - * DAnCE/Old_Config_Handlers/Process_Element.h (Process_Function): - * DAnCE/Old_Config_Handlers/Process_Element.cpp - (~Process_Function): - * tests/RTCCM/Priority_Test/Controllers/Pulser.h (Pulse_Handler): - * tests/RTCCM/Priority_Test/Controllers/Pulser.cpp - (~Pulse_Handler): - - Added missing virtual destructor. Fixes g++ 4.0 "class with - virtual functions but no virtual destructor" warnings. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp (mode): - - Fixed "non-local variable uses anonymous type" g++ 4.0 warning. - - * DAnCE/ciao/Home_Servant_Impl_T.cpp (remove_component): - * tools/RTComponentServer/RTConfig_Manager.cpp - (find_threadpool_by_name): - * tools/XML_Helpers/RTConfig_Handlers.cpp (add_threadpoollane): - (add_priorityband): - - Fixed "variable may be used uninitialized" warnings. - - * tools/Assembly_Deployer/Assembly_Deployer.cpp - (teardown_assembly): - - Fixed format specifier mismatch. - -Mon May 16 11:27:30 2005 Jeff Parsons - - * CIAO-INSTALL.html: - - Added line to table about availability of binaries for MacOS - and Solaris. - -Sat May 14 06:12:44 2005 Johnny Willemsen - - * CIAO version 0.4.5 released. - -Thu May 12 10:20:55 2005 Douglas C. Schmidt - - * Updated the COPYING file to clarify some ambiguity about - proprietary usage of CIAO. - -Tue May 10 21:12:47 2005 Gan Deng - - * docs/releasenotes/dance.html: Updated this page to clearly - point out which OMG D&C specification DAnCE implements. - Thanks to Gary Duzan for requesting this. - -Tue May 10 07:49:47 2005 Douglas C. Schmidt - - * DAnCE/examples/Hello/descriptors: Changed the name of - ruNodeDaemons.pl to run_NodeDaemons.pl. Thanks to Arno Wilhelm - for reporting this. - -Sun May 8 11:07:12 UTC 2005 Johnny Willemsen - - * tests/CIDL/CodeGen/CodeGen.mpc: - Removed requires+=cidl - -Sat May 7 19:53:12 UTC 2005 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - Removed requires+=cidl for the NodeAppTest_RoundTrip_svnt project. - It should not be there. Thanks for Jaiganesh B - for finding out that this caused the - problems in the gcc4 build - -Fri May 6 08:15:43 2005 Jeff Parsons - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - - Changed base project lists and added explicit lists (sometimes - empty) for header and inline files. - -Wed May 4 19:27:01 2005 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed typo in generated code - changed "provides_" prefix - in component facet access operation to the correct - "provide_". Thanks to Don Busch for - pointing out the mistake. - -Tue May 03 22:42:47 2005 Nanbor Wang - - * NEWS: Updated news on upcoming real-time extension on Gan Deng's - behalf. - -Tue May 3 13:05:44 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Changed the generated string (used for object id) which is passed - to the port activator constructor and to generate_reference() to - be a concatentation of the component instance name and the port - name, to ensure uniqueness in any use case. - -Mon May 2 07:19:12 UTC 2005 Johnny Willemsen - - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp: - * DAnCE/ciao/Dynamic_Component_Servant_T.cpp: - Fixed gcc 4 warnings - -Sat May 1 03:11:17 2005 Jaiganesh B - - * ciao/tools/Simple_Component_Server/Simple_Component_Server.cpp: - - Made a change to fix compile errors. - -Sat Apr 30 20:02:10 2005 Jaiganesh B - - * ciao/Container_Impl.cpp: - - Made a change to fix compile errors. - -Sat Apr 30 09:58:05 2005 Jaiganesh Balasubramanian - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.h: - - Made changes to the old CIAO infrastructure to support - passing and storing of the component instance name from the - descriptor XML file and into the component instance. - -Thu Apr 28 14:50:05 2005 Jaiganesh Balasubramanian - - * DAnCE/ciao/Dynamic_Component_Servant_T.cpp: - * DAnCE/ciao/Dynamic_Component_Servant_T.h: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h: - - Made changes to the CIAO infrastructure that allows the - swapping capability to make use of the component instance - name when we create object references. - -Wed Apr 27 11:15:12 2005 Jeff Parsons - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Container_Impl.cpp: - * DAnCE/ciao/Deployment_Core.idl: - * DAnCE/ciao/Home_Servant_Impl_T.cpp: - * DAnCE/ciao/Home_Servant_Impl_T.h: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - - Some cosmetic changes and changes by Jaiganesh Balasubramanian - to support the passing and storing of - the component instance name (from the descriptor XML file) in - the component instance. Also removed the gen_UUID() static - method from class Servant_Impl_Base, since it is no longer - used. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changes to servant code generation corresponding with the - changes above. - -Tue Apr 26 18:14:01 2005 Jeff Parsons - - * docs/releasenotes/index.html: - - Updated CIDL compiler documentation, and added item about the - existing IDL3-to-IDL2 coverter. - - * tools/IDL3_to_IDL2/README: - - Updated documentation file. - -Tue Apr 26 11:34:52 2005 Nanbor Wang - - * docs/schema/CIAOServerResources.xsd: Changed some of the XML - element and type names to be more consistent with the rest of - RTCORBA spec that the following new IDL file follows. - - * DAnCE/ciao/ServerResources.idl: First cut of server - configuration information set in IDL. - -Mon Apr 25 11:07:28 2005 Jaiganesh Balasubramanian - - * DAnCE/ciao/Container_Base.cpp: - - Fixed compiler warnings in the Debian Full_Reactor build. - -Sun Apr 24 02:47:22 2005 Jaiganesh Balasubramanian - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Swapping_Container.cpp: - * DAnCE/ciao/Swapping_Container.h: - - Made changes to fix compile errors. - -Sat Apr 23 13:54:10 2005 Jaiganesh Balasubramanian - - * DAnCE/example/Swapping/Sender/Sender_exec_1.cpp: - - Made a modification to the example to reflect changes made - in the infrastructure code. - -Sat Apr 23 13:43:22 2005 Jai Balasubramanian - - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/UpgradeableContext.idl: - * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp: - * DAnCE/ciao/Upgradeable_Context_Impl_T.h: - - Made some changes to the CIAO infrastructure to efficiently - handle updating the facets when the component is swapped. - -Thu Apr 21 18:10:13 2005 Jeff Parsons - - * DAnCE/examples/Hello/Hello_Base/Hello_Base.idl: - * DAnCE/examples/HelloHello_Base/Hello_Base.mpc: - * DAnCE/examples/HelloReceiver/Receiver.idl: - * DAnCE/examples/HelloReceiver/Receiver.mpc: - * DAnCE/examples/HelloSender/Sender.idl: - * DAnCE/examples/HelloSender/Sender.mpc: - - Made cosmetic changes to all files, and added explicit - specification of header and inline files in MPC - projects. Also added -Sc command line option to the - IDL compiler, to suppress generation of the TIE - classes. - -Thu Apr 21 17:40:12 2005 Jeff Parsons - - * CCF/CCF/CIDL/Traversal/Elements.cpp: - * CCF/CCF/IDL3/Traversal/EventType.cpp: - - Removed these files, since they contain nothing but - empty namespaces. - - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/IDL3/IDL3.vcproj: - - Removed the above files from the appropriate projects. - -Thu Apr 21 14:31:21 2005 Jeff Parsons - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Changes to eliminate some warnings in the Debian LInux build. - -Thu Apr 21 09:06:58 2005 Jeff Parsons - - * Added UUID generation for the object id when creating - event consumers, similar to that already added for facets. - This change eliminates the error of repeated connection - to the same event consumer instance when multiple - instances and connections are intended. Thanks to - Steve Baker for reporting - the problem. - -Thu Apr 21 09:04:32 CDT 2005 Will Otte - - * DAnCE/examples/Hello/descriptors/TestNodeManagerMap.dat - * DAnCE/examples/Hello/descriptors/run_test.pl - - Added a NodeManagerMap specific to the test and changed the ports - that the node managers invoked by the test listen on to avoid - test failures. - -Wed Apr 20 16:14:26 CDT 2005 Will Otte - - * docs/schema/CIAOServerResources.xsd - - Fixed syntax and semantic errors. - -Wed Apr 20 12:43:53 2005 Emre Turkay - - * DAnCE/examples/Hello/descriptors/run_test.pl: - - Not all the test platforms has CIAO_ROOT environment variable - defined. Changed that dependency to ACE_ROOT in the script. - -Wed Apr 20 13:11:28 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Added full scoping to a generated method call on - Servant_Impl_Base, to eliminate a warning from the - Borland compiler. - -Wed Apr 20 13:05:23 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp - * DAnCE/RepositoryManager/Update_Plan.cpp - - Fixed compile errors in Borland. - -Wed Apr 20 08:09:17 CDT 2005 Will Otte - - * DAnCE/ciao/Servant_Impl_T.cpp - - Fixed a compile error with emulated exceptions. - -Wed Apr 20 08:03:23 2005 CDT Will Otte - - * DAnCE/Config_Handlers/DP_Handler.cpp - - Silenced some compile errors in VC6. - -Tue Apr 19 23:41:02 2005 CDT Will Otte - - * DAnCE/Config_Handlers/XML_File_Intf.cpp - - Silenced some compile errors in VC6. - -Tue Apr 19 16:46:00 2005 CDT Gan Deng - - * CIAO-INSTALL.html - - Fixed this page to direct people where to download CIDLC. - -Tue Apr 19 17:33:55 2005 Nanbor Wang - - * docs/schema/ServerResourceUsage.txt: - * docs/schema/CIAOServerResources.xsd: Added the first draft - schema for DAnCE RT extension, and a file to document how I - foresee the extension can be used. - -Tue Apr 19 12:16:00 2005 CDT Will Otte - - * DAnCE/Config_Handlers/IDREF_Base.h - - Fixed a compile error on VC71. - -Mon Apr 18 12:50:51 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Added '.in ()' to some _var type arguments in generated code. - -Mon Apr 18 08:38:14 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Changed all instances of 'FALSE' to 'false'. - -Sun Apr 17 21:57:52 2005 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Removed unnecessary _narrow() and local variable from generated - event push operations. - -Sun Apr 17 16:05:57 CDT 2005 Will Otte - - * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp - * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp - - Fixed a compile error on platforms using emulated exceptions. - -Sun Apr 17 12:46:51 2005 Jeff Parsons - - * ciao/CCM_Event.idl: - * DAnCE/ciao/CCM_Event.idl: - - Added operation ciao_is_substitutable() to EventConsumerBase, - so we can check if there is an inheritance relationship - when a base class event consumer is passed to the subscribe() - operation for a derived eventtype. Thanks to Boris Kolpackov - for suggesting this approach. - - * CIDLC/Literals.cpp: - - Cosmetic changes. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added code generation to take advantage of the new - EventConsumerBase operation described above. - -Sat Apr 16 20:17:38 2005 Emre Turkay - - * DAnCE/examples/Hello/descriptors/run_test.pl: - - Fixed some perl errors. - -Sat Apr 16 18:31:40 2005 CDT Will Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc - - Removed typecodefactory fromt the base projects. - -Sat Apr 16 17:24:40 2005 Emre Turkay - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Added a missing include file. - -Sat Apr 16 17:22:42 2005 Emre Turkay - - * DAnCE/examples/Hello/descriptors/run_test.pl: - - Added code to ensure killing open processes on failure. - -Sat Apr 16 16:38:09 2005 Emre Turkay - - * DAnCE/examples/Hello/descriptors/run_test.pl: - - Added perl script running all the steps for deploying an application. - -Sat Apr 16 16:10:10 2005 Emre Turkay - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Added two command line options to plan_launcher to easily use in - scripts. Now the launch and destruction of the application can be - done in two steps. - -Sat Apr 16 15:00:31 2005 Emre Turkay - - * DAnCE/examples/Hello/step-by-step.html: - - Fixed typo on the documentation. - -Fri Apr 15 12:54:46 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Req_Handler.h - - Fixed a compile error on builds using -pendantic. - -Fri Apr 15 10:46:56 CDT 2005 Gan Deng - - * DAnCE/ciao/Container_Impl.cpp - - Added a condition to check whether call standard configurator. - - * DAnCE/RepositoryManager/Repository_Manager.cpp - - Modified to make it work by using ORBDebugLevel. - - * DAnCE/examples/Hello/Sender/Sender_exec.cpp - - Fixed a warning message. - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp - - This should fix the warning message on Dynamic_Hash_Op_Lookup - build. - -Thu Apr 14 10:54:56 CDT 2005 Will Otte - - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp - - Fixed a warning due to ambiguous conversion. - -Thu Apr 143 10:21:58 2005 Gan Deng - - * DAnCE/examples/Hello/Sender/Sender.idl - * DAnCE/examples/Hello/Sender/Sender_exec.cpp - * DAnCE/examples/Hello/Sender/Sender_exec.h - * DAnCE/examples/Hello/Sender/starter.cpp - * DAnCE/examples/Hello/descriptors/Hello.cid - * DAnCE/examples/Hello/descriptors/Receiver.cid - * DAnCE/examples/Hello/descriptors/Sender.cid - - Modified the Hello example to showcase the feature of setting - attributes through XML. "string" and "long" type attributes - are put into the test. - - * DAnCE/ciao/Container_Impl.cpp - - Cleaned up a little bit. - -Thu Apr 14 10:14:44 CDT 2005 Will Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Added 'naming' to the list of base projects to fix a compile - error - -Thu Apr 14 02:02:13 CDT 2005 Will Otte - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ciao/Context_Impl_T.cpp - * DAnCE/ciao/Dynamic_Component_Servant_Base.h - * DAnCE/ciao/Dynamic_Component_Servant_T.cpp - * DAnCE/ciao/Dynamic_Component_Servant_T.h - * DAnCE/ciao/Home_Servant_Impl_T.cpp - * DAnCE/ciao/Servant_Impl_T.cpp - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp - * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp - - Fixed a number of mistakes with emulated exceptions. - -Wed Apr 13 18:55:58 2005 Gan Deng - - * DAnCE/ciao/CCM_Component.idl - * DAnCE/ciao/Container_Impl.cpp - * DAnCE/ciao/Servant_Impl_Base.cpp - * DAnCE/ciao/Servant_Impl_Base.h - - Added support for configuring component attributes through - XML tags. - - * DAnCE/RepositoryManager/Update_Plan.cpp - * DAnCE/RepositoryManager/Update_Plan.h - - Fixed to make sure correct component attributes are - populated. Thanks Jai for the fix. - -Wed Apr 13 15:14:58 2005 Emre Turkay - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - - Deleted typecodefactory base project to the mpc files. - -Wed Apr 13 11:39:58 2005 Emre Turkay - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - - Added typecodefactory base project to the mpc files. - -Tue Apr 12 17:12:35 2005 Jeff Parsons - - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - Added a static method to generate a UUID. This method is - called by the generated servant class to create unique - object ids for port object references. Thanks to Steve - Baker for reporting the - problem of connecting to facets on multiple instances - of the same component type. - - * CIDLC/ServantSourceGenerator.cpp: - - Changed code generation for provide_*_i() to use the - new method described above. - -Tus Apr 12 16:04:21 2005 Gan Deng - - * DAnCE/Old_Config_Handlers/IAD_Handler.cpp - - Modified to ignore the tag, since this might - cause a problem where multiple _svnt or multiple _exec - libraries to be specified as implArtifacts of a component - type. - -Tue Apr 12 14:35:58 CDT 2005 Will Otte - - * CIAO-INSTALL.html - - Updated to include Xerces information. Also cleaned up the - file a bit and made it XHTML compliant. - -Tue Apr 12 11:56:26 CDT 2005 Will Otte - - * DAnCE/ciao/Dynamic_Component_Activator.cpp - * DAnCE/ciao/Servant_Activator.cpp - * DAnCE/ciao/Servant_Impl_Base.cpp - - Fixed some more compile errors with emulated exceptions. - -Tue Apr 12 11:11:41 CDT 2005 Will Otte - - * DAnCE/ciao/Servant_Impl_Base.cpp - - Fixed some compile errors with emulated exceptions. - -Mon Apr 11 23:54:21 2005 Gan Deng - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - - Fixed a bug where multiple "_svnt" and "_exec" libs for - a given MonolithicDeploymentDescription could cause - chaos while pupulating ImplementationInfo stuct. This - fix now only consides the first "_svnt" and "_exec" - libs, and ignore remaining ones. A better solution will - be enforcing any MonolithicDeploymentDescription could - only have exactly one _svnt and one _exec lib. This - will be achieved through the flattened deployment plan. - -Mon Apr 11 17:56:22 2005 Jaiganesh B - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Added typecodefactory to the list of project files. - -Mon Apr 11 13:43:47 CDT 2005 Will Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - - Corrected the ExecutionManager narrow operation. - -Mon Apr 11 08:29:50 2005 Jeff Parsons - - * DAnCE/ciao/Container_Impl.cpp: - * DAnCE/ciao/Dynamic_Component_Activator.cpp: - * DAnCE/ciao/Dynamic_Component_Activator.h: - * DAnCE/ciao/NodeApplication_Impl.cpp: - * DAnCE/ciao/NodeApplication_Impl.h: - * DAnCE/ciao/Swapping_Container.cpp: - * DAnCE/ciao/Swapping_Container.h: - - Fixed various glitches with environment variables, unused variables, - and ACE_TRY macros. - -Mon Apr 11 07:12:54 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - - Fixed a compile error. - -Sun Apr 10 18:44:22 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - * DAnCE/Config_Handlers/ccd.cpp - * DAnCE/Config_Handlers/ccd.hpp - - Regenerated the handlers to reflect the changes in the previous - commit. - -Sat Apr 09 18:35:23 CDT 2005 Will Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/ccd.xsd - - Updated schemas to reflect changes made to Modified_Deployment - in conformance to the spec. - -Sat Apr 09 17:15:23 CDT 2005 Will Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Changed the after clause to point to the XSC_Config_Handlers - instad of the old config handlers. - -Sat Apr 09 23:59:40 2005 Gan Deng - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp - - Fixed a bug where duplicated CORBALOC specified in the - NodeManagerMap could cause undetected exception. This fix - will allow such duplication IOR error to be detected explicitly - and error message will be printed out. Thanks Steve Baker - for report this bug. - -Fri Apr 8 14:30:52 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/cdp.cpp - * DAnCE/Config_Handlers/cdp.hpp - - Regenerated handlers to reflect schema changes. - - * docs/schema/cdp.xsd - - Updated schema to allow 0 on the realizes element. - -Fri Apr 8 13:33:24 2005 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added backend support for attribute exceptions. - -Thu Apr 07 14:49:40 2005 Gan Deng - - * DAnCE/examples/Hello/descriptors/basicNodeDaemon.pl - * DAnCE/examples/Hello/descriptors/runNodeDaemons.pl - - Removed the first file and added the second file since - the name of the first file doens't make any sense. These - two files are the same. - - * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp - * DAnCE/examples/BasicSP/descriptors/flattened_deploymentplan.cdp - - Removed the first file and added the second file since - the name of the first file contained a typo. - - * DAnCE/examples/Hello/descriptor/Modified_Deployment.xsd - - Changed the tag to allow zero - tag in the XML. - - * DAnCE/Config_Handlers/DP_Handler.cpp - * DAnCE/Config_Handlers/cdp.cpp - * DAnCE/Config_Handlers/cdp.hpp - - Modified handlers to accomodate the above change. - - * DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp - - Added this file in, which is a flattened deployment plan for - for the Hello example. I will come back to remove the - tag some time later since it is useless. - - * DAnCE/examples/Hello/step-by-step.html - - Bring the documentation page up to date. - -Wed Apr 06 11:12:40 2005 Gan Deng - - * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp - - Cleaned this a little bit. Removed most and - tags from the tag. - -Wed Apr 06 10:30:40 2005 Gan Deng - - * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat - - Modified virtual node names to make them more meaningful. - - * DAnCE/examples/BasicSP/descriptors/DeploymentPlan.cdp - - Added this file, which is a copy of the old HUDisplay.cdp - file. This is the old version deployment plan XML metadata. - - * DAnCE/examples/BasicSP/descriptors/BasicSP.cdp - * DAnCE/examples/BasicSP/descriptors/HUDisplay.cdp - - Removed these two files since they are redundant. The - former one now is "flattern_deploymentplan.cdp", - the latter one is "DeploymentPlan.cdp". - - * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp - - Fixed this file, which contains a invalid connection, i.e., - connecting a EventPublisher to a SimplexReceptacle. The root - of this problem is that "data_read" is a Facet instead of - a EventPublisher. - -Tue Apr 05 19:29:40 2005 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Fixed project dependency. - - * DAnCE/ciao/Container_Impl.cpp - - Fixed a compilation error caused by specifying a - wrong exception name. - - * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat - - Fixed a wrong string to specify the vitual node name. - -Tue Apr 5 14:37:16 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Any_Handler.cpp - - Updated Gary's fix to work in Borland 6. - -Tue Apr 5 14:13:10 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Any_Handler.cpp - - Incorporated a fix to the Any handler from Gary Duzan. - -Tue Apr 5 11:34:32 CDT 2005 Will Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - * DAnCE/Config_Handlers/Deployment.cpp - * DAnCE/Config_Handlers/Deployment.hpp - * DAnCE/Config_Handlers/ccd.cpp - * DAnCE/Config_Handlers/ccd.hpp - * DAnCE/Config_Handlers/cdd.cpp - * DAnCE/Config_Handlers/cdd.hpp - * DAnCE/Config_Handlers/cdp.cpp - * DAnCE/Config_Handlers/cdp.hpp - * DAnCE/Config_Handlers/cid.cpp - * DAnCE/Config_Handlers/cid.hpp - * DAnCE/Config_Handlers/cpd.cpp - * DAnCE/Config_Handlers/cpd.hpp - * DAnCE/Config_Handlers/iad.cpp - * DAnCE/Config_Handlers/iad.hpp - * DAnCE/Config_Handlers/pcd.cpp - * DAnCE/Config_Handlers/pcd.hpp - * DAnCE/Config_Handlers/toplevel.cpp - * DAnCE/Config_Handlers/toplevel.hpp - * DAnCE/Config_Handlers/XMLSchema/Types.hpp - - New version of the generated XSC handlers fixing the following problems: - - Use ACE_TCHAR instead of char as the character type - - Export macros for the generated classes. - - Borland 6 support - - Misc VC6 warnings. - -Sun Apr 3 23:52:50 CDT 2005 Will Otte - - * examples/BasicSP/descriptors/flattern_deploymentplan.cdp - - Fixed a mistake in the descriptor. - -Sun Apr 3 18:08:12 UTC 2005 Johnny Willemsen - - * ciao/Container_Base.h: - * ciao/ServerActivator_Impl.h: - Added missing include of ace/Hash_Map_Manager_T.h - -Sat Apr 02 13:12:40 2005 Nanbor Wang - - * DAnCE/examples/BasicSP/README.html: Brought the documentation a - bit more up-to-date. - -Sat Apr 2 13:06:02 2005 Nanbor Wang - - * DAnCE/ciao/Container_Base.cpp: Added more debug print out - statements in install_home method. - -Sat Apr 02 11:45:52 2005 Nanbor Wang - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: Merged from xsc_handler_1 - branch. Added a missing break statement, otherwise, it will not - run. - -Thu Mar 31 20:31:12 UTC 2005 Johnny Willemsen - - * DAnCE/ciao/NodeApplication_Impl.h: - * DAnCE/ciao/Container_Base.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Added missing include of ace/Hash_Map_Manager_T.h - -Thu Mar 31 09:45:07 2005 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp: - * CCF/CCF/IDL2/Traversal/Attribute.cpp: - * CCF/CCF/IDL2/Traversal/Attribute.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Added support for raises-specification in attributes. - -Wed Mar 30 21:48:14 2005 Nanbor Wang - - * DAnCE/Config_Handlers/Deployment.hpp: Made the function - deploymentPlan an export function since it will be accessed - externally. The handler test program needed this change to - compile on Win32. - - * DAnCE/Config_Handlers/Config_Handlers.mpc: Changed to source in - the Xerces library settings from the latest xerces MPC template - that Kitty suggested. - - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/Config_Handlers/ccd.hpp: - * DAnCE/Config_Handlers/cdd.hpp: - * DAnCE/Config_Handlers/cdp.hpp: - * DAnCE/Config_Handlers/cid.hpp: - * DAnCE/Config_Handlers/cpd.hpp: - * DAnCE/Config_Handlers/iad.hpp: - * DAnCE/Config_Handlers/pcd.hpp: - * DAnCE/Config_Handlers/toplevel.hpp: - * DAnCE/Config_Handlers/XMLSchema/Types.hpp: - * DAnCE/Config_Handlers/XSCRT/Elements.hpp: - * DAnCE/Config_Handlers/XSCRT/Parser.hpp: - * DAnCE/Config_Handlers/XSCRT/Traversal.hpp: - * DAnCE/Config_Handlers/XSCRT/Writer.hpp: - * DAnCE/Config_Handlers/XSCRT/XML.hpp: Changed all local include - files to use the right syntax. I.e., they should be in the form - of: - - #include "foo/bar.h" - - instead of - - #include - -Wed Mar 30 22:03:23 2005 Will Otte - - * docs/schema/xsc-banner.cpp - * docs/schema/xsc-banner.h - - These files are the banners that should be included at - the top of XSC generated code. - -Wed Mar 30 13:23:12 UTC 2005 Johnny Willemsen - - * ciao/ComponentsC.h: - * DAnCE/ciao/ComponentsC.h: - Fixed include of Typecode.h to TypeCode.h - -Wed Mar 30 13:20:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/DataType_Handler.cpp: - * DAnCE/Old_Config_Handlers/DT_Handler.cpp: - Fixed include of Typecode.h to TypeCode.h - -Thu Mar 24 17:02:34 Will Otte - - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp - * DAnCE/Config_Handlers/Deployment.hpp - * DAnCE/Config_Handlers/ccd.hpp - * DAnCE/Config_Handlers/cdd.hpp - * DAnCE/Config_Handlers/cdp.hpp - * DAnCE/Config_Handlers/cid.hpp - * DAnCE/Config_Handlers/cpd.hpp - * DAnCE/Config_Handlers/iad.hpp - * DAnCE/Config_Handlers/pcd.hpp - * DAnCE/Config_Handlers/toplevel.hpp - * DAnCE/Config_Handlers/XSCRT/XML.hpp - * DAnCE/Config_Handlers/vc6-4786.h - - Finally beat a big warning problem in VC6. - -Thu Mar 24 15:19:21 2005 Will Otte - - * DAnCE/Config_Handlers/XSCRT/Elements.hpp - * DAnCE/Config_Handlers/XSCRT/XML.hpp - - Moved a pragma disable from Elements.hpp to XML.hpp to - attempt to silence more warnings in VC6. - -Thu Mar 24 14:52:03 2005 Will Otte - - * DAnCE/Config_Handlers/Any_Handler.cpp - - Fixed a compile error for 64bit arch that resulted from - the earlier VC6 fix. - -Thu Mar 24 09:21:59 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Sender/Sender.mpc: - - Added the "after" clause in the MPC file to fix a - linker error. - -Thu Mar 24 08:46:07 2005 Jeff Parsons - - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - - - Added generation of ACE_UNUSED_ARG macros for local variables in - the get_registered_consumers() method for upgradeable components, - to avoid unused argument warnings if the component has no - event consumers. - - - Added predefined string literals for "ACE_UNUSED_ARG", - "ACE_CHECK_RETURN", and "ACE_THROW_RETURN". - -Wed Mar 23 19:45:32 2005 Jeff Parsons - - * CCF/CCF/IDL2/IDL2.vcpoj: - - Added more new files to the project, ValueTypeMember.hpp and - ValueTypeMember.tpp in IDL2/Traversal. - - * CIDLC/ServantSourceGenerator.cpp: - - Restored backend code that was commented out until frontend - support for traversal of valuetype/eventtype members was added. - -Wed Mar 23 13:00:32 2005 Will Otte - - * DAnCE/Config_Handlers/Any_Handler.cpp - - Fixed compile errors for VC6. - -Wed Mar 23 12:39:43 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Sender/Sender.mpc: - - Added a missing library include. - -Wed Mar 23 11:19:32 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Sender/Sender.mpc: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_1_export.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_2_export.h: - - Added new export macros to fix compiler problems in Windows - builds. - -Wed Mar 23 11:41:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: - Fixed compile errors - -Wed Mar 23 11:22:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/Config_Handlers/DP_Handler.cpp: - Fixed compile errors with Borland - -Tue Mar 22 21:21:12 UTC 2005 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - Fixed fuzz error - -Tue Mar 22 13:08:32 2005 Will Otte - - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h - * DAnCE/examples/Swapping/Sender/Sender_exec_1.h - * DAnCE/examples/Swapping/Sender/Sender_exec_2.h - - Silence some Fuzz errors. - -Tue Mar 22 11:45:57 2005 Will Otte - - * DAnCE/Config_Handlers/ADD_Handler.cpp - * DAnCE/Config_Handlers/Any_Handler.cpp - * DAnCE/Config_Handlers/CCD_Handler.cpp - * DAnCE/Config_Handlers/XSCRT/Elements.hpp - - Changes to accomodate broken compilers (VC6). - -Tue Mar 22 10:40:21 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Sender/Sender_exec.cpp: - - Made changes to fix compiler warnings. - -Tue Mar 22 10:26:18 2005 Will Otte - * DAnCE/Config_Handlers/CCD_Handler.cpp - - Silenced an error in VC6 that occured because it couldn't obey - some simple scope rules. - - * DAnCE/Config_Handlers/XSCRT/Elements.hpp - - Silenced a warning in VC6 debug builds relating to debug identifiers being - too long. - -Tue Mar 22 08:44:03 2005 Will Otte - - * DAnCE/ciao/Container_Base.cpp - - Silenced a warning. - -Tue Mar 22 08:05:57 2005 Jeff Parsons - - * CCF/CCF/IDL2/IDL2.vcproj: - - Added new ValueTypeFactory files to SemanticAction and new - ValueTypeMember files to SemanticGraph. - -Tue Mar 22 00:13:56 2005 Will Otte - - * DAnCE/Config_Handlers/Any_Handler.cpp - - Silenced warnings present in GCC >3 builds. - - * DAnCE/Config_Handlers/CCD_Handler.h - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/IDD_Handler.cpp - * DAnCE/Config_Handlers/Property_Handler.h - * DAnCE/Config_Handlers/Req_Handler.h - * DAnCE/Config_Handlers/XML_Error_Handler.h - * DAnCE/Config_Handlers/XML_File_Intf.h - - Silenced a few warnings present in the Fuzz build. - -Mon Mar 21 08:47:44 2005 Jeff Parsons - - * CCF/CCF/IDL2/IDL2.vcproj: - - Added the new ValuetypeMember files in SemanticAction to - the project. - -Mon Mar 21 16:25:07 2005 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.hpp: - - Finished "full support" for valuetype members. It also - adds "full support" for eventtype members since it just - re-uses valuetype's rules. - - - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - - Added support for valuetype factories. - - - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/ValueType.tpp: - - Implemented support for valuetype inheritance and - support of interfaces. - - - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/Traversal/EventType.tpp: - - Implemented support for eventtype inheritance and - support of interfaces. - - - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - - Minor cleanups. - -Sun Mar 20 21:35:04 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Sender/Sender.mpc: - - Made a change to link to the right library. - -Sun Mar 20 21:12:55 2005 Will Otte - - * DAnCE/Config_Handlers/Config_Handlers.mpc - - Disabled the build of the test. There is no need for - this to build for the most part - as it is not a great test - - and appears to be lighting up the scoreboard for some reason. - -Sun Mar 20 14:05:08 2005 Jaiganesh B - - * DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Handler_Test.h: - * DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp: - * DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp: - - Made changed to include the "right" config handlers - to fix the compilation errors. - -Sun Mar 20 13:57:55 2005 Jaiganesh B - - * DAnCE/Config_Handlers/XercesString.cpp: - * DAnCE/Config_Handlers/XercesString.h: - - Added these new files from the old config handlers - directory to the new config handlers directory - to fix missing includes. - -Sun Mar 20 13:54:17 2005 Jaiganesh B - - * DAnCE/Old_Config_Handlers/Process_Element_T.cpp: - - Changed a #include to fix a compilation error. - -Sun Mar 20 17:39:18 2005 Jaiganesh B - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.cpp: - - Made changes to the older version of the ciao - infrastructure to reflect changes made in the - newer version of ciao, which is DaNCE. - -Sun Mar 20 10:09:14 2005 Will Otte - * DAnCE/Config_Handlers/Basic_Handler.cpp - * DAnCE/Config_Handlers/Basic_Handler.h - * DAnCE/Config_Handlers/CAD_Handler.cpp - * DAnCE/Config_Handlers/CAD_Handler.h - * DAnCE/Config_Handlers/CPK_Handler.cpp - * DAnCE/Config_Handlers/CPK_Handler.h - * DAnCE/Config_Handlers/CPR_Handler.cpp - * DAnCE/Config_Handlers/CPR_Handler.h - * DAnCE/Config_Handlers/Cap_Handler.cpp - * DAnCE/Config_Handlers/Cap_Handler.h - * DAnCE/Config_Handlers/CompImplDesc_Handler.cpp - * DAnCE/Config_Handlers/CompImplDesc_Handler.h - * DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp - * DAnCE/Config_Handlers/CompIntrDesc_Handler.h - * DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp - * DAnCE/Config_Handlers/CompPkgDesc_Handler.h - * DAnCE/Config_Handlers/Config.h - * DAnCE/Config_Handlers/Config_Error_Handler.cpp - * DAnCE/Config_Handlers/Config_Error_Handler.h - * DAnCE/Config_Handlers/Config_Handler_export.h - * DAnCE/Config_Handlers/DT_Handler.cpp - * DAnCE/Config_Handlers/DT_Handler.h - * DAnCE/Config_Handlers/Domain_Handler.cpp - * DAnCE/Config_Handlers/Domain_Handler.h - * DAnCE/Config_Handlers/IAD_Handler.cpp - * DAnCE/Config_Handlers/IAD_Handler.h - * DAnCE/Config_Handlers/IR_Handler.cpp - * DAnCE/Config_Handlers/IR_Handler.h - * DAnCE/Config_Handlers/MID_Handler.cpp - * DAnCE/Config_Handlers/MID_Handler.h - * DAnCE/Config_Handlers/NIA_Handler.cpp - * DAnCE/Config_Handlers/NIA_Handler.h - * DAnCE/Config_Handlers/PCI_Handler.cpp - * DAnCE/Config_Handlers/PCI_Handler.h - * DAnCE/Config_Handlers/PC_Handler.cpp - * DAnCE/Config_Handlers/PC_Handler.h - * DAnCE/Config_Handlers/Plan_Handler.cpp - * DAnCE/Config_Handlers/Plan_Handler.h - * DAnCE/Config_Handlers/Process_Element.cpp - * DAnCE/Config_Handlers/Process_Element.h - * DAnCE/Config_Handlers/Process_Element_T.cpp - * DAnCE/Config_Handlers/Process_Element_T.h - * DAnCE/Config_Handlers/RS_Handler.cpp - * DAnCE/Config_Handlers/RS_Handler.h - * DAnCE/Config_Handlers/RUK_Handler.cpp - * DAnCE/Config_Handlers/RUK_Handler.h - * DAnCE/Config_Handlers/Requirement_Handler.cpp - * DAnCE/Config_Handlers/Requirement_Handler.h - * DAnCE/Config_Handlers/SPK_Handler.cpp - * DAnCE/Config_Handlers/SPK_Handler.h - * DAnCE/Config_Handlers/SP_Handler.cpp - * DAnCE/Config_Handlers/SP_Handler.h - * DAnCE/Config_Handlers/TPD_Handler.cpp - * DAnCE/Config_Handlers/TPD_Handler.h - * DAnCE/Config_Handlers/Utils.cpp - * DAnCE/Config_Handlers/Utils.h - * DAnCE/Config_Handlers/XercesString.cpp - * DAnCE/Config_Handlers/XercesString.h - - Removed files unused by the new config handlers. - - * DAnCE/Config_Handlers/Config_Handlers.mpc - - Enabled the config handlers build. - -Sat Mar 19 18:19:34 2005 Will Otte - - * DAnCE/Config_Handlers/XMLSchema/Traversal.hpp - * DAnCE/Config_Handlers/XMLSchema/Traversal.ipp - * DAnCE/Config_Handlers/XMLSchema/Traversal.tpp - * DAnCE/Config_Handlers/XMLSchema/TypeInfo.hpp - * DAnCE/Config_Handlers/XMLSchema/TypeInfo.ipp - * DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp - * DAnCE/Config_Handlers/XMLSchema/Types.hpp - * DAnCE/Config_Handlers/XMLSchema/Types.ipp - * DAnCE/Config_Handlers/XMLSchema/Types.tpp - * DAnCE/Config_Handlers/XMLSchema/Writer.hpp - * DAnCE/Config_Handlers/XMLSchema/Writer.ipp - * DAnCE/Config_Handlers/XMLSchema/Writer.tpp - * DAnCE/Config_Handlers/XSCRT/Elements.hpp - * DAnCE/Config_Handlers/XSCRT/Elements.ipp - * DAnCE/Config_Handlers/XSCRT/Elements.tpp - * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp - * DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp - * DAnCE/Config_Handlers/XSCRT/Parser.hpp - * DAnCE/Config_Handlers/XSCRT/Parser.ipp - * DAnCE/Config_Handlers/XSCRT/Parser.tpp - * DAnCE/Config_Handlers/XSCRT/Traversal.hpp - * DAnCE/Config_Handlers/XSCRT/Traversal.ipp - * DAnCE/Config_Handlers/XSCRT/Traversal.tpp - * DAnCE/Config_Handlers/XSCRT/Writer.hpp - * DAnCE/Config_Handlers/XSCRT/Writer.ipp - * DAnCE/Config_Handlers/XSCRT/Writer.tpp - * DAnCE/Config_Handlers/XSCRT/XML.hpp - * DAnCE/Config_Handlers/XSCRT/XML.ipp - * DAnCE/Config_Handlers/XSCRT/XML.tpp - * DAnCE/Config_Handlers/XSCRT/XMLSchema.ipp - * DAnCE/Config_Handlers/XSCRT/XMLSchema.tpp - - Completed the merge of xsc_handler_1 into main. - -Sat Mar 19 17:29:50 2005 Jaiganesh B - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - - Fixed compiler errors. - -Sat Mar 19 16:57:41 2005 Jaiganesh B - - * DAnCE/Old_Config_Handlers/Any_Handler.cpp: - * DAnCE/Old_Config_Handlers/Any_Handler.h: - * DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/Old_Config_Handlers/Basic_Handler.cpp: - * DAnCE/Old_Config_Handlers/Basic_Handler.h: - * DAnCE/Old_Config_Handlers/CAD_Handler.cpp: - * DAnCE/Old_Config_Handlers/CAD_Handler.h: - * DAnCE/Old_Config_Handlers/CEPE_Handler.cpp: - * DAnCE/Old_Config_Handlers/CEPE_Handler.h: - * DAnCE/Old_Config_Handlers/CPK_Handler.cpp: - * DAnCE/Old_Config_Handlers/CPK_Handler.h: - * DAnCE/Old_Config_Handlers/CPR_Handler.cpp: - * DAnCE/Old_Config_Handlers/CPR_Handler.h: - * DAnCE/Old_Config_Handlers/Cap_Handler.cpp: - * DAnCE/Old_Config_Handlers/Cap_Handler.h: - * DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp: - * DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h: - * DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp: - * DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h: - * DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp: - * DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h: - * DAnCE/Old_Config_Handlers/Config.h: - * DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp: - * DAnCE/Old_Config_Handlers/Config_Error_Handler.h: - * DAnCE/Old_Config_Handlers/Config_Handler_export.h: - * DAnCE/Old_Config_Handlers/Config_Handlers.mpc: - * DAnCE/Old_Config_Handlers/DT_Handler.cpp: - * DAnCE/Old_Config_Handlers/DT_Handler.h: - * DAnCE/Old_Config_Handlers/Deployment.cpp: - * DAnCE/Old_Config_Handlers/Deployment.hpp: - * DAnCE/Old_Config_Handlers/DnC_Dump.cpp: - * DAnCE/Old_Config_Handlers/DnC_Dump.h: - * DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Old_Config_Handlers/DnC_Dump_T.h: - * DAnCE/Old_Config_Handlers/Domain_Handler.cpp: - * DAnCE/Old_Config_Handlers/Domain_Handler.h: - * DAnCE/Old_Config_Handlers/Dump_Obj.cpp: - * DAnCE/Old_Config_Handlers/Dump_Obj.h: - * DAnCE/Old_Config_Handlers/ERE_Handler.cpp: - * DAnCE/Old_Config_Handlers/ERE_Handler.h: - * DAnCE/Old_Config_Handlers/IAD_Handler.cpp: - * DAnCE/Old_Config_Handlers/IAD_Handler.h: - * DAnCE/Old_Config_Handlers/ID_Handler.cpp: - * DAnCE/Old_Config_Handlers/ID_Handler.h: - * DAnCE/Old_Config_Handlers/IR_Handler.cpp: - * DAnCE/Old_Config_Handlers/MID_Handler.cpp: - * DAnCE/Old_Config_Handlers/MID_Handler.h: - * DAnCE/Old_Config_Handlers/NIA_Handler.cpp: - * DAnCE/Old_Config_Handlers/NIA_Handler.h: - * DAnCE/Old_Config_Handlers/PCI_Handler.cpp: - * DAnCE/Old_Config_Handlers/PCI_Handler.h: - * DAnCE/Old_Config_Handlers/PC_Handler.cpp: - * DAnCE/Old_Config_Handlers/PC_Handler.h: - * DAnCE/Old_Config_Handlers/Plan_Handler.cpp: - * DAnCE/Old_Config_Handlers/Plan_Handler.h: - * DAnCE/Old_Config_Handlers/Process_Element.cpp: - * DAnCE/Old_Config_Handlers/Process_Element.h: - * DAnCE/Old_Config_Handlers/Process_Element_T.cpp: - * DAnCE/Old_Config_Handlers/Process_Element_T.h: - * DAnCE/Old_Config_Handlers/Property_Handler.cpp: - * DAnCE/Old_Config_Handlers/Property_Handler.h: - * DAnCE/Old_Config_Handlers/RS_Handler.cpp: - * DAnCE/Old_Config_Handlers/RS_Handler.h: - * DAnCE/Old_Config_Handlers/RUK_Handler.cpp: - * DAnCE/Old_Config_Handlers/RUK_Handler.h: - * DAnCE/Old_Config_Handlers/Requirement_Handler.cpp: - * DAnCE/Old_Config_Handlers/Requirement_Handler.h: - * DAnCE/Old_Config_Handlers/SPK_Handler.cpp: - * DAnCE/Old_Config_Handlers/SPK_Handler.h: - * DAnCE/Old_Config_Handlers/SP_Handler.cpp: - * DAnCE/Old_Config_Handlers/SP_Handler.h: - * DAnCE/Old_Config_Handlers/TPD_Handler.cpp: - * DAnCE/Old_Config_Handlers/TPD_Handler.h: - * DAnCE/Old_Config_Handlers/Utils.cpp: - * DAnCE/Old_Config_Handlers/Utils.h: - * DAnCE/Old_Config_Handlers/XercesString.cpp: - * DAnCE/Old_Config_Handlers/XercesString.h: - * DAnCE/Old_Config_Handlers/ccd.cpp: - * DAnCE/Old_Config_Handlers/ccd.hpp: - * DAnCE/Old_Config_Handlers/cdd.cpp: - * DAnCE/Old_Config_Handlers/cdd.hpp: - * DAnCE/Old_Config_Handlers/cdp.cpp: - * DAnCE/Old_Config_Handlers/cdp.hpp: - * DAnCE/Old_Config_Handlers/cid.cpp: - * DAnCE/Old_Config_Handlers/cid.hpp: - * DAnCE/Old_Config_Handlers/cpd.cpp: - * DAnCE/Old_Config_Handlers/cpd.hpp: - * DAnCE/Old_Config_Handlers/iad.cpp: - * DAnCE/Old_Config_Handlers/iad.hpp: - * DAnCE/Old_Config_Handlers/pcd.cpp: - * DAnCE/Old_Config_Handlers/pcd.hpp: - * DAnCE/Old_Config_Handlers/toplevel.cpp: - * DAnCE/Old_Config_Handlers/toplevel.hpp: - - Older version of config handlers. - - -Sat Mar 19 16:14:20 2005 Jaiganesh B - - * DAnCE/Config_Handlers/ccd.cpp: - * DAnCE/Config_Handlers/ccd.hpp: - * DAnCE/Config_Handlers/cdd.cpp: - * DAnCE/Config_Handlers/cdd.hpp: - * DAnCE/Config_Handlers/cdp.cpp: - * DAnCE/Config_Handlers/cdp.hpp: - * DAnCE/Config_Handlers/cid.cpp: - * DAnCE/Config_Handlers/cid.hpp: - * DAnCE/Config_Handlers/cpd.cpp: - * DAnCE/Config_Handlers/cpd.hpp: - * DAnCE/Config_Handlers/iad.cpp: - * DAnCE/Config_Handlers/iad.hpp: - * DAnCE/Config_Handlers/pcd.cpp: - * DAnCE/Config_Handlers/pcd.hpp: - * DAnCE/Config_Handlers/toplevel.cpp: - * DAnCE/Config_Handlers/toplevel.hpp: - * DAnCE/Config_Handlers/ERE_Handler.cpp: - * DAnCE/Config_Handlers/ERE_Handler.h: - * DAnCE/Config_Handlers/IDD_Handler.cpp: - * DAnCE/Config_Handlers/IDD_Handler.h: - * DAnCE/Config_Handlers/IDREF_Base.cpp: - * DAnCE/Config_Handlers/IDREF_Base.h: - * DAnCE/Config_Handlers/ID_Handler.cpp: - * DAnCE/Config_Handlers/ID_Handler.h: - * DAnCE/Config_Handlers/IRDD_Handler.cpp: - * DAnCE/Config_Handlers/IRDD_Handler.h: - * DAnCE/Config_Handlers/MDD_Handler.cpp: - * DAnCE/Config_Handlers/MDD_Handler.h: - * DAnCE/Config_Handlers/PCD_Handler.cpp: - * DAnCE/Config_Handlers/PCD_Handler.h: - * DAnCE/Config_Handlers/PSPE_Handler.cpp: - * DAnCE/Config_Handlers/PSPE_Handler.h: - * DAnCE/Config_Handlers/Property_Handler.cpp: - * DAnCE/Config_Handlers/Property_Handler.h: - * DAnCE/Config_Handlers/RDD_Handler.cpp: - * DAnCE/Config_Handlers/RDD_Handler.h: - * DAnCE/Config_Handlers/Req_Handler.cpp: - * DAnCE/Config_Handlers/Req_Handler.h: - * DAnCE/Config_Handlers/XML_Error_Handler.cpp: - * DAnCE/Config_Handlers/XML_Error_Handler.h: - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - * DAnCE/Config_Handlers/XML_File_Intf.h: - * DAnCE/Config_Handlers/XML_Helper.cpp: - * DAnCE/Config_Handlers/XML_Helper.h: - * DAnCE/Config_Handlers/XercesString.cpp: - * DAnCE/Config_Handlers/XercesString.h: - * DAnCE/Config_Handlers/ADD_Handler.cpp: - * DAnCE/Config_Handlers/ADD_Handler.h: - * DAnCE/Config_Handlers/Any_Handler.cpp: - * DAnCE/Config_Handlers/Any_Handler.h: - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/Config_Handlers/CCD_Handler.cpp: - * DAnCE/Config_Handlers/CCD_Handler.h: - * DAnCE/Config_Handlers/CEPE_Handler.cpp: - * DAnCE/Config_Handlers/CEPE_Handler.h: - * DAnCE/Config_Handlers/CPD_Handler.cpp: - * DAnCE/Config_Handlers/CPD_Handler.h: - * DAnCE/Config_Handlers/CRDD_Handler.cpp: - * DAnCE/Config_Handlers/CRDD_Handler.h: - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp: - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h: - * DAnCE/Config_Handlers/Config_Handlers.mpc: - * DAnCE/Config_Handlers/Config_Handlers_Export.h: - * DAnCE/Config_Handlers/DP_Handler.cpp: - * DAnCE/Config_Handlers/DP_Handler.h: - * DAnCE/Config_Handlers/DP_PCD_Handler.cpp: - * DAnCE/Config_Handlers/DP_PCD_Handler.h: - * DAnCE/Config_Handlers/DataType_Handler.cpp: - * DAnCE/Config_Handlers/DataType_Handler.h: - * DAnCE/Config_Handlers/Deployment.cpp: - * DAnCE/Config_Handlers/Deployment.hpp: - * DAnCE/Config_Handlers/DnC_Dump.cpp: - * DAnCE/Config_Handlers/DnC_Dump.h: - * DAnCE/Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Config_Handlers/DnC_Dump_T.h: - * DAnCE/Config_Handlers/Dump_Obj.cpp: - * DAnCE/Config_Handlers/Dump_Obj.h: - - Merged branch xsc_handler_1 to main. - -Sat Mar 19 15:36:55 2005 Jaiganesh B - - * DAnCE/Config_Handlers/RDD_Handler.cpp: - * DAnCE/Config_Handlers/RDD_Handler.h: - * DAnCE/Config_Handlers/Req_Handler.cpp: - * DAnCE/Config_Handlers/Req_Handler.h: - * DAnCE/Config_Handlers/XML_Error_Handler.cpp: - * DAnCE/Config_Handlers/XML_Error_Handler.h: - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - * DAnCE/Config_Handlers/XML_File_Intf.h: - * DAnCE/Config_Handlers/XML_Helper.cpp: - * DAnCE/Config_Handlers/XML_Helper.h: - - More XSC config handlers. - -Sat Mar 19 15:29:45 2005 Jaiganesh B - - * DAnCE/Config_Handlers/Any_Handler.h: - * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/Config_Handlers/CEPE_Handler.cpp: - * DAnCE/Config_Handlers/CEPE_Handler.h: - * DAnCE/Config_Handlers/Deployment.cpp: - * DAnCE/Config_Handlers/DnC_Dump.cpp: - * DAnCE/Config_Handlers/DnC_Dump.h: - * DAnCE/Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Config_Handlers/DnC_Dump_T.h: - * DAnCE/Config_Handlers/Dump_Obj.cpp: - * DAnCE/Config_Handlers/Dump_Obj.h: - * DAnCE/Config_Handlers/ERE_Handler.cpp: - * DAnCE/Config_Handlers/ERE_Handler.h: - * DAnCE/Config_Handlers/IDD_Handler.cpp: - * DAnCE/Config_Handlers/IDD_Handler.h: - * DAnCE/Config_Handlers/IDREF_Base.cpp: - * DAnCE/Config_Handlers/IDREF_Base.h: - * DAnCE/Config_Handlers/ID_Handler.cpp: - * DAnCE/Config_Handlers/ID_Handler.h: - * DAnCE/Config_Handlers/IRDD_Handler.cpp: - * DAnCE/Config_Handlers/IRDD_Handler.h: - * DAnCE/Config_Handlers/MDD_Handler.cpp: - * DAnCE/Config_Handlers/MDD_Handler.h: - * DAnCE/Config_Handlers/Modified_Deployment.xsd: - * DAnCE/Config_Handlers/PCD_Handler.cpp: - * DAnCE/Config_Handlers/PCD_Handler.h: - * DAnCE/Config_Handlers/PSPE_Handler.cpp: - * DAnCE/Config_Handlers/PSPE_Handler.h: - - More XML config handlers. - -Sat Mar 19 15:25:17 2005 Jaiganesh B - - * DAnCE/Config_Handlers/ADD_Handler.cpp: - * DAnCE/Config_Handlers/ADD_Handler.h: - * DAnCE/Config_Handlers/BasicSP.cdp: - * DAnCE/Config_Handlers/CCD_Handler.cpp: - * DAnCE/Config_Handlers/CCD_Handler.h: - * DAnCE/Config_Handlers/CPD_Handler.cpp: - * DAnCE/Config_Handlers/CPD_Handler.h: - * DAnCE/Config_Handlers/CRDD_Handler.cpp: - * DAnCE/Config_Handlers/CRDD_Handler.h: - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp: - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h: - * DAnCE/Config_Handlers/Config_Handlers_Export.h: - * DAnCE/Config_Handlers/DP_Handler.cpp: - * DAnCE/Config_Handlers/DP_Handler.h: - * DAnCE/Config_Handlers/DP_PCD_Handler.cpp: - * DAnCE/Config_Handlers/DP_PCD_Handler.h: - * DAnCE/Config_Handlers/DataType_Handler.cpp: - * DAnCE/Config_Handlers/DataType_Handler.h: - - Added a XSC compiler compliant config handlers. - -Sat Mar 19 15:22:54 2005 Jaiganesh B - - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/ExecutionManager/DAM_Map.h: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - - Fixed some more compiler errors. - -Sat Mar 19 15:06:37 2005 Jaiganesh B - - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/ExecutionManager/DAM_Map.h: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/NodeApplication/NodeApplication.cpp: - * DAnCE/NodeManager/NodeDaemon_Impl.cpp: - - Made changes to fix compile errors. - -Sat Mar 19 15:02:03 2005 Jaiganesh B - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * - DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Made changes to reflect changes made to the CIAO - infrastructure to support NodeApplication instantiate - multiple containers. - - Thanks to Gan Deng for making this - change. - -Sat Mar 19 14:54:15 2005 Jaiganesh B - - * DAnCE/examples/BasicSP/descriptors/BasicSP.cdp: - * DAnCE/examples/BasicSP/descriptors/NodeManagerMap.dat: - * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl: - * DAnCE/examples/BasicSP/descriptors/flattern_deploymentplan.cdp: - - Added a flattened deployment plan for testing the DaNCE - infrastructure. - - Thanks to Will Otte for helping - out with this project. - -Sat Mar 19 14:23:49 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Hello_Base/Hello_Base.idl: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base.mpc: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base_stub_export.h: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base_svnt_export.h: - * DAnCE/examples/Swapping/Receiver/Receiver.mpc: - * DAnCE/examples/Swapping/Sender/Sender.mpc: - - Fixed few minor compiler errors. - -Sat Mar 19 13:40:30 2005 Jaiganesh B - - * DAnCE/examples/Swapping/Hello_Base/Hello_Base.idl: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base.mpc: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base_stub_export.h: - * DAnCE/examples/Swapping/Hello_Base/Hello_Base_svnt_export.h: - * DAnCE/examples/Swapping/Receiver/Receiver.cidl: - * DAnCE/examples/Swapping/Receiver/Receiver.idl: - * DAnCE/examples/Swapping/Receiver/Receiver.mpc: - * DAnCE/examples/Swapping/Receiver/Receiver_exec.cpp: - * DAnCE/examples/Swapping/Receiver/Receiver_exec.h: - * DAnCE/examples/Swapping/Receiver/Receiver_exec_export.h: - * DAnCE/examples/Swapping/Receiver/Receiver_stub_export.h: - * DAnCE/examples/Swapping/Receiver/Receiver_svnt_export.h: - * DAnCE/examples/Swapping/Sender/Sender.cidl: - * DAnCE/examples/Swapping/Sender/Sender.idl: - * DAnCE/examples/Swapping/Sender/Sender.mpc: - * DAnCE/examples/Swapping/Sender/Sender_exec.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_1.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.cpp: - * DAnCE/examples/Swapping/Sender/Sender_exec_2.h: - * DAnCE/examples/Swapping/Sender/Sender_exec_export.h: - * DAnCE/examples/Swapping/Sender/Sender_stub_export.h: - * DAnCE/examples/Swapping/Sender/Sender_svnt_export.h: - * DAnCE/examples/Swapping/Sender/starter.cpp: - - Added a "HelloWorld" example that can test the dynamic - swapping of component implementation capability. - - Thanks to Bala Natarajan - for helping me with this project. - -Sat Mar 19 13:17:37 2005 Jaiganesh B - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - - Made changes to reflect changes made to the infrastructure - to provide the capability in the NodeApplication - to support multiple containers. - -Sat Mar 19 13:13:13 2005 Jaiganesh B - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - Changes to reflect the infrasrtuctural changes related - to providing capability in the NodeApplication - to support multiple containers. - - Thanks to Gan Deng for - architecting and implementing this project. - -Sat Mar 19 13:08:18 2005 Jaiganesh B - - * DAnCE/ciao/NodeApplication_Impl.inl: - - Made some changes to fix compiler errors. - -Sat Mar 19 12:48:44 2005 Jaiganesh B - - * DAnCE/ciao/CCM_Core.mpc: - * DAnCE/ciao/CIAO_Config.h: - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/Container_Base.h: - * DAnCE/ciao/Container_Impl.cpp: - * DAnCE/ciao/Container_Impl.h: - * DAnCE/ciao/Container_Impl.inl: - * DAnCE/ciao/Context_Impl_T.cpp: - * DAnCE/ciao/Deployment.idl: - * DAnCE/ciao/Deployment_Core.idl: - * DAnCE/ciao/Dynamic_Component_Activator.cpp: - * DAnCE/ciao/Dynamic_Component_Activator.h: - * DAnCE/ciao/Dynamic_Component_Servant_Base.cpp: - * DAnCE/ciao/Dynamic_Component_Servant_Base.h: - * DAnCE/ciao/Dynamic_Component_Servant_T.cpp: - * DAnCE/ciao/Dynamic_Component_Servant_T.h: - * DAnCE/ciao/Home_Servant_Impl_Base.h: - * DAnCE/ciao/Home_Servant_Impl_T.cpp: - * DAnCE/ciao/Home_Servant_Impl_T.h: - * DAnCE/ciao/NodeApplication_Impl.cpp: - * DAnCE/ciao/NodeApplication_Impl.h: - * DAnCE/ciao/NodeApplication_Impl.inl: - * DAnCE/ciao/Object_Set_T.cpp: - * DAnCE/ciao/Object_Set_T.h: - * DAnCE/ciao/Object_Set_T.inl: - * DAnCE/ciao/Port_Activator_T.cpp: - * DAnCE/ciao/Servant_Activator.cpp: - * DAnCE/ciao/Servant_Activator.h: - * DAnCE/ciao/Servant_Impl_Base.cpp: - * DAnCE/ciao/Servant_Impl_Base.h: - * DAnCE/ciao/Servant_Impl_T.cpp: - * DAnCE/ciao/Servant_Impl_T.h: - * DAnCE/ciao/SwapExec.idl: - * DAnCE/ciao/Swapping_Container.cpp: - * DAnCE/ciao/Swapping_Container.h: - * DAnCE/ciao/Swapping_Container.inl: - * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp: - * DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp: - * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h: - * DAnCE/ciao/UpgradeableContext.idl: - * DAnCE/ciao/Upgradeable_Context_Impl_T.cpp: - * DAnCE/ciao/Upgradeable_Context_Impl_T.h: - - Added CIAO infrastructure changes to allow NodeApplications - to support multi container instantiation. - - Added CIAO infrastructure changes to allow dynamic - swapping of component implementations. - - Thanks to Gan Deng and - Bala Natarajan for their - help in architecting and implementing these changes. - -Fri Mar 18 18:34:20 2005 Boris Kolpackov - - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp: - * CCF/CCF/IDL2/Traversal/ValueTypeMember.hpp: - * CCF/CCF/IDL2/Traversal/ValueTypeMember.tpp: - - First part of the "full" support for members in valuetypes. - - -Thu Mar 17 10:18:33 2005 Jeff Parsons - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added command line option 'custom-container' to the CIDL - compiler backend, and code generation to execute if the - argument to the new option is 'upgradeable'. CIAO - infrastructure changes to support dynamic component - swapping will be merged from a branch shortly - these - CIDL compiler changes will not affect any existing builds - or tests since they don't use the new command line option. - -Fri Mar 11 10:33:28 2005 Will Otte - - * docs/schema/cdp.xsd - - Corrected an incorrect element in the schema. - -Fri Mar 11 12:01:12 UTC 2005 Johnny Willemsen - - * ciao/ComponentsC.h: - * ciao/ComponentsS.h: - * DAnCE/ciao/ComponentsC.h: - * DAnCE/ciao/ComponentsS.h: - * DAnCE/NodeManager/NodeDaemon_Impl.h: - * performance-tests/Benchmark/LatencyTest.h: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.h: - Changed _MSC_VER check - -Fri Mar 4 17:13:16 2005 Jeff Parsons - - * examples/Hello/Hello_Base/Hello_Base.idl: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - - Cosmetic changes to IDL files and changes to MPC files to - eliminate unnecessary files in a given project and bring - in missing export header files. - -Thu Mar 3 10:31:10 2005 Jeff Parsons - - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - - - Added support for .cdl file extension similar to - support already in the servant generators. - - - Fixed bug in export include generation. - - Thanks to Matt Emerson , - Ming Xiong , James Hill - and Stoyan Paunov - for reporting these - problems. - - * CIDLC/ServantSourceGenerator.cpp: - - - Replaced remaining instances of generation of 'new' with - 'ACE_NEW' and changed code generation to reduce line - lengths. - - - Changed code generation of Cookie_var for multiplex - receptacles to pass a Cookie* to ACE_NEW, then - assign to the _var, instead of passing in _var.out(), - which causes the allocation to fail on some platforms. - Thanks to Don Busch for reporting - the problem. - -Mon Mar 03 09:37:23 2005 Gan Deng - - * DAnCE/examples/Hello/descriptors/Hello.cdp - * DAnCE/examples/Hello/descriptors/hello.dat - - Remove these two files because the file name is bad. - - * DAnCE/examples/Hello/descriptors/DeploymentPlan.cdp - * DAnCE/examples/Hello/descriptors/NodeManagerMap.dat - - Added these two files. - - * DAnCE/examples/Hello/step-by-step.html - - Fixed this page to reflex the above change. - -Mon Mar 03 08:59:23 2005 Gan Deng - - * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc - - Fixed the Hello_Base_DnC_svnt project settings which - caused comilation errors. - -Wed Mar 02 11:42:12 UTC 2005 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/RepositoryManager/RepositoryManager.mpc - * performance-tests/Protocols/Controller/Controller.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/RTCCM/DiffServ/Controller/Controller.mpc - Use exceptions as base project instead of requires exceptions - -Mon Mar 02 18:30:25 2005 Gan Deng - - * examples/Hello/step-by-step.html - * DAnCE/examples/Hello/step-by-step.html - - Modified these two documentation page to fix some errors. - - * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc - - Fixed wrong shared library names and project names. - -Sat Feb 26 14:38:46 2005 Arvind S. Krishna - - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC/EC/EC.mpc: - * examples/handcrafted/BasicSP_EC/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC2/EC/EC.mpc: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc: - * examples/handcrafted/BasicSP_EC2/BasicSP.mpc: - - Replaced all occurances of "dummy" with "dummy_label" - - * bin/replace_dummy_with_dummylabel.sh: - - Shell script that can be used to do this. In case people find it - useful. - - -Tue Feb 22 09:55:51 2005 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - - Fixed typos in code generation that were omitting a space - between the type name and '_ciao_extract_val' for enums, - structs and unions when used as component or home attributes. - Thanks to Steve Baker for - reporting the bug with enums. - -Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen - - * DAnCE/ciao/Servant_Activator.h: - * ciao/Servant_Activator.h: - Added missing includes because of POA refactoring - -Thu Feb 17 14:04:12 UTC 2005 Johnny Willemsen - - * ciao/Component_Base.idl: - Fixed typo in include of orb.idl. Thanks to Roland Schimmack - for reporting this - -Tue Feb 15 22:43:34 2005 Arvind S. Krishna - - * DAnCE/examples/BasicSP/BMDisplay_exec.h: - - Added missing export file to make things compile on Windows - platforms. Thanks to Diana Ukleja - for pointing this out. - -Mon Feb 14 14:52:32 2005 Gan Deng - - * DAnCE/NEWS - - Updated the NEWS file by adding support for parsing - hierarchical assembly of component descriptors. - -Sun Feb 13 13:25:12 UTC 2005 Johnny Willemsen - - * Release: - Removed CIAO-INSTALL from the release files. It is already - picked up because we include the complete CIAO directory - -Fri Feb 11 11:12:21 2005 Gan Deng - - * DAnCE/NEWS - - Updated the NEWS file by adding support for setting up - attribute in component configuration. - -Fri Feb 11 11:10:54 2005 Will Otte - - * docs/schema/Modified_Deployment.xsd: - - Corrected a couple mistakes in the schema. - -Thu Feb 10 07:11:04 2005 Johnny Willemsen - - * CIAO version 0.4.4 released. - -Tue Feb 08 10:04:21 2005 Gan Deng - - * DAnCE/NEWS - - Updated the NEWS file for the coming 0.4.4 release. - -Mon Feb 7 09:49:12 UTC 2005 Johnny Willemsen - - * Release: - Added CIAO-INSTALL to the release files - -Fri Feb 4 09:35:00 2005 Emre Turkay - - * DAnCE/examples/Hello/descriptors/basicNodeDaemon.pl: - The perl script to create node daemons created. - - * DAnCE/examples/Hello/step-by-step.html: - Step by step tutorial for the DAnCE. - -Fri Feb 4 12:11:12 UTC 2005 Johnny Willemsen - - * tools/RTComponentServer/RTConfig_Manager.h: - Include SString.h instead of SStringfwd.h to fix compile errors with - CBuilderX - -Thu Feb 3 20:01:12 UTC 2005 Johnny Willemsen - - * tools/Segment_Timer/Segment_Timer.mpc: - Removed TAO_ROOT again, the gnu template has been changed so that - when CIAO is detected, also TAO_ROOT is set - -Thu Feb 3 12:32:12 UTC 2005 Johnny Willemsen - - * DAnCE/ciao/NodeApplication_Impl.h: - Added include of ace/SString.h to fix compile errors with CBuilderX - -Thu Feb 3 10:11:12 UTC 2005 Johnny Willemsen - - * tools/Segment_Timer/Segment_Timer.mpc: - Added $(TAO_ROOT) so that MPC creates a correct GNU makefile - -Wed Feb 2 19:48:12 UTC 2005 Johnny Willemsen - - * rules.ciao.GNU: - Fixed error in this file - -Wed Feb 2 09:39:25 2005 Chad Elliott - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - * CIDLC/CIDLC.mpc: - - Converted includes to incorporate $(CIAO_ROOT). This allows the - GNUACEProjectCreator to recognize these projects as CIAO projects. - - * DAnCE/ciao/CCM_Core.mpc: - * ciao/CCM_Core.mpc: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/Segment_Timer/Segment_Timer.mpc: - - Added a bogus include of $(CIAO_ROOT). This allows the - GNUACEProjectCreator to recognize these projects as CIAO projects. - -Wed Feb 2 14:33:12 UTC 2005 Johnny Willemsen - - * rules.ciao.GNU: - New rules file to set the correct SOVERSION and SONAME values - -Wed Feb 2 10:51:12 UTC 2005 Johnny Willemsen - - * ciao/Port_Activator_T.cpp: - Added include of OS_NS_string.h to get ACE_OS::strcmp - -Tue Feb 1 18:09:12 UTC 2005 Johnny Willemsen - - * ciao/CCM_Core.mpc: - * DAnCE/ciao/CCM_Core.mpc: - Removed some ciaoversion based projects I missed during my checkin - below - -Tue Feb 1 13:41:12 UTC 2005 Johnny Willemsen - - * ciao/CCM_Core.mpc: - * DAnCE/ciao/CCM_Core.mpc: - Removed ciaoversion as base project. This will be removed because it - results in the fact that each generated GNU makefile will get the - version number generated. We want that the GNU make rules get the - version number from Version.h - -Mon Jan 31 21:00:12 2005 Ossama Othman - - * CIDLC/ServantSourceGenerator.cpp (pre): - - Generate '#include "ace/OS_NS_string.h"' directive. CIAO CIDL - servant sources call ACE_OS::strcmp(), the prototype of which is - found in that header. Necessitated by inter-header dependency - reductions in ACE. - -Mon Jan 31 11:59:04 2005 Ossama Othman - - * DAnCE/Config_Handlers/Any_Handler.cpp: - * DAnCE/Config_Handlers/CPK_Handler.cpp: - * DAnCE/Config_Handlers/DT_Handler.cpp: - * DAnCE/Config_Handlers/Property_Handler.cpp: - * DAnCE/Config_Handlers/RS_Handler.cpp: - * DAnCE/Config_Handlers/Requirement_Handler.cpp: - * DAnCE/Config_Handlers/SP_Handler.cpp: - * DAnCE/ciao/Port_Activator_T.cpp: - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * ciao/Container_Impl.cpp: - * performance-tests/Protocols/Controller/Controller.cpp: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTServer_Impl.cpp: - - Added missing header include directives that are necessary due - to inter-header dependency reductions in ACE. - -Sun Jan 30 20:30:46 2005 Ossama Othman - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/ciao/Container_Base.cpp: - * DAnCE/ciao/NodeApplication_Impl.cpp: - * ciao/Container_Base.cpp: - * ciao/ServerActivator_Impl.h: - * docs/tutorial/Hello/hello_exec.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * tests/RTCCM/Priority_Test/Controllers/client.cpp: - * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp: - * tools/Assembly_Deployer/Deployment_Configuration.h: - * tools/RTComponentServer/RTServer_Impl.cpp: - - Added missing header include directives that are necessary due - to inter-header dependency reductions in ACE. - -Sun Jan 23 01:49:51 2005 Marek Brudka - - * examples/OEP/Display/NavDisplayGUI_exec/README (Module): - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module): - Changes related with separation of GUI reactors. - The additional information is avalaible in ChangeLog at REACTOR_SEPARATION branch (below). - - Mon Dec 6 00:39:19 2004 Marek Brudka - - * examples/OEP/Display/NavDisplayGUI_exec/README (Module): - Remove reference to ACE_HAS_QT. - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module): - Removed deprecated qt_moc base project. - -Fri Jan 21 17:27:12 2005 Gan Deng - - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc - - Fixed dependency relationship by making - NodeAppTest_RoundTrip_stub depending on CIAO_DnC_Container. - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp - - Fixed warning on Debian_Full_Reactor build. The warning is - caused because of assigning "const char*" to a "char *" type. - - Thanks Johnny Willemsen for pointing - these. - -Thu Jan 20 18:29:47 2005 Ossama Othman - - * DAnCE/Config_Handlers/Any_Handler.cpp: - * DAnCE/Config_Handlers/Utils.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tools/Daemon/Daemon_Impl.cpp: - - Converted all ACE_{static,dynamic,reinterpret,const}_cast macros - calls to their standard C++ counterparts using new - bin/ACE-casts-convert script. The ACE cast macros were - deprecated back in ACE 5.4.2. - -Thu Jan 20 09:54:04 2005 Nanbor Wang - - * examples/OEP/Display/descriptors/NOTE.txt: - * examples/OEP/Display/descriptors/NOTE-win.txt: - - Fixed the discrepancy on using Assembly_Deployer. Thanks to - Martina Yen for reporting this. - -Wed Jan 19 09:39:14 2005 Gan Deng - - * DAnCE/examples/BasicSP/BasicSP.mpc - * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc - * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc - * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc - * DAnCE/examples/BasicSP/EC/EC.mpc - - Changed the shared component library name from - _DnC_ to _, - since it doesn't make sense to let the modelers to put _DnC - trailing a component name. - - The same change applied to _svnt and _exec libraries. - - * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl - - Fixed this script since Some earlier cosmetic change make - this perl script broken. - - Thanks Steven Baker and - Sam Abbe to pointing errors to - run this example. - -Sat Jan 15 15:16:14 2005 Gan Deng - - * DAnCE/examples/BasicSP/README.html - - Updated this README file for instructions on running the BasicSP - example by using DAnCE. Thanks Sam Abbe - for pointing errors on this document page. This fixes bugid - 2031. - -Mon Jan 10 09:45:14 2005 Nanbor Wang - - * DAnCE/RTNodeApplication/RTServer_Impl.h: - * DAnCE/RTNodeApplication/RTServer_Impl.cpp: Removed init method - altogether. VC6 can't handle the syntax and we'll deal with - later. - -Fri Jan 7 10:02:02 2005 Nanbor Wang - - * DAnCE/RTNodeApplication/RTServer_Impl.cpp (init): Changed to - call the virtual function defined by the parent explicitly with - this pointer to work around a VC6 bug. - -Wed Jan 5 15:20:12 UTC 2005 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Deployment_Configuration.inl: - * DAnCE/tests/Config_Handlers/Handler_Test.i: - Removed inl/i file, updated h,cpp - -Wed Jan 5 14:57:12 UTC 2005 Johnny Willemsen - - * tools/Assembly_Deployer/Deployment_Configuration.{h,cpp,inl}: - * tools/XML_Helpers/XML_Utils.{h,cpp,inl}: - Removed inl file, updated h,cpp - -Wed Jan 5 10:45:12 UTC 2005 Johnny Willemsen - - * DAnCE/RTNodeApplication/RTServer_Impl.h: - Fixed compile problem in emulated exception builds due to - incorrect environment macro - -Mon Jan 3 10:01:09 2005 Nanbor Wang - - * DAnCE/RTNodeApplication/README: - * DAnCE/RTNodeApplication/NodeApplication_Task.cpp: - * DAnCE/RTNodeApplication/NodeApplication_Task.h: - * DAnCE/RTNodeApplication/NodeApplication_Task.inl: - * DAnCE/RTNodeApplication/RTNodeApplication.cpp: - * DAnCE/RTNodeApplication/RTNodeApplication.mpc: - * DAnCE/RTNodeApplication/RTServer_Impl.cpp: - * DAnCE/RTNodeApplication/RTServer_Impl.h: - * DAnCE/RTNodeApplication/RTServer_Impl.inl: - * DAnCE/RTNodeApplication/senv.sh: Added a minimal - real-time-enabled NodeApplication server. - -Mon Jan 3 12:20:12 UTC 2005 Johnny Willemsen - - * ciao/CCM_Core.mpc: - * DAnCE/ciao/CCM_Core.mpc: - Added ciaoversion as base project to all projects so that SOVERSION - is set to the correct version number in the GNU makefiles - -Thu Dec 30 13:24:16 2004 Chris Cleeland - - * CIAO version 0.4.3 released. - - diff --git a/CIAO/ChangeLogs/ChangeLog-2006b b/CIAO/ChangeLogs/ChangeLog-2006b deleted file mode 100644 index b7797cca18a..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2006b +++ /dev/null @@ -1,2752 +0,0 @@ -Fri Nov 17 16:08:43 UTC 2006 Jeff Parsons - - * performace-tests/Protocols/common/Protocols_svnt_export.h: - - Removed this file, renamed as the one added below. - - * performace-tests/Protocols/common/Protocols_skel_export.h: - - New file, renamed from the one removed above. - - * performace-tests/Protocols/Sender/Sender.idl: - * performace-tests/Protocols/Sender/Sender.mpc: - * performace-tests/Protocols/Receiver/Receiver.mpc: - * performace-tests/Protocols/Receiver/Receiver.idl: - * performace-tests/Protocols/common/Protocols.mpc: - * performace-tests/Protocols/common/Protocols.idl: - - Fixes to incorrect generation by generate_component_mpc.pl, - similar to those in - - Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons - - Also removed include of Components.idl from Protocols.idl, - since it contains no component or eventtype declarations, - and added the include to Sender.idl and Receiver.idl. - -Thu Nov 16 14:41:24 UTC 2006 Jeff Parsons - - * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h: - - Removed these files, added as renamed below. - - * tests/Bug_2130_Regression/interfaces/ENW_skel_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - - New files, renamed from those removed above. - - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc: - * docs/tutorials/Quoter/Simple/Broker/Broker.mpc: - - Fixes to incorrect generation by generate_component_mpc.pl, - similar to those in - - Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons - -Wed Nov 15 19:56:46 UTC 2006 Jeff Parsons - - * examples/Display/Display_Base/Display_Base_svnt_export.h: - - Removed this file, and added it as named below. - - * examples/Display/Display_Base/Display_Base_skel_export.h: - - New file, renamed from the one removed above. - - * examples/Display/Display_Base/Display_Base.mpc: - - Fixed incorrect export macros that were originally generated - by generate_component_mpc.pl. Also removed the -GT IDL - compiler command line option, which generated unnecessar - tie classes and template files (added by a base MPC project), - and made cosmetic changes to line breaks. Finally, - renamed project Display_Base_svnt to Display_Base_skel, - to eliminate confusion since the projects in this MPC - file are object-based, not component-based. The export - macros and export include files were also renamed, as - described above, consistently with these last changes. - - * examples/GPS/GPS.mpc: - * examples/NavDisplay/NavDisplay.mpc: - * examples/RateGen/RateGen.mpc: - - Renamed references to the Display_Base_svnt lib to be - consistent with the name change above, removed -GT - from the command line options passed to the IDL compiler, - and added -SS (suppress skeleton file generation) and - -St (suppress typecode and Any operator generation) from - *_svnt projects, and removed 'idlflags' line from - *_exec projects without IDL files. - -Wed Nov 15 10:30:00 UTC 2006 Simon Massey - - * NEWS: - - Entries submitted by Shanshan Jiang and Johnny Willemsen. - -Tue Nov 14 16:27:55 UTC 2006 Jeff Parsons - - * examples/Null_Component/Null_Component.mpc: - - Updated lib names in 'libs +=...' lines, overlooked in - - Mon Nov 13 16:54:47 UTC 2006 Jeff Parsons - -Tue Nov 14 09:00:00 UTC 2006 Simon Massey - - * NEWS: - - Entry submitted by Boris Kolpackov. - -Mon Nov 13 16:54:47 UTC 2006 Jeff Parsons - - * examples/Null_Component/Null_Interface_svnt_export.h: - - Removed this file, renamed as below. - - * examples/Null_Component/Null_Interface_skel_export.h: - - Added this file, renamed from removed file above. - - * examples/Null_Component/Null_Interface.mpc: - - Renamed several things corresponding to the renaming - change above and replace export macro definition in - the skel project with separate stub and skel export - macro definitions and corresponding included. Also - added typecode/Any suppression command line option - -St to IDL compiler execution for both stub and skel - projects, and reduced MPC base project dependencies - (and thus link dependencies) to a minimum. - - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/StaticDAnCEApp.mpc: - - Renamed items corresponding to change above. - -Fri Nov 10 16:10:12 UTC 2006 Johnny Willemsen - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - Removed deprecated -Sc option from idlflags - -Wed Nov 8 20:56:12 UTC 2006 Johnny Willemsen - - * examples/Null_Component/*: - Added some modelling files I got also from Abdul and removed the .ccd file - I committed by accident - -Wed Nov 8 14:24:12 UTC 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Fixed a small memory leaks and other problems. This fixes bugzilla - 2692. Thanks to Sowayan Abdullah - for reporting these issues. - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - A few small improvements - -Sun Nov 5 19:16:57 UTC 2006 Shanshan Jiang - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - Removed the use of STL iostream. - Use ACE DLL decorator, prefix, suffix for DLL file names. - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - Removed the use of STL iostream. - -Fri Nov 3 03:03:24 UTC 2006 Shanshan Jiang - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/RepositoryManager/PC_Updater.cpp - Modified these files to differentiate the location field of - deploymentplan for different platforms. - -Thu Nov 2 22:54:12 UTC 2006 Jeff Parsons - - * CIDLC/ServnatSourceGenerator.cpp: - - Added generation of code to register eventtype factories with - the container ORB for components with publish and emit ports - (generation of such registration for components with consume - ports already existed). This additional registration is necessary - if the component sends an event using a CIAO Event Service - event channel that is collocated with it. - -Thu Nov 2 20:22:46 UTC 2006 Douglas C. Schmidt - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp (main): - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/NodeManager/Node_Manager.cpp (main): Replaced exit() with - ACE_OS::exit(). Thanks to Abdul Sowayan for reporting this. - This fixes bugid #2695. - -Mon Oct 30 19:13:03 UTC 2006 Jeff Parsons - - * tests/IDL3/Events/Any/EventAny.idl: - * tests/IDL3/Events/Any/Any.mpc: - * tests/IDL3/Events/Any/main.cpp: - * tests/IDL3/Events/Any/README: - * tests/IDL3/Events/Any/run_test.pl: - - New test, to ensure that IDL eventtypes are - inserted/extracted from Anys correctly, and that - the resulting Anys are marshaled/demarshaled - correctly. - - * tests/IDL3/Events/Regular/Regular.mpc: - - Added backslashes to shorted 'idlflags' line. - -Mon Oct 30 13:26:00 UTC 2006 Simon Massey - - * DAnCE/TargetManager/CmpClient.cpp - BUILDCZAR removing old scoreboard warning. - -Thu Oct 26 14:37:12 UTC 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Use ACE_OS methods, this fixes bugzilla 2691. - Thanks to Sowayan Abdullah - for reporting this issue - -Wed Oct 25 14:54:03 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Home.hpp: - - Minor fixes and cleanups. - - * CCF/CCF/IDL2/Parsing/Recovery.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/CIDL/Parser.hpp: - * CCF/CCF/CIDL/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/Parser.cpp: - - Added syntax errors to every grammar rule. - -Wed Oct 25 11:02:12 UTC 2006 Johnny Willemsen - - * examples/Null_Component/StaticDAnCEApp.mpc: - Enabled this project in all builds - -Mon Oct 23 19:35:12 UTC 2006 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Added missing CORBA::string_dup to fix crash with BCB - -Fri Oct 20 06:41:12 UTC 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Changed the HomeAttributes generation in such a way that it - also compiles with BCB6 - - * examples/Null_Component/*: - New example, a component with just one interface. This can be used - to analyze the core footprint and see what we can reduce - Thanks to Sowayan Abdullah - for creating this example - -Thu Oct 19 23:22:49 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/RepositoryManager.mpc - Modified this file to make sure RepositoryManager project is built - after minizip project. - -Thu Oct 19 10:47:12 UTC 2006 xiong,ming - - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * examples/BasicSP/EC/controller.cpp - * examples/Display/RateGen/controller.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - Changed the naked atoi () to ACE_OS::atoi (), again thanks to Abdul - for reporiting this. - -Wed Oct 18 14:00:04 UTC 2006 Douglas C. Schmidt - - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp - (parse_args): Changed the naked atoi() to ACE_OS::atoi(). - Thanks to Abdul for reporting this. - -Wed Oct 18 12:05:00 UTC 2006 Simon Massey - - * DAnCE/TargetManager/DomainDataManager.cpp - Removed warnings about unused local variables (line 186 & 558) - -Wed Oct 18 09:50:00 UTC 2006 Simon Massey - - * DAnCE/TargetManager/CmpClient.cpp - Removed warning about unused local variable (line 154) - -Tue Oct 17 21:23:27 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/README - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/RepositoryManager/ZIP_Wrapper.h - Updated these files to use minizip under $ACE_ROOT/contrib/minizip. - -Tue Oct 17 13:40:12 UTC 2006 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Several small layout changes and use ACE_ERROR for - errors - -Tue Oct 17 13:30:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeApplication/RTNodeApp_Configurator.{h,cpp}: - Moved destructor implementation to cpp file - -Tue Oct 17 13:10:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeManager/CIAO_Monitor.h: - Doxygen improvements - - * DAnCE/NodeManager/NAM_Map.{h,cpp}: - Made is_available a const method - - * DAnCE/NodeManager/Node_Manager.cpp: - Use bool - - * DAnCE/NodeManager/Node_Manager_Impl.cpp: - Use ACE_ERROR together with LM_ERROR - -Tue Oct 17 12:32:12 UTC 2006 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - Use ACE_ERROR together with LM_ERROR - - * DAnCE/NodeApplication/NodeApplication_Impl.inl: - Initialise pointers with 0 - - * DAnCE/NodeApplication/Configurator_Factory.{h,cpp}: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - Use bool and const improvements, doxygen improvements - -Mon Oct 16 19:52:15 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Updated the re_launch_plan () function for Repoman integration. - - * DAnCE/RepositoryManager/README - * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * examples/BasicSP/RepoMan_Usage.html - Fixed some warnings on Liunx. - Fixed the "Deamon" typos. - -Mon Oct 16 15:11:40 UTC 2006 Nilabja R - - * DAnCE/TargetManager/TM_Client.mpc: - Fixed the linking error in Mac and in FC5 Static - -Mon Oct 16 11:20:00 UTC 2006 Simon Massey - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - BUILD CZAR. Due to the removal of - DAnCE/NodeApplication/NodeApp_Configurator.cpp to correct - the fuze error below, this "other" project's MPC needed to - be updated. (Why is this dependancy here?) - -Mon Oct 16 11:20:00 UTC 2006 Simon Massey - - * DAnCE/NodeApplication/NodeApp_Configurator.cpp - * DAnCE/TargetManager/DomainEvents.idl - BUILD CZAR. Removed Fuzz errors after no user action to correct. - -Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp - * DAnCE/RepositoryManager/ - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Use ACE_ERROR together with LM_ERROR - - * RACE/Controller/Component/Controller.idl: - Changed some comments to doxygen style - - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - Const change - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Layout changes - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Use strcmp to compare two strings and several layout changes - - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - Doxygen changes - - * DAnCE/RepositoryManager/RMadmin.cpp: - Documentation changes - - * DAnCE/RepositoryManager/URL_Parser.{h,cpp}: - Use bool for debug_ - - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - Initialise pointers with 0 - -Mon Oct 16 08:35:12 UTC 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl: - Simplified this file by using the new ciao_static_dnc_app base - project. - -Fri Oct 13 17:57:12 2006 John S. Kinnebrew - - * docs/schema/SANet_Network.xsd - * docs/schema/Task_Map.xsd - - Added SA-POP schemas. - -Fri Oct 13 17:54:58 UTC 2006 Nilabja Roy - - * DAnCE/TargetManager/TargetManager.mpc: - Addressed the problems coming up in Mac. Changed the project - inheritence of the TM Component. - -Fri Oct 13 17:43:29 UTC 2006 Nilabja Roy - - * DAnCE/TargetManager/DomainDataManager.cpp: - Addressed an error in the last check-in. - -Thu Oct 12 17:36:58 UTC 2006 Nilabja Roy - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/DomainEvents.idl: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Added the functionality to detect any add/delete to the Domain. - Added the feature to relay events to anyone interested for the above. - - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - Changed the test script to test the above - -Tue Oct 10 19:13:12 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: - Fixed compile error. - Thanks to Sowayan Abdullah - for reporting this. - -Tue Oct 10 17:56:51 UTC 2006 Shanshan Jiang - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - Modify these files to get the artifacts names when using http reference. - -Tue Oct 10 14:24:12 2006 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - Layout improvements, use ACE_ERROR with LM_ERROR - - * DAnCE/ExecutionManager/DAM_Map.cpp: - Const improvements - - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - Layout changes - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Use ACE_ERROR with LM_ERROR - - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - Documentation improvements - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - Const improvements - - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - Const improvements - -Tue Oct 10 09:28:12 2006 Johnny Willemsen - - * ciao/CCM_Base.idl: - Removed a remark about RTF 1.1, method is now according to the spec - - * ciao/CCM_Component.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Event.idl: - * ciao/Deployment.idl: - * ciao/Target_Data.idl - Updated some documentation and added some todos about things which - are CIAO specific - - * ciao/Server_init.cpp: - With LM_ERROR use ACE_ERROR - - * ciao/Dynamic_Component_Activator.{h,cpp}: - Removed some invalid comments and a mutex that was not used at all - - * ciao/Context_Impl_Base.h: - Documentation update - -Thu Oct 05 00:35:37 2006 William R. Otte wotte@dre.vanderbilt.edu - - * CIAO version 0.5.3 released. - -Wed Oct 4 08:12:24 UTC 2006 Boris Kolpackov - - * NEWS: - - Updated with entries for the CIDL compiler work. - -Tue Oct 3 15:16:40 UTC 2006 Shanshan Jiang - - * NEWS: - - Updated the NEWS to add the changes for Repoman and Plan_Generator - projects. - -Tue Oct 3 12:49:16 UTC 2006 xiong,ming - - * NEWS: - - Updated the NEWS to add the changes for CoSMIC Quoter tutorial - -Mon Oct 2 09:28:58 UTC 2006 Johnny Willemsen - - * docs/index.html: - Corrected linked to OMG spec - -Mon Oct 2 08:58:58 UTC 2006 Johnny Willemsen - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Set the nodemanager in the static nodeapplication manager. - Thanks to Sowayan Abdullah - for reporting this. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Doxygen improvement - -Thu Sep 28 16:47:58 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Added the base projects to Plan_Launcher_Impl project to include - required libs. Added null head files to the Plan_Launcher project to - remove the unnecessary dependency on other libs. - -Thu Sep 28 15:57:53 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Fixed the "undefined reference" error on FC5_Static build. - - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - Modified this file to handle the possible RepoMan null reference error. - -Tue Sep 26 21:05:48 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Fixed the "conversion from '_var' to 'CORBA::Object*'" warning. - -Tue Sep 26 15:52:12 UTC 2006 Boris Kolpackov - - * docs/tutorials/Quoter/Simple/Broker/Broker.cidl: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl: - - Added missing semicolons. - -Mon Sep 25 23:19:15 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Modified the fetch_reference_naming () to remove its arguments related - to Repoman. - - * DAnCE/Plan_Generator/PCVisitor.h: - Adjusted the order of the data members of Plan_Generator_i class. - - -Mon Sep 25 19:46:37 UTC 2006 Nishanth Shankaran - - * DAnCE/Plan_Generator/Plan_Generator.mpc (project): Fixed the MPC - file by removing the "requires += RepositoryManager" as this - project, as well as other projects that depend on this, will not - be built unless RepositoryManager=1 is set. - -Mon Sep 25 14:42:03 UTC 2006 Nishanth Shankaran - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Fixed the mpc file. - -Mon Sep 25 13:06:05 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - - Move some operator<< operators to the global scope so that they - do not hide others. - -Sun Sep 24 21:06:07 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Removed the unnecessary Repoman head file. - -Sat Sep 23 04:31:13 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RMadmin.cpp - * ciao/RepositoryManager.idl - Added the replace argument in installPackage () and createPackage () - functions and extend the functionalities of these two functions based - on the latest D&C spec. - -Sat Sep 23 04:07:59 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Generator - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Generator/Plan_Generator_Impl.h - * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h - Added these files which implement the Plan_Generator project. This - project is used to retrieve information from Repoman and generate/modify - DeploymentPlans based on different demands. - - * DAnCE/Planner - * DAnCE/Planner/Node_T.cpp - * DAnCE/Planner/Node_T.h - * DAnCE/Planner/Node_T.inl - * DAnCE/Planner/PCVisitor.cpp - * DAnCE/Planner/PCVisitor.h - * DAnCE/Planner/PCVisitorBase.cpp - * DAnCE/Planner/PCVisitorBase.h - * DAnCE/Planner/PCVisitorBase.inl - * DAnCE/Planner/Planner.cpp - * DAnCE/Planner/Planner.mpc - Deleted these files. The planner project has been replaced by the more - useful Plan_Generator project. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Modified these files. - - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - Deleted these files. - Removed the Plan_Launcher's dependence on RepoMan. Use Plan_Generator - to retrieve information from Repoman and generate/modify DeploymentPlans. - -Fri Sep 22 09:27:25 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.cpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/String.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp: - * CCF/CCF/IDL2/SemanticGraph/String.hpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/SemanticGraph/Array.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: - * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.hpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: - * CCF/CCF/IDL2/SemanticGraph/Member.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4: - * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.cpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.tpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.hpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.hpp: - * CCF/CCF/IDL2/SemanticGraph/Module.hpp: - - * CCF/CCF/CIDL/SemanticGraph/Executor.cpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.cpp: - * CCF/CCF/CIDL/SemanticGraph/Executor.hpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.hpp: - - * CCF/CCF/IDL3/SemanticGraph/Component.cpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.hpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - - - Add file name and line information to every semantic - graph node. This information is used in diagnostics. - - - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp: - - Adjust semantic actions interface to provide a way to derive - line numbers. - - - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: - - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - - Propagate file name and line number from tokens to semantic - graph nodes. Use file and line numbers when printing error - messages. - - - * CCF/CCF/IDL2/Token.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parser.cpp: - - Fix a number of bugs in error handling and recover. - - - * CIDLC/cidlc.cpp: - - Use file name and line number when creating the translation - unit object. - - -Wed Sep 20 04:05:42 UTC 2006 xiong,ming - - * docs\tutorials\CoSMIC\02.html - - Added some useful links to various resources to help readers reduce - learning curve.Added a small section that mentions that a Node Map file - has to be created in order to get Quoter example working. Again, - Thanks to Sowayan Abdullah from LMCO for his help in improving the - cosmic documentations. - - -Mon Sep 18 03:26:22 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.h - - Fixed compile error by removing extra ;. - -Fri Sep 15 21:28:47 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * ciao/Deployment_Core.idl - - Removed the unnecessary event type definition for RTEC since - they are no longer used. - -Sun Sep 10 09:20:18 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Removed workaround from previous commit, as Ossama Othman has - provided the proper fix in the G++ macros. - -Fri Sep 8 00:28:27 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Made the export declaration on the singleton typedef - contingent on a Microsoft compiler, as the GCC included - with FC5 was not defining the symbol as a result. - -Fri Sep 1 03:09:38 UTC 2006 xiong,ming - - * docs\tutorials\CoSMIC\index.html - * docs\tutorials\CoSMIC\01.html - - Updated index.html to change the cosmic version.Updated 01.html - to reflect recent changes of idl_to_picml. Thanks to Sowayan Abdullah - from LMCO for his help in improving the cosmic documentations. - -Thu Aug 31 22:45:09 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/RepositoryManager.mpc - Modified this file to include $(CIAO_ROOT)/tools/Config_Handlers - in the RMAdmin project. - -Wed Aug 30 17:16:18 UTC 2006 Shanshan Jiang - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Added more changes to this file to fix the "reference to - ACE_Singleton - ::instance()'"warnings with FC5_Static build. - -Tue Aug 29 23:08:20 UTC 2006 Shanshan Jiang - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Fixed the "reference to `ACE_Singleton::instance()'"warnings with - FC5_Static build. - - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Removed unnecessary using of CIAO::Config_Handlers::XML_Helper. - -Mon Aug 28 12:53:12 UTC 2006 Johnny Willemsen - - * ciao/Container_Base.cpp: - Fixed some compile warnings with gcc 2.96 - -Thu Aug 24 15:44:08 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - Changed some of the command-line options. - - * examples/BasicSP/RepoMan_Usage.html - Made some minor changes. - -Thu Aug 24 000:41:16 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/PCVisitor.cpp - * DAnCE/Plan_Launcher/PCVisitor.h - * DAnCE/Plan_Launcher/PCVisitorBase.cpp - * DAnCE/Plan_Launcher/PCVisitorBase.h - Solved the "'class has virtual functions but non-virtual destructor" - warnings. - -Wed Aug 23 17:57:15 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/PCVisitorBase.h - Solved the "invalid use of undefined type 'struct PCVisitorBase'" - warnings. - -Wed Aug 23 15:22:36 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/PCVisitor.cpp - Solved the "unused parameter" warning. - -Wed Aug 23 000:04:06 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/README - Made some minor changes. - -Wed Aug 23 000:00:43 UTC 2006 Shanshan Jiang - - * examples/BasicSP/descriptors/basicNodeDaemon.pl - Use "$ENV{'ACE_ROOT'}/bin" to point to the location of lib file. - -Tue Aug 22 23:47:06 UTC 2006 Shanshan Jiang - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Modified these files for RepoMan integration. - - * DAnCE/Plan_Launcher/PCVisitor.cpp - * DAnCE/Plan_Launcher/PCVisitor.h - * DAnCE/Plan_Launcher/PCVisitorBase.cpp - * DAnCE/Plan_Launcher/PCVisitorBase.h - * DAnCE/Plan_Launcher/PCVisitorBase.inl - Added these files for RepoMan integration. - - * examples/BasicSP/RepoMan_Usage.html - Added this file, which explains how to run the BasicSP example using - the integrated RepoMan. - -Mon Aug 21 15:19:25 UTC 2006 Nishanth Shankaran - - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: Fixed the - environment variable DANCE_ROOT to point to CIAO_ROOT/DAnCE. - -Thu Aug 17 16:09:09 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Reimplemented the findNamesByType () and getAllTypes () operations - of Repository Manager, which use the newly generated - ACE_Hash_MultiMap_Manager class and its corresponding classes. - -Mon Aug 14 15:46:34 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.h - - Fixed a compile error for pedantic GCC4. - -Sun Aug 13 15:18:00 UTC 2006 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/Regex.hpp: - - Reimplemented regex wrapper to allow building CIDLC on - platforms without wchat_t support (e.g., Cygwin/Mingw). - -Fri Aug 11 11:46:17 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - - Added support for IDL (underscore) escaping. Added support - for custom name printers. - - * CIDLC/UnescapedNamePrinter.hpp: - - Name printer that prints names unescaped (without the IDL - underscore). - - * CIDLC/CxxNamePrinter.cpp: - * CIDLC/CxxNamePrinter.hpp: - - Name printer that escapes C++ keywords. - - * CIDLC/CorbaTypeNameEmitters.cpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/CompositionEmitter.cpp: - - Updated to handle IDL and C++ name escaping. This fixes - bugzilla bug #2427. - -Fri Aug 11 07:30:35 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.h - * DAnCE/RepositoryManager/RMadmin.cpp - - Fixes for a compiler error in the version of GCC shipped with - FC5. - -Wed Aug 9 18:53:48 UTC 2006 Jaiganesh B - - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: - examples/Hello/descriptors_RTCCM/rt-example.cdp: - examples/Hello/descriptors_RTCCM/rt-config-example.csr: - - Fixed the RT-CCM code to conform to the schema changes. Made changes - to the descriptors directory to fix the working example for RT-CCM. - - Thanks to Nanbor Wang for helping fix the codebase. - -Tue Aug 8 07:53:12 UTC 2006 Johnny Willemsen - - * CIAO-INSTALL.html: - Removed vc6 info - -Fri Aug 4 21:40:46 UTC 2006 William R. Otte - - * docs/tutorials/CoSMIC/01.html - * docs/tutorials/CoSMIC/02.html - * docs/tutorials/CoSMIC/03.html - * docs/tutorials/CoSMIC/04.html - * docs/tutorials/CoSMIC/style.css - * docs/tutorials/CoSMIC/index.html - - Style fixes, grammatical and spelling corrections, clarifications. - -Thu Aug 3 20:38:39 UTC 2006 Nanbor Wang - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Fixed RT-CCM support. - -Thu Aug 3 15:33:11 UTC 2006 Boris Kolpackov - - * docs/cidlc.html: - - Regenerated to include the -D and -I options. - -Wed Aug 2 18:52:14 UTC 2006 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp: - - Added option types: flag or value. - - * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp: - * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - - Reimplemented to use hand-coded parser instead of Spirit. The - new implementation takes into account the option types. - - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp: - - Removed. - - * CIDLC/cidlc.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplGenerator.hpp: - - Updated with the option types. This fixes bugzilla bug #2426. - - -Fri Jul 28 17:53:57 UTC 2006 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Translation.cpp: - - Reimplemented a chunk of code that resulted in what appears to - be invalid code generation by the Intel C++ compiler. This - fixes bugzilla bug #2387. - -Thu Jul 27 18:08:47 UTC 2006 William R. Otte - - * CIAO_TAO.mwc - * CIAO_TAO_DAnCE.mwc - - Replaced relative references to ACE/TAO with absolute references - using environment variables. - -Mon Jul 24 15:45:34 UTC 2006 William R. Otte - - * Subversion conversion completed at revision 73730 - -Sun Jul 23 15:44:43 UTC 2006 William R. Otte - - * Repository frozen for repository conversion - -Sat Jul 22 21:34:57 UTC 2006 Gan Deng - - * ciao/Container_Base.cpp - - Fixed a runtime Segfault bug about destroying POA. The problem - is because a Session_Container creates 2 POAs, one of which is called - facet_cons_POA which uses the Servant_Activator policy to activate component - ports (facets, consumers) on demand, then the Servant_Activator object - was deleted when the Session_Container object is out of scope in its - destructor. But when the ORB finally shuts itself down, it tries - to clean all the resources including the facet_cons_POA, since the - Servant_Activator attached to this POA is long gone, a segfault - occurs in the cleaning up phase. The right fix is to destroy all the POAs - associated with this Session_Container in its destructor together with the - Servant_Activator. Thanks Phlip for a - bug report. - -Thu Jul 20 22:03:31 UTC 2006 Nanbor Wang - - * docs/schema/ServerResourceUsage.txt: Revised the document to - change how a policy set should be hooked into a component - instance. This needs to be changed to reflect recent changed in - DnC schema. - -Thu Jul 20 01:10:58 UTC 2006 Vipul Singh - - * DAnCE/RepositoryManager/PC_Updater.cpp: Removed the variable name - from the arguments in function definition in empty functions to - fix warnings. - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: Changed declaration - at a few places from const static to static const to fix a few - warnings, also removed an unnecessarily defined namespace. - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: Made a few - changes to fix the warnings and to keep the code in sync with - the changes made to RepositoryManager_Impl.h. Fixed code which - passed non POD types to a varargs function(ACE_DEBUG) which - resulted in aborts at runtime. - - * DAnCE/RepositoryManager/URL_Parser.cpp: Assigned value to ptr before - if condition to fix a few warnings. - -Wed Jul 19 08:00:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Config_Handlers.mpc: - Use exceptions as base project - -Mon Jul 17 17:49:41 UTC 2006 Ossama Othman - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Use new ACE_CString::size_type type to hold string - position/index value, instead of "int". Addresses "comparison - between signed and unsigned" warnings. - -Sat Jul 15 04:21:13 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/README.txt: - Remove this file. - - * DAnCE/RepositoryManager/README: - Add this file. - -Thu Jul 13 18:42:08 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Fixed a minor error. - -Wed Jul 12 14:00:59 UTC 2006 Shanshan Jiang - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Fixed the "comparison between signed and unsigned integer" warning. - -Tue Jul 11 23:19:58 UTC 2006 Shanshan Jiang - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Fixed the "conversion from '__int64' to 'size_t', possible loss - of data" warnings. - -Sun Jul 09 06:01:14 2006 Johnny Willemsen - - * CIAO version 0.5.2 released. - -Wed Jul 5 15:31:18 UTC 2006 Shanshan Jiang - - * NEWS - Updated the NEWS file to add the changes of Repoman. - -Tue Jul 4 11:39:12 UTC 2006 Johnny Willemsen - - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - Fixed compile problems with VxWorks 5.5.1 and GCC 2.96 - -Tue Jul 4 06:26:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - Don't build this project in the ace_for_tao configuration - -Mon Jul 3 16:20:54 UTC 2006 Jeff Parsons - - * NEWS - - Updated the NEWS file. - -Tue Jun 27 13:37:12 UTC 2006 Johnny Willemsen - - * DAnCE/RepositoryManager/RM_Helper.cpp: - Layout changes - -Fri Jun 23 13:45:38 UTC 2006 Jeff Parsons - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Added $(TAO_ROOT) to the 'includes' line of the executable - project, due to a change in the way TAO/Version.h is - included. - -Thu Jun 22 18:47:47 UTC 2006 Jeff Parsons - - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - - Made changes to template code corresponding to those in - - Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons - -Mon Jun 19 14:52:25 UTC 2006 Jeff Parsons - - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp - * ciao/Servant_Impl_T.h: - - Reduced the number of template parameters in - the component servant and home servant template - base classes. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changes to generated servant code corresponding - the the changes in servant base class code - described above. - -Thu Jun 15 20:13:02 UTC 2006 Jeff Parsons - - * tools/IDL3_to_IDL2/be_helper.cpp: - - Uncommented code that outputs our copyright notice. This - change also elinates an unused arg warning for the - copyright notice string. - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added a newline after opening the file for better readability. - -Thu Jun 15 18:37:43 UTC 2006 Jeff Parsons - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - - Added ciao_deployment_stub as a base project for - CIAO_Events_Handlers, to eliminate 'unresolved symbol' - linking errors. Thanks to Ming Xiong - for suggesting the fix. - -Thu Jun 15 15:10:58 UTC 2006 Jeff Parsons - - * tools/IDL3_to_IDL2/be_extern.h: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - - Changes to keep this backend in sync with changes to the - TAO_IDL front end - see TAO ChangeLog entry of a few - minutes ago. - -Thu Jun 8 16:07:05 UTC 2006 Jeff Parsons - - * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle): - - Fixed an error in instantiation of a - Components::ConnectionDescription valuetype - the actual - constructor call should have been on the OBV_* subclass. - -Thu Jun 8 12:29:12 UTC 2006 Johnny Willemsen - - * DAnCE/Planner/PCVisitor.cpp: - Fixed parameter never used warnings - -Wed Jun 7 21:39:00 UTC 2006 William R. Otte - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc - - Removed unneeded base projects. - -Wed Jun 7 21:07:11 UTC 2006 Jeff Parsons - - * ciao/Servant_Impl_Utils_T.cpp: - - Fixed CORBA memory management rule violations in - Servant_Impl_Base static template methods - describe_pub_event_source(), describe_simplex_receptacle() and - describe_multiplex_receptacle(). Thanks to Phlip - for reporting a problem in - get_all_receptacles() that uncovered the above violations. - -Wed Jun 7 16:52:45 UTC 2006 William R. Otte - - * tools/Config_Handlers/Config_Handlers.mpc - - Fix for linking error in Visual Studio. - -Wed Jun 7 06:04:45 UTC 2006 William R. Otte - - * CIDLC/ExecutorMappingGenerator.cpp - - Modified to generate an include of CCM_Container.idl. - - * ciao/Components.idl - * ciao/ComponentsC.h - * ciao/ComponentsS.h - - Changed Components.idl to include CCM_Component.idl instead of - CCM_Container.idl. This removes a dependancy on the container - library for stub projects. - - Note this commit may be rolled back later based on discussions - on the dance-dev list, I am making it preemptively to resolve - scoreboard problems. - -Tue Jun 6 20:32:53 UTC 2006 William R. Otte - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Property_Handler.h - - Compile fixes for Borland. - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - - Fixes for Borland ICEs. - -Tue Jun 6 13:48:59 UTC 2006 William R. Otte - - * tools/Config_Handlers/Config_Handlers_Common_Export.h - - Missing file from previous commit. - -Mon Jun 5 20:34:51 UTC 2006 William R. Otte - - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/TargetManager/TM_Client.mpc - * RACE/Controller/Component/Controller.mpc - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * performance-tests/Protocols/common/Protocols.mpc - * tests/Bug_2130_Regression/interfaces/ENW.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc - * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc - * tests/IDL3/Events/Abstract/Abstract.mpc - * tests/IDL3/Events/Regular/Regular.mpc - * tests/IDL3/Homes/Attributes/HomeAttributes.mpc - * tests/IDL3/Homes/Basic/Basic.mpc - * tests/IDL3/Homes/Factory/Factory.mpc - * tests/IDL3/Homes/Finder/Finder.mpc - * tests/IDL3/Homes/Inheritance/Inheritance.mpc - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc - * tests/IDL3/ImpliedIDL/Events/Events.mpc - * tests/IDL3/ImpliedIDL/Homes/Homes.mpc - * tests/IDL3/Lookup/lookup_test.mpc - * tests/Minimum/Minimum_Base/Minimum.mpc - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - - Fixes for linking errors/warnings in OS X. - - * tools/Config_Handlers/Any_Handler.h - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - - Factored certain elements used by both the deployment - and packaging handlers into a seperate library, also - fixes for linking errors in OS X. - -Fri Jun 2 18:55:41 UTC 2006 Jeff Parsons - - * tools/Config_Handlers/Config_Handlers.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - - Shortened long lines. - -Fri Jun 2 12:17:12 UTC 2006 Johnny Willemsen - - * rules.ciao.GNU: - Added setting of TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP when - they are not set, needed for cross compilation - -Thu Jun 1 21:23:51 UTC 2006 - - * examples/Hello/descriptors/run_test.pl - Changed the codes so that it will correctly destroy all - running processes upon failure. - -Thu Jun 1 16:03:26 UTC 2006 Jeff Parsons - - * DAnCE/Planner/Planner.cpp: - - Added global qualifier (double colon) to the specialization - and typedef of the planner's Node class, to avoid an - 'ambiguous symbol' error in VC8, which is presumably confusing - it with Deployment::Node. - -Thu Jun 1 15:49:47 UTC 2006 jiang,shanshan - - * DAnCE/Planner/Node_T.h - * DAnCE/Planner/Planner.cpp - - Modified some minor errors. - -Thu Jun 1 12:55:07 UTC 2006 Jeff Parsons - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Fixed typo. - -Wed May 31 18:46:37 UTC 2006 Jeff Parsons - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Added 'libs += Display_Base_stub' to the - Display_Base_NaviDisplay_stub project so that VC8, with its - parallel builds, will know about the dependency that VC7.1 - seems to get from the 'after' line. - -Wed May 31 18:17:11 UTC 2006 Jeff Parsons - - * DAnCE/TargetManager/TM_Client.mpc: - - Cosmetic changes. - -Wed May 31 17:08:17 UTC 2006 jiang,shanshan - - * DAnCE/Planner/Planner.mpc - * DAnCE/Planner/Planner.cpp - - Removed the generated file of Repoman (RepositoryManagerDaemonC.*) - included in the Planner project and use the RepositoryManagerC.*. - -Wed May 31 16:49:12 UTC 2006 jiang,shanshan - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - - Made some minor changes. - -Tue May 30 10:08:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeManager/MonitorController.cpp: - Fixed typo - -Tue May 30 06:16:58 UTC 2006 Boris Kolpackov - - * tools/Config_Handlers/XSCRT/Elements.hpp: - - Added a fix for Sun C++ <= 5.7 template instantiation issue. - -Tue May 30 00:00:22 UTC 2006 Stoyan Paunov - - * DAnCE/Planner/Node_T.h: - * DAnCE/Planner/Node_T.inl: - * DAnCE/Planner/Node_T.cpp: - * DAnCE/Planner/PCVisitor.h: - * DAnCE/Planner/PCVisitor.cpp: - * DAnCE/Planner/PCVisitorBase.h: - * DAnCE/Planner/PCVisitorBase.inl: - * DAnCE/Planner/PCVisitorBase.cpp: - * DAnCE/Planner/Planner.mpc: - * DAnCE/Planner/Planner.cpp: - - Checking in the Planner for DAnCE which creates a Deployment - Plan on the fly (in-memory). - - * RACE/Input_Adapters/LocationUpdater/Injector.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h: - * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp: - * RACE/Input_Adapters/LocationUpdater/README.txt: - - Adding the LocationUpdater which is a RACE input adapter which - updates the locations of the implementation artifact to reclect - the ones available in the RepositoryManager. Please see the README - and the code for more info. - - * RACE/Input_Adapters/PlanGenerator/Injector.cpp: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h: - * RACE/Input_Adapters/PlanGenerator/README.txt: - - Adding the PlanGenerator which is a RACE input adapter which queries - the RepositoryManager for an installation name, retrieves the corresponding - PackageConfiguration, and builds the DeploymentPlan on the fly. Please see - the README and the code for more info. - -Mon May 29 21:58:18 UTC 2006 Stoyan Paunov - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Got rid of the code that updates the loader path for the - libraries downloaded via HTTP. Now this has to be done - manually. - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/README.txt: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - - Changing the way library names are matched to be more general. - Some additions to the README - A minor change to one of the functions - -Mon May 29 19:07:54 UTC 2006 Jeff Parsons - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * examples/Swapping/Sender/Sender_exec.cpp: - - Changed C-style casts from void* to pointer-to-function - to two-step reinterpret_cast<>s, with ptrdiff_t as a - temporary intermediate. C++ forbids casting directly - between pointer-to-object and pointer-to-function, and - some the newer compilers are catching it. - -Mon May 29 17:44:01 UTC 2006 Jeff Parsons - - * examples/Display/Display_Base/Display_Base.mpc: - - Changed the base project of Display_Base_stub from - ciao_client_dnc to ciao_events_base_dnc, in order to pull - in a needed dependency on CIAO_DnC_Container. Thanks to - Ming Xiong for supplying the - fix. - -Mon May 29 15:32:38 UTC 2006 Jeff Parsons - - * examples/Display/NavDisplay/NavDisplay.mpc: - - Cosmetic changes (shortened long lines). - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Changed 'after +=' and 'libs +=' lines to reflect recent - changes to other examples/Display projects. - -Fri May 26 13:57:38 UTC 2006 Jeff Parsons - - * DAnCE/RepositoryManager/RMAdmin.cpp(ACE_TMAIN): - - Fixed unused variable warning, cosmetic changes. - -Fri May 26 12:59:03 UTC 2006 Phil Mesnier - - * DAnCE/NodeManager/NAM_Map.cpp: - Make the equality test explicit to work with the revised octet - sequence implementation. - -Thu May 25 19:02:52 UTC 2006 Jeff Parsons - - * ciao/Container_Base.cpp(ciao_install_home): - - Changed the single-step reinterpret_cast of the component - DLL entry points to be a two-step process: first to the - integer type 'ptrdiff_t' then to the desired pointer-to- - function type. A single cast won't work because casting - from pointer-to-object (even void*) to pointer-to-function - directly is not allowed in C++. - -Thu May 25 11:50:39 UTC 2006 Phil Mesnier - - * ciao/Container_Base.cpp: - Replace the use of static_cast in ciao_install_home with - reinterpret_cast since void* sources are involved. - -Wed May 24 17:35:53 UTC 2006 Nanbor Wang - - * examples/Display/RateGen/RateGen.mpc: Fixed the project - dependency for controller. - -Tue May 23 22:46:58 UTC 2006 jiang,shanshan - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/Options.h - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - - Added the code to save the state of the RepoMan at exit and - load the state of it at start. - -Tue May 23 14:31:11 UTC 2006 jiang,shanshan - - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/Options.h - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - - Added the naming service & the implementation of createPackage - function to RepoMan. - -Mon May 22 18:49:14 UTC 2006 Jeff Parsons - - * ciao/Container_Base.cpp(ciao_install_home): - - Changed C-style casts of DLL entrypoints to static_cast<>s - to the appropriate pointer to function. This change is - intended to eliminate warnings from gcc 4.0. - -Fri May 19 16:49:32 UTC 2006 Jeff Parsons - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - - Minor changes to eliminate scoreboard warnings, and to bring - code in line with the ACE style guidelines. - -Thu May 18 20:28:00 UTC 2006 Roopa Pundaleeka - - * examples/Display/GPS/GPS_Impl.ccd: - * examples/Display/NavDisplay/NavDisplay_Impl.ccd: - * examples/Display/RateGen/RateGen_Impl.ccd: - - Removed these generated files from CVS. - -Thu May 18 11:28:52 UTC 2006 Phil Mesnier - - - * examples/Display/Display_Base/GNUmakefile: - * examples/Display/Display_Base/GNUmakefile.Display_Base_stub: - * examples/Display/Display_Base/GNUmakefile.Display_Base_svnt: - - Removed these files from CVS. - -Wed May 17 21:20:46 UTC 2006 Roopa Pundaleeka - - * TAO/CIAO/examples/Display: - Ported the Display example to use the new CIAO framework - - -Tue May 16 12:10:12 UTC 2006 Johnny Willemsen - - * README: - Removed mentioning of vc6 - -Mon May 15 20:48:52 UTC 2006 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp (generate): - - Removed commented-out code. - - * CIDLC/ServantHeaderGenerator.cpp (generate_facets): - - Fixed cut-and-paste error that was causing facet servant - class declaration to get skipped when the composition is - defined inside one or more IDL modules. - -Fri May 12 07:36:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Utils/Functors.h: - Added a workaround for specific for BCB6, should fix the gcc4 - internal compiler errors - -Fri May 12 07:29:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - The work around is needed for < gcc 3.3 and also BCB6, so make - it a little bit more easier to handle this. - -Thu May 11 21:24:45 UTC 2006 Jeff Parsons - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/UtilityTypeNameEmitters.hpp: - - Change code generation for facet servant classes to be - defined in a special namespace created from a prefix - and a flattened version of the name of the scope - containing the interface that supports the facet. This - change enables facets in the same translation unit - using the same interface to use a single source code - definition (an internal check in the CIDL compiler - guarantees that the facet servant class is generated - once per interface per translation unit). The fact - that the actual facet servant class type is an instantiation - of a template class ensures that the same interface type - used as a facet in multiple translation units in a build - will not produce multiple-definition link errors, - although in this case there will be duplicated code. - Thanks to James Hill for providing - the multiple-facet-single-translation-unit use case - and to Nanbor Wang for his comments - on the proposed solution. - -Wed May 10 14:04:57 UTC 2006 William R. Otte - - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - - Fixes for warnings. - -Mon May 8 20:41:43 UTC 2006 Stoyan Paunov - - * bin/PerlCIAO/perlciao.mpc: - - Fixing a fuzz build error due to a missing Id tag - -Mon May 8 15:33:58 UTC 2006 Stoyan Paunov - - * DAnCE/RepositoryManager/HTTP_Client.h: - * DAnCE/RepositoryManager/HTTP_Client.cpp: - * DAnCE/RepositoryManager/HTTP_Handler.h: - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater_T.h: - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - * DAnCE/RepositoryManager/README.txt: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - - Updating the RepositoryManager with the latest changes from the - escher repository. Adding my newest changes. Adding some new - minor features. - - * bin/PerlCIAO/TestUtils.base: - * bin/PerlCIAO/TestUtils.pm: - * bin/PerlCIAO/TestUtils_Base.pm: - * bin/PerlCIAO/generate_container.pl: - * bin/PerlCIAO/perlciao.mpc: - - This is a set of test utilities tailored towards testing CIAO components. - It provides a nice and quick interface provising the common functionality - necessary to run a CIAO test and perform clean-up on failure. This utils - are a wrapper around the $ACE_ROOT/bin/PerlACE/ utilities. I will check in - an example of how test utils are used shortly. - - * tools/Config_Handlers/IDD_Handler.cpp: - - Fixing a bug in the PackageConfiguration reverse handler. - - -Fri May 5 15:36:47 2006 Douglas C. Schmidt - - * docs/cidlc.html Added documentation for the CIDL compiler. - Thanks to Boris for contributing this. - - * docs/index.html: Fixed some broken links to the tutorials and added - a link to Ming's tutorial example that shows how to use CoSMIC. - -Fri May 5 16:58:17 UTC 2006 Nishanth Shankaran - - * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the - parsing of command line options. - -Thu May 4 21:35:01 UTC 2006 William R. Otte - - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - - Fixed a reverse handler bug. - -Thu May 4 08:33:12 UTC 2006 Johnny Willemsen - - * DAnCE/RepositoryManager/PC_Updater.cpp: - Fixed compilation error - -Wed May 3 22:11:32 UTC 2006 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/ccd.xsd - * docs/schema/cdd.xsd - * docs/schema/cdp.xsd - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - * docs/schema/iad.xsd - * docs/schema/pcd.xsd - * docs/schema/toplevel.xsd - - Schema propagated from the ARMS repo. - -Wed May 3 12:53:12 UTC 2006 Johnny Willemsen - - * Config_Handlers/Utils/Functors.h: - Made the FUNC argument just return void, this fixes the errors with this - template with BCB on my system, hopefully it doesn't break other - compilers - -Tue May 2 03:04:50 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeApplication/NodeApplication.cpp: Removed the code - snippet that bootstraps the NodeApplication process at a - specific OS priority. - -Wed Apr 26 21:25:26 UTC 2006 William R. Otte - - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Utils/Functors.h - - Introduced a workaround for a ICE in GCC 4.0.22. - -Wed Apr 26 13:10:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp: - * tools/Config_Handlers/XSCRT/XMLSchema.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - Removed workarounds for vc6 again - - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: - Added missing post.h - - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: - * tools/Config_Handlers/Package_Handlers/PC_Intf.h: - Fixed incorrect file tags - -Wed Apr 26 08:46:12 UTC 2006 Johnny Willemsen - - * DAnCE/TargetManager/DomainDataManager.h: - Fixed compile problem in gcc4 build - -Tue Apr 25 21:27:05 UTC 2006 William R. Otte - - * DAnCE/TargetManager/TargetManager.mpc - - Linking problems for Borland. - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - - More compile fixes for Borland. -Tue Apr 25 20:12:25 UTC 2006 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * ciao/Deployment_Core.idl - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.h - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.cpp - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - - Compilation fixes for borland, some cosmetic fixes as well. - -Tue Apr 25 09:00:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/CPD_Handler.h: - ComponentPortDescription is a struct, so also forward declare it - as a struct - -Mon Apr 24 18:53:22 UTC 2006 William R. Otte - - * CIDLC/ServantSourceGenerator.cpp - - Fixed a code generation problem caused by careless merging. - -Mon Apr 24 18:40:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/ID_Handler.h: - Removed incorrect semi colons - -Mon Apr 24 06:33:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/IDREF_Base.cpp: - Removed not needed semi colon that caused compile errors in some - builds - -Sun Apr 23 11:22:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Utils/XML_Helper.h: - Fixed compile error - -Sat Apr 22 21:13:10 UTC 2006 William R. Otte - - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - - Compile errors. - -Fri Apr 21 16:24:46 UTC 2006 William R. Otte - - * Merge from the ARMS Escher repository. - - Changelog entries to follow: - - Tue Apr 11 09:29:12 UTC 2006 - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeManager/Node_Manager.cpp - - Additional debugging/compile fixes. - - Tue Apr 11 08:30:42 UTC 2006 Gan Deng - - * ciao/Deployment_Core.idl - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - - Modified to passivate (and reactivate later) shared components - when tearing down an assembly. - - Sun Apr 9 01:03:19 UTC 2006 - - * M APRIL_DEMO.mwc - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Various compile/runtime fixes. - - Fri Apr 7 15:47:34 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to enforce passivation occured on all components - before any connections are removed. - - Fri Apr 7 03:28:03 UTC 2006 Edward R. Mulholland - - * tools/Config_Handlers/Utils/XML_Helper.cpp: - - Replaced "throw;" (which Stroustrup tells us causes an abort) - with "throw 0;" (kind of like an unnamed exception, which is - clearly what the author of this code intended). - - * ciao/Packaging_Data.idl: - - I've had occasion to use this file with the IFR Service, and - I've found that the IFR Service backend chokes on a bunch of - stuff here. The stuff that it chokes on has been protected with - "#ifndef AVOID_IFR_CRASH" so that you can protect the backend - from crashing if you pass -DAVOID_IFR_CRASH to tao_ifr. - - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_Base.h: - - Implemented the add_receptacle operation. - - Fri Apr 7 02:55:37 UTC 2006 Edward R. Mulholland - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - - Added ACE_CATCHANY and ACE_CATCHALL blocks in - Plan_Launcher_i::launch_plan to avoid crashing in case of CORBA - fault. - - Fri Apr 7 02:54:29 UTC 2006 Edward R. Mulholland - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Options beginning with "-ORB" are explicitly ignored. This - avoids having an "-ORB" option mistakenly parsed as being a - "-o " option. - - Fri Apr 7 02:51:31 UTC 2006 Edward R. Mulholland - - * CIDLC/ServantSourceGenerator.cpp: - - Added code to support "get_all_receptacles" operation. - - Fri Apr 7 02:47:02 UTC 2006 Edward R. Mulholland - - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - - Made a couple small changes that keep the CIDLC from coughing on - enums - - Fri Apr 7 02:37:34 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - - Fixed a bug in detecting External connection and Internal - connections. Earlier when an external component is detected, - not *all* connections associated with this components are - purged from the to-be-removed connections list. Added another - helper method to accomplish this task. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Modified to reuse rebind() instead of bind() to avoid - redeployment duplicate instance errors. - - Thu Apr 6 15:02:59 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeApplication/NodeApplication.cpp: - - Modified the NodeApplications to up at OS priority 20 instead of - 50. - - Thu Apr 6 00:35:35 UTC 2006 Nilabja Roy - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - Fixed the TM component removal problem. Changed/Removed - debug messages. - - Wed Apr 5 16:54:20 UTC 2006 William R. Otte - - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - - Improvements to output more information in the reverse handler. - - - Thu Mar 30 22:10:53 UTC 2006 William Otte - - * DAnCE/NodeApplication/Container_Impl.cpp - * DAnCE/NodeApplication/NodeApplication.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * ciao/Home_Servant_Impl_T.cpp - * ciao/Servant_Activator.cpp - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - - Disabled excessive debugging. - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Disabled RT-CCM support. - - * DAnCE/TargetManager/DomainDataManager.cpp - - Added error messages. - - Wed Mar 29 21:34:07 UTC 2006 Nilabja Roy - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Fixed a Access Error in the monitor. - - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Added to have graceful termination. - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Update to turn off monitors at the end. - - Mon Mar 27 22:39:25 UTC 2006 William R. Otte - - * tools/Config_Handlers/Utils/XML_Helper.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - - Mon Mar 27 20:10:09 UTC 2006 Nishanth Shankaran - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp - (get_node_manager): - - Modified this method to re-throw the caught exception. - - Sun Mar 26 22:10:16 2006 Nishanth Shankaran - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - - Added code to handle exceptions while trying to connect to the - node managers in get_node_manager (). - - * DAnCE/TargetManager/DomainDataManager.cpp: - - Added debug messages. - - * RACE/Controller/Component/RACE_common.h: - - Added a new file to define the RACE_DEBUG and RACE_ERROR macros. - - Mon Mar 27 00:22:02 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to allow ccm_passicate to be called on all components - before actually deactivating any components. - - Thu Mar 23 23:18:56 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeManager/MonitorController.cpp (svc): - - Removed an unwanted debug statement. - - Thu Mar 23 22:54:25 UTC 2006 Nishanth Shankarn - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Removed an unwanted debug statement. - - Thu Mar 23 19:40:54 UTC 2006 Nishanth Shankarn - - * APRIL_DEMO.mwc: - * CIAO.mwc: - * CIAODAnCE.mwc: - * CIAOTAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Modified the mwc files so that they exclude the RACE/hog_string - directory. - - Thu Mar 23 18:04:58 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Fixed a bug in set_priority method. - - Wed Mar 22 19:32:37 UTC 2006 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Modified to make debug statements debug_level controlled. - - Wed Mar 22 00:51:11 UTC 2006 Gan Deng - - * DAnCE/NodeManager/NodeManager_Impl.cpp - - Modified to find the corresponding NAM when given a plan_uuid. - - Wed Mar 22 02:12:58 UTC 2006 Nilabja Roy - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - - Removed some of the debug statements - - Tue Mar 21 19:12:57 UTC 2006 Nishanth Shankarn - - * RACE/hog_string/hog.cdp: - - Fixed the plan id. - - Mon Mar 20 21:07:50 UTC 2006 Stoyan Paunov - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - turning off the HTTP capability for Linux until I figure out why - it affects the loading of libraries. - - Mon Mar 20 20:40:37 UTC 2006 Stoyan Paunov - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Changed loader path delimiter on Unix-like systems from ';' to ':' - - - Mon Mar 20 17:22:22 UTC 2006 Stoyan Paunov - - * DAnCE/NodeApplicationManager/HTTP_Client.h: - * DAnCE/NodeApplicationManager/HTTP_Client.cpp: - * DAnCE/NodeApplicationManager/HTTP_Handler.h: - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - * DAnCE/NodeApplicationManager/URL_Parser.h: - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - - Oops. Forgot to add the actual HTTP code. - - Mon Mar 20 04:27:48 UTC 2006 Stoyan Paunov - - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - - Adding HTTP capability to DAnCE. - - * DAnCE/RepositoryManager/HTTP_Client.h: - * DAnCE/RepositoryManager/HTTP_Client.cpp: - * DAnCE/RepositoryManager/HTTP_Handler.h: - * DAnCE/RepositoryManager/HTTP_Handler.cpp: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater_T.h: - * DAnCE/RepositoryManager/PC_Updater_T.cpp: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - - Porting the RepositoryManager to the newest XML config handlers. - Also migrating the code from the DOC repository to ensure the gap - between the code in this repository and that in cvs.doc.wustl.edu - repo is closed. - - - NOTE: I still have some testing left, but before that I need to - compile the CoSMIC version from this repository and regenerate - a bunch of descriptors because all the example descriptors are - broken. - - Sat Mar 18 22:33:10 UTC 2006 Gan Deng - - * DAnCE/Interfaces/NodeManager.idl - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * ciao/Deployment.idl - - Put the struct Sched_Params definition outside of the NAM - interface. - Cleaned up the code a bit. - - Sun Mar 19 16:52:54 UTC 2006 Nilabja Roy - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Updated to implement the commitResource and releaseResource - function - - Sat Mar 18 19:01:18 UTC 2006 Nishanth Shankaran - - * DAnCE/NodeApplication/NodeApplication.cpp: - - Enhanced the NodeApplication to run in realtime priority mode. - - Fri Mar 17 06:36:18 UTC 2006 Nilabja Roy - - * DAnCE/Interfaces/NodeManager.idl: - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * ciao/Deployment.idl: - - Implemented the set_priority method on the NodeManager - and NodeApplicationManager interface. Removed some of the debug - messages - - Thu Mar 16 03:54:39 UTC 2006 Nilabja Roy - - * tools/Config_Handlers/DD_Handler.cpp: - Updated the handler to handle optional parameters - - Tue Mar 14 07:01:28 UTC 2006 Nilabja R - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - Updated to make it portable in windows - - * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: - Fixed the entry point. - - Mon Mar 13 23:04:32 UTC 2006 - - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Utils/XercesString.h - - Fixed linking/warnings on Windows. - - Mon Mar 13 18:27:27 UTC 2006 Nilabja R - - * DAnCE/TargetManager/TargetManager.mpc: - Changed the projects to depend on NodeManager_Stub. This will fix the - linking errors in Windows. - - Mon Mar 13 17:36:28 UTC 2006 Krishnakumar B - - * CIDLC/ServantSourceGenerator.cpp (namespace): Updated the - generated code to set the component id on the component context - class to allow retrieving the id at run-time from an executor - implementation. - - Mon Mar 13 17:28:44 UTC 2006 - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Fixes for nameservice discovery of EM. - - * docs/schema/toplevel.xsd - - Minor correction to schema. - - Fri Mar 10 17:03:26 UTC 2006 - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - - Fixed minor bug in URI interface. - - Thu Mar 9 22:26:17 UTC 2006 Jeff Parsons - - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.h: - - Added CORBA::String_var member to store the component instance - id, also added a pair of set/get methods called _ciao_instance_id. - - Wed Mar 8 19:07:31 UTC 2006 - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - - Add error message for connection failure. - - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - - Disabled this project. - - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManager_exec.h - - Fix entry point problems. - - Wed Mar 8 19:29:20 UTC 2006 Nilabja R - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Added the structure in the TMExt interface to maintain the - mapping between hostname to NM refs. - - Wed Mar 8 14:40:41 UTC 2006 William R. Otte - - * tools//Config_Handlers/Deployment.cpp - * tools//Config_Handlers/Deployment.hpp - * tools//Config_Handlers/GNUmakefile - * tools//Config_Handlers/cdd.cpp - * tools//Config_Handlers/cdd.hpp - * tools//Config_Handlers/pcd.cpp - * tools//Config_Handlers/pcd.hpp - * tools//Config_Handlers/toplevel.cpp - * tools//Config_Handlers/toplevel.hpp - * tools//Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools//Config_Handlers/Package_Handlers/PCD_Handler.h - - New generated code. - - Wed Mar 8 03:11:02 UTC 2006 Nilabja R - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Implement the Signal Handler for the process NodeManager. And - set the option avoid_zombies=0 - - - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Implement ComponentID to Process Id mapping - - Tue Mar 7 23:26:41 UTC 2006 Nilabja Roy - - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/TargetManagerExt.idl - * DAnCE/TargetManager/TargetManager.mpc: - Changed to depend on the NodeManager_Stub, so that - CIAO::NodeManager can be used. - - Tue Mar 7 03:14:50 UTC 2006 Nilabja R - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Changed to add the percentage cpu same as vmstat - - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Changed to add the Comp_id to Proc_id mapping - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - Changed to add interface to RACE - - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Changed to add interface to RACE - - * DAnCE/TargetManager/descriptors/Domain.cdd: - Updated to the latest xsd - - - * docs/schema/cdd.xsd: - Changed the Domain definations - - Mon Mar 6 19:46:54 UTC 2006 Nishanth Shankaran - - * DAnCE/Interfaces/NodeManager.idl - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Added the set_priority method to modify the priority of - NodeApplication process. - - Wed Mar 1 20:56:16 UTC 2006 Nishanth Shankaran - - * DAnCE/TargetManager/TargetManager_exec.h - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManagerExt.idl: - - Added method to TargetManagerExt interface to obtain references to - the NodeManagers. - - - Fri Feb 24 22:55:51 UTC 2006 William R. Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_Handler.h - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/IDREF_Base.h - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/IRDD_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/STD_PCD_Handler.h - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/test.cdp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp - * tools/Config_Handlers/Package_Handlers/PC_Intf.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/Package_Handlers/descriptors/package.tpd - * tools/Config_Handlers/Utils/Exceptions.h - * tools/Config_Handlers/Utils/Functors.h - * tools/Config_Handlers/Utils/XML_Error_Handler.cpp - * tools/Config_Handlers/Utils/XML_Helper.h - * tools/Config_Handlers/XMLSchema/Writer.hpp - - Package handlers and changes necessary to support them. - -Fri Apr 21 08:13:12 UTC 2006 Johnny Willemsen - - * CIDLC/ServantSourceGenerator.cpp: - Removed usage of ACE_NESTED_CLASS - - * DAnCE/RepositoryManager/PC_Updater.cpp: - Fixed compile errors - -Thu Apr 20 13:14:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/DnC_Dump.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - Fixed compile error - -Thu Apr 20 09:14:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp: - Fixed compile error - -Wed Apr 19 19:03:12 UTC 2006 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Fixed usage of sequences. The sequences now return - a pointer on the subscript operators, not _var which was not according - to the spec. - -Wed Apr 19 14:39:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/XMLSchema/Types.hpp: - Removed vc6 workaround - -Wed Apr 19 13:43:12 UTC 2006 Johnny Willemsen - - * docs/schema/xsc-banner.h: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - Removed include of vc6-4786.h - -Wed Apr 19 13:39:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/STD_PC_Intf.cpp: - * tools/Config_Handlers/XSCRT/XMLSchema.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - Removed vc6 workarounds - -Wed Apr 19 11:23:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/DnC_Dump.{h,cpp}: - Updated for string manager change in TAO - - * ciao/Servant_Impl_Base.cpp: - Updated for sequence change - -Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen - - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/toplevel.hpp - Removed vc6 workarounds - - * tools/Config_Handlers/vc6-4786.h - Removed - -Tue Apr 18 20:55:05 2006 Wallace Zhang - - * CIAO version 0.5.1 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2007a b/CIAO/ChangeLogs/ChangeLog-2007a deleted file mode 100644 index 613da3f1e4c..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2007a +++ /dev/null @@ -1,1122 +0,0 @@ -Mon Jan 22 23:14:56 2007 William R. Otte - - * CIAO version 0.5.5 released. - -Thu Jan 18 17:49:00 UTC 2007 Gan Deng - - * docs/index.html: - - Fixed broken links to doxygen. - -Wed Jan 10 21:35:25 UTC 2007 Jeff Parsons - - * NEWS: - - Updated with my changes since 0.5.4. - -Tue Jan 8 20:01:12 UTC 2007 Johnny Willemsen - - * RACE/common/RACE_common.idl: - Use the CORBA::StringSeq to reduce footprint - -Tue Jan 8 19:43:12 UTC 2007 Johnny Willemsen - - * ciao/CCM_CCMException.idl: - * ciao/CCM_Context.idl: - Added some commented out IDL that is part of the QoS4CCM spec - -Sun Jan 7 18:44:12 UTC 2007 Johnny Willemsen - - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - No need to set members to 0 in destructor - - * DAnCE/RepositoryManager/URL_Parser.cpp: - Fixed conversion warning and memory leak - -Sun Jan 7 12:14:12 UTC 2007 Johnny Willemsen - - * ciao/CCM_ClientContainerInterceptor.idl: - * ciao/CCM_ClientContainerInterceptorRegistration.idl: - * ciao/CCM_ContainerClientRequestInfo.idl: - * ciao/CCM_ContainerInterceptor.idl: - * ciao/CCM_ContainerRequestInfo.idl: - * ciao/CCM_ContainerServantRequestInfo.idl: - * ciao/CCM_ContainerServerRequestInfo.idl: - * ciao/CCM_ContainerStubRequestInfo.idl: - * ciao/CCM_ExtensionComponent.idl: - * ciao/CCM_ExtensionContext.idl: - * ciao/CCM_InvalidRegistration.idl: - * ciao/CCM_QoS.idl: - * ciao/CCM_ServantContainerInterceptor.idl: - * ciao/CCM_ServantContainerInterceptorRegistration.idl: - * ciao/CCM_ServerContainerInterceptor.idl: - * ciao/CCM_ServerContainerInterceptorRegistration.idl: - * ciao/CCM_StubContainerInterceptor.idl: - * ciao/CCM_StubContainerInterceptorRegistration.idl: - Added interfaces from QoS for CCM spec (OMG 06-04-15). We - don't have an implementation yet, just the interfaces at - this moment - -Fri Jan 5 12:14:12 UTC 2007 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Fixed conversion warnings - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/URL_Parser.cpp: - Improved layout and documentation - -Wed Jan 3 19:32:05 UTC 2007 Chad Elliott - - * CIAO_TAO_DAnCE.mwc: - - Added $(ACE_ROOT)/contrib/minizip since the RepositoryManager can - use minizip if the zlib feature is enabled. - -Wed Jan 3 07:01:12 UTC 2007 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Fixed conversion warnings - - * DAnCE/RepositoryManager/URL_Parser.cpp: - Initialise pointer with 0 - -Wed Jan 3 16:18:36 UTC 2007 Chad Elliott - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Use the install base project instead of the deprecated core base - project. - -Thu Dec 28 12:22:12 UTC 2006 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Doxygen improvements - -Mon Dec 25 16:19:42 UTC 2006 Douglas C. Schmidt - - * Merry Christmas everyone!!! - -Wed Dec 20 06:37:27 UTC 2006 William R. Otte - - * MPC/config/ciao_rtevent_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * ciao/CCM_Core.mpc: - - Fixed linking errors on OS X. - -Wed Dec 13 08:35:48 UTC 2006 Gan Deng - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - - Fixed warnings on NoInterceptors_Core build related to - type conversion. - -Wed Dec 13 07:57:02 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - - Fixed a fuzz error. - -Wed Dec 13 07:29:10 UTC 2006 Gan Deng - - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - - Fixed Debian_GCC_4.0 compilation error by removing - unnecessary common for enum definition. - -Wed Dec 13 07:19:13 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - - Fixed a compilation error in Win2003_VC71_Versioned_Namespace - build by removing the unnecessary declaration. - -Wed Dec 13 06:45:57 UTC 2006 Johnny Willemsen - - * examples/Swapping/Sender/Sender_exec.h: - Fixed include because of file name changes - -Tue Dec 12 20:55:02 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: - - Modified the ciao_push_event() in this base class to fix - BCC warnings. - -Tue Dec 12 20:21:03 UTC 2006 Gan Deng - - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - - Fixed the fuzz errors. - -Tue Dec 12 20:15:57 UTC 2006 Johnny Willemsen - - * ciao/CCM_Component.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_EventBase.idl: - * ciao/CCM_EventConsumerBase.idl: - * ciao/CCM_HomeConfiguration.idl: - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_Object.idl: - * ciao/CCM_PrimaryKeyBase.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/Servant_Impl_Base.h: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: - * DAnCE/TargetManager/DomainEvents.idl: - Added remarks about compliance and another set of splitting - idl files in smaller ones - - * ciao/CCM_Event.idl: - * ciao/CCM_Events.idl: - Renamed Event to Events - - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_HomeConfiguration.idl: - Renamed Configurator to Configuration - -Tue Dec 12 14:48:57 UTC 2006 Johnny Willemsen - - * ciao/CCM_Base.idl: - * ciao/CCM_CCM2Context.idl: - * ciao/CCM_ComponentId.idl: - * ciao/CCM_Configurator.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Container_Ex.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_Entity2Context.idl: - * ciao/CCM_Event.idl: - * ciao/CCM_ExecutorLocator.idl: - * ciao/CCM_HomeConfigurator.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_SessionContext.idl: - * ciao/CCM_StandardConfigurator.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/Deployment_NodeApplication.idl: - Moved more interfaces to their own file - - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - Removed virtual keywords, not needed - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Const changes and improved some messages - - * DAnCE/Plan_Generator/PCVisitor.h: - * DAnCE/Plan_Generator/PCVisitorBase.h: - Doxygen changes - - * tools/Config_Handlers/DynAny_Handler.mpc: - layout changes - -Tue Dec 12 10:08:57 UTC 2006 Johnny Willemsen - - * MPC/config/taoidl3toidl2defaults.mpb: - Moved from TAO to here - -Mon Dec 11 20:55:39 UTC 2006 Gan Deng - - * ciao/CCM_Event.idl: - - Modified the "ciao_push_event" operation to pass in "source_id", - which is used to identify the sources of the publisher ports to - support event filtering mechanism. - - * ciao/Deployment_Events.idl: - - Added new IDL definitions to support RTEC federation, such as - AddrServer, UDPSender, UPDReceiver, etc. - - * ciao/Deployment_NodeApplication.idl: - - Modified the "install_es" operation to install one service object - per invocation, instead of a sequence of objects. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - - Modified to accomodate the changes made above by adding only - one ciao event service object reference to the map. - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: - - Removed the inheritance relationship between Consumer_Config and - Supplier_Config object. The reason why it was there is because - of a tightly coupled design long time ago. - - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: - - Added a virtual function "ciao_push_event" and provides a - default implementation, which is essentially a no_op impl. - - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h: - - Modified the factory method "create" by passing in the - string identifier for the service object. - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl: - - Added new operations to create gateways object to support - event channel federations. - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - - Added the implementation and MPC files to support event - channel federations in CIAO_Event_Service. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Automatically generate the implementation code of - ciao_push_event for component in the servant code. - - * DAnCE/NodeApplication/NodeApplication.cpp: - - Explicitly add the init_svcs() operation to the - NA component server implementation. We should figure - out a way to see whether we can avoid doing this at - this level. - - * DAnCE/NodeManager/Node_Manager.cpp: - - Enhanced NM to pass in service configuration file explicitly. - Also fixed a bug about controlling ORBDebugLevel. - - * docs/schema/CIAOEvents.xsd: - - Enhanced the CIAOEvents schema to support event channel - federation configuration. - - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - - Config handlers enhancement to support the above - schema changes. - - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - - Modified to use environment variables instead of relative paths. - - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Receiver/Receiver_exec.cpp: - - Modified to explicitly print out the contents of the received msgs. - - * examples/Hello/descriptors_events/ciao-events-example-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced: - * examples/Hello/descriptors_events/ciao-events-example.ced: - * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp.ced: - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_events/NodeManagerMap.dat: - * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat: - * examples/Hello/descriptors_events/rtec.conf: - * examples/Hello/descriptors_events/run_NodeDaemons.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl: - - Added a bunch of test cases for CIAO Event Service. - -Fri Dec 8 22:59:14 UTC 2006 Jeff Parsons - - * tools/tools.mwc: - - Added IDL3_to_IDL2 directory to the list. - -Fri Dec 8 000:09:04 UTC 2006 Jeff Parsons - - * bin/generate_component_mpc.pl: - - Another typo found by Abdullah Sowayan . - -Thu Dec 7 20:22:57 UTC 2006 Jeff Parsons - - * bin/generate_component_mpc.pl: - - Fixed bug that omits necessary space between items in 'after' - line, if it contains more than one item. Thanks to Abdullah - Sowayan for reporting the bug. - -Thu Dec 7 19:15:04 UTC 2006 Jeff Parsons - - * bin/generate_component_mpc.pl: - - Fixed typo, had 'ciao_server_dnc', should have been - 'ciao_servant_dnc'. Thanks to Abdullah Sowayan - for reporting the mistake. - -Thu Dec 7 19:04:38 UTC 2006 Jeff Parsons - - * tools/Config_Handlers/DynAny_Handler.mpc: - - Removed taolib and anytypecode base projects, since they are - already pulled in by typecodefactory. - -Thu Dec 7 13:47:57 UTC 2006 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Deployment_Configuration (init): - Use ACE_Read_Buffer to read the file and parse it contents. This way - we are independent of a fixed buffer length, especially on systems - with multiple network cards and IPv6 enabled the IORs can get huge. - -Thu Dec 7 11:48:57 UTC 2006 Johnny Willemsen - - * ciao/CCM_Core.mpc: - * MPC/config/ciao_server_dnc.mpb: - Don't build DnC server with minimum corba and CORBA/e, this was - disabled in the past implicitly because we used security as - MPC base project but because that has been removed we now - have to explicitly disable this project - -Thu Dec 7 11:34:57 UTC 2006 Johnny Willemsen - - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - Added some todo's, check whether the narrow on the NamingContext - did succeed, use CORBA::ULong for the sequence index - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Use a CORBA::String_var to store the uuid string - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Added some todo's, check whether the narrow on the NamingContext - did succeed, layout changes, fixed bugzilla bug 2729, thanks to Abdul - for reporting that. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Doxygen improvements - -Wed Dec 6 11:26:57 UTC 2006 Johnny Willemsen - - * ciao/CIAO_ServerResources.idl: - * ciao/Deployment_NodeApplicationManager.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeManager/MonitorCB.h: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/TargetManager/DomainDataManager.h: - * tools/Config_Handlers/DD_Handler.h: - Doxygen documentation updates - - * MPC/config/ciao_container_dnc.mpb: - * ciao/CCM_Core.mpc: - Added avoids_corba_e_compact as base project - -Tue Dec 5 11:45:57 UTC 2006 Johnny Willemsen - - * ciao/CCM_Core.mpc: - * MPC/config/ciao_container_dnc.mpb: - Don't build Dnc_Container with corba/e compact has been enabled - - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - Simplified this MPC file - -Mon Dec 4 12:14:57 UTC 2006 Johnny Willemsen - - * MPC/config/*: - All CIAO base projects are moved from - ACE_wrappers/bin/MakeProjectCreator/config to this directory - -Mon Dec 4 12:35:57 UTC 2006 Johnny Willemsen - - * DAnCE/TargetManager/TM_Client.mpc: - Simplified this file using more base projects - -Mon Dec 4 12:29:57 UTC 2006 Johnny Willemsen - - * DAnCE/TargetManager/DomainDataManager.h: - Documentation changes - - * DAnCE/TargetManager/TargetManager.mpc: - Simplified this file using more base projects - -Mon Dec 4 12:24:57 UTC 2006 Johnny Willemsen - - * MPC - * MPC/config - New directory for the base projects specifically for CIAO - -Mon Dec 4 12:16:12 UTC 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Use include from CIAO_ROOT and removed using namespace - - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - Simplified this file - -Mon Dec 4 11:41:12 UTC 2006 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - Simplified by using the base projects - -Mon Dec 4 11:37:12 UTC 2006 Johnny Willemsen - - Converted the NodeApplication into a library and build - an exe using this library. Will prevent duplicate compilation - of part of the code. Fixes bugzilla bug 2739. - - * DAnCE/NodeApplication/CIAO_NodeApplication_export.h: - New export file: - - * DAnCE/NodeApplication/Configurator_Factory.h: - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Core.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Added export macro to export the class from the new NodeApplication - library. - - * DAnCE/NodeApplication/NodeApplication.mpc: - Added new library project and use this in the executable. - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - Use the new NodeApplication library and the new base projects - I added for CIAO - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}: - Moved destructor from inline to cpp method and small code improvements - - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - Simplified by using the new base projects - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Small improvements - -Mon Dec 4 07:35:12 UTC 2006 Johnny Willemsen - - * CIAO-INSTALL.html: - Updated build instructions - - * ciao/Dynamic_Component_Activator.cpp: - Removed not needed return statements in a void method - - * ciao/Dynamic_Component_Activator.h: - Changed guard in file to match filename - - * ciao/Home_Servant_Impl_T.cpp: - Layout changes - - * ciao/Port_Activator.{h,cpp}: - The name methods did really change oid, so renamed name - to oid and added a new name method to return the name - member - - * ciao/Servant_Activator.cpp: - Const changes and updated for Port Activator changes - - * ciao/Servant_Impl_Base.cpp: - Small code improvements - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Const changes - - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Throw NO_MEMORY when allocation fails - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - Throw BAD_PARAM when an incorrect method parameter has been passed - - * DAnCE/NodeManager/BaseMonitor.h: - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - Doxygen changes - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Fixed a comment - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Use true/false for bool - - * DAnCE/TargetManager/DomainDataManager.cpp: - Layout changes - - * DAnCE/TargetManager/TargetManager_exec.cpp: - Removed not needed includes, made messages dependent - on the debug level, added missing duplicate - - * DAnCE/TargetManager/TargetManager_exec.h: - Don't use std:: for auto_ptr - - * DAnCE/TargetManager/TargetManagerExt.idl: - Removed commented out include - - * DAnCE/TargetManager/TargetManagerImpl.idl: - Removed empty lines - - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl: - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - * examples/Display/descriptors/basicNodeDaemon.pl: - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_NodeDaemons.pl: - Use $ACE_ROOT/bin with use lib. This fixes bugzilla bug 2737, - thanks for Abdul for reporting this. - - * docs/tutorials/Quoter/Simple/01.html: - Update from Abdul - -Fri Dec 1 16:27:34 UTC 2006 Jeff Parsons - - * bin/generate_component_mpc.pl: - - Fixed generation of export files. Thanks to Abdullah - Sowayan for reporting - the problem. - -Fri Dec 1 13:39:12 2006 Johnny Willemsen - - * docs/tutorials/CoSMIC/index.html: - * docs/tutorials/Quoter/Simple/index.html: - Updated download location of ACE/TAO/CIAO - -Fri Dec 1 11:26:12 2006 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - Fixed invalid check whether we have a nil POA or not - -Fri Dec 1 11:17:12 2006 Johnny Willemsen - - * DAnCE/TargetManager/Deployment_Configuration.{h,cpp}: - Removed these files, not used in the mpc file - - * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}: - Close the file handle, part of the fix for bugzilla bug 2733 - - * DAnCE/TargetManager/DomainDataManager.{h,cpp}: - Const changes, sequences have a CORBA::ULong as length, not int. - Added some todo's and use a little bit more ACE - - * DAnCE/TargetManager/TargetManager.cidl: - Removed empty line - - * DAnCE/TargetManager/TargetManager_exec.cpp: - Fixed memory management and the way we check for a nil - reference - -Fri Dec 1 09:01:12 2006 Johnny Willemsen - - * bin/generate_component_mpc.pl: - Layout improvements, thanks to Abdul for making this - update. - -Thu Nov 30 12:45:12 2006 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - Removed not needed ACE_TRY_CHECK - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - Const improvement - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Initialise pointer with 0, removed code after return - added added a todo - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - Doxygen improvement - - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - Lot of layout changes to make the code a little bit more - readable, more has to be done to this file - - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - Doyxgen improvements and removed not needed include - - * DAnCE/TargetManager/CmpClient.cpp: - Use true/false for a bool - - * DAnCE/TargetManager/Deployment_Configuration.cpp: - Use bool and use 0 instead of NULL - - * DAnCE/TargetManager/DomainDataManager.h: - Doxygen changes - - * DAnCE/TargetManager/DomainEvents.idl: - Removed not needed include - - * DAnCE/TargetManager/TargetManager_exec.cpp: - Layout changes - - * DAnCE/TargetManager/TM_Client.mpc: - Removed not needed includes - -Wed Nov 29 21:26:53 UTC 2006 Jeff Parsons - - * docs/generate_component_mpc.html: - - New file, documentation for the Perl script - generate_component_mpc.pl, in CIAO_ROOT/bin. - - * bin/generate_component_mpc.pl: - - Changes mainly to correct problems with MPC files - generated for non-component builds, i.e., from some IDL - file used in common by multiple component builds, such - as the definition of a port interface. Also made changes - and added a new command line option to help minimize the - amount of code generated from IDL and minimize the - dependencies of the generated makefile or project. - -Wed Nov 29 15:43:12 2006 Johnny Willemsen - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Don't use plain new, fixes bugzilla bug 2732. Thanks to Abdul - for reporting this - -Wed Nov 29 12:48:12 2006 Johnny Willemsen - - * ciao/*.idl: - Added ciao/ as prefix to the include path. This way it is clear - where we are including a file from. - -Tue Nov 28 21:38:12 2006 Johnny Willemsen - - * DAnCE/RTNodeApplication: - Zapped, not used anymore - -Tue Nov 28 19:33:12 2006 Johnny Willemsen - - * ciao/Deployment_DomainApplicationManager.idl: - Added comments about more details which are not compliant according - to the spec - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Use native bool instead of int - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - Reordered includes and improved doxygen documentation - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Const changes, use ACE_ERROR for error messages - - * DAnCE/NodeManager/CIAO_Monitor.cpp: - Const changes, use more ACE and little cleanup - - * DAnCE/NodeManager/CIAO_Monitor.h: - Doxygen improvement - - * DAnCE/NodeManager/MonitorCB.cpp: - Code layout changes - - * DAnCE/NodeManager/MonitorCB.h: - Doxygen changes and added some todo's - - * DAnCE/NodeManager/MonitorController.cpp: - Use bool and small improvements - - * DAnCE/NodeManager/Node_Manager.cpp: - Use the correct value for the lenght of the buffer passed - to hostname - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Small improvements and added some todo's - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Cleanup - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Made some debug lines dependent on a debug level - -Tue Nov 28 16:11:32 UTC 2006 William R. Otte - - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/NodeManager/Monitor.mpc - - Fixes for link errors in OS X. - -Tue Nov 28 11:45:12 2006 Johnny Willemsen - - * CIDLC/ExecutorMappingGenerator.cpp: - Updated because of idl file rename - -Tue Nov 28 10:42:12 2006 Johnny Willemsen - - * ciao/*: - * *: - Renamed a lot of idl files, if the file contains interfaces/types - from the DAnCE spec, added Deployment_ as prefix, if they are - containing CIAO specific interfaces, added CIAO_. This way we can - more easily see if we have spec compliant IDL or not. - -Tue Nov 28 09:50:12 2006 Johnny Willemsen - - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome again to its own file - - * ciao/Security.idl: - CIAO uses an interface of the security service but we don't - do a thing with it, so just define a local interface within - CIAO and use that for the moment, saves 250Kb of footprint - - * ciao/CCM_Context.idl: - Use the local security interface - - * ciao/ExectionManager.idl: - Added todo - - * ciao/CCM_Core.idl: - Added new file - -Mon Nov 27 18:34:12 2006 Johnny Willemsen - - * ciao/NodeApplicationManager.idl: - * ciao/Deployment_ApplicationManager.idl: - Moved ApplicationManager interface to its own file - - * ciao/CCM_Core.mpc: - Added new file - - * ciao/DomainApplicationManager.idl: - * ciao/TargetManager.idl: - Updated includes - - * ciao/Target_Data.idl: - Moved ResourceNotAvailable also to the new - Deyloyment_ApplicationManger file - - * DAnCE/NodeManager/CIAO_Monitor.h: - Removed include of memory, not portable and not used. - Fixes bugzilla bug 2730. Thanks to Abdul for reporting - this. - -Mon Nov 27 15:41:12 2006 Johnny Willemsen - - * ciao/Deployment_Core.idl: - * ciao/Deployment_Container.idl: - * ciao/Deployment_NodeApplication.idl: - Moved types from Core to the other files and added remarks - to all CIAO specific types - - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - Updated includes because of the move above - -Mon Nov 27 14:55:12 2006 Johnny Willemsen - - * ciao/CCM_Core.mpc: - Added new Deployment_DeploymentPlan - - * ciao/Deployment_Data.idl - * ciao/Deployment_DeploymentPlan.idl: - Moved types related to DeploymentPlan to their own file - - * ciao/Deployment_Data.idl - Removed RequirementSatisfier, it is superfluous. - - * ciao/Deployment.idl: - No need to include Deployment_Data - - * ciao/Target_Data.idl: - Removed not needed include - - * ciao/Deployment_Connection.idl: - * ciao/TargetManager.idl: - * RACE/Output_Adapters/Interface/PlanEgress.idl: - * RACE/Plan_Analyzer/Interface/PlanIngress.idl: - * RACE/Planner_Manager/Interface/Planner_Manager_I.idl: - * RACE/Planners/Interface/Planner_I.idl: - Updated include because of move above - - * tools/Config_Handlers/DnC_Dump.{h,cpp}: - Removed RequirementSatisfier - -Mon Nov 27 14:11:12 2006 Johnny Willemsen - - * ciao/Deployment.idl: - Removed LastConfiguration, it is not used and has been zapped - from the DAnCE spec - -Mon Nov 27 14:04:12 2006 Johnny Willemsen - - * ciao/Deployment_Core.idl: - * ciao/Deployment_NodeApplication.idl: - Moved ESInstallationInfo to NodeApplication file - - * ciao/Deployment.idl: - LastConfiguration doesn't seem used, added a comment to that - exception. - - * ciao/NodeApplicationManager.idl: - Doxygen improvement - -Mon Nov 27 13:23:12 2006 Johnny Willemsen - - * ciao/NodeApplicationManager.idl: - Doxygen improvement - - * ciao/Deployment_Core.idl: - Removed InvalidLocation exception, not used and not in the DAnCE - spec - -Mon Nov 27 13:10:12 2006 Johnny Willemsen - - * ciao/Deployment_Core.idl - * ciao/Deployment_Container.idl - * ciao/Deployment_NodeApplication.idl - Moved some interfaces from Core to their own files - - * ciao/CCM_Core.mpc: - Updated because of split above and added some more flags to - reduce the amount of generated files - - * ciao/DomainApplicationManager.idl: - * ciao/NodeApplication_CallBack.idl - Updated include - - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCENodeApplication/NodeApplication_Impl.h: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - Updated includes because of refactoring above - -Mon Nov 27 09:40:12 2006 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - Instead of the http files in this library, use the HTTP - classes from the TAO lib - - * DAnCE/RepositoryManager/HTTP_Client.cpp - * DAnCE/RepositoryManager/HTTP_Client.h - * DAnCE/RepositoryManager/HTTP_Handler.cpp - * DAnCE/RepositoryManager/HTTP_Handler.h - Removed, not needed anymore, these files did move to the TAO - lib to support http:// ior and we are reusing them now in - CIAO - - * DAnCE/RepositoryManager/RepositoryManager.mpc - Removed the files above - -Mon Nov 27 09:36:12 2006 Johnny Willemsen - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - Instead of the http files in this library, use the HTTP - classes from the TAO lib - - * DAnCE/NodeApplicationManager/URL_Parser.h: - Doxygen improvements - - * DAnCE/NodeApplicationManager/HTTP_Client.cpp: - * DAnCE/NodeApplicationManager/HTTP_Client.h: - * DAnCE/NodeApplicationManager/HTTP_Handler.cpp: - * DAnCE/NodeApplicationManager/HTTP_Handler.h: - Removed, not needed anymore, these files did move to the TAO - lib to support http:// ior and we are reusing them now in - CIAO - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - Removed the files above - -Mon Nov 27 09:33:12 2006 Johnny Willemsen - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Removed include of errno.h. It is not portable, but it seems - it isn't needed at all. Thanks to Abdul for reporting this, - this fixes bugzilla bug 2726. - -Mon Nov 27 08:59:12 2006 Johnny Willemsen - - * docs/tutorials/Quoter: - Extended this tutorial with more documentations. Thanks to - Abdul for delivering these files. This fixes bugzilla 2717 - -Fri Nov 24 13:59:12 2006 Johnny Willemsen - - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - Added check whether we got a valid NodeImplementationInfo back - and not a nill pointer. Fixes bugzilla bug 2692 finally. - Thanks to Abdul for pointing out the need for this check - -Fri Nov 24 09:41:12 2006 Johnny Willemsen - - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - Don't build this project in ace_for_tao configuration - -Thu Nov 23 12:34:12 2006 Johnny Willemsen - - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome again to its own file now the idl compiler has - been fixed to handle this correctly - -Wed Nov 22 20:39:12 2006 Johnny Willemsen - - * ciao/Dynamic_Component_Servant_Base.h: - Removed the character c from the first line which drove the - compilers really crazy - -Wed Nov 22 19:31:12 2006 Johnny Willemsen - - * ciao/CCM_Home.idl: - * ciao/CCM_Object.idl: - Moved CCMHome to CCMObject, when these are in seperate files - the generated code for components is not correct. We want to have - these interfaces in seperate files but we can sort out this - later. - -Wed Nov 22 14:45:12 2006 Johnny Willemsen - - * ciao/Dynamic_Component_Servant_Base.h: - Fixed pragme once warning - -Wed Nov 22 11:05:12 2006 Johnny Willemsen - - * ciao/CCM_Base.idl - * ciao/CCM_CCM2Context.idl - * ciao/CCM_CCMException.idl - * ciao/CCM_Component.idl - * ciao/CCM_Configurator.idl - * ciao/CCM_Container.idl - * ciao/CCM_Container_Ex.idl - * ciao/CCM_Context.idl - * ciao/CCM_Cookie.idl - * ciao/CCM_Core.mpc - * ciao/CCM_EnterpriseComponent.idl - * ciao/CCM_EntityComponent.idl - * ciao/CCM_EntityContext.idl - * ciao/CCM_Enumeration.idl - * ciao/CCM_Event.idl - * ciao/CCM_Home.idl - * ciao/CCM_HomeConfigurator.idl - * ciao/CCM_HomeExecutorBase.idl - * ciao/CCM_HomeFinder.idl - * ciao/CCM_HomeRegistration.idl - * ciao/CCM_KeylessCCMHome.idl - * ciao/CCM_Navigation.idl - * ciao/CCM_Object.idl - * ciao/CCM_ProxyHomeRegistration.idl - * ciao/CCM_Receptacle.idl - * ciao/CCM_Session2Context.idl - * ciao/CCM_SessionSynchronization.idl - * ciao/CCM_StandardConfigurator.idl - * ciao/Client_init.cpp - * ciao/Components.idl - * ciao/Cookies.h - * ciao/CosPersistentState.idl - * ciao/Deployment.idl - * ciao/Deployment_Application.idl - * ciao/Deployment_Base.idl - * ciao/Deployment_Connection.idl - * ciao/Deployment_Core.idl - * ciao/Deployment_Data.idl - * ciao/Deployment_TargetData.idl - * ciao/DomainApplicationManager.idl - * ciao/Home_Servant_Impl_Base.h - * ciao/NodeApplicationManager.idl - * ciao/NodeManager.idl - * ciao/Servant_Impl_Base.h - * ciao/Servant_Impl_T.cpp - * ciao/Server_init.cpp - * ciao/StandardConfigurator_Impl.h - * ciao/SwapExec.idl - * ciao/Swapping_Servant_Home_Impl_Base.h - * ciao/Target_Data.idl - * ciao/TargetManager.idl - * ciao/UpgradeableContext.idl - Splitted the huge idl files into smaller parts. The CCM files are almost done, - the Deployment files do need some more iterations to get smaller files that - contain an interface with the types they need. This way the linker can optimize - objects out during a static compilation - - * ciao/CIAO_Value.idl: - * ciao/Container_Base.pidl: - Removed, not used at all - - * ciao/ComponentsC.h: - * ciao/ComponentsS.h: - Removed, will be generated by tao_idl - - * DAnCE/Interfaces/NodeManagerDaemon.idl - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeManager/MonitorController.h - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/DomainEvents.idl - * DAnCE/TargetManager/TargetManager.cidl - * DAnCE/TargetManager/TargetManager.mpc - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.h - * examples/Hello/Sender/starter.cpp - Updated because of rename above - - * DAnCE/TargetManager/TargetManager.idl: - Renamed to TargetManagerImpl.idl, this is the interface - it contains. - - * DAnCE/NodeApplication/Container_Impl.cpp - * DAnCE/NodeApplication/Container_Impl.h - Removed get_homes(), it is not in the base idl - - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/RateGen/RateGen.mpc - * RACE/common/RACE_common.mpc - * RACE/Input_Adapters/Base/Input_Adapter.mpc - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc - * RACE/Output_Adapters/Base/Output_Adapter.mpc - * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc - * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc - * RACE/Planner_Manager/Component/Planner_Manager.mpc - * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc - * RACE/Planners/Base/Planner.mpc - * RACE/Planners/Interface/Planner_Interface.mpc - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc - * tests/IDL3/ImpliedIDL/All/all.mpc - * tests/IDL3/Lookup/lookup_test.mpc - * tests/Minimum/Minimum_Base/Minimum.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - Simplified these mpc files, the -GT option is not added by - orbsvcslib anymore and -Sc is deprecated - - * tests/IDL3/Events/Any/main.cpp: - * tests/IDL3/Events/Any/README: - * tests/IDL3/Events/Any/run_test.pl: - Updated this test to reproduce a problem with valuetype - insertion into an any. This test will now fail until - Jeff Parsons commits some idl compiler changes - -Mon Nov 20 08:16:34 2006 Simon McQueen - - * CIAO version 0.5.4 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: - diff --git a/CIAO/ChangeLogs/ChangeLog-2007b b/CIAO/ChangeLogs/ChangeLog-2007b deleted file mode 100644 index 5ffc3af510a..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2007b +++ /dev/null @@ -1,2845 +0,0 @@ -Fri Jul 27 06:50:14 CDT 2007 Johnny Willemsen - - * CIAO version 0.5.10 released. - -Tue Jul 24 20:38:50 UTC 2007 Douglas C. Schmidt - - * COPYING: Updated this file to reflect 2007. - -Tue Jul 24 16:24:58 UTC 2007 Krishnakumar B - - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - - Initialized the attributes of the Sender. The test spits out an - error message if the Sender's enum attribute could not be - initialized. It is currently not possible to initialize enum - attributes in PICML. So I have modified these plans by hand for - now. - -Tue Jul 24 10:09:20 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp(can_skip_module): - - Fixed a bug in the logic, where a local or abstract interface, - or abstract eventtype, would trigger an immediate return of - 'false'. This no longer happens. - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed a typo where a line was commented out inadvertently. - -Mon Jul 23 16:53:45 UTC 2007 Krishnakumar B - - * examples/Hello/descriptors/DeploymentPlan.cdp: Updated - deployment plan generated from the corresponding PICML model. - - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: New - deployment plan which doesn't use the Naming Service. - - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - - Updated the nightly build script to use the new deployment plans. - -Mon Jul 23 09:07:14 UTC 2007 Johnny Willemsen - - * ciao/Cookies.cpp: - Removed const in cast, not needed and fixes Intel C++ - warning - -Fri Jul 20 12:11:43 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_sunsoft.h: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/be_helper.h: - - Refactored code and other changes to make this backend more - friendly to others that extend it. No changes to generated - code or to the behavior of the backend. - -Thu Jul 19 07:50:21 UTC 2007 Johnny Willemsen - - * tools/IDL3_to_IDL2/be_global.{h,cpp}: - No need to specify "bool const" for a return value, this also - triggers a warning with the Intel C++ Compiler - -Thu Jul 19 00:50:28 UTC 2007 Krishnakumar B - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - - Updated to remove traces of _DnC_ from the projects. - - * examples/Hello/descriptors/DeploymentPlan.cdp: Generated the - plan using the new PICML model of Hello. - - * examples/Hello/descriptors_RTCCM/rt-config-example.cdp: - * examples/Hello/descriptors_RTCCM/rt-example.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp: - - Removed traces of _DnC_ from these files. - - * examples/Hello/descriptors/flattened_deploymentplan.cdp: - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp: - - Removed these files as they were redundant. - -Sun Jul 15 13:06:12 UTC 2007 Abdullah Sowayan - - * CCF/Example/IDL2/CxxMapping/GeneratorImpl.hpp: - - Fixed Fuzz warnings regarding exception specification. - -Fri Jul 13 11:04:13 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - - New files containing a base class visitor that factors - out code common to idl3_to_idl2_visitor and others which - may be created later or link this library. - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Updated MPC file with new additions above. - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/identifier_helper.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - - Factored code out of idl3_to_idl2_visitor into basic_visitor - described above. - - - Added export macros to classes so another tool can instantiate - and inherit from them. - -Wed Jul 11 04:33:45 UTC 2007 Abdullah Sowayan - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - - Fix fuzz warning regarding exception specification. - -Tue Jul 10 13:21:12 UTC 2007 Johnny Willemsen - - * ciao/Session_Container.cpp: - Fixed debug statements, thanks to Friedhelm Wolf - for pointing this out - -Tue Jul 10 03:53:18 UTC 2007 Abdullah Sowayan - - * CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp: - - Fixed fuzz warnings. Zap the usage of exception specification. - -Mon Jul 9 11:23:12 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.cpp: - - Added missing newline to the end of the file. - -Mon Jul 9 07:26:20 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Updated project to include new source and header files. - -Mon Jul 9 02:11:22 UTC 2007 Abdullah Sowayan - - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - * CCF/CCF/CodeGenerationKit/IndentationIDL.hpp: - * CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp: - * CCF/CCF/CodeGenerationKit/IndentationXML.hpp: - * CCF/CCF/CompilerElements/Context.hpp: - * CCF/CCF/CompilerElements/Preprocessor.cpp: - * CCF/CCF/CompilerElements/PreprocessorToken.cpp: - * CCF/CCF/CompilerElements/PreprocessorToken.hpp: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp: - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - * CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp: - * CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp: - * DAnCE/Utils/Plan_Handler.h: - * DAnCE/Utils/Plan_Handler.cpp: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - * tools/Config_Handlers/DD_Handler.h: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.h: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/ESD_Handler.h: - * tools/Config_Handlers/ESD_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.h: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.h: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/IRDD_Handler.h: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/OR_Handler.h: - * tools/Config_Handlers/RT-CCM/OR_Handler.cpp: - * tools/Config_Handlers/RT-CCM/SRD_Handler.h: - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp: - - Fixed fuzz warnings. Zap the usage of exception specification. - -Fri Jul 6 12:09:31 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.cpp: - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/identifier_helper.cpp: - * tools/IDL3_to_IDL2/identifier_helper.h: - - New files, added to help implement the new features - described below. - - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Changes to existing files which, along with the new files - listed above, add the following improvements to the CIAO - IDL3_to_IDL2 compiler: - - - more robust handling of escaped identifiers - - more robust handling of identifiers prefixed with _cxx_ - due to clashes with C++ keywords - - a new command line option to exclude included IDL files - from default processing, generating a corresponding - include with the name of the IDL file unchanged - - an optional alternative to regenerating an IDL file with - no IDL3 declarations, which is to simply generate an - include of the original IDL file - - Thanks for all these improvements to Hakim Souami - and his team. - -Fri Jun 29 19:23:14 UTC 2007 Johnny Willemsen - - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - Added include of Throughput_Stats.h - -Thu Jun 28 03:41:14 UTC 2007 Abdullah Sowayan - - * examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.h: - * examples/Display/NavDisplayGUI_exec/Command.h: - * examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/Display/NavDisplayGUI_exec/QuitCmd.h: - * examples/Display/NavDisplayGUI_exec/RootPanel.cpp: - * examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.h: - * examples/Display/NavDisplayGUI_exec/Worker.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tools/Config_Handlers/Utils/XercesString.cpp: - - Fixed fuzz warnings. Replace NULL with 0 to adhere to ACE/TAO/CIAO - coding guidlines. - -Thu Jun 28 03:27:08 UTC 2007 Abdullah Sowayan - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/NodeApplication/NodeApplication.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * examples/BasicSP/EC/client.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/Display/RateGen/controller.cpp: - * examples/Hello/Sender/starter.cpp: - * examples/Swapping/Sender/starter.cpp: - * performance-tests/Benchmark/Multi_Threaded/client.cpp: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - * performance-tests/Benchmark/server.cpp: - * performance-tests/Protocols/Controller/Controller.cpp: - * tests/IDL3/Events/Any/main.cpp: - - Fixed fuzz warnings. - Use "int ACE_TMAIN (int argc, ACE_TCHAR *argv[])" - instead of "int main (int argc, char *argv[])" to conform to ACE's - coding guidelines. - -Wed Jun 27 03:44:44 UTC 2007 Abdullah Sowayan - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/Utils/Plan_Handler.cpp: - * docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/Display/NavDisplayGUI_exec/NodeItem.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - - Fixed ACE_OS fuzz warnings. Use ACE_OS calls instead of raw OS function - where possible. If fuzz detected a false-positive, then disable - the ACE_OS fuzz check for that section of the code. - -Wed Jun 27 01:55:29 UTC 2007 Abdullah Sowayan - - * CIDLC/AttributeHeaderEmitters.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/OperationHeaderEmitters.cpp: - - Enhance the layout of CIDLC generated code. This fixes bugilla 2949. - -Mon Jun 25 11:34:36 CDT 2007 Ciju John - - * CIAO version 0.5.9 released. - -Mon Jun 25 16:16:17 UTC 2007 Ciju John - - * NEWS: - NEWS summary contributions from Gan Deng. - -Fri Jun 22 14:58:53 UTC 2007 Ciju John - - * ChangeLog: - * PROBLEM-REPORT-FORM: - * VERSION: - * ciao/Version.h: - Revert to x.5.8 status. - -Wed Jun 6 20:00:19 UTC 2007 Gan Deng - - * examples/Null_Component/plan.h - - Fixed Sun C++ on Salaris 10 linkage warning regarding - extern "C" and extern "C++" mismatch. - -Wed Jun 6 16:52:46 UTC 2007 Gan Deng - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp - - Fixed a type conversion warning on the - WinXP_VC71_NET_Dynamic_Debug build. - -Wed Jun 6 02:04:42 UTC 2007 Phil Mesnier - - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - - Update the name of the test enum value to match the idl. - -Tue May 29 21:02:08 UTC 2007 Phil Mesnier - - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - - Added code to support the new IPv4/IPv6 capable address server. - -Sun May 27 16:20:10 UTC 2007 Abdullah Sowayan - - * ciao/Object_Set_T.cpp: - - Enhanced exception safety of this class. Look at BUG ID 2725 for - details. - -Thu May 24 14:52:18 UTC 2007 - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - - Reverted a change which was accidentally checked in. - -Wed May 23 20:01:49 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - * DAnCE/Deployment/NodeApp_CB_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - Removed ACE_HAS_THREADS guards. - -Wed May 23 18:36:35 UTC 2007 Gan Deng - - * MPC/config/ciao_deployment_stub.mpb: - - Added "requires += threads" to disable single threaded build. - - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - - Removed ACE_HAS_THREADS guards. - -Wed May 23 02:21:30 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.h: - - Added back #if defined (ACE_HAS_THREADS) macro to - fix error in single_threaded build. - -Mon May 21 15:46:23 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Task_StartLaunch.h: - - Included ACE configuration header file to fix the warnigns - on the VxWorks5.5.1_x86_GCC2.96_Exceptions build. - -Sat May 19 15:59:08 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - * DAnCE/Deployment/NodeApp_CB_Impl.h: - - Moved #include "ace/config-all.h" from .h file to - the .cpp file since otherwise the #if defined (ACE_HAS_THREADS) - cannot be evaluated properly. - -Fri May 18 13:46:13 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - - Added #if defined (ACE_HAS_THREADS) to prevent build error - of single_threaded build. - -Thu May 17 19:53:02 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Task_StartLaunch.cpp: - * DAnCE/DomainApplicationManager/Task_StartLaunch.h: - - Added this new class which serves as an active object when - performing startLaunch. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_ActiveObject_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_ActiveObject_Impl.h: - - This implementation of DomainApplicationManager is a subclass - of standard implementation of DomainaApplicationManager but - uses an active object based approach to handle deployment, - which essentially spawns a number of threads wich each - correponds to one node. - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - - Added the above new classes into the project file - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - - Modified to allow a new command line option "-b", which - will make the DomainApplicationManager to take an active - object based approach to handle deployment - -Thu May 17 19:02:09 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.h: - - Added #if defined (ACE_HAS_THREADS) to prevent build error - of single_threaded build. - -Wed May 16 17:51:57 UTC 2007 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Fixed unused variable warnings on GCC Linux build. - -Wed May 16 14:35:58 UTC 2007 Gan Deng - - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - * DAnCE/Deployment/NodeApp_CB_Impl.h: - - Implemented a NA component server callback wait strategy in - NAM, which uses conditional variable to signal the NA call - back so it can work with multi-threaded configuration, such - as thread-per-connection mode. The original implementation - uses the main thread to run the ORB event loop, which will - not work for multi-threaded environment. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - - Implemented the single_threaded_wait_for_callback() and - multi_threaded_wait_for_callback() methods which uses - perform_work() and conditional variable technique - respectively. - - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - - Modified the Node_Manager command line option so the - user can control whether to use single threaded or - multi-threaded mode with command line option. - - * examples/Hello/descriptors/flattened_deploymentplan.cdp: - * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp: - - Modified the tag so the interface of the assembly - corresponds to some concrete ports of the components. Thanks - Santos for reporting this issue. - -Wed May 2 14:09:37 UTC 2007 Johnny Willemsen - - * examples/BasicSP/BasicSP_exec.h: - Fixed warning in VxWorks build - -Mon Apr 30 08:59:37 CDT 2007 Chad Elliott - - * CIAO version 0.5.8 released. - -Mon Apr 30 13:21:23 UTC 2007 Chad Elliott - - * NEWS: - - Added user visible changes for 0.5.8 based on ChangeLog entries. - -Thu Apr 26 15:01:17 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Fixed warning on GCC with constructor initialization list - sequence. - -Wed Apr 25 20:22:44 UTC 2007 - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Fixed warning on GCC with constructor initialization list - sequence. - - * DAnCE/Utils/Plan_Handler.cpp - * DAnCE/Utils/Plan_Handler.h - - Added a utility method to add more instances into a plan. - -Wed Apr 25 19:27:28 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.inl - - An AMH-based implementation of DomainApplicationManager. This - class duplicates *most* of code with the non-AMH based - DomainApplicationManager implementation, eventually we should - either remove one version completely or find a way to minimize - the duplicate code. The public interfaces of these two classes are - quite different. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h - - Modified to use AMH-based DomainApplicationManager in - conjunction with the AMI. - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - The AMI callback reply handler should work with the - AMH-based DomainApplicationManager instead of the non-AMH based - version. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - - Modified to make the construction process of the - DomainApplicationManager to be more self-contained and atomic. - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - - Modified the instantation of the DomainApplicationManager - servant so we can mix between the AMH/AMI based - DomainApplicationManager servant and the synchronous based - DomainApplicationManager servant based on the command input. - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - - Added the AMH-based DAM servant into the project. - -Tue Apr 24 17:44:22 UTC 2007 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - - Modified the debug output information to make it - better describe the program behavior. - - * examples/Hello/descriptors/run_NodeDaemons.pl - - Increased the spawn latency delay so it can handle - deployment with a large number of components, i.e., - more than one thousand. - - * examples/Hello/descriptors/svc_em.conf - - Service configuration file for ExecutionManager. - -Tue Apr 24 14:58:58 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp: - - Added a newline to the end of the file. - -Mon Apr 23 23:02:25 UTC 2007 Gan Deng - - * DAnCE/Deployment/DAnCE_Core.mpc - - Modified the IDL flag by passing -GH to generate AMH code - for Deployment_DomainApplicationManager.idl. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h - - Added functionality to use AMH to handle StartLaunch request - processing. - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - - Modified to notify the DAM servant object once all the - AMI callbacks are received. - -Sat Apr 21 21:26:30 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h: - - Used raw pointer to cache the servant since no copy constructor - is defined for the Value_Ptr in ACE. - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Get rid of the unnecessary copy constructor. - - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/Container_Impl.h - * DAnCE/NodeApplication/Container_Impl.inl: - - Modified to use Auto_Ptr to cache the container pointer. - Return a duplicate pointer instead of returning a pointer - within the object. - -Fri Apr 20 19:08:43 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Modified to make the debug message more informative. - -Thu Apr 19 23:15:10 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h - - Added a centrallized map to track the status of the AMI callback - return status. - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Added a DomainApplicationManager_AMI_Impl object as a member - variable for callback purpose, i.e., notifiying this object - as soon as a AMI call returns. - - * DAnCE/ExecutionManager/Execution_Manager.cpp - - Added usage info printout about using AMI. - -Thu Apr 19 18:29:12 UTC 2007 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * performance-tests/Benchmark/Multi_Threaded/run_test.pl: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - Use $PerlACE::wait_interval_for_process_creation - -Sun Apr 15 19:20:32 UTC 2007 Johnny Willemsen - - * CIDLC/ServantSourceGenerator.cpp: - Fixed bug 2892, thanks to Abdul Sowayan for reporting this. - -Wed Apr 11 11:48:32 UTC 2007 Chad Elliott - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - - Removed the stray '\' I accidentally added yesterday. - -Tue Apr 10 17:23:16 UTC 2007 Krishnakumar B - - * examples/BasicSP/BasicSP.mwc: Added SVN Id tag to remove Fuzz - warning. Thanks to Chad for pointing out the error. - - * examples/BasicSP/EC/EC_exec.cpp: Removed use of - ACE_PRINT_EXCEPTION since it is deprecated. - -Tue Apr 10 15:37:24 UTC 2007 Gan Deng - - * DAnCE/ExecutionManager/ExecutionManager.mpc - - Modified to inherit from the "strategies" base project. - - * DAnCE/Utils/Plan_Handler.cpp - - Removed ACE exception macros. - -Tue Apr 10 14:13:19 UTC 2007 Chad Elliott - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - - Removed parenthesis around throw argument. - -Mon Apr 9 23:29:15 UTC 2007 Krishnakumar B - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/EC/EC.mpc: - - Updated MPC files to cleanup the generated skeleton files. - Thanks to Chad for this solution. - -Mon Apr 9 14:15:13 UTC 2007 Chad Elliott - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - - Added BasicSP_exec to the after keyword setting. - -Sat Apr 7 22:09:57 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - - Changed ACE_Thread_Mutex to ACE_SYNCH_MUTEX to fix - Singled Threaded build error. - -Fri Apr 6 03:42:04 UTC 2007 Krishnakumar B - - * examples/BasicSP/descriptors/run_test.pl: Updated the second - invocation of plan_launcher to pass in the previously generated - execution manager's IOR. The test fails on Linux without this - flag. Somehow it works on Windows without this flag; probably - due to some issue with case-sensitivity. - -Fri Apr 6 01:15:00 UTC 2007 Gan Deng - - * MPC/config/dance_utils.mpb - - Added the base project for the DAnCE utility library. - -Fri Apr 6 03:35:21 UTC 2007 Krishnakumar B - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - - Added missing dependencies on BasicSP_svnt so that the test runs - fine on Linux. - -Thu Apr 5 21:32:57 UTC 2007 Krishnakumar B - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/EC/EC.mpc: - - Fixed errors in Linux builds due to a duplicate dependency rule - added to the MPC files between a .cidl file and a E.idl file. - -Thu Apr 5 21:03:50 UTC 2007 Gan Deng - - * DAnCE/Utils/DAnCE_Utils.mpc - * DAnCE/Utils/DAnCE_Utils_Export.h - * DAnCE/Utils/Plan_Handler.cpp - * DAnCE/Utils/Plan_Handler.h - - Added the utility library to manipulate the deployment - plan, such as adding/removing instances, adding/removing - connections, and pretty print. - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - - Modified to use the above utility class so we can - programatically scale up the deployment. - -Thu Apr 5 16:51:24 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Changed ACE_Thread_Mutex to ACE_SYNCH_MUTEX to avoid errors - in Single_Threaded build. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - - Added exception catching blocks to re_launch_plan operation. - -Thu Apr 5 01:07:34 UTC 2007 Krishnakumar B - - * examples/BasicSP/BMClosedED/BMClosedEDEI.idl: - * examples/BasicSP/BMDevice/BMDeviceEI.idl: - * examples/BasicSP/BMDisplay/BMDisplayEI.idl: - * examples/BasicSP/EC/ECEI.idl: - - Removed these files. - -Wed Apr 4 21:55:58 UTC 2007 Krishnakumar B - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Improved the option handling of the Execution_Manager and - plan_launcher. This includes printing meaningful usage - messages, and exiting with an error message when an error occurs - instead of silent termination etc. etc. - - * examples/BasicSP/BMClosedED/BMClosedED.cidl: - * examples/BasicSP/BMClosedED/BMClosedED.idl: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice.cidl: - * examples/BasicSP/BMDevice/BMDevice.idl: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay.cidl: - * examples/BasicSP/BMDisplay/BMDisplay.idl: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/BasicSP.idl: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BasicSP.mwc: - * examples/BasicSP/BasicSP_exec.h: - * examples/BasicSP/BasicSP_exec.cpp: - * examples/BasicSP/BasicSP_exec_export.h: - * examples/BasicSP/EC/EC.cidl: - * examples/BasicSP/EC/EC.idl: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/EC/EC_exec.h: - * examples/BasicSP/EC/EC_exec.cpp: - * examples/BasicSP/EC/client.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/BasicSP/descriptors/BasicSP.cdp: - * examples/BasicSP/descriptors/BasicSP.dat: - * examples/BasicSP/descriptors/run_test.pl: - - Updated the example to use the latest and greatest CIAO features - include --lem-force-all which gives an example of how to share - the implementation of a facet among multiple components. While - at it, make sure that the run_test.pl actually deploys and runs - the application. Now the example can be turned on for nightly - builds. - - * examples/BasicSP/descriptors/Airframe.ccd: - * examples/BasicSP/descriptors/Airframe.cid: - * examples/BasicSP/descriptors/Airframe.cpd: - * examples/BasicSP/descriptors/Airframe_Exec.iad: - * examples/BasicSP/descriptors/Airframe_Stub.iad: - * examples/BasicSP/descriptors/Airframe_Svnt.iad: - * examples/BasicSP/descriptors/DeploymentPlan.cdp: - * examples/BasicSP/descriptors/Domain.cdd: - * examples/BasicSP/descriptors/GPS.ccd: - * examples/BasicSP/descriptors/GPS.cid: - * examples/BasicSP/descriptors/GPS.cpd: - * examples/BasicSP/descriptors/GPS_Exec.iad: - * examples/BasicSP/descriptors/GPS_Stub.iad: - * examples/BasicSP/descriptors/GPS_Svnt.iad: - * examples/BasicSP/descriptors/HUDisplay.cid: - * examples/BasicSP/descriptors/HUDisplay.cpd: - * examples/BasicSP/descriptors/HUDisplay.pcd: - * examples/BasicSP/descriptors/Libraries.iad: - * examples/BasicSP/descriptors/NavDisplay.ccd: - * examples/BasicSP/descriptors/NavDisplay.cid: - * examples/BasicSP/descriptors/NavDisplay.cpd: - * examples/BasicSP/descriptors/NavDisplay_Exec.iad: - * examples/BasicSP/descriptors/NavDisplay_Stub.iad: - * examples/BasicSP/descriptors/NavDisplay_Svnt.iad: - * examples/BasicSP/descriptors/NodeManagerMap.dat: - * examples/BasicSP/descriptors/Timer.ccd: - * examples/BasicSP/descriptors/Timer.cid: - * examples/BasicSP/descriptors/Timer.cpd: - * examples/BasicSP/descriptors/Timer_Exec.iad: - * examples/BasicSP/descriptors/Timer_Stub.iad: - * examples/BasicSP/descriptors/Timer_Svnt.iad: - * examples/BasicSP/descriptors/XMI.xsd: - * examples/BasicSP/descriptors/basicNodeDaemon.pl: - * examples/BasicSP/descriptors/basicsp.dat: - * examples/BasicSP/descriptors/flattened_deploymentplan.cdp: - * examples/BasicSP/descriptors/package.tpd: - - Removed these files. - -Wed Apr 4 22:04:11 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Fixed static build errors. - -Wed Apr 4 19:28:09 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Added header file for ACE_Thread_Mutex. - -Wed Apr 4 15:55:23 UTC 2007 Gan Deng - - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Removed unused arguments. - -Tue Apr 3 19:30:05 UTC 2007 Gan Deng - - * DAnCE/Deployment/DAnCE_Core.mpc - * MPC/config/ciao_deployment_stub.mpb - - Added "messaging.mpb" as base project for ciao_deployment_stub. - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - - Modified to allow passing command line option to - indicate whether to use AMI or not. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp - * DAnCE/DomainApplicationManager/Reply_Handler_i.h - - Added implementation of using AMI for "startLaunch" - operation. - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/Interfaces/Interfaces.mpc - * DAnCE/NodeManager/Monitor.mpc - - Modified to accomodate the above changes. - -Tue Apr 3 18:59:38 UTC 2007 Jeff Parsons - - * CIAO_TAO_DAnCE.mwc: - * CIAO_TAO.mwc: - - In the list of directories eplaced ACE_ROOT/ace/ACEXML with - 3 subdirectories, leaving out the tests and examples - subdirectories, which aren't needed. These included ACEXML - subdirectories are now the same as in TAO_ACE.mwc. - - * tests/CIDL/CodeGen/CodeGen.mpc: - - Cosmetic changes, shortened line lengths. - -Tue Apr 3 15:19:01 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - - Removed deprecated ACE exception macros. - -Mon Apr 2 16:38:24 UTC 2007 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h - - Address virtual destructor warnings. - - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - - Address exception warnings. - -Fri Mar 30 23:10:24 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: - - Removed the declaration and definition of the virtual - destructor since a virtual destructor has been defined - in the base class. - -Fri Mar 30 18:23:43 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - - Silenced the "unused variables" warnings. - -Fri Mar 30 18:09:55 UTC 2007 Gan Deng - - * DAnCE/ExecutionManager/ExecutionManager.mpc - - Added "rtcorba" as base project dependency. - -Fri Mar 30 18:05:06 UTC 2007 Gan Deng - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - - Added virtual destructors into the class. - -Fri Mar 30 14:15:58 UTC 2007 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - - Removed emulated exceptions since they are no - longer supported. Also removed the exception - specification in the c++ mapping of IDL operation - since they are obsolete. - -Thu Mar 29 15:22:08 UTC 2007 Gan Deng - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Created a child POA which is configured with - Client_Propagated Priority Model. - - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - - Added a get_current_thread_priority() to get the - priority of the current thread. Also added - debug_level control so the thread priority could - be printed out. - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Added two new methods. - The is_client_propagated_model() checks whether - the ExecutionManager exposes the CLIENT_PROPAGATED - priority model. The set_current_priority() method - will set the client thread priority if the priority - model is CLIENT_PROPAGATED on the EM side. - - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - - Added two derived classes which collect benchmarking - results of DAnCE. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Added a command line argument "-z" to allow priority - to be specified on Plan_Launcher, and then propagated - to the Execution Manager. - - -Wed Mar 28 11:16:43 UTC 2007 Abdullah Sowayan - - * DAnCE/NodeApplication/NodeApp_Configurator.h: - - Partially reverted changes made in Fri Mar 23 03:13:40 UTC 2007. - VS 7.1 didn't like it. Forward declaration to Config_Manager was - removed and its header file was included again. - -Sun Mar 25 23:26:11 UTC 2007 William R. Otte - - * CCF/CCF/IDL2/Parsing/Recovery.hpp - * CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp - - An attempt to deal with copious warnings from the CIDLC - build. - -Sun Mar 25 23:07:17 UTC 2007 William R. Otte - - * CIDLC/OperationHeaderEmitters.cpp - * CIDLC/OperationHeaderEmitters.hpp - - Reverted part of previous commit which caused malformed output - in components with supported interfaces with raises clauses. - -Fri Mar 23 21:26:31 UTC 2007 Jeff Parsons - - * ciao/Cookies.h: - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Utils_T.cpp: - * ciao/Cookies.cpp: - * CIDLC/OperationHeaderEmitters.cpp: - * CIDLC/OperationHeaderEmitters.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - - changed key type of ACE_Array_Map added in - - Tue Mar 6 20:21:45 UTC 2007 Jeff Parsons - - to ptrdiff_t from CORBA::ULong, so it will be - portable to 64-bit systems. - - - fixed formatting errors in generated code - for facet servant operations, and removed - unused methods from the emitter class. - -Fri Mar 23 12:46:12 UTC 2007 Johnny Willemsen - - * ciao/Session_Container.cpp: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/Swapping_Container.cpp: - * examples/Null_Component/Null_Component_exec.h: - * tools/Config_Handlers/ERE_Handler.h: - Layout changes - -Fri Mar 23 06:56:38 UTC 2007 William R. Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Removed emulated exception macros. - -Fri Mar 23 06:45:51 UTC 2007 William R. Otte - - * DAnCE/RepositoryManager/ZIP_Wrapper.h - - Addressed initialization warning. - -Fri Mar 23 03:13:40 UTC 2007 Abdullah Sowayan - - * DAnCE/NodeApplication/Config_Manager.h: - * DAnCE/NodeApplication/Config_Manager.cpp: - * DAnCE/NodeApplication/Config_Manager_export.h: - - Removed uncessary include files. Also, implementation of virtual - destructor should not be in header or inline file, it was moved - to a newly created cpp file and an export header was created. - This Fixes bugzilla 2858. - - * DAnCE/NodeApplication/NodeApp_Configurator.h: - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: - - Don't include a header file if a forward declaration suffices. The - include of Config_Manager.h was moved from the header to the cpp file. - - * DAnCE/NodeApplication/NodeApplication.mpc: - - Added a new Config_Manager project. Also simplified this file to - utilize mpb base projects. - - * MPC/config/ciao_config_manager.mpb: - - New base project for Config_Manager. - - * MPC/config/ciao_nodeapp_configurator.mpb: - - This project now inherits from ciao_config_manager base project. - -Fri Mar 23 02:50:00 UTC 2007 Abdullah Sowayan - - * DAnCE/NodeApplication/Configurator_Factory.h: - * DAnCE/NodeApplication/Configurator_Factory.inl: - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Fixed bugzilla 2860. All inlined implementations were - moved to .inl file to follow ACE/TAO/CIAO conventions. - - Uncessary include files were removed. - - ACE_DLL was commented out since it is not used anymore. - -Thu Mar 22 19:09:35 UTC 2007 Gan Deng - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - - Reverted a change made from: - - Sun Apr 9 01:03:19 UTC 2006 - - - The old change accidentally checked in some wrong code, - which broke the ReDaC functionality when removing components. - -Wed Mar 21 12:12:26 CDT 2007 Chad Elliott - - * CIAO version 0.5.7 released. - -Wed Mar 21 14:54:24 UTC 2007 William R. Otte - - * NEWS - - Latest NEWS items. - -Tue Mar 13 20:13:09 UTC 2007 Steve Huston - - * MPC/config/cidlc.mpb: Added C4996 (deprecated CRT function) to the - list of suppressed warnings. The warnings emanate from the - ACE_wrappers/contrib/utility area, in case anyone wants to - investigate the desireability of making a change. - -Mon Mar 11 07:12:19 UTC 2007 Johnny Willemsen - - * CIDLC/ServantSourceGenerator.cpp: - Added missing .in() to the generation - -Sat Mar 10 22:49:01 UTC 2007 Steve Huston - - * MPC/config/ciao_vc8warnings.mpb: New base containing features that - turn VC8 warnings on/off. Some of these may benefit from some looking - at; if you want to see them, regenerate projects with the feature - turned off. - - * MPC/config/ciao_client_dnc.mpb: Inherit from ciao_vc8warnings to - shut off the gazillions of VC8 warnings. - -Sat Mar 10 01:11:40 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/index.html: - - Added $Id to each file to fix fuzz errors. - -Fri Mar 9 21:11:20 UTC 2007 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Changes to code generation specific to upgradeable components - corresponding to changes in - - Tue Mar 6 20:21:45 UTC 2007 Jeff Parsons - -Fri Mar 9 15:53:02 UTC 2007 Steve Huston - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: Adjusted 3rd arg to - ACE_CString for matching change in ACE from yesterday. - -Fri Mar 9 14:09:19 UTC 2007 Johnny Willemsen - - * DAnCE/NodeApplication/RTConfig_Manager.{cpp,inl}: - Fixed ownership problems with the policy list, fixes bugzilla 2743. - Also moved destructor to cpp file - -Thu Mar 8 01:27:19 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/index.html: - - Added link to CIDLC compiler options. - Added link to generate_component_mpc.pl options. - Made it easier to navigate between tutorial pages. - -Wed Mar 7 11:42:26 PST 2007 William R. Otte - - * NEWS: - - Updated to include some important changes in this release and - plans for next release. - - -Wed Mar 7 02:20:26 UTC 2007 Abdullah Sowayan - - * docs/tutorials/CoSMIC: - * docs/tutorials/CoSMIC/01.html: - * docs/tutorials/CoSMIC/02.html: - * docs/tutorials/CoSMIC/03.html: - * docs/tutorials/CoSMIC/04.html: - * docs/tutorials/CoSMIC/Icons: - * docs/tutorials/CoSMIC/Icons/AddConnMode.gif: - * docs/tutorials/CoSMIC/Icons/SetMode.gif: - * docs/tutorials/CoSMIC/Images: - * docs/tutorials/CoSMIC/Images/fig1.jpg: - * docs/tutorials/CoSMIC/Images/fig10.jpg: - * docs/tutorials/CoSMIC/Images/fig11.jpg: - * docs/tutorials/CoSMIC/Images/fig12.jpg: - * docs/tutorials/CoSMIC/Images/fig2.jpg: - * docs/tutorials/CoSMIC/Images/fig3.jpg: - * docs/tutorials/CoSMIC/Images/fig4.jpg: - * docs/tutorials/CoSMIC/Images/fig5.jpg: - * docs/tutorials/CoSMIC/Images/fig6.jpg: - * docs/tutorials/CoSMIC/Images/fig7.jpg: - * docs/tutorials/CoSMIC/Images/fig8.jpg: - * docs/tutorials/CoSMIC/Images/fig9.jpg: - * docs/tutorials/CoSMIC/Model: - * docs/tutorials/CoSMIC/Model/Quoter.xme: - * docs/tutorials/CoSMIC/index.html: - * docs/tutorials/CoSMIC/style.css: - - Removed these files. This tutorial has been subsumed by the - tutorial in docs/tutorials/Quoter. - -Tue Mar 6 23:43:58 UTC 2007 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Added code generation for attaching diffserv policies to - receptacle interfaces at connection time. - -Tue Mar 6 20:21:45 UTC 2007 Jeff Parsons - - * ciao/Cookies.h: - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Utils_T.cpp: - * ciao/Server_init.cpp: - * ciao/Cookies.inl: - * ciao/Servant_Impl_Base.cpp: - * ciao/Cookies.cpp: - * ciao/Dynamic_Component_Servant_Base.h: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/AttributeSourceEmitters_T.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/Upcase.hpp: - * CIDLC/ServantGenerator.cpp: - - - changed the container used to hold object reference for - multiplex receptacle and event source ports from - ACE_Active_Object_Map to ACE_Array_Map - - - removed class CIAO::Map_Key_Cookie (since it encodes an - ACE_Active_Object_Map_Key, which is tightly coupled with - ACE_Active_Object_Map) and replaced it with class - Cookie_Impl, which encodes a CORBA::ULong - - - formatting and cosmetic changes to CIDLC-generated code - -Tue Mar 6 13:21:24 UTC 2007 Douglas C. Schmidt - - * COPYING: Updated this file to clarify that the CIAO license need - not be shipped with binary-only releases. Thanks to Michael - Kircher and Werner - Burger for motivating - this. - -Sun Mar 4 21:49:19 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Icons: - * docs/tutorials/Quoter/Simple/Model: - - Added GME model of the Quoter tutorial. - -Thu Mar 1 23:05:27 UTC 2007 William R. Otte - - * docs/tutorials/Quoter/Simple/images/step6.jpg: - * docs/tutorials/Quoter/Simple/images/step1.jpg: - * docs/tutorials/Quoter/Simple/images/step2.jpg: - * docs/tutorials/Quoter/Simple/images/step3.jpg: - * docs/tutorials/Quoter/Simple/images/steps.jpg: - - Lowercased file names, removed spaces. - - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/index.html: - - Changes to reflect above change. -Thu Mar 1 22:20:28 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplication/Container_Impl.cpp: - - A minor change to add a "_" to the receptacle name, - that is used as a key in a Hash Map storing the - receptacle policies and the receptacle name. - -Thu Mar 1 07:17:00 UTC 2007 William R. Otte - - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/iad.cpp: - - Regenrated with the latest version of XSC to pick up - bugfixes, esp for addressing warnings in Borland. - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/TP_Handler.cpp: - * tools/Config_Handlers/IRDD_Handler.h: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.cpp: - - Borland compile errors resolved. - - * tools/Config_Handlers/Property_Handler.h: - - Layout changes. - -Thu Mar 1 03:54:50 UTC 2007 William R. Otte - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - - Changed base project from ciao_xml_utils to ciao_config_handlers_base - to pull in specific block that turns off visibility. - -Wed Feb 28 22:19:37 UTC 2007 Jaiganesh B - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - - Added a method to get the receptacle policy associated - with a receptacle. - -Wed Feb 28 22:04:52 UTC 2007 Jaiganesh B - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - - Added a new private variable of type ACE_Hash_Map to hold - the receptacle policy list. - - Added a set operation for setting the value of the receptacle policy - map. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - When the Container_Impl class is created, pass on the - NA's configurator. The configurator will be used by the - Container_Impl class to identify the policies that needs to - be set on the components and their ports. Finally, the - Container_Impl class lets the container know about these policies. - - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/NodeApplication/Container_Impl.inl: - * DAnCE/NodeApplication/Container_Impl.cpp: - - Modified the constructor to receive the NA configurator as - an input argument. - - Added capabilities to collect the policies associated with the - receptacles of the components. - -Wed Feb 28 14:30:12 UTC 2007 Johnny Willemsen - - * CIAO_TAO.mwc: - Removed RACE - -Wed Feb 28 09:33:12 UTC 2007 Johnny Willemsen - - * MPC/config/ciao_nodeapp_configurator.mpb: - New base project - - * MPC/config/ciao_nodeapplication.mpb: - Updated because of new project - - * MPC/config/ciao_race_component.mpb: - * MPC/config/ciao_race_default.mpb: - * MPC/config/ciao_race_monitor.mpb: - Removed, RACE is removed for the moment - - * DAnCE/NodeApplication/NodeApplication.mpc: - Use the new base project - - * NodeApplicationManager/NodeApplicationManager_Impl.h: - Layout changes - - * NodeApplicationManager/NodeApplicationManager_Impl.inl: - No need to use ACE_UNUSED_ARG - -Wed Feb 28 07:00:15 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - - Added missing includes to the .cpp file, and added - missing file for compilation in the .mpc file. - -Tue Feb 27 21:35:17 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplication/NodeApp_Configurator.h: - - Changed the current structure of the NodeApplication library - by introducing the NodeApp_Configurator, that will now be - used to manage both RT and non-RT policies using the respective - config managers. - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Previously, when RT support was required, the Configurator - Factory would create the RT config manager. - - Instead, now the NodeApp_Configurator is created, which will - then subsequently create the RT or non-RT config managers - depending on whether RT support is required or not. - - By default a non-RT config manager is created, which will be used - to create the non-RT policies. - - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - - Made modifications to create the RT and non-RT config managers. - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.h: - - Made modifications to conform to the base config manager class. - - * DAnCE/NodeApplication/NodeApplication.mpc: - - Made modifications to compile the newly added files. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - Changed the private variable type for the NA Configurator used. - -Tue Feb 27 20:11:28 UTC 2007 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed cut and paste error in code generation of type-specific - disconnect_*() method for multiplex uses ports. - -Tue Feb 27 17:44:08 UTC 2007 Jaiganesh B - - * examples/Hello/descriptors/run_test_without_ns.pl: - - Updated the script in finding the location of the Execution - Manager executable. - -Tue Feb 27 05:26:53 UTC 2007 Shanshan Jiang - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - - Modified the remove_extracted_package () function. - Added the functionality to save the package information when - install or delete a package. - -Tue Feb 27 03:29:42 UTC 2007 William R. Otte - - * tools/Config_Handlers/DynAny_Handler.mpc - - Inherit from config_handlers_base to disable symbol visibility. - -Tue Feb 27 03:10:14 UTC 2007 William R. Otte - - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc - - Changed double quotes to <%quote%> to correctly generate in - Visual Studio projects. Thanks to Kitty for suggesting the - fix. - -Tue Feb 27 03:00:25 UTC 2007 William R. Otte - - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl - * tests/Bug_2130_Regression/descriptors/run_test.pl - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl - * DAnCE/tests/NodeApplicationTest/run_test.pl - * examples/Hello/descriptors/run_NodeDaemons.pl - * examples/Hello/descriptors/run_test_without_ns.pl - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors_events/run_NodeDaemons.pl - * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl - * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl - * examples/Hello/descriptors_RTCCM/rt_run_test.pl - * examples/BasicSP/descriptors/run_test.pl - * examples/BasicSP/descriptors/basicNodeDaemon.pl - * examples/Display/descriptors/run_test_without_ns.pl - * examples/Display/descriptors/basicNodeDaemon.pl - * examples/Display/descriptors/run_NodeDaemons.pl - - Updated to reflect movement of binaries to CIAO_ROOT/bin. - -Mon Feb 26 17:21:55 UTC 2007 Adam Mitz - - * examples/Hello/descriptors_RTCCM/rt_run_test.pl: - - Locate the CIAO directory using $PerlACE::CIAO_ROOT instead of - assuming that it is nested within TAO. This change supports the - peer-style directory layout. - -Sat Feb 24 21:32:05 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/RTConfig_Manager.h: - * DAnCE/NodeApplication/NodeApp_Configurator.h: - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Reverted some inadvertent check-ins. - -Sat Feb 24 20:53:14 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplication/NodeApp_Configurator.h: - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: - - Changed the current structure of the NodeApplication library - by introducing the NodeApp_Configurator, that will now be - used to manage both RT and non-RT policies using the respective - config managers. - - * DAnCE/NodeApplication/Configurator_Factory.cpp: - - Previously, when RT support was required, the Configurator - Factory would create the RT config manager. - - Instead, now the NodeApp_Configurator is created, which will - then subsequently create the RT or non-RT config managers - depending on whether RT support is required or not. - - By default a non-RT config manager is created, which will be used - to create the non-RT policies. - - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - - Made modifications to create the RT and non-RT config managers. - - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.h: - - Made modifications to conform to the base config manager class. - - * DAnCE/NodeApplication/NodeApplication.mpc: - - Made modifications to compile the newly added files. - -Sat Feb 24 19:52:49 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplication/Config_Manager.h: - - A new base class for the RT and non-RT NodeApplication - config managers, that are used by the NodeApplication - configurators. - - * DAnCE/NodeApplication/NAConfig_Manager.cpp: - * DAnCE/NodeApplication/NAConfig_Manager.h: - * DAnCE/NodeApplication/NAConfig_Manager.inl: - * DAnCE/NodeApplication/NA_Configurator_Export.h: - - A non-RT NodeApplication config manager that is being used to - create the DiffServ policies. In general, this config manager - can be used to create all the TAO-specific policies that are - created using ORB, rather than RT-ORB. - - * DAnCE/NodeApplication/NodeApplication.mpc: - - Updated the MPC file to compile the new non-RT NodeApplication - config manager library. - -Fri Feb 23 04:08:04 UTC 2007 Abdullah Sowayan - - * CIDLC/ServantGenerator.cpp: - - cidlc --help prints the following: - - [--svnt-export-macro macro] - Replace default servant DLL export macro with provided ,acro. - - Fixed the misspelling of macro in the cidlc help message. - - -Thu Feb 22 22:59:01 UTC 2007 Jaiganesh B - - * docs/schema/ServerResourceUsage.txt: - - Updated the text document with the new usage guidelines. - -Thu Feb 22 22:53:52 UTC 2007 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - - Changed in order to remove a warning in the build - -Thu Feb 22 22:22:13 UTC 2007 Jaiganesh B - - * examples/Hello/descriptors_RTCCM/rt-example.cdp: - - Updated the RT-CCM example deployment plan to conform - to the latest changes in specifying the POA policies - within the deployment plan. - - The POA policies now need to be specified with a tag name - as CIAO:InstancePolicy. - -Thu Feb 22 22:19:14 UTC 2007 Jaiganesh B - - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - - Modifications to read in DiffServ policy specifications - within the deployment plan. - -Thu Feb 22 22:18:24 UTC 2007 William R. Otte - - * CCF/CCF/CompilerElements/TokenStream.hpp - * CCF/CCF/IDL2/SemanticAction/Exception.hpp - * CCF/CCF/IDL2/SemanticAction/TypeId.hpp - * CCF/CCF/IDL2/SemanticAction/Operation.hpp - * CCF/CCF/IDL2/SemanticAction/Interface.hpp - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp - * CCF/CCF/IDL2/SemanticAction/Attribute.hpp - * CCF/CCF/IDL2/SemanticAction/Enum.hpp - * CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp - * CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp - * CCF/CCF/IDL2/SemanticAction/Member.hpp - * CCF/CCF/IDL2/SemanticAction/Elements.hpp - * CCF/CCF/IDL2/SemanticAction/ValueType.hpp - * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp - * CCF/CCF/IDL2/SemanticAction/Include.hpp - * CCF/CCF/IDL2/SemanticAction/Struct.hpp - * CCF/CCF/IDL2/SemanticAction/Module.hpp - * CCF/CCF/IDL2/SemanticAction/Native.hpp - * CCF/CCF/IDL2/SemanticAction/Const.hpp - * CCF/CCF/IDL2/SemanticAction/Union.hpp - * CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp - * CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp - * CCF/CCF/IDL3/SemanticAction/Provides.hpp - * CCF/CCF/IDL3/SemanticAction/Consumes.hpp - * CCF/CCF/IDL3/SemanticAction/Publishes.hpp - * CCF/CCF/IDL3/SemanticAction/Uses.hpp - * CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp - * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp - * CCF/CCF/IDL3/SemanticAction/Emits.hpp - - Addressed warnings relating to classes w/ virtual methods having - non virtual destructors. - -Thu Feb 22 21:36:35 UTC 2007 William R. Otte - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - - Fix for compile warning. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - - Regenerated with newer version of XSC than Jai had, re-applying - fixes from - Wed Feb 21 20:30:34 UTC 2007 William R. Otte - -Thu Feb 22 17:07:08 UTC 2007 Jaiganesh B - - * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp: - - Removed a unused input argument from cnw_priority_pd () method. - -Thu Feb 22 02:30:29 UTC 2007 Jaiganesh B - - * DAnCE/Deployment/CIAO_ServerResources.idl: - - Modified the IDL to conform to the changes made in the - schema. - -Thu Feb 22 02:27:00 UTC 2007 Jaiganesh B - - * tools/Config_Handlers/RT-CCM/CNPM_Handler.h: - * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp: - * tools/Config_Handlers/RT-CCM/NPM_Handler.h: - * tools/Config_Handlers/RT-CCM/NPM_Handler.cpp: - - New config handlers for handling the DiffServ policy - additions in the CIAOServerResources schema. - - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: - - PolicySet within the CIAOServerResources schema will now - have DiffServ policy specify sub-elements. So the PolicySet - handler is modified to call the specific handlers checked-in - above. - - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - - Included the new files in the MPC. - -Thu Feb 22 01:26:05 UTC 2007 Jaiganesh B - - * docs/schema/CIAOServerResources.xsd: - - Added elements for representing the DiffServ policy. - - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp: - - Associated config handlers change. - -Wed Feb 21 22:01:45 UTC 2007 Jaiganesh B - - * docs/schema/Basic_Deployment_Data.xsd: - - Updated the InstanceDeploymentDescription element's - deployedResource sub-element to be a sequence. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/IRDD_Handler.h: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/IDD_Handler.cpp: - - Associated config handler changes. - -Wed Feb 21 20:30:34 UTC 2007 William R. Otte - - * DynAny_Handler/DynAny_Handler.cpp - * CIAO_Events/CIAOEvents.hpp - * RT-CCM/CIAOServerResources.hpp - * Basic_Deployment_Data.hpp - - Compile fixes for Borland and pedantic G++ compilers. - -Wed Feb 21 19:16:14 UTC 2007 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager.mpc: - Fixed error in this file - -Wed Feb 21 19:12:14 UTC 2007 Johnny Willemsen - - * DAnCE/Deployment/Deployment_Target_Data.idl: - Removed, this file was reintroduced with the move by accident - - * DAnCE/TargetManager/TargetManagerImpl.idl: - Use full paths - -Wed Feb 21 15:49:14 UTC 2007 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager.mpc: - Added missing files - -Wed Feb 21 08:30:14 UTC 2007 Johnny Willemsen - - * ciao/Swapping_Container.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Layout change - - * tools/Config_Handlers/Utils/XercesString.{h,cpp}: - Use std::swap instead of ACE_Swap - -Tue Feb 20 17:56:25 UTC 2007 Douglas C. Schmidt - - * COPYING: Clarified how the COPYING file need to be included with - any code released. Thanks to Scott Mark - for helping clarify this. - -Tue Feb 20 17:59:51 UTC 2007 William R. Otte - - * DAnCE/Deployment/Deployment_TargetManager.idl - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.h - * DAnCE/TargetManager/TargetManagerImpl.idl - * DAnCE/NodeApplication/Container_Impl.h - * ciao/Context_Impl_Base.h - * ciao/Swapping_Container.cpp - - Cleared up compile errors from - Tue Feb 20 16:17:46 UTC 2007 William R. Otte - -Tue Feb 20 17:48:14 UTC 2007 Johnny Willemsen - - * ciao/Context_Impl_Base.h: - * DAnCE/Deployment/NodeApp_CB_Impl.{h,cpp}: - Removed ACE_THROW_SPEC - -Tue Feb 20 17:10:14 UTC 2007 Johnny Willemsen - - * ciao/Extension_Context.{h,cpp}: - Moved to ciao/extension - -Tue Feb 20 16:17:46 UTC 2007 William R. Otte - - * Merged ciao_core_2 to head. - - Tue Feb 20 16:03:02 UTC 2007 William R. Otte - - * RACE/Plan_Analyzer/Interface/PlanIngress.idl - * RACE/Planners/Interface/Planner_I.idl - * RACE/Controller/Component/Controller.idl - * RACE/Output_Adapters/Interface/PlanEgress.idl - * RACE/Planner_Manager/Interface/Planner_Manager_I.idl - - Further updates to support migration of Deployment IDL to - DAnCE/Deployment. - - Mon Feb 19 21:27:11 UTC 2007 William R. Otte - - * MPC/config/ciao_events_base_dnc.mpb - * MPC/config/ciaoexe.mpb - * MPC/config/ciao_client_dnc.mpb - * MPC/config/ciao_container_dnc.mpb - * MPC/config/ciao_servant_dnc.mpb - * MPC/config/ciao_component_dnc.mpb - * MPC/config/ciao_events_dnc.mpb - * MPC/config/ciao_server_dnc.mpb - - Removed the _DnC_ from a bunch of projects, as since we no longer have - DnC and non DnC versions of CIAO, its reall superfluous. - - * DAnCE/Deployment - * DAnCE/Deployment/Deployment_NodeApplication.idl - * DAnCE/Deployment/Deployment_Data.idl - * DAnCE/Deployment/Deployment_svnt_export.h - * DAnCE/Deployment/Deployment_Base.idl - * DAnCE/Deployment/Deployment_RepositoryManager.idl - * DAnCE/Deployment/Deployment_Packaging_Data.idl - * DAnCE/Deployment/Deployment_Target_Data.idl - * DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl - * DAnCE/Deployment/Deployment_TargetData.idl - * DAnCE/Deployment/Deployment.idl - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Deployment_TargetManager.idl - * DAnCE/Deployment/Deployment_Container.idl - * DAnCE/Deployment/NodeApp_CB_Impl.cpp - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl - * DAnCE/Deployment/Deployment_Core.idl - * DAnCE/Deployment/NodeApp_CB_Impl.h - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/Deployment/Deployment_DomainApplication.idl - * DAnCE/Deployment/CIAO_ServerResources.idl - * DAnCE/Deployment/Deployment_stub_export.h - * DAnCE/Deployment/Deployment_ExecutionManager.idl - * DAnCE/Deployment/Deployment_ApplicationManager.idl - * DAnCE/Deployment/Deployment_Connection.idl - * DAnCE/Deployment/Deployment_Application.idl - * DAnCE/Deployment/Deployment_NodeApplicationManager.idl - * DAnCE/Deployment/Deployment_Events.idl - * DAnCE/Deployment/Deployment_common.h - - Moved these IDLs from CIAO_ROOT/ciao in an effort to isolate the - DnC IDL from the CIAO IDL and control directory size explosion of - CIAO_ROOT/ciao. - - * tools/Config_Handlers/DnC_Dump.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/STD_CPD_Handler.cpp - * tools/Config_Handlers/CIAO_Events/test.cpp - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.cpp - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.cpp - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/XML_File_Intf.cpp - * tools/Config_Handlers/test.cpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/SatisfierProperty_Handler.cpp - * tools/Config_Handlers/RT-CCM/CLA_Handler.h - * tools/Config_Handlers/RT-CCM/TPL_Handler.h - * tools/Config_Handlers/RT-CCM/OC_Handler.h - * tools/Config_Handlers/RT-CCM/PM_Handler.h - * tools/Config_Handlers/RT-CCM/OR_Handler.h - * tools/Config_Handlers/RT-CCM/PS_Handler.h - * tools/Config_Handlers/RT-CCM/TP_Handler.h - * tools/Config_Handlers/RT-CCM/CB_Handler.h - * tools/Config_Handlers/RT-CCM/SRD_Handler.h - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/Dump_Obj.h - * tools/Config_Handlers/ESD_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.h - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc - * ciaosvcs/Events/CIAO_Events.mpc - * DAnCE/NodeManager/MonitorController.h - * DAnCE/NodeManager/MonitorCB.h - * DAnCE/NodeManager/BaseMonitor.h - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/Plan_Generator_Impl.h - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainEvents.idl - * DAnCE/TargetManager/TargetManagerImpl.idl - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp - * DAnCE/Interfaces/ExecutionManagerDaemon.idl - * DAnCE/Interfaces/NodeManagerDaemon.idl - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp - * DAnCE/NodeApplicationManager/Containers_Info_Map.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/ImplementationInfo.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/Deployment_Configuration.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplication/Container_Impl.h - * DAnCE/NodeApplication/RTConfig_Manager.h - * DAnCE/NodeApplication/NodeApp_Configurator.h - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp - * DAnCE/NodeApplication/NodeApplication_Core.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/RepositoryManager/RM_Helper.h - * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl - * DAnCE/RepositoryManager/PC_Updater.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/PC_Updater.h - * DAnCE/ExecutionManager/DAM_Map.h - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager.mpc - * ciao/Swapping_Container.h - * ciao/Dynamic_Component_Activator.h - * ciao/CCM_Core.mpc - * ciao/Container_Base.h - - For the most part, modifications to support movement of DnC interfaces - to DAnCE/Deployment. One or two files were further modified to support - removal of DnC from project names. - - Mon Feb 19 19:40:19 UTC 2007 William R. Otte - - * MPC/config/ciaoexe.mpb - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - - Modified to install exes to CIAO_ROOT/bin. - - Mon Feb 19 19:33:32 UTC 2007 William R. Otte - - * DAnCE/NodeManager/MonitorCB.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - - Corrected to reflect changes in IDL. - - * CCF/CCF/CodeGenerationKit/CommandLine.cpp - - Added get_all_values to support revrieval of all values for a given - option passed on the command line. - - Mon Feb 19 19:32:34 UTC 2007 William R. Otte - - * ciao/Container_Base.cpp - - Cosmetic format changes. - - * ciao/CCM_Context.idl - - re-added removed comment. - - Mon Feb 19 19:25:06 UTC 2007 William R. Otte - - * ccd.hpp - * cid.cpp - * pcd.cpp - * Deployment.hpp - * toplevel.cpp - * cdd.hpp - * Basic_Deployment_Data.cpp - * cdp.hpp - * cpd.hpp - * CIAO_Events/CIAOEvents.cpp - * CIAO_Events/CIAOEvents.hpp - * ccd.cpp - * iad.hpp - * cid.hpp - * pcd.hpp - * Deployment.cpp - * cdd.cpp - * toplevel.hpp - * RT-CCM/CIAOServerResources.hpp - * RT-CCM/CIAOServerResources.cpp - * cdp.cpp - * cpd.cpp - * Basic_Deployment_Data.hpp - * iad.cpp - - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - - Changed include ordering. - - * docs/schema/Basic_Deployment_Data.xsd - - Added elements to support sequence, struct, and valuetypes - in the schema. - - Mon Feb 19 19:20:35 UTC 2007 William R. Otte - - * Package_Handlers/PCD_Handler.cpp - - Changed to reflect slight change in schema. - - * CIAO_Events/CIAO_Events_Handlers.mpc - * Config_Handlers.mpc - * RT-CCM/RT-CCM-Handlers.mpc - - Updated to include XSC generation. - - Mon Feb 19 15:30:04 UTC 2007 William R. Otte - - * MPC/config/xscdefaults.mpb - * tools/Config_Handlers/Config_Handlers.mpc - - Added a custom type to MPC to handle XSC generation. - - Wed Feb 7 21:16:36 UTC 2007 William R. Otte - - * ciao/Deployment_Data.idl - * ciao/Deployment_ApplicationManager.idl - * ciao/CCM_CCMException.idl - * ciao/Deployment_Application.idl - * ciao/Context_Impl_Base.h - * ciao/Deployment.idl - * ciao/Context_Impl_Base.cpp - * ciao/Deployment_NodeApplication.idl - * ciao/Deployment_TargetData.idl - * ciao/CCM_Events.idl - * ciao/Deployment_ExecutionManager.idl - * ciao/Deployment_NodeApplicationManager.idl - * ciao/CCM_Context.idl - * ciao/Deployment_Base.idl - * ciao/Deployment_Packaging_Data.idl - * ciao/Deployment_DomainApplicationManager.idl - * ciao/Deployment_Connection.idl - * ciao/Deployment_TargetManager.idl - * ciao/Deployment_DeploymentPlan.idl - * ciao/Deployment_NodeManager.idl - - Updated with changes to comply with the 06-02-01 version of the - DnC spec. Many of these changes would break the entire toolchain, - so they are commented out for the time being. grep for - - @@changed @@add @@delete - - to find changes. - - * ciao/CCM_Core.mpc - *ciao/Deployment_DomainApplication.idl - - Added DomainApplication interface, completely missing from our IDL. - -Tue Feb 20 14:15:14 UTC 2007 Johnny Willemsen - - * CIDLC/OperationHeaderEmitters.cpp: - * CIDLC/OperationHeaderEmitters.hpp: - * CIDLC/ServantSourceGenerator.cpp: - Override raises to get no throw spec at all - -Tue Feb 20 03:56:37 UTC 2007 Abdullah Sowayan - - * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl: - - Added missing dependency on iortable base project. - -Mon Feb 19 20:22:14 UTC 2007 Johnny Willemsen - - * ciao/extension/*: - Moved all idl files for QoS4CCM to the new extension directory - - * caio/Session_Container.h: - Layout change - -Sat Feb 17 03:45:30 UTC 2007 Abdullah Sowayan - - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: - - Updated template file to match the recent enhancements to StaticDAnCEApp.cpp - found in examples/Null_Component/StaticDAnCEApp.cpp - -Fri Feb 15 19:41:14 UTC 2007 Johnny Willemsen - - * CIDLC/AttributeHeaderEmitters.cpp: - * CIDLC/AttributeSourceEmitters_T.hpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/OperationHeaderEmitters.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - Removed generation of ACE_THROW_SPEC, maybe some raise methods can be - removed internally but that is for the next cleanup round - - * examples/Null_Component/Null_Component_exec.h: - Layout change - - * examples/Null_Component/StaticDAnCEApp.cpp: - Updated include - -Fri Feb 15 09:34:14 UTC 2007 Johnny Willemsen - - * ciao/CCM_Core.mpc: - Removed the extension context files for the moment, this needs - much more idl files - -Thu Feb 14 16:06:14 UTC 2007 Johnny Willemsen - - * ciao/Deployment_Target_Data.idl: - * ciao/Deployment_PlanError.idl: - Renamed Target_Data to PlanError - - * ciao/CCM_Core.mpc: - * ciao/Deployment.idl: - * ciao/Deployment_TargetManager.idl: - * DAnCE/TargetManager/TargetManagerImpl.idl: - Updated because of rename above - -Thu Feb 14 16:00:14 UTC 2007 Johnny Willemsen - - * ciao/CCM_CCMException.idl: - Enabled the QoS4CCM enums - - * ciao/CCM_Core.mpc: - Added ExtensionContext.cpp - - * ciao/ExtensionContext.{h,cpp}: - New file, just throw no implement in all the new methods, just - creating first the empty classes and infrastructure - -Thu Feb 14 13:05:14 UTC 2007 Johnny Willemsen - - * ciao/Context_Impl_Base.h: - * ciao/Dynamic_Component_Activator.cpp: - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Home_Servant_Impl_Base.cpp - * ciao/Home_Servant_Impl_Base.h: - * ciao/ome_Servant_Impl_T.cpp: - * ciao/Home_Servant_Impl_T.h: - * ciao/Object_Set_T.h: - * ciao/Port_Activator_T.cpp - * ciao/Port_Activator_T.h: - * ciao/Servant_Impl_Utils_T.cpp: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/StandardConfigurator_Impl.h: - * ciao/Swapping_Container.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.h: - Layout changes - - * ciao/Cookies.cpp: - * ciao/Cookies.inl: - Don't inline virtual destructors - -Thu Feb 14 12:51:14 UTC 2007 Johnny Willemsen - - * ciao/Context_Impl_Base.cpp: - Just let resolve_service_reference throw not implemented, - need some more work - -Thu Feb 14 12:22:14 UTC 2007 Johnny Willemsen - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Session_Container.cpp: - * ciao/Session_Container.h: - * ciao/Session_Container.inl: - Moved Session_Container to its own file - - * ciao/Container_Base.inl: - Removed, not needed anymore - - * ciao/CCM_Context.idl: - Added resolve_service_reference - - * ciao/CCM_Core.mpc: - Added new Session_Container - - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_Base.h: - Layout changes and implemented resolve_service_reference - - * ciao/Context_Impl_T.cpp: - * ciao/Context_Impl_T.h: - * ciao/Port_Activator.h: - * ciao/Port_Activator_T.h: - * ciao/Servant_Impl_Base.cpp: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/TargetManager/TargetManager_exec.h: - Layout changes - - * ciao/Dynamic_Component_Activator.cpp: - * ciao/Dynamic_Component_Activator.h: - * ciao/Swapping_Container.cpp: - * ciao/Swapping_Container.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - Renamed add_servant_map to add_servant_to_map and delete_servant_map - to delete_servant_from_map - - * CIDLC/ServantHeaderGenerator.cpp: - Include Session_Container.h instead of Container_Base.h - - * DAnCE/ExecutionManager/DAM_Map.cpp: - No need to use intermediate variables - -Tue Feb 13 20:49:13 UTC 2007 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.cpp: - Changed in order to address couple of warnings in the TargetManager. - -Mon Feb 12 16:02:14 UTC 2007 Nilabja R - - * RACE: - - * RACE/Controller: - - * RACE/Controller/Component: - - * RACE/Controller/Component/Controller.cidl: - * RACE/Controller/Component/Controller.idl: - * RACE/Controller/Component/Controller.mpc: - * RACE/Controller/Component/Controller_exec.h: - * RACE/Controller/Component/Controller_exec.cpp: - * RACE/Controller/Component/Controller_exec_export.h: - * RACE/Controller/Component/Controller_stub_export.h: - * RACE/Controller/Component/Controller_svnt_export.h: - - * RACE/Input_Adapters: - - * RACE/Input_Adapters/Base: - - * RACE/Input_Adapters/Base/Input_Adapter.idl: - * RACE/Input_Adapters/Base/Input_Adapter.mpc: - * RACE/Input_Adapters/Base/Input_Adapter_stub_export.h: - * RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h: - - * RACE/Input_Adapters/Interactive_Input_Adapter: - - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h: - * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h: - - * RACE/Input_Adapters/LocationUpdater: - - * RACE/Input_Adapters/LocationUpdater/Injector.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cdp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.cidl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater.idl: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_deployment.dat: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_stub_export.h: - * RACE/Input_Adapters/LocationUpdater/LocationUpdater_svnt_export.h: - * RACE/Input_Adapters/LocationUpdater/Location_Updater.mpc.disable: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.h: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.inl: - * RACE/Input_Adapters/LocationUpdater/PCVisitorBase.cpp: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.h: - * RACE/Input_Adapters/LocationUpdater/PlanUpdater.cpp: - * RACE/Input_Adapters/LocationUpdater/README.txt: - - * RACE/Input_Adapters/PlanGenerator: - - * RACE/Input_Adapters/PlanGenerator/Injector.cpp: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.h: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.inl: - * RACE/Input_Adapters/PlanGenerator/PCVisitorBase.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cidl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cdp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.idl: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator.mpc.disable: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_deployment.dat: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_stub_export.h: - * RACE/Input_Adapters/PlanGenerator/PlanGenerator_svnt_export.h: - * RACE/Input_Adapters/PlanGenerator/README.txt: - - * RACE/Output_Adapters: - - * RACE/Output_Adapters/Base: - - * RACE/Output_Adapters/Base/Output_Adapter.idl: - * RACE/Output_Adapters/Base/Output_Adapter.mpc: - * RACE/Output_Adapters/Base/Output_Adapter_stub_export.h: - * RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h: - - * RACE/Output_Adapters/Component: - - * RACE/Output_Adapters/Component/Output_Manager.idl: - - * RACE/Output_Adapters/Interface: - - * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc: - * RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h: - * RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h: - * RACE/Output_Adapters/Interface/PlanEgress.idl: - - * RACE/Output_Adapters/XML_Output_Adapter: - - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h: - * RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h: - - * RACE/Plan_Analyzer: - - * RACE/Plan_Analyzer/Component: - - * RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl: - * RACE/Plan_Analyzer/Component/Plan_Analyzer.idl: - * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc: - * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h: - * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp: - * RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h: - * RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h: - * RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h: - - * RACE/Plan_Analyzer/Interface: - - * RACE/Plan_Analyzer/Interface/PlanIngress.idl: - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc: - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h: - * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h: - - * RACE/Planner_Manager: - - * RACE/Planner_Manager/Component: - - * RACE/Planner_Manager/Component/Planner_Manager.cidl: - * RACE/Planner_Manager/Component/Planner_Manager.idl: - * RACE/Planner_Manager/Component/Planner_Manager.mpc: - * RACE/Planner_Manager/Component/Planner_Manager_exec.h: - * RACE/Planner_Manager/Component/Planner_Manager_exec.cpp: - * RACE/Planner_Manager/Component/Planner_Manager_exec_export.h: - * RACE/Planner_Manager/Component/Planner_Manager_stub_export.h: - * RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h: - - * RACE/Planner_Manager/Interface: - - * RACE/Planner_Manager/Interface/Planner_Manager_I.idl: - * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc: - * RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h: - * RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h: - - * RACE/Planners: - - * RACE/Planners/Base: - - * RACE/Planners/Base/Planner.idl: - * RACE/Planners/Base/Planner.mpc: - * RACE/Planners/Base/Planner_stub_export.h: - * RACE/Planners/Base/Planner_svnt_export.h: - - * RACE/Planners/Interface: - - * RACE/Planners/Interface/Planner_I.idl: - * RACE/Planners/Interface/Planner_Interface.mpc: - * RACE/Planners/Interface/Planner_Interface_stub_export.h: - * RACE/Planners/Interface/Planner_Interface_svnt_export.h: - - * RACE/Planners/SimpleBinPacker: - - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h: - * RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h: - - * RACE/common: - - * RACE/common/RACE_common.idl: - * RACE/common/RACE_common.mpc: - * RACE/common/RACE_common_stub_export.h: - * RACE/common/RACE_common_svnt_export.h: - - * RACE/descriptors: - - * RACE/descriptors/Deployment.xsd: - * RACE/descriptors/Modified_Deployment.xsd: - * RACE/descriptors/XMI.xsd: - * RACE/descriptors/deployment.dat: - * RACE/descriptors/flattened_deploymentplan.cdp: - - Removed these files. Removed the RACE implementation from the HEAD, - since this is obsolete. This module is now in the process of - re-structuring and will be checked in by Nishanth Shankaran. - -Mon Feb 12 12:53:14 UTC 2007 Johnny Willemsen - - * ciao/*.{h,cpp,inl}: - Removed ACE_THROW_SPEC, layout changes, reduced includes - -Sat Feb 10 20:16:57 UTC 2007 Nilabja R - - * DAnCE/TargetManager/ResourceCommitmentManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - - * ciao/Deployment_ResourceCommitmentManager.idl: - Added missing Id tag - -Fri Feb 9 20:11:15 UTC 2007 Nilabja R - - * ChangeLog: - - * DAnCE/NodeManager/MonitorCB.cpp: - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManagerImpl.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - - * ciao/CCM_Core.mpc: - * ciao/Deployment_ResourceCommitmentManager.idl: - * ciao/Deployment_TargetManager.idl: - - Merged in changes from the branch TargetManager_Ext to introduce new - feature complying to the spec - - Fri Feb 2 21:00:48 UTC 2007 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerImpl.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - Cleaning TM code to separate CIAO-specific functionality. - - Tue Jan 16 21:18:57 UTC 2007 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManagerExt.idl: - * DAnCE/TargetManager/TargetManagerImpl.idl: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - Added some comments to decrease doxygen warnings;Changed - ACE_DEBUG in many places to ACE_ERROR;Removed a lot of unwanted - debug messages - - Fri Jan 12 22:04:14 UTC 2007 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - - * ciao/Deployment_TargetManager.idl: - Changed to address Johnny's comments - - Thu Dec 28 22:59:45 UTC 2006 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - * ciao/Deployment_ResourceCommitmentManager.idl: - * ciao/Deployment_TargetManager.idl: - Modified defination to ResourceCommitmentManager - - Wed Dec 27 19:59:32 UTC 2006 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - - * ciao/CCM_Core.mpc: - * ciao/Deployment_ResourceCommitmentManager.idl: - * ciao/Deployment_TargetManager.idl: - Changes made to accomodate the ResourceCommitmentManager - - Tue Dec 5 17:44:49 UTC 2006 Nilabja R - - * ciao/Deployment_TargetManager.idl: - Deleted some extraneous comments - - Tue Dec 5 06:29:22 UTC 2006 Nilabja R - - * DAnCE/TargetManager/CmpClient.cpp: - - * ciao/CCM_Core.mpc: - * ciao/Deployment_ResourceCommitmentManager.idl: - * ciao/Deployment_TargetManager.idl: - Added in order to introduce ResourceCommitmenManager - to TargetManager - -Thu Feb 8 18:35:51 UTC 2007 Johnny Willemsen - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantSourceGenerator.cpp: - Don't generate ACE_THROW_RETURN but just throw - -Wed Feb 7 23:48:51 UTC 2007 Jeff Parsons - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - - Removed an 'ex' identifier in a catch block that is - no longer referenced. - -Wed Feb 7 23:22:08 UTC 2007 Jeff Parsons - - * ciao/Context_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.h: - * ciao/Context_Impl_T.cpp: - * ciao/Upgradeable_Context_Impl_T.cpp: - - - Replaced a class template parameter in both - Context_Impl and Upgradeable_Context_Impl with - a trait in the class body. This change was - evidently overlooked when similar changes were - made to Servant_Impl and Home_Servant_Impl - pursuant to dropping support for Visual Studio 6. - - - In Upgradeable_Context_Impl, removed class members - already present in the base class Context_Impl. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - - Made changes to the generated context class corresponding - to the changes above. - - - Added code generation to check for a nil event - consumer before a push call is made on it by - an emits port. The event consumer would be nil - if a connection had not yet been made. Thanks - to James Hill for - reporting the problem. - -Fri Feb 2 15:09:14 UTC 2007 Johnny Willemsen - - * ciao/Container_Base.cpp: - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_T.cpp: - * ciao/Home_Servant_Impl_Base.cpp: - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Port_Activator_T.cpp: - * ciao/Servant_Activator.cpp: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_T.cpp: - * ciao/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp: - Replaced ACE_THROW_RETURN with throw - -Fri Feb 2 13:28:14 UTC 2007 Johnny Willemsen - - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * examples/BasicSP/EC/client.cpp: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - * performance-tests/Benchmark/server.cpp: - * performance-tests/Protocols/Controller/Controller.cpp: - * RACE/Input_Adapters/LocationUpdater/Injector.cpp: - * RACE/Input_Adapters/PlanGenerator/Injector.cpp: - * tests/IDL3/Events/Any/main.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/RT-CCM/test.cpp: - * tools/Config_Handlers/test.cpp: - No need anymore to pass an empty string as orbname - -Fri Feb 2 11:48:34 UTC 2007 Simon McQueen - - * tests/IDL3/Components/SimpleComponent/SimpleComponent.idl: - - Add regression testing for bug #2790. - -Wed Jan 31 15:44:14 UTC 2007 Johnny Willemsen - - * DAnCE/Plan_Generator/PCVisitor.cpp: - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * RACE/Controller/Component/Controller_exec.cpp: - * RACE/Controller/Component/Controller_exec.h: - -Wed Jan 31 15:03:14 UTC 2007 Johnny Willemsen - - * DAnCE/ExecutionManager/DAM_Map.{h,cpp}: - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.{h,cpp}: - Const changes, layout improvements - -Tue Jan 30 20:49:50 UTC 2007 William R. Otte - - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - - Compile fixes for FC6. - -Tue Jan 30 20:43:14 UTC 2007 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Changed the check for the bind, with -1 return an error, with - 1 report a debug message of the reuse, else a normal debug. - Thanks to Sandro Andrade - for reporting that ReDAC was broken. - -Tue Jan 30 11:27:14 UTC 2007 Johnny Willemsen - - * ciao/Server_init.{h,cpp}: - Change argument of BindObjectPath to a _ptr. Fixes bugzilla - 2779. Thanks to Abdullah Sowayan - for reporting this. - -Mon Jan 29 19:23:14 UTC 2007 Johnny Willemsen - - * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}: - * ciao/Upgradeable_Context_Impl_T.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - Layout changes - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - Fixed parsing of node manager file - - * examples/BasicSP/descriptors/run_test.pl: - New script to run this example automatically - - * exampls/BasicSP/README.html: - Fixed incorrect path and mpc generation command - -Sun Jan 28 19:59:14 2007 William R. Otte - - * CIAO version 0.5.6 released. - -Thu Jan 25 18:18:58 UTC 2007 Chad Elliott - - * *.{h,cpp,inl}: - - Removed the majority of the ACE exception macros. The - ACE_THROW_RETURN's were left in to avoid warnings from aCC. - -Wed Jan 24 13:00:12 UTC 2007 Johnny Willemsen - - * *.{h,cpp,inl}: - Removed part of the environment macros - -Mon Jan 22 23:14:56 2007 William R. Otte - - * CIAO version 0.5.5 released. - - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2009a b/CIAO/ChangeLogs/ChangeLog-2009a deleted file mode 100644 index 2ac01dcc17a..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2009a +++ /dev/null @@ -1,15360 +0,0 @@ -Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen - - * CIAO version 0.7.4 released. - -Mon Oct 12 18:44:56 UTC 2009 William R. Otte - - * NEWS: - - Further describe -Glem changes. - -Fri Oct 9 09:24:08 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Don't print expected exceptions; otherwise the scoreboard will be - confused. - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Wait 90 sec instead of 60 sec to compleet this example. - -Fri Oct 9 06:47:29 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/descriptors/USER_QOS_PROFILES.xml: - QoS profile file for this example - -Thu Oct 8 13:02:29 UTC 2009 Marcel Smit - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Described the use of IDL3+. - -Thu Oct 8 12:32:38 UTC 2009 Marcel Smit - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Update example to meet the spec. - -Thu Oct 8 11:06:29 UTC 2009 Marcel Smit - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Extended the component section. - -Thu Oct 8 08:31:25 UTC 2009 Marcel Smit - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Some minor updates. - -Wed Oct 7 15:15:20 UTC 2009 Jeff Parsons - - * NEWS: - - Update. - -Wed Oct 7 14:41:09 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl - Added missing include - -Wed Oct 7 14:09:09 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - Got rid of ior file between CORBA server and client. - -Wed Oct 7 13:33:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - Refactored the connector into a template - -Wed Oct 7 13:33:47 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Renamed module interface of Hello_Base and AMI. - -Wed Oct 7 13:15:22 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Changed name of module CCM_AMI into Hello. - -Wed Oct 7 12:42:58 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI.mpc: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Removed interface MyInterface in order to focus on the MyFoo. - - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyInterface_i.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyInterface_i.cpp: - Removed these files. - -Tue Oct 6 21:52:02 UTC 2009 Jeff Parsons - - * examples/Null_Component/Null_Component.mpc: - - Fixed build order bug. - -Tue Oct 6 12:30:44 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc: - Enabled these projects - -Tue Oct 6 12:29:30 UTC 2009 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_ListenerControl.idl3: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Resolved fuzz errors. - -Tue Oct 6 11:26:51 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: - * connectors/dds4ccm/idl/dds4ccm_Connector_Base.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_State.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Getter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiUpdater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiWriter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Get.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiUpdate.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiWrite.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Read.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_StateListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Update.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Write.idl3p: - * connectors/dds4ccm/idl/dds4ccm_RawListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Reader.idl3p: - * connectors/dds4ccm/idl/dds4ccm_StateListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Updater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - Resolved some more fuzz errors. - -Tue Oct 6 10:53:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - Moved listener into a template - -Tue Oct 6 10:16:16 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: - AMI_Hello_lem_gen shouldn't be derived from ami. This would - result in unnecessary sendc methods in the Receiver. - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - None of the projects shouldn't be derived from AMI. - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - Cleanup unnecessary sendc methods. - -Tue Oct 6 09:34:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3 - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - * connectors/dds4ccm/impl/ndds/Writer.tpp - Added a Stock_Info_Seq as corba sequence for the reader - -Tue Oct 6 09:30:27 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p: - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl3p: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3p: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl3p: - * connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Base.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_State.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Getter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiUpdater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiWriter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Get.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiUpdate.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiWrite.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Read.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_StateListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Update.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Write.idl3p: - * connectors/dds4ccm/idl/dds4ccm_RawListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Reader.idl3p: - * connectors/dds4ccm/idl/dds4ccm_StateListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Updater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - Resolve fuzz errors. - -Tue Oct 6 09:03:55 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Converted to the new test framework - -Tue Oct 6 08:37:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Reader_T.{h,cpp}: - First version of the reader as template - -Tue Oct 6 07:48:47 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Enabled some tests for ce/labview/fuzz - - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl3: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl3: - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_ListenerControl.idl3: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3: - Resolved some fuzz errors. - - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - Converted to the new test framework - -Tue Oct 6 07:40:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp - * connectors/dds4ccm/impl/ndds/ListenerControl.cpp - * connectors/dds4ccm/impl/ndds/ListenerControl.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - Implemented more functionality - -Tue Oct 6 07:06:28 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Enabled some tests for ce/labview/fuzz - - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - Converted to the new test framework - - * examples/DevGuideExamples/Messenger/Messenger.mpc: - Resolved compiler errors. - -Mon Oct 5 19:35:41 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Distributor/controller.cpp: - Removed this file because it was empty and was generating - fuzz errors. - -Mon Oct 5 19:28:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: - Corrected type registration - -Mon Oct 5 19:14:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: - Register the type with rti dds - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Layout change - -Mon Oct 5 18:47:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: - Updated build order and use -Glem - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_ConnectorE.idl: - Removed from the repository - -Mon Oct 5 18:36:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl3 - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3 - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_ConnectorE.idl - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl3 - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/impl/ndds/Writer.h - Enabled the quoter example. - - * connectors/dds4ccm/impl/ndds/Builtin_Writer.h - * connectors/dds4ccm/impl/ndds/Builtin_Writer.tpp - New template for builtin types, will rework in the future, but by using - this one we don't have to rewrite the hello world example at this - moment - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_ConnectorE.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_ConnectorE.idl - Removed, are generate now as part of the regular build - -Mon Oct 5 16:36:33 UTC 2009 Jeff Parsons - - * tests/IDL3/ImpliedIDL/All/all.mpc: - - Fixed dependency problems, and added include.idl to - IDL_Files block, since its include is now passed - through unchanged automatically, even though include_IDL2.idl - is still generated. - -Mon Oct 5 13:24:28 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/controller.cpp: - Resolved fuzz errors. - -Mon Oct 5 11:40:44 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm - * connectors/dds4ccm/docs - * connectors/dds4ccm/examples/Hello/Base - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h - * connectors/dds4ccm/examples/Quoter - * connectors/dds4ccm/examples/Quoter/Base - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Quoter/Broker - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl3 - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl3p - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h - * connectors/dds4ccm/examples/Quoter/Connector - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3 - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3p - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_ConnectorE.idl - * connectors/dds4ccm/examples/Quoter/descriptors - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/Distributor - * connectors/dds4ccm/examples/Quoter/Distributor/controller.cpp - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl3 - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl3p - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p - * connectors/dds4ccm/impl/ndds/NDDS_Traits.h - * connectors/dds4ccm/impl/ndds/Writer.h - * connectors/dds4ccm/impl/ndds/Writer.tpp - Integrated the second proto from the ddsports branch. This is disabled - in the mpc files right now, but the branch wasn't usable because of all - lem changes in tao_idl. By merging this to head now we have a stable - base to tweak this proto - -Mon Oct 5 09:50:44 UTC 2009 Marijke Hengstmengel - - * docs/tutorials/Quoter/Simple/descriptors/NodeMap.dat: - Changed svn properties. Added svn eol-property. - -Sun Oct 4 17:36:44 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - - Fixed FC_8 build errors/warnings. - -Fri Oct 2 18:32:21 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/be_produce.cpp: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - - Replaced the -x option, which manually - excluded an IDL file include from getting its processed - name decorated with '_IDL2', with a mechanims that - detects automatically which included IDL files have - no IDL3 constructs, and skips mangling their processed - included name accordingly. - - * tests/IDL3/ImpliedIDL/All/all.mpc: - * tests/IDL3/ImpliedIDL/All/pass_through.idl: - - Minor changes to this test of idl3_to_idl2. - - * tools/IDL3_to_IDL2/README: - * docs/releasenotes/index.html: - - Updated documentation. - -Fri Oct 2 18:30:12 UTC 2009 Jeff Parsons - - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - - Fixed some dependency problems. - -Fri Oct 2 14:01:59 UTC 2009 Marcel Smit - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Update working document. - -Fri Oct 2 09:08:34 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Fix build orders and missing libraries - -Fri Oct 2 08:36:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl: - * performance-tests/Protocols/common/Protocols.idl: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - Resolved some fuzz errors/warnings. - -Fri Oct 2 08:22:34 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc - * examples/Hello/Sender/Sender.mpc - Fix build orders and missing libraries - -Fri Oct 2 07:06:34 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc: - Fixed build order - -Fri Oct 2 02:05:34 UTC 2009 William R. Otte - - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/BenchmarkE.idl: - * performance-tests/Benchmark/Benchmark_skel_export.h: - * performance-tests/Benchmark/Benchmark_stub_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Protocols/Receiver/Receiver.idl: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/common/Protocols.idl: - * performance-tests/Protocols/common/Protocols.mpc: - * tests/CIDL/CodeGen/Basic.mpc: - * tests/CIDL/CodeGen/CodeGen.idl: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/IDL_Test/Included_Component/IC_Bar.idl: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl: - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc: - - Additional -Glem changes. - -Thu Oct 1 20:15:35 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_ConnectorE.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_ConnectorE.idl: - * connectors/dds4ccm/idl/dds4ccm.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.idl: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.idl: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.idl: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Messenger.idl: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.idl: - * examples/Display/GPS/GPS.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender.mpc: - * examples/Null_Component/Null_Component.idl: - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/Null_Interface.mpc: - - -Glem changes. - -Thu Oct 1 20:14:03 UTC 2009 William R. Otte - - * examples/Swapping: - - Removed, this functionality isn't in CIAO anymore. - -Thu Oct 1 19:17:02 UTC 2009 Jeff Parsons - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - - Fixed export macro/include in *_lem_gen project. - -Thu Oct 1 18:48:45 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyInterface_i.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyInterface_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Fixed some compiler and fuzz errors. Also added attribute handling. - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Changed time out to 40 sec. - -Thu Oct 1 14:52:07 UTC 2009 William R. Otte - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI.mpc: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: - - New -Glem behavior. - -Thu Oct 1 14:32:08 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl: - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider.idl: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - - New -Glem behavior. - -Thu Oct 1 11:38:42 UTC 2009 Johnny Willemsen - - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc - Fixed lem generation using -Glfa - -Thu Oct 1 11:28:42 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI.mpc: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: - Fixed lem generation using -Glfa - -Thu Oct 1 10:14:42 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - Fixed to use the new -Glfa and -Glem behaviour - -Tue Sep 29 14:37:17 UTC 2009 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - - Provided a correct fix for XMI generation for module reopening. - Fixed similar code for interface/valuetype/eventtype/struct/ - exception/union forward declarations. Extended a test for module - reopening. - -Tue Sep 29 11:57:42 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - Build order fixes - -Tue Sep 29 11:49:42 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Null_Component/Null_Interface.mpc: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * performance-tests/Protocols/common/Protocols.mpc: - * tests/CIDL/CodeGen/Basic.mpc: - Removed duplicated base projects - -Tue Sep 29 11:36:42 UTC 2009 Johnny Willemsen - - * docs/Connectors.graffle: - * docs/OMG-CCM-Tutorial.ppt: - Added new sheets for IDL3+, Connector, DDS4CCM, and AMI4CCM - -Mon Sep 28 18:21:42 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - - Cosmetic changes. - - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * connectors/ami4ccm/examples/Hello/AMI/AMI.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - - Config changes. - -Mon Sep 28 11:25:43 UTC 2009 Vladimir Zykov - - * tools/IDL3_to_XMI/Literals.cpp: - - Added missing comma between CORBAany and CORBAnative literals. - - * tests/IDL3_to_XMI/XMI_For_Native/test.idl: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * bin/ciao_tests.lst: - - Added a test that checks for CORBAnative in XMI file. - -Mon Sep 28 06:19:36 UTC 2009 Johnny Willemsen - - Integrated idl3_plus branch - - Thu Sep 24 17:35:36 UTC 2009 Jeff Parsons - - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - - Added separate IDL processing project. - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - - Updated base project on IDL processing project, and - cosmetic changes. - - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - - Commented out or removed unused args. - - Wed Sep 23 21:50:44 UTC 2009 Jeff Parsons - - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - - Removed unused arg. - - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Swapping/Sender/Sender.mpc: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * examples/Null_Component/Null_Interface.mpc: - - Fixed missing export header file generation and missing - dependency of *E.idl processing on *.idl processing. - - Wed Sep 23 21:23:19 UTC 2009 Jeff Parsons - - * tests/CIDL/CodeGen/Basic.mpc: - - Added generation of export header files. - - * tests/CIDL/CodeGen/CodeGen_exec_export.h: - * tests/CIDL/CodeGen/Basic_stub_export.h: - * tests/CIDL/CodeGen/CodeGen_svnt_export.h: - * tests/CIDL/CodeGen/Basic_skel_export.h: - * tests/CIDL/CodeGen/CodeGen_stub_export.h: - - Removed these files, now generated. - - Wed Sep 23 19:37:29 UTC 2009 Jeff Parsons - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - - Removed unnecessary base project. - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Updated visitors to reflect IDL3+ changes. - - Tue Sep 22 22:17:57 UTC 2009 Jeff Parsons - - * DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h: - - Removed these files, now generated. - - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - - MPC project changes. - - Tue Sep 22 21:45:42 UTC 2009 Jeff Parsons - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - - Removed these files, now generated. - - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - - Config updates. - - Tue Sep 22 21:22:48 UTC 2009 Jeff Parsons - - * performance-tests/Protocols/Sender/Sender_svnt_export.h: - * performance-tests/Protocols/Sender/Sender_stub_export.h: - * performance-tests/Protocols/Sender/Sender_exec_export.h: - * performance-tests/Protocols/Receiver/Receiver_exec_export.h: - * performance-tests/Protocols/Receiver/Receiver_svnt_export.h: - * performance-tests/Protocols/Receiver/Receiver_stub_export.h: - * performance-tests/Protocols/common/Protocols_stub_export.h: - * performance-tests/Protocols/common/Protocols_skel_export.h: - - Removed these files, now generated. - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/common/Protocols.mpc: - - Addition of -Glfa IDL compiler option where necessary. - - Tue Sep 22 21:00:03 UTC 2009 Jeff Parsons - - * examples/Hello/Hello_Base/Hello_Base_stub_export.h: - * examples/Hello/Hello_Base/Hello_Base_skel_export.h: - * examples/BasicSP/BasicSP_exec_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_exec_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_svnt_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_stub_export.h: - * examples/BasicSP/EC/EC_exec_export.h: - * examples/BasicSP/EC/EC_svnt_export.h: - * examples/BasicSP/EC/EC_stub_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_svnt_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_stub_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec_export.h: - * examples/BasicSP/BasicSP_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice_svnt_export.h: - * examples/BasicSP/BMDevice/BMDevice_stub_export.h: - * examples/BasicSP/BMDevice/BMDevice_exec_export.h: - * examples/BasicSP/BasicSP_exec.h: - * examples/Display/Display_Base/Display_Base_stub_export.h: - * examples/Display/Display_Base/Display_Base_skel_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_export.h: - * examples/Display/RateGen/RateGen_exec_export.h: - * examples/Display/RateGen/RateGen_svnt_export.h: - * examples/Display/RateGen/RateGen_stub_export.h: - * examples/Display/GPS/GPS_exec_export.h: - * examples/Display/GPS/GPS_svnt_export.h: - * examples/Display/GPS/GPS_stub_export.h: - * examples/Display/NavDisplay/NavDisplay_exec_export.h: - * examples/Display/NavDisplay/NavDisplay_svnt_export.h: - * examples/Display/NavDisplay/NavDisplay_stub_export.h: - * examples/Swapping/Sender/Sender_svnt_export.h: - * examples/Swapping/Sender/Sender_stub_export.h: - * examples/Swapping/Sender/Sender_exec_1_export.h: - * examples/Swapping/Sender/Sender_exec_export.h: - * examples/Swapping/Sender/Sender_exec_2_export.h: - * examples/Swapping/Receiver/Receiver_exec_export.h: - * examples/Swapping/Receiver/Receiver_svnt_export.h: - * examples/Swapping/Receiver/Receiver_stub_export.h: - * examples/Swapping/Hello_Base/Hello_Base_stub_export.h: - * examples/Swapping/Hello_Base/Hello_Base_skel_export.h: - * examples/Null_Component/Null_Component_stub_export.h: - * examples/Null_Component/Null_Component_exec_export.h: - * examples/Null_Component/Null_Component_svnt_export.h: - * examples/Null_Component/Null_Interface_skel_export.h: - * examples/Null_Component/Null_Interface_stub_export.h: - - Removed these export header files since they're now - generated. Also removed BasicSP_exec.*, and moved the - code to BMClosedED_exec.* and BMDevice_exec.*. - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - - MPC changes, and code moved from BasicSP_exec.*. - - Mon Sep 21 22:01:50 UTC 2009 Jeff Parsons - - * examples/DevGuideExamples/Messenger/Administrator_Client.cpp: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Receiver_exec_export.h: - * examples/DevGuideExamples/Messenger/Receiver_svnt_export.h: - - Fixed config bugs. - - * examples/DevGuideExamples/Messenger/Messenger_exec_export.h: - * examples/DevGuideExamples/Messenger/Receiver_stub_export.h: - * examples/DevGuideExamples/Messenger/Messenger_svnt_export.h: - * examples/DevGuideExamples/Messenger/Receiver_exec_export.h: - * examples/DevGuideExamples/Messenger/Administrator_stub_export.h: - * examples/DevGuideExamples/Messenger/Receiver_svnt_export.h: - * examples/DevGuideExamples/Messenger/Administrator_exec_export.h: - * examples/DevGuideExamples/Messenger/Administrator_svnt_export.h: - * examples/DevGuideExamples/Messenger/Messenger_stub_export.h: - - Removed these files from the repository, since they are now generated. - - Mon Sep 21 21:58:49 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed bug in implied IDL generation for ports. - - Mon Sep 21 19:42:01 UTC 2009 Jeff Parsons - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - - Fixed name clash with 'port' identifier. - - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl: - * tests/IDL3/Components/ComplexComponent/Facets/Facets.idl: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl: - - Fixed name clashes. - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - - Fixed bug in processing of valuetypes. - - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_exec_export.h: - * DAnCE/TargetManager/TargetManager_stub_export.h: - * DAnCE/TargetManager/TargetManager_svnt_export.h: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_stub_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_svnt_export.h: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec_export.h: - * examples/BasicSP/BMDevice/BMDevice_stub_export.h: - * examples/BasicSP/BMDevice/BMDevice_svnt_export.h: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BMDisplay/BMDisplay_exec_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_stub_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_svnt_export.h: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BasicSP_exec_export.h: - * examples/BasicSP/BasicSP_stub_export.h: - * examples/BasicSP/BasicSP_svnt_export.h: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/EC/EC_exec_export.h: - * examples/BasicSP/EC/EC_stub_export.h: - * examples/BasicSP/EC/EC_svnt_export.h: - * examples/DevGuideExamples/Messenger/Administrator_Client.cpp: - * examples/DevGuideExamples/Messenger/Administrator_exec_export.h: - * examples/DevGuideExamples/Messenger/Administrator_stub_export.h: - * examples/DevGuideExamples/Messenger/Administrator_svnt_export.h: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/DevGuideExamples/Messenger/Messenger_exec_export.h: - * examples/DevGuideExamples/Messenger/Messenger_stub_export.h: - * examples/DevGuideExamples/Messenger/Messenger_svnt_export.h: - * examples/DevGuideExamples/Messenger/Receiver_stub_export.h: - * examples/DevGuideExamples/Messenger/Receiver_svnt_export.h: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/GPS/GPS_exec_export.h: - * examples/Display/GPS/GPS_stub_export.h: - * examples/Display/GPS/GPS_svnt_export.h: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Display/NavDisplay/NavDisplay_exec_export.h: - * examples/Display/NavDisplay/NavDisplay_stub_export.h: - * examples/Display/NavDisplay/NavDisplay_svnt_export.h: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/RateGen/RateGen_exec_export.h: - * examples/Display/RateGen/RateGen_stub_export.h: - * examples/Display/RateGen/RateGen_svnt_export.h: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/Null_Component_exec_export.h: - * examples/Null_Component/Null_Component_stub_export.h: - * examples/Null_Component/Null_Component_svnt_export.h: - * examples/Swapping/Receiver/Receiver_exec_export.h: - * examples/Swapping/Receiver/Receiver_stub_export.h: - * examples/Swapping/Receiver/Receiver_svnt_export.h: - * examples/Swapping/Sender/Sender.mpc: - * examples/Swapping/Sender/Sender_exec_export.h: - * examples/Swapping/Sender/Sender_stub_export.h: - * examples/Swapping/Sender/Sender_svnt_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_stub_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_svnt_export.h: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/CIDL/CodeGen/CodeGen_exec_export.h: - * tests/CIDL/CodeGen/CodeGen_stub_export.h: - * tests/CIDL/CodeGen/CodeGen_svnt_export.h: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc: - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Receiver/Receiver_exec_export.h: - * tests/Minimum/Receiver/Receiver_stub_export.h: - * tests/Minimum/Receiver/Receiver_svnt_export.h: - * tests/Minimum/Sender/Sender.mpc: - * tests/Minimum/Sender/Sender_exec_export.h: - * tests/Minimum/Sender/Sender_stub_export.h: - * tests/Minimum/Sender/Sender_svnt_export.h: - - Added configuration changes corresponding to IDL3+ changes - to IDL compiler. - - Wed Sep 2 16:06:59 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Replaced commented-out gen_* methods with - corresponding visit_* methods for component ports. - - Wed Aug 26 18:29:14 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Updated visitors to include the new visit methods, - and commented out the existing methods that use - port descriptions, which have been eliminated. - - Fri Jul 17 19:07:47 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - - Added new visit_* methods corresponding to new nodes - added in the IDL compiler front end. - - Wed Jul 8 22:44:15 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - - Added new visit_template_interface() and - visit_porttype() methods to keep these classes up to - date with the IDL compiler frontend. The methods are - empty for now, but the IDL3_to_IDL2 visitor classes are - kept concrete and instantiable. - -Wed Sep 23 11:57:59 UTC 2009 Vladimir Zykov - - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * bin/ciao_tests.lst: - - Added a test for XMI generation in case of module reopening. - Scheduled the test for run. - -Wed Sep 23 10:50:59 UTC 2009 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Fixed XMI generation in case of module reopening. - -Tue Sep 22 07:16:55 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Replaced ACE_xxx macros with DANCE_xxx macros. - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Every sendc method should have it's own reply handler. - - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyInterface_i.cpp: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Every sendc method has it's own reply handler. - Also the implementation of the exception handling has changed. - Now an exception holder is used. - -Mon Sep 14 09:19:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Updated some messages to not get false positives on the scoreboard - -Fri Sep 11 02:39:39 CDT 2009 Johnny Willemsen - - * CIAO version 0.7.3 released. - -Thu Sep 10 07:05:10 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Updated some messages to not get false positives on the scoreboard - -Tue Sep 8 10:38:10 UTC 2009 Johnny Willemsen - - * bin/ciao_tests.lst: - Added ami4ccm example - -Tue Sep 8 10:17:10 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/Hello - Moved example to the new Hello subdirectory - -Tue Sep 8 10:08:10 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - Fixed compile error - -Tue Sep 8 08:38:10 UTC 2009 Johnny Willemsen - - Integrated AMI4CCM branch which shows a prototype how AMI would - look like at the CCM level - - Mon Sep 7 09:41:10 UTC 2009 Marcel Smit - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Resolved merge conflicts to head. - - Mon Sep 7 08:28:12 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/docs: - * connectors/AMI_CCM/docs/AMI4CCM-explanation.odt: - * connectors/AMI_CCM/docs/AMI4CCM-spec.odt: - Created a subdirectory called 'docs'. Moved the - existing documents to this directory. - - * connectors/AMI_CCM/examples: - * connectors/AMI_CCM/examples/AMI: - * connectors/AMI_CCM/examples/Hello_Base: - * connectors/AMI_CCM/examples/Receiver: - * connectors/AMI_CCM/examples/Sender: - * connectors/AMI_CCM/examples/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/examples/descriptors: - * connectors/AMI_CCM/AMI: - * connectors/AMI_CCM/AMI/AMI.idl: - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.h: - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.cpp: - * connectors/AMI_CCM/AMI/AMI_MyInterface_i.h: - * connectors/AMI_CCM/AMI/AMI_MyInterface_i.cpp: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI4CCM-explanation.odt: - * connectors/AMI_CCM/AMI4CCM-spec.odt: - * connectors/AMI_CCM/Hello_Base: - * connectors/AMI_CCM/Hello_Base/Hello.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - * connectors/AMI_CCM/Receiver: - * connectors/AMI_CCM/Receiver/Hello_Receiver.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender: - * connectors/AMI_CCM/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/Sender/Hello_Sender.mpc: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * connectors/AMI_CCM/descriptors: - * connectors/AMI_CCM/descriptors/Plan.cdp: - * connectors/AMI_CCM/descriptors/run_test.pl: - Created a subdirectory called 'examples'. Moved - all files to this directory. - - Fri Sep 4 11:00:39 UTC 2009 Marcel Smit - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Improved logging. - - Thu Sep 3 14:10:17 UTC 2009 Marcel Smit - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Improved logging. - - Thu Sep 3 13:17:52 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - Resolved compiler errors on Windows. - - Thu Sep 3 12:05:43 UTC 2009 Marcel Smit - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - rebind (in stead of bind) is always called. - This results in an unnecessary warning. - - * ciao/Containers/Servant_Activator.cpp: - tmp was initialized but never used. - - Thu Sep 3 10:20:48 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - Resolved compiler error on windows. - - Thu Sep 3 08:19:18 UTC 2009 Marcel Smit - - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - Log message inserted. - - * DAnCE/RepositoryManager/URL_Parser.cpp: - Resolved compiler error on Windows. - - Thu Sep 3 07:48:59 UTC 2009 Marcel Smit - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/Plan_Generator/PCVisitor.cpp: - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.h: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Replaced all ACE_ERROR-s, ACE_ERROR_RETURN-s and ACE_DEBUG-s with th - DANCE variant. - - Wed Sep 2 12:09:58 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.cpp: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Changed to meet the spec. - - Wed Sep 2 07:33:20 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI4CCM-explanation.odt: - * connectors/AMI_CCM/AMI4CCM-spec.odt: - When the rh in the sendc is nil, AMI treats - this as an oneway request. - When a rh per request is used, the 'global' rh - code should not be generated. - - Mon Aug 31 11:09:40 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI4CCM-explanation.odt: - * connectors/AMI_CCM/AMI4CCM-spec.odt: - Added. - - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Resolved bug regarding the MyInterface interface. - - Mon Aug 31 10:39:25 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Resolved some compiler errors/warnings. - - Fri Aug 28 07:29:13 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.h: - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.cpp: - * connectors/AMI_CCM/AMI/AMI_MyInterface_i.cpp: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Extende the MyFoo interface with a new method. Just - to gain more inside info. - - Thu Aug 27 16:47:53 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.h: - * connectors/AMI_CCM/AMI/AMI_MyFoo_i.cpp: - * connectors/AMI_CCM/AMI/AMI_MyInterface_i.h: - * connectors/AMI_CCM/AMI/AMI_MyInterface_i.cpp: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * connectors/AMI_CCM/descriptors/run_test.pl: - Refactored code. Also expanded this - example with another interface. - - * connectors/AMI_CCM/AMI/AMI_internal_i.h: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_perform_work.h: - * connectors/AMI_CCM/AMI/AMI_perform_work.cpp: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - - Removed these files. - - Wed Aug 26 18:42:49 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.idl: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * connectors/AMI_CCM/descriptors/Plan.cdp: - Set up (empty) framework in order to test one reply handler - per request. - - Wed Aug 26 13:04:12 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Removed cookie from IDL interfaces. - - Wed Aug 26 08:59:26 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.idl: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.h: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_perform_work.cpp: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - * connectors/AMI_CCM/Hello_Base/Hello.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Added Hello.idl to seperate AMI interfaces from - "normal" interfaces. Besides this changed naming - convention to make a distinction between AMI interfaces - and "normal" interfaces. - - Tue Aug 25 13:30:29 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - Removed unnecessary class variables. - - Tue Aug 25 13:03:23 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - AMI collacation set to 0 since AMI CORBA client and - AMI CORBA server are running in the same process. - - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Improved logging. - - * connectors/AMI_CCM/descriptors/run_test.pl: - Automatically remove AMI CORBA ior file. - - Tue Aug 25 09:35:49 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.idl: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Refactored exception handling a bit. An exception struct - is now passed to the exception callback. - Also shortened the time stamps. - - * connectors/AMI_CCM/descriptors/run_test.pl: - Shortened the sleep time. - - Tue Aug 25 07:19:55 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_perform_work.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender.mpc: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Resolved compiler errors on windows. - Resolved linker errors related to previous login. - - Tue Aug 25 05:44:12 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.h: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_perform_work.h: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - Removed internal IDL and use Hello base foo interface - - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - foo interface uses AMI. - - Mon Aug 24 13:31:57 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.h: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * connectors/AMI_CCM/descriptors/Plan.cdp: - Implemented synchronous calls from Sender to Receiver. Renamed some - interfaces to match the CORBA specs regarding AMI. - - Mon Aug 24 12:21:50 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - Removed file since this wasn't needed. - - Mon Aug 24 11:34:05 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Implemented exception handling. - - Mon Aug 24 09:25:00 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_perform_work.cpp: - CORBA callback in seperate thread. Refactored to - one reply handler per request. - - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Optimized logging. Removed sleep between calls. - Wait 5 sec. (in stead of 10) before start. - - * connectors/AMI_CCM/descriptors/run_test.pl: - Minor changes. - - Mon Aug 24 07:34:08 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - Implemented a define to switch between implementations. - Resolved some compiler warnings. - - Mon Aug 24 07:10:16 UTC 2009 Marcel Smit - - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/AMI/AMI_internal_i.h: - * connectors/AMI_CCM/AMI/AMI_internal_i.cpp: - * connectors/AMI_CCM/AMI/AMI_perform_work.h: - * connectors/AMI_CCM/AMI/AMI_perform_work.cpp: - * connectors/AMI_CCM/AMI/AMI_server.h: - * connectors/AMI_CCM/AMI/AMI_server.cpp: - First step to use CORBA AMI in the AMI component. - - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Minor changes. - - Thu Aug 20 09:56:11 UTC 2009 Marcel Smit - - * connectors: - * connectors/AMI_CCM: - * connectors/AMI_CCM/AMI: - * connectors/AMI_CCM/AMI/AMI.idl: - * connectors/AMI_CCM/AMI/AMI.mpc: - * connectors/AMI_CCM/AMI/AMI_exec.h: - * connectors/AMI_CCM/AMI/AMI_exec.cpp: - * connectors/AMI_CCM/Hello_Base: - * connectors/AMI_CCM/Hello_Base/Hello_Base.idl: - * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: - * connectors/AMI_CCM/Receiver: - * connectors/AMI_CCM/Receiver/Hello_Receiver.idl: - * connectors/AMI_CCM/Receiver/Hello_Receiver.mpc: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * connectors/AMI_CCM/Sender: - * connectors/AMI_CCM/Sender/Hello_Sender.idl: - * connectors/AMI_CCM/Sender/Hello_Sender.mpc: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.h: - * connectors/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * connectors/AMI_CCM/descriptors: - * connectors/AMI_CCM/descriptors/Plan.cdp: - * connectors/AMI_CCM/descriptors/run_test.pl: - Moved this example from tests to this location. Just to - be consistent with dds4ccm. - - * tests/AMI_CCM: - * tests/AMI_CCM/AMI: - * tests/AMI_CCM/AMI/AMI.idl: - * tests/AMI_CCM/AMI/AMI.mpc: - * tests/AMI_CCM/AMI/AMI_exec.h: - * tests/AMI_CCM/AMI/AMI_exec.cpp: - * tests/AMI_CCM/Hello_Base: - * tests/AMI_CCM/Hello_Base/Hello_Base.idl: - * tests/AMI_CCM/Hello_Base/Hello_Base.mpc: - * tests/AMI_CCM/Receiver: - * tests/AMI_CCM/Receiver/Hello_Receiver.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender: - * tests/AMI_CCM/Sender/Hello_Sender.idl: - * tests/AMI_CCM/Sender/Hello_Sender.mpc: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * tests/AMI_CCM/descriptors: - * tests/AMI_CCM/descriptors/Plan.cdp: - * tests/AMI_CCM/descriptors/run_test.pl: - Removed these files. - - Thu Aug 20 09:24:04 UTC 2009 Marcel Smit - - * tests/AMI_CCM/AMI/AMI_exec.cpp: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Improved log messages. - - * tests/AMI_CCM/descriptors/run_test.pl: - Changed to meet the latest version. - - Thu Aug 20 08:54:46 UTC 2009 Marcel Smit - - * tests/AMI_CCM/AMI/AMI_exec.h: - * tests/AMI_CCM/AMI/AMI_exec.cpp: - * tests/AMI_CCM/Hello_Base/Hello_Base.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - The basic version of AMI seems to work. The AMI component - determines a cookie and spawns a thread per request. - The thread handles the request and calls the callback - function of the sender. - - Wed Aug 19 09:07:17 UTC 2009 Marcel Smit - - * tests/AMI_CCM/AMI/AMI_exec.h: - * tests/AMI_CCM/AMI/AMI_exec.cpp: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - The Sender component is now able to pass a string through the - AMI component to the Receiver component. - - Wed Aug 19 07:58:49 UTC 2009 Marcel Smit - - * tests/AMI_CCM/AMI: - * tests/AMI_CCM/AMI/AMI.idl: - * tests/AMI_CCM/AMI/AMI.mpc: - * tests/AMI_CCM/AMI/AMI_exec.h: - * tests/AMI_CCM/AMI/AMI_exec.cpp: - * tests/AMI_CCM/Hello_Base/Hello_Base.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender.idl: - * tests/AMI_CCM/Sender/Hello_Sender.mpc: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * tests/AMI_CCM/descriptors/Plan.cdp: - Changed to deploy the third component (AMI). None of the - executors are implemented yet. Deploymentplan and IDL files - are prepared to deploy the AMI component. - - Tue Aug 18 09:59:07 UTC 2009 Marcel Smit - - * tests/AMI_CCM/Hello_Base/Hello_Base.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender.idl: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * tests/AMI_CCM/descriptors/Plan.cdp: - * tests/AMI_CCM/descriptors/run_test.pl: - Baseline for AMI implementation. Sender and Receiver - components are deployable and runable. - - Fri Jul 24 11:54:48 UTC 2009 Marcel Smit - - * tests/AMI_CCM/Hello_Base/Hello_Base.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender.mpc: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - Rerun example. - - * tests/AMI_CCM/descriptors/Plan.cdp: - Added connectors. Now both components - can be deployed. - - Fri Jul 24 07:34:04 UTC 2009 Marcel Smit - - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * tests/AMI_CCM/descriptors/Plan.cdp: - Changed naming convention regarding entry points - - Thu Jul 23 18:53:34 UTC 2009 Marcel Smit - - * tests/AMI_CCM/descriptors/Plan.cdp: - * tests/AMI_CCM/descriptors/run_test.pl: - Few minor changes regarding names of IOR and - dll's. - - Thu Jul 23 15:31:09 UTC 2009 Marcel Smit - - * tests/AMI_CCM/Hello_Base/Hello_Base.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver.mpc: - * tests/AMI_CCM/Sender/Hello_Sender.mpc: - Added library paths. - - * tests/AMI_CCM/descriptors/Plan.cdp: - Renaming. - - Thu Jul 23 14:20:55 UTC 2009 Marcel Smit - - * tests/AMI_CCM: - * tests/AMI_CCM/Hello_Base: - * tests/AMI_CCM/Hello_Base/Hello_Base.idl: - * tests/AMI_CCM/Hello_Base/Hello_Base.mpc: - * tests/AMI_CCM/Receiver: - * tests/AMI_CCM/Receiver/Hello_Receiver.idl: - * tests/AMI_CCM/Receiver/Hello_Receiver.mpc: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.h: - * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: - * tests/AMI_CCM/Sender: - * tests/AMI_CCM/Sender/Hello_Sender.idl: - * tests/AMI_CCM/Sender/Hello_Sender.mpc: - * tests/AMI_CCM/Sender/Hello_Sender_exec.h: - * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp: - * tests/AMI_CCM/descriptors: - * tests/AMI_CCM/descriptors/Plan.cdp: - * tests/AMI_CCM/descriptors/run_test.pl: - Added as a starter for ami4ccm - -Fri Aug 14 13:27:29 UTC 2009 Johnny Willemsen - - * MPC/config/ciao_vcwarnings.mpb: - Use prop:microsoft - -Fri Aug 14 10:12:29 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Disabled some code for CB2009 - -Fri Aug 14 09:28:29 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Use global scope explicitly - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Use <<= for DDS_Time - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Removed commented out include - -Fri Aug 14 02:25:41 UTC 2009 William R. Otte - - * MPC/config/ciao_cs_client.mpb: - - Static linking fix. - -Thu Aug 13 18:07:29 UTC 2009 Johnny Willemsen - - * dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Some more code in read_one_history - -Thu Aug 13 12:58:29 UTC 2009 Johnny Willemsen - - * dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Start with read_one_history implementation - -Thu Aug 13 11:51:29 UTC 2009 Johnny Willemsen - - * dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Added some commented out test code to test the reader code. - This uncovered an issue with the spec, what should the reader - do when there is no data - -Thu Aug 13 10:31:29 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Fized fuzz/borland errors - -Thu Aug 13 08:57:29 UTC 2009 Johnny Willemsen - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Fixed compile error - -Thu Aug 13 07:56:29 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Removed code for vc6 - -Thu Aug 13 01:23:29 UTC 2009 William R. Otte - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Unicode compile errors. - -Wed Aug 12 18:26:09 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication.mpc: - * MPC/config/ciao_cs_client.mpb: - - try to fix link problems introduced by - Tue Aug 11 11:51:29 UTC 2009 ChangeLog - -Wed Aug 12 18:00:56 UTC 2009 William R. Otte - - * tools/Config_Handlers/XMLSchema/Traversal.hpp: - * tools/Config_Handlers/XMLSchema/Types.hpp: - - Integrated more cleanly the changes from XSC XSCRT/XMLSchema. - -Wed Aug 12 13:30:50 UTC 2009 William R. Otte - - * tools/Config_Handlers/XMLSchema/Traversal.hpp: - * tools/Config_Handlers/XMLSchema/Traversal.ipp: - * tools/Config_Handlers/XMLSchema/Traversal.tpp: - * tools/Config_Handlers/XMLSchema/TypeInfo.ipp: - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp: - * tools/Config_Handlers/XMLSchema/Types.hpp: - * tools/Config_Handlers/XMLSchema/Types.ipp: - * tools/Config_Handlers/XMLSchema/Types.tpp: - * tools/Config_Handlers/XMLSchema/Writer.hpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp: - * tools/Config_Handlers/XSCRT/Parser.hpp: - * tools/Config_Handlers/XSCRT/Traversal.hpp: - * tools/Config_Handlers/XSCRT/Traversal.tpp: - * tools/Config_Handlers/XSCRT/Writer.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - - Rolled back the XSC update, it didn't include a number of fixes - necessary for Borland and Xerces2/3. - -Wed Aug 12 10:21:10 UTC 2009 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Small updates regarding to CORBA usage and the official OMG - spec document numbers - -Wed Aug 12 07:27:10 UTC 2009 Johnny Willemsen - - * MPC/config/dds4ccm_base.mpb: - Added after of DDS4CCM_lem_gen - -Wed Aug 12 07:06:10 UTC 2009 Johnny Willemsen - - * DAnCE/Logger/File_Logger_Backend.cpp: - Unicode compile error fix - -Tue Aug 11 17:48:10 UTC 2009 William R. Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/XMI.cpp: - - Fix warnings. - - * tools/Config_Handlers/XMLSchema/Traversal.hpp: - * tools/Config_Handlers/XMLSchema/Traversal.ipp: - * tools/Config_Handlers/XMLSchema/Traversal.tpp: - * tools/Config_Handlers/XMLSchema/TypeInfo.ipp: - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp: - * tools/Config_Handlers/XMLSchema/Types.hpp: - * tools/Config_Handlers/XMLSchema/Types.ipp: - * tools/Config_Handlers/XMLSchema/Types.tpp: - * tools/Config_Handlers/XMLSchema/Writer.hpp: - * tools/Config_Handlers/XMLSchema/id_map.hpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp: - * tools/Config_Handlers/XSCRT/Parser.hpp: - * tools/Config_Handlers/XSCRT/Traversal.hpp: - * tools/Config_Handlers/XSCRT/Traversal.tpp: - * tools/Config_Handlers/XSCRT/Writer.hpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - - Pull in new version of XMLSchema and XSCRT. - -Tue Aug 11 11:51:29 UTC 2009 ChangeLog - - * DAnCE/MPC/config/dance_deployment_svnt.mpb: - * DAnCE/MPC/config/dance_plan_launcher_base.mpb: - * DAnCE/NodeManager/NodeManager.mpc: - * MPC/config/ccm_componentserver_svnt.mpb: - * MPC/config/ciao_cs_client.mpb: - - Link fixes for an ARM cross compile. - -Tue Aug 11 08:55:12 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XML_File_Intf.cpp: - Improved error debug statements - -Mon Aug 10 17:46:12 UTC 2009 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/TargetManager/Target_Manager_Module.h: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1/test.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/File_Logger_Backend.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp: - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Any_Handler.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/CCD_Handler.cpp: - * tools/Config_Handlers/CEPE_Handler.cpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/CRDD_Handler.cpp: - * tools/Config_Handlers/Common.h: - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/Deployment.hpp: - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: - * tools/Config_Handlers/ERE_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.h: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/ID_Handler.cpp: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/PSPE_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.h: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp: - * tools/Config_Handlers/Property_Handler.cpp: - * tools/Config_Handlers/RDD_Handler.cpp: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/SatisfierProperty_Handler.cpp: - * tools/Config_Handlers/Utils/Exceptions.h: - * tools/Config_Handlers/Utils/Functors.h: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XMI.hpp: - * tools/Config_Handlers/XMLSchema/id_map.hpp: - * tools/Config_Handlers/XML_File_Intf.h: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/XML/XML_Helper.tpp: - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - - Unicode compile fixes. - -Mon Aug 10 14:23:39 UTC 2009 Johnny Willemsen - - * dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * dds4ccm/examples/Hello/descriptors/run_test.pl - Added missing \n - -Mon Aug 10 14:12:39 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Fixed layout of debug message - -Mon Aug 10 12:59:21 UTC 2009 William R. Otte - - * DAnCE/Logger/File_Logger_Backend.h: - * DAnCE/Logger/Logger_Service.cpp: - - Unicoe fixes. - -Mon Aug 10 10:53:39 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.mpc - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser.idl - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp - Added a new test for the case where the component that - provides return a nil object reference. The caller should - then get an INV_OBJREF exception, not a crash. - - The CCM spec says in 6.4.2: - In general, a component instance shall be prepared to return object - references for facets throughout the instance's life - cycle. A component implementation may, as part of its advertised - behavior, return a nil object reference as the result of - a provide_ operation - - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp - Catch as const - - * DAnCE/tests/DeploymentPlanDump/test.cpp: - Layout change - - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - Type, unicode changes - - * DAnCE/tests/NameServiceTest/clt_main.cpp: - Unicode fix - - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - Layout change - -Mon Aug 10 09:00:39 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp: - Unicode fixes - -Mon Aug 10 08:53:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/RawListener.h - Fixed fuzz errors - -Mon Aug 10 07:44:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/RawListener.cpp - * connectors/dds4ccm/impl/ndds/Reader.cpp - * connectors/dds4ccm/impl/ndds/Reader.h - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/Utils.h - Fixed fuzz errors - -Sun Aug 9 20:20:39 UTC 2009 William R. Otte - - * .: - * CIAO-INSTALL.html: - * CIAO.mwc: - * CIAO_DAnCE.mwc: - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * COPYING: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/RepositoryManager: - * DAnCE/tests/CIAO/Components/ProcessColocation.idl: - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp: - * MPC: - * MPC/config/ciao_dds4ccm_ndds_impl.mpb: - * MPC/config/ciao_example_output.mpb: - * NEWS: - * bin: - * bin/ciao_tests.lst: - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - * ciao: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * connectors: - * connectors/dds4ccm: - * connectors/dds4ccm/examples: - * connectors/dds4ccm/examples/Hello: - * connectors/dds4ccm/examples/Hello/DDS_Receiver: - * connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp: - * connectors/dds4ccm/examples/Hello/DDS_Sender: - * connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp: - * connectors/dds4ccm/examples/Hello/Receiver: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_ConnectorE.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl3p: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_ConnectorE.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/examples/Hello/descriptors: - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/id3p_test: - * connectors/dds4ccm/id3p_test/Multiple_Reader_Ports: - * connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p: - * connectors/dds4ccm/idl: - * connectors/dds4ccm/idl/dds4ccm.mpc: - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_Connector_Base.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_State.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Getter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_ListenerControl.idl3: - * connectors/dds4ccm/idl/dds4ccm_MultiListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiUpdater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiWriter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_Port_Get.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiUpdate.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiWrite.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Read.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_StateListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Update.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Write.idl3p: - * connectors/dds4ccm/idl/dds4ccm_RawListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Reader.idl3p: - * connectors/dds4ccm/idl/dds4ccm_StateListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Updater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl: - * connectors/dds4ccm/impl/ndds: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/ListenerControl.h: - * connectors/dds4ccm/impl/ndds/ListenerControl.cpp: - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/NDDS_Traits.h: - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener.cpp: - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/RawListener.h: - * connectors/dds4ccm/impl/ndds/RawListener.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/Reader.h: - * connectors/dds4ccm/impl/ndds/Reader.cpp: - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.h: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Writer.h: - * connectors/dds4ccm/impl/ndds/Writer.tpp: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * docs: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - * etc/ciao.doxygen: - * etc/ciao_DAnCE.doxygen: - * etc/ciao_config_handlers.doxygen: - * examples: - * examples/DevGuideExamples: - * examples/Hello/descriptors/Aliased_Map.dat: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Null_Component/descriptors/run_test.pl: - * performance-tests: - * rules.ciao.GNU: - * tests: - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc: - * tools: - * tools/Config_Handlers/XMLSchema/id_map.hpp: - * DAnCE/MPC/config/dance_plan_launcher_base.mpb: - * MPC/config/example_output.mpb: - - Merged in branch dds_ports. Changelog entries: - - Fri Aug 7 19:46:43 UTC 2009 William R. Otte - - * bin/ciao_tests.lst: - - Added dds4ccm tests. - - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp: - - Added 2 second delay after initialization and before sending. - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - - Configure dds during configuration_complete, to ensure delayed initialization - doesn't mees up our receiver counts. - - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - - initialize expected_samples attribute to correctly account for the - expected number of senders. - - Fri Aug 7 19:15:30 UTC 2009 William R. Otte - - * tools/Config_Handlers/XMLSchema/id_map.hpp: - - Compile fixes for sun studio 12. - - Fri Aug 7 14:21:34 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - - 5_to_5 behavior. This deploys the senders/receivers as part of - separate plans. It seems that the delayed servant activation may be - causing problems with discovery, leaving the receivers recieving less - than 50 messages each. - - Fri Aug 7 14:00:45 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - - Added name attribute to identify receivers. - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - - Increased wait time before starting sending task to allow - more time for discovery. - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - - Test for 1 to 5 communication. - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - - Increased timeouts. - - Fri Aug 7 13:50:19 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Use ACE_NEW_NORETURN in the get entry point method so that we only - have one exit point - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - Comment out the multiwriter code, just for testing - - Fri Aug 7 13:21:19 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Use the safer set_session_context as now generated by TAO_IDL - - Fri Aug 7 12:57:19 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Fixed typo in debug statements - - * ciao/Containers/Session/Session_Container.cpp: - Improved debug statements - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - Use CCM_DDS::DataReader directly, saves an indirection step - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - Added some comments - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - Get the DDSDataWriter from the global scope - - Fri Aug 7 11:44:30 UTC 2009 William R. Otte - - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - - Re-implemented the servant activator to address a crash at - teardown. - - Fri Aug 7 11:11:19 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Some more defensive programming and pluged a memory leak - - Thu Aug 6 15:32:19 UTC 2009 William R. Otte - - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - - Second part of fix for - Thu Aug 6 01:46:32 UTC 2009 William R. Otte , - now bug 3725. Homes how keep an increasing serial counter of the home - instances they create, and append this number to the instance ID passed - to the component servant when it is instantiated. - - Thu Aug 6 13:46:11 UTC 2009 William R. Otte - - * ciao/Containers/Servant_Activator.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - - Various logging improvements, as well as a *partial* fix for - Thu Aug 6 01:46:32 UTC 2009 William R. Otte , - allowing multiple homes of the *same type* to deploy/manage a single component - each. Part of the problem was memory corruption in the home/component instance - name, which has been resolved by using ACE_CString instead of naked char *s to - store these. - - Homes which host multiple components are still broken, as the facet ObjectID, - while no longer garbage, is the same for all instances managed by that home. - - * ciao/Containers/Session/Session_Container.cpp: - - Newline on log message. - - Thu Aug 6 13:39:16 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - - Updated to use separate homes for each sender/connector to workaround - the bug checked in with: - - Thu Aug 6 01:46:32 UTC 2009 William R. Otte - - Thu Aug 6 11:29:35 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/Containers/Session/Session_Container.cpp - * ciao/Servants/Servant_Impl_Base.cpp - More defensive programming against nil object references - - Thu Aug 6 08:43:35 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - Fixed compile warnings - - Thu Aug 6 01:46:32 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp: - - Added test plan that exhibits a problem when the same home is used - to deploy two components that provide facets. The problem is that - the servant activator/port activator only really tracks a SINGLE - facet instance PER HOME. This would produce runtime side effects - for components with stateful facet executors, but especially causes - a problem during teardown, when the container attempts to - repeatedly deactivate the single facet servant. - - Wed Aug 5 18:58:35 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - Improved debug messages - - Wed Aug 5 18:05:29 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - - Plan modifications/test script for many to one communication. - This appears to expose another bug in CIAO, investigating. - - Wed Aug 5 17:44:03 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - - Log message tweak. - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - - Spawn a thread to do sending, necessary to multiple sender tests, - as ccm_activate would block until completion. - - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - - Added a sleep between deployment/teardown to accomodate - new sender behavior. - - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - - Plan that deploys 5 to 1 communication. - - Wed Aug 5 14:39:36 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - - Changed severity of logging for replacement of already present - artifact info. - - Wed Aug 5 14:38:22 UTC 2009 William R. Otte - - * ciao/Containers/Servant_Activator.cpp: - - Fixed bug whereby the port activator for a servant would never be found. - - Wed Aug 5 14:25:09 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - - Added some configuration attributes to provide a hint to the receiver as to - how many samples it should be receiving. - - Wed Aug 5 14:00:06 UTC 2009 William R. Otte - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - - Fixed a couple bugs whereby homed and unhomed components didn't - have their end of lifecycle events (passivate/remove) invoked - during teardown. - - Wed Aug 5 08:18:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - Use "" instead of '' - - Wed Aug 5 08:13:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Implemented more methods - - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - Use DDS sequences - - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - Use a template for the conversion, we need to factor out conversion of all - sequences - - Tue Aug 4 16:00:02 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - - Added plan/test script to deploy only a receiver component and - send messages using the RTI DDS sender. - - Tue Aug 4 15:04:21 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp: - - Add command line parameter to automatically shut down after a given - number of samples. - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - - Added configuration attributes for number of samples and message. - - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - - Added plan/test script to deploy only a Sender component and receive - messages using the raw DDS_Receiver. - - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/Writer.h: - - Compile fixes. - - Tue Aug 4 12:27:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - Started with the QueryFilter support - - Tue Aug 4 12:05:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - Implement a few more methods - - Mon Aug 3 14:00:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp - * connectors/dds4ccm/impl/ndds/Writer.h - * connectors/dds4ccm/impl/ndds/Writer.tpp - Added write with a set for the MultiWriter - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - Start with the reader implementation - - Mon Aug 3 12:46:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - Moved HelloListener to the cpp file. Added an enabled flag to - be able to stop publishing data, default is now true, - should be modified to false later - - Fri Jul 31 14:27:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - More glue code - - Fri Jul 31 13:46:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h - Added InstanceHandleSeq support. Note that we have added a new - trait to the CORBA sequences, knowing _size_type. - - Fri Jul 31 12:43:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - More methods and more states - - Fri Jul 31 12:12:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/Writer.tpp - Fixed some small bugs, the example compiles again - - Fri Jul 31 11:41:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h - DataWriterListener is now implemented - - Fri Jul 31 11:26:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h - DataReaderListener is now fully implemented - - Fri Jul 31 11:13:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h - Added some more status conversions - - Fri Jul 31 11:05:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/Topic.h - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/Writer.h - Renamed the member to impl_, that way we can more easily copy - code from one wrapper to another - - Fri Jul 31 10:49:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/PortStatusListener.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/Topic.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - Use localobject - - Fri Jul 31 08:57:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/PortStatusListener.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/Topic.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/Writer.h - Added defines to prevent redefinitions, added same file - header - - Fri Jul 31 08:28:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - More methods implemented - - Thu Jul 30 13:54:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - Implement more listen methods - - Thu Jul 30 11:47:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - Implemented some more methods - - Thu Jul 30 11:34:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - Added QueryCondition - - Thu Jul 30 11:18:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - Implemented all get_instance_handle methods - - Thu Jul 30 11:05:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - Changed InstanceHandle_t to a struct that contains in the case of - RTI DDS an octet[16] and an unsigned long. The DDS spec gives - long as example but it can be vendor dependent. The problem with long - is that it is passed by value, a struct is const&. In case a different - vendor has to be used, change the NativeInstanceHandle_t struct - to contain a long, than all interfaces stay const& - - Thu Jul 30 09:15:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - Added SampleRejectedStatus - - Thu Jul 30 09:03:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - Added SubscriptionMatchedStatus conversion - - Thu Jul 30 08:16:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - Added DDS_Duration_t conversion - - Wed Jul 29 18:49:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - Added SampleLostStatus - - Wed Jul 29 18:16:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - Added TopicDescription - - Wed Jul 29 13:36:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - Port status listener implemented here, not to add that to the ndds - wrapper - - Wed Jul 29 12:58:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - The RTI_DDSDataReaderListener is now derived from the RTI base - class and is then passed to DDS. DDS then invokes back on this - RTI listener, this then delegates to the CORBA defined IDL - interface - - Tue Jul 28 19:16:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - corrected a few types, need to regenerate the E file - - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - Implemented another set of methods - - Tue Jul 28 17:06:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - added publisherlistener - - Tue Jul 28 15:30:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - Again some more methods - - Tue Jul 28 15:21:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - Implement some more methods, just the basic ones that don't need - any conversion/wrapping - - Tue Jul 28 15:09:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp - Use ndds_namespace_cpp.h so that we get everything in the DDS namespace - - Tue Jul 28 15:00:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Participant.cpp - * connectors/dds4ccm/impl/ndds/Participant.h - * connectors/dds4ccm/impl/ndds/ParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/ParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.h - Added DataWriterListener and added Domain prefix to the participant - files - - Tue Jul 28 14:46:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - Added ReadCondition - - Tue Jul 28 14:19:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - Use the NDDS wrapper for the listener, that part is now working - again. - - Tue Jul 28 13:25:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - Added DDS::DataReaderListener - - Tue Jul 28 13:10:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Participant.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.h - Added DDS:StatusCondition - - Tue Jul 28 12:26:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Participant.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - Added part of subscriber listener - - Tue Jul 28 12:01:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - Implement a few more methods. We need to convert each time between the RTI DDS - types and the CORBA types. This gets very ugly in the executor itself. This - all should be done in the impl/ndds directory which I now need to extend - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/NDDS_Traits.h - * connectors/dds4ccm/impl/ndds/Participant.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - Added some more wrapper interfaces with just a few methods implemented - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - Prefix increment - - Tue Jul 28 08:08:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - The CCM receiver listener component now gets called. - - Mon Jul 27 10:42:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp: - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp: - Fixed incorrect comparison - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: - Fixed issue related to lem generation - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - Added missing library - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - Create an subscribe a listener to see if we get some data from DDS - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Implemented on_data_available - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - Catch exceptions as const - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: - configure_dds is a private method - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Added an ACE_DEBUG to show we send a message - - * connectors/dds4ccm/id3p_test - * connectors/dds4ccm/id3p_test/Multiple_Reader_Ports - * connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p - * connectors/dds4ccm/impl/ndds/Participant.cpp - First start with IDL3+ tests for dds4ccm - - Mon Jul 27 06:58:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/DDS_Receiver - * connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp - * connectors/dds4ccm/examples/Hello/DDS_Sender - * connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp - Receiver and sender to send plain strings as addition to the CCM based - sender/receiver. These programs use RTI DDS - - Fri Jul 24 19:20:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - More base project fixes - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Simplified the conversion of return codes to string - - Fri Jul 24 18:34:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/Utils.h - * MPC/config/ciao_dds4ccm_ndds_impl.mpb - Various compile fixes for windows. Added base projects, afters, etc - - Fri Jul 24 12:55:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - Fixed link problems - - * connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl: - Include StringSeq.pidl directly - - Fri Jul 24 12:37:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl: - Add this file for the moment to the repository - - Fri Jul 24 12:32:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp - Various changes to get the code to compile on windows - - Fri Jul 24 10:49:35 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - * MPC/config/ciao_example_output.mpb - * MPC/config/example_output.mpb - Renamed example_output to ciao_example_output - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Added include of StringSeq.pidl - - Fri Jul 24 09:18:35 UTC 2009 Johnny Willemsen - - * CIAO_TAO.mwc: - Added connectors directory - - Fri Jul 10 17:13:35 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_ConnectorE.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - * connectors/dds4ccm/idl/dds4ccm.mpc: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - - Various compile fixes, link fixes, along with initial implementation of the - sender connector and the sender component. When deployed, the sender connector - will register with DDS, and the sender component will use dds4ccm defined interfaces - to send a series of messages. Currently, this can be tested by using the ndds - Hello_simple example. - - It should be noted that Hello_Sender_ConnectorE.idl IS checked in because it - is hand-modified to remove the CCM_DataWriter interface until such a time - as the support for lem force all can be worked out. - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/ListenerControl.h: - * connectors/dds4ccm/impl/ndds/ListenerControl.cpp: - * connectors/dds4ccm/impl/ndds/NDDS_Traits.h: - * connectors/dds4ccm/impl/ndds/Participant.h: - * connectors/dds4ccm/impl/ndds/Participant.cpp: - * connectors/dds4ccm/impl/ndds/ParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/ParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Writer.h: - * connectors/dds4ccm/impl/ndds/Writer.tpp: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - - Initial implementation of the DataWriter, and a minimum of the IDL-defined - DDS DCPS interfaces as a wrapper facade for RTI DDS as needed to implement - basic writing functionality. - - * connectors/dds4ccm/impl/ndds/ListnerControl.h: - * connectors/dds4ccm/impl/ndds/ListnerControl.cpp: - * connectors/dds4ccm/impl/ndds/Writer.cpp: - - Removed these files. - - Wed Jul 8 17:30:09 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm.mpc: - Added anytypecode to resolve link problems with msvc - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Added include of tao sequence file to resolve link problems with mwvc - - Wed Jul 8 15:12:09 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - Layout - - Wed Jul 8 12:12:59 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - - Change project names to not clash. - - Tue Jul 7 19:14:09 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - - Components now deploy. - - Tue Jul 7 18:17:19 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - - Added homes. - - Tue Jul 7 18:05:15 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - - Compile/linking problems now taken care of. - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl3: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl3: - - Removed these files. - - Tue Jul 7 00:49:09 UTC 2009 William R. Otte - - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.idl3: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Base.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Base.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - - Added missing files. - - * connectors/dds4ccm/idl/dds4ccm.mpc: - - corrected spelling error. - - * connectors/dds4ccm/examples/Hello/Sender/Sender_exec_export.h: - * connectors/dds4ccm/examples/Hello/Sender/Sender_stub_export.h: - * connectors/dds4ccm/examples/Hello/Sender/Sender_svnt_export.h: - - Removed these files. - - Tue Jul 7 00:14:45 UTC 2009 William R. Otte - - * connectors/dds4ccm/idl/dds4ccm_Connector_Base.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_State.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Getter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiUpdater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiWriter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Get.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiUpdate.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiWrite.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Read.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_StateListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Update.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Write.idl3p: - * connectors/dds4ccm/idl/dds4ccm_RawListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Reader.idl3p: - * connectors/dds4ccm/idl/dds4ccm_StateListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Updater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - - fixed malformed include guards. - - Tue Jul 7 00:07:13 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl3p: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.idl3: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Sender_exec_export.h: - * connectors/dds4ccm/examples/Hello/Sender/Sender_stub_export.h: - * connectors/dds4ccm/examples/Hello/Sender/Sender_svnt_export.h: - - Example now compiles, but there is no business logic yet. - There are still missing symbols that I need to ferret out. - - * connectors/dds4ccm/idl/dds4ccm.mpc: - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3: - * connectors/dds4ccm/idl/dds4ccm_ListenerControl.idl3: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - - Malformed include guards, and small updates to go with standard. - - * connectors/dds4ccm/examples/Hello/Hello_Base: - * connectors/dds4ccm/examples/Hello/Hello_Base.idl3: - * connectors/dds4ccm/examples/Hello/Hello_Base.idl3p: - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base_skel_export.h: - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base_stub_export.h: - * connectors/dds4ccm/examples/Hello/Hello_Receiver.idl3: - * connectors/dds4ccm/examples/Hello/Hello_Receiver.idl3p: - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.cpp: - * connectors/dds4ccm/idl/dds4ccm_ListnerControl.idl3: - - Removed these files. - - Thu Jul 2 01:47:53 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - - Tue Jun 30 19:11:28 UTC 2009 William R. Otte - - * connectors/dds4ccm/idl/dds4ccm.mpc: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3: - - Added last remanining non-idl3p dds4ccm item into the mpc file. - - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3p: - - Removed this file. - - Tue Jun 30 17:49:49 UTC 2009 William R. Otte - - * connectors/dds4ccm/impl: - * connectors/dds4ccm/impl/ndds: - * connectors/dds4ccm/impl/ndds/ListnerControl.h: - * connectors/dds4ccm/impl/ndds/ListnerControl.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener.cpp: - * connectors/dds4ccm/impl/ndds/RawListener.h: - * connectors/dds4ccm/impl/ndds/RawListener.cpp: - * connectors/dds4ccm/impl/ndds/Reader.h: - * connectors/dds4ccm/impl/ndds/Reader.cpp: - * connectors/dds4ccm/impl/ndds/Writer.h: - * connectors/dds4ccm/impl/ndds/Writer.cpp: - - implementation stubs. - - Tue Jun 30 17:39:21 UTC 2009 William R. Otte - - * connectors/dds4ccm/idl/dds4ccm.mpc: - * connectors/dds4ccm/idl/dds4ccm_ListnerControl.idl3: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3: - - Generate/compile idl necessary for hello example. - - * connectors/dds4ccm/idl/dds4ccm_ListnerControl.idl3p: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3p: - - Removed these files. - - Mon Jun 22 09:22:17 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - - Updated base projects - - Fri Jun 19 18:15:10 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - Corrected this connector based on OMG issue 13953 - - Thu Jun 18 13:37:02 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - - Compile fixes - - Thu Jun 18 13:34:02 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.h - - Compile fixes - - Thu Jun 18 13:17:02 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.h - - Compile fixes - - Thu Jun 18 13:00:05 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - Compile fixes - - Thu Jun 18 09:32:05 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base_skel_export.h - * connectors/dds4ccm/examples/Hello/Hello_Base/Hello_Base_stub_export.h - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.idl - * connectors/dds4ccm/examples/Hello/Receiver/Receiver.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec.h - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_exec_export.h - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_stub_export.h - * connectors/dds4ccm/examples/Hello/Receiver/Receiver_svnt_export.h - Put these under version control. Copy of regular hello world - - Wed Jun 17 18:07:10 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.cidl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.cidl: - - Removed these files. - - Wed Jun 17 10:07:19 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc - - Zap ciaocidldefaults from the MPC files. Everything has to be rebuild to - sort out the compile/link issues, but at least now cidlc is not used anymore - - Wed Jun 10 18:31:15 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - - First pass at deployment plan. - - Fri Jun 5 20:10:11 UTC 2009 William R. Otte - - * connectors/dds4ccm/examples/Hello/Hello_Base.idl3: - * connectors/dds4ccm/examples/Hello/Hello_Receiver.idl3: - * connectors/dds4ccm/examples/Hello/Hello_Sender.idl3: - - Finished the by-hand translation to idl3. - - Tue Jun 2 03:43:30 UTC 2009 William R. Otte - - * connectors: - * connectors/dds4ccm: - * connectors/dds4ccm/example: - * connectors/dds4ccm/example/Hello: - * connectors/dds4ccm/example/Hello/Hello_Base.idl3: - * connectors/dds4ccm/example/Hello/Hello_Base.idl3p: - * connectors/dds4ccm/example/Hello/Hello_Receiver.idl3: - * connectors/dds4ccm/example/Hello/Hello_Receiver.idl3p: - * connectors/dds4ccm/example/Hello/Hello_Sender.idl3: - * connectors/dds4ccm/example/Hello/Hello_Sender.idl3p: - - Outline of a driving use case for phase 1. Note that the - idl3p files are the IDL3+ for the components/connector, and the - idl3 files are my best guess at the implied IDL3 mapping. - - * connectors/dds4ccm/idl: - * connectors/dds4ccm/idl/dds4ccm_Base.idl3: - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Base.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_Event.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Connector_State.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Getter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_ListnerControl.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiUpdater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_MultiWriter.idl3p: - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Get.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiUpdate.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_MultiWrite.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Read.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_StateListen.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Update.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Port_Write.idl3p: - * connectors/dds4ccm/idl/dds4ccm_RawListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Reader.idl3p: - * connectors/dds4ccm/idl/dds4ccm_StateListener.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Updater.idl3p: - * connectors/dds4ccm/idl/dds4ccm_Writer.idl3p: - - DDS4CCM IDL. - - -Mon Aug 3 22:54:37 UTC 2009 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - - Set DANCE_ROOT environment variable. - -Wed Jul 29 11:40:12 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Another hpux fix - -Mon Jul 27 12:09:12 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Fixed compile error by invalid character at the top of the file - -Sun Jul 26 07:51:12 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Updated for Sun Studio 12 - -Sat Jul 25 13:05:03 UTC 2009 William R. Otte - - * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc: - - Add -Gex. - -Fri Jul 24 11:26:23 UTC 2009 William R. Otte - - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - - Disabled this test until its fixed. - -Fri Jul 24 10:59:12 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/PIDL_Include/PIDLInclude.idl: - * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc: - New test to reproduce a problem when including pidl files - -Thu Jul 23 16:26:17 UTC 2009 William R. Otte - - * tests/IDL_Test/Inherited_Component: - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl: - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - * tests/IDL_Test/Inherited_Component/IhC_Foo.idl: - * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc: - - Test which demonstrates an inability to generate code properly - for inherited components. - -Thu Jul 23 17:48:12 UTC 2009 Johnny Willemsen - - * NEWS: - Updated for next release - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Compile fixes for HPUX - -Thu Jul 23 02:11:02 CDT 2009 Johnny Willemsen - - * CIAO version 0.7.2 released. - -Wed Jul 22 08:06:47 UTC 2009 Johnny Willemsen - - * bin/ciao_tests.lst: - NodeManager-Deployments is known to fail - -Tue Jul 21 17:38:47 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/Dump_Obj.cpp: - * tools/Config_Handlers/Dump_Obj.h: - Moved include to header file to fix compile errors with CB2009 - -Tue Jul 21 13:48:47 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Backported some CB2009 fixes - -Tue Jul 21 10:51:47 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixed compile error on HPUX - -Tue Jul 21 02:23:41 UTC 2009 William R. Otte - - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - - Avoids minimum corba. - -Tue Jul 21 01:43:50 UTC 2009 William R. Otte - - * tests/IDL3/ImpliedIDL/All/all.mpc: - - Disabled this on MFC systems due to the fact that it produces - errors in newer VS compilers due to the mixing in of c# language - elements. - -Mon Jul 20 11:16:47 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixed compile error on HPUX - -Mon Jul 20 11:13:53 UTC 2009 Marcel Smit - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Reverted an unicode change. - -Mon Jul 20 10:55:13 UTC 2009 Marcel Smit - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeApplication/Name_Utilities.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Starter/Starter.h: - * DAnCE/Starter/Starter.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/File_Logger_Backend.cpp: - Reverted some unicode changes. - -Mon Jul 20 10:50:47 UTC 2009 Johnny Willemsen - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - Also disabled svnt projects with ace_for_tao - -Mon Jul 20 10:32:47 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Removed old msvc checks - -Mon Jul 20 07:02:47 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - Use bool for rt_support_ and added a default value to the constructor - to resolve problems with older gcc versions - -Sun Jul 19 18:25:47 UTC 2009 Johnny Willemsen - - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/Logger/Logger_Service.h: - Unicode fixes - -Sun Jul 19 17:22:08 UTC 2009 William R. Otte - - * tests/IDL_Test/Keywords/Keywords.mpc: - - avoids mfc, as building with mfc enabled causes 'interface' - to become a language keyword, where it otherwise would not be. - -Sun Jul 19 09:50:47 UTC 2009 Johnny Willemsen - - * ciao/Servants/Port_Activator_T.cpp: - Layout change - - * ciao/Servants/Servants.mpc: - Port_Activator_T is a template file, not a source file - -Sun Jul 19 09:46:47 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - Layout changes - - * DAnCE/DomainApplication/Domain_Application_Impl.h: - Made startLaunch public - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Layout, const, datatype changes - - * DAnCE/MPC/config/dance_repositorymanagerbase.mpb: - Added after JAWS - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Layout changes - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Layout, datatype, const changes - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - Layout changes - - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - Corrected messages - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - Unicode fix - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - JAWS is added by the base project - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - Corrected base class - -Sat Jul 18 22:33:47 UTC 2009 William R. Otte - - * DAnCE/Starter/Starter.mpc: - - Temporarily disable this project, there's no way it works properly - at run-time, even if it compiles. We will take another look at this - after 0.7.2. - -Sat Jul 18 17:41:10 UTC 2009 William R. Otte - - * tools/XML/XML_Schema_Resolver.cpp: - - Rolling back changes from - Fri Jul 17 11:50:08 UTC 2009 Marcel Smit - Fri Jul 17 10:26:28 UTC 2009 Marcel Smit - - as they broke all tests involving XMl. - -Sat Jul 18 17:19:49 UTC 2009 William R. Otte - - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - - avoids_ace_for_tao. - -Sat Jul 18 15:56:16 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Sender/Sender.mpc: - - avoids_ace_for_tao. - -Sat Jul 18 09:34:30 UTC 2009 Marcel Smit - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Corrected a coding error during last commit. - -Sat Jul 18 09:20:47 UTC 2009 Marcel Smit - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Starter/Starter.h: - * DAnCE/Starter/Starter.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - Fixed UNICODE compiler errors. - -Sat Jul 18 05:12:00 UTC 2009 William R. Otte - - * DAnCE/Logger/Logger_Service.cpp: - - stab at some unicode problems on Windows. - -Sat Jul 18 05:01:32 UTC 2009 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/MPC/config/dance_tm_daemon.mpb: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - - Static linking fixes. - -Sat Jul 18 00:50:20 UTC 2009 William R. Otte - - * DAnCE/Deployment/CIAO_Interfaces.mpc: - - linker fixes. - - * examples/Hello/Receiver/Receiver.mpc: - - this mpc specified more than was generated, causing it to be - re-run. - -Fri Jul 17 21:18:11 UTC 2009 William R. Otte - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - - Disabled this. there's lots wrong with it. - -Fri Jul 17 18:06:48 UTC 2009 William R. Otte - - * DAnCE/DomainApplication/DomainApplication.mpc: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - - Linking fixes for Windows. - - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Deployment.hpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/XMI.hpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XMLSchema/id_map.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/Config_Handlers/toplevel.hpp: - - Updated generated code to 1) update to latest version of XSC, - 2) resolve unicode errors in the generator. - -Fri Jul 17 14:41:29 UTC 2009 Marcel Smit - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeApplication/Name_Utilities.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Resolved some unicode compiler errors. - -Fri Jul 17 13:35:03 UTC 2009 Marcel Smit - - * ciao/Logger/File_Logger_Backend.h: - Resolved UNICODE compiler errors. - -Fri Jul 17 12:48:09 UTC 2009 Marcel Smit - - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cpd.cpp: - Resolved UNICODE compiler errors. - -Fri Jul 17 12:09:55 UTC 2009 Marcel Smit - - * tools/Config_Handlers/XMI.cpp: - Resolved UNICODE compiler errors. - -Fri Jul 17 11:50:08 UTC 2009 Marcel Smit - - * ciao/Containers/Session/Session_Container.cpp: - * tools/XML/XML_Schema_Resolver.cpp: - Resolved UNICODE compiler errors. - -Fri Jul 17 10:26:28 UTC 2009 Marcel Smit - - * tools/XML/XML_Schema_Resolver.cpp: - Resolved UNICODE compiler errors. - -Fri Jul 17 07:06:08 UTC 2009 Marcel Smit - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * ciao/Logger/File_Logger_Backend.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - Resolved UNICODE compiler errors. - - * docs/tutorials/Quoter/Simple/02.html: - Removed reference toe CIDL. - -Wed Jul 15 15:51:36 UTC 2009 William R. Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - - Compile warning fixes. - -Wed Jul 15 14:20:19 UTC 2009 Johnny Willemsen - - * examples/Hello/Sender/starter.cpp: - Fixed wchar problem - -Wed Jul 15 13:17:19 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc: - Fixed build orders - -Tue Jul 14 20:34:19 UTC 2009 Johnny Willemsen - - * MPC/config/viao_vcwarnings.mpb: - Added vc10 - -Tue Jul 14 20:31:19 UTC 2009 Johnny Willemsen - - * MPC/config/dance_plan_launcher_base.mpc: - * DAnCE/MPC/config/dance_plan_launcher_base.mpb: - Moved to DAnCE and corrected extension - -Tue Jul 14 20:14:19 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb - Shortened some project names to fix fuzz errors - -Tue Jul 14 17:56:19 UTC 2009 Marcel Smit - - * ciao/Logger/File_Logger_Backend.cpp: - - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - -Tue Jul 14 14:24:08 UTC 2009 Marcel Smit - - * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl: - * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl: - * DAnCE/MPC/config/dance_targetmanager.mpb: - * DAnCE/RepositoryManager/repository_manager_admin.h: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/TargetManager/TargetManager.idl: - * MPC/config/ciao_connector_base.mpb: - * MPC/config/connectoridldefaults.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_skel.mpb: - * MPC/config/example_output.mpb: - * tests/IDL_Test/Keywords/Keyword_Clash.idl: - * tools/Config_Handlers/PL_Handler.h: - * tools/Config_Handlers/PL_Handler.cpp: - Resolved Fuzz errors. - -Tue Jul 14 11:11:57 UTC 2009 William R. Otte - - * .: - * CIAO-INSTALL.html: - * CIAO.mwc: - * CIAO_DAnCE.mwc: - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * COPYING: - * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl: - * DAnCE/Deployment/CIAO_Interfaces.mpc: - * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl: - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/Deployment/Deployment.idl: - * DAnCE/Deployment/Deployment_Application.idl: - * DAnCE/Deployment/Deployment_ApplicationManager.idl: - * DAnCE/Deployment/Deployment_Connection.idl: - * DAnCE/Deployment/Deployment_Data.idl: - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/Deployment/Deployment_DomainApplication.idl: - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl: - * DAnCE/Deployment/Deployment_ExecutionManager.idl: - * DAnCE/Deployment/Deployment_NodeApplication.idl: - * DAnCE/Deployment/Deployment_NodeApplicationManager.idl: - * DAnCE/Deployment/Deployment_NodeManager.idl: - * DAnCE/Deployment/Deployment_Packaging_Data.idl: - * DAnCE/Deployment/Deployment_PlanError.idl: - * DAnCE/Deployment/Deployment_StartError.idl: - * DAnCE/Deployment/Deployment_StopError.idl: - * DAnCE/Deployment/Deployment_TargetManager.idl: - * DAnCE/Deployment/Module_Main.h: - * DAnCE/DomainApplication/DomainApplication.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/Logger/Logger.mpc: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/MPC: - * DAnCE/MPC/config: - * DAnCE/MPC/config/ciao_executionmanager_skel.mpb: - * DAnCE/MPC/config/ciao_executionmanager_stub.mpb: - * DAnCE/MPC/config/ciao_nodeapplication.mpb: - * DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb: - * DAnCE/MPC/config/ciao_nodemanager_skel.mpb: - * DAnCE/MPC/config/ciao_nodemanager_stub.mpb: - * DAnCE/MPC/config/ciao_plan_generator.mpb: - * DAnCE/MPC/config/ciao_targetmanager_stub.mpb: - * DAnCE/MPC/config/ciao_targetmanager_svnt.mpb: - * DAnCE/MPC/config/dance.mpb: - * DAnCE/MPC/config/dance_cdmw_idl.mpb: - * DAnCE/MPC/config/dance_component_server.mpb: - * DAnCE/MPC/config/dance_component_server_svnt.mpb: - * DAnCE/MPC/config/dance_deployment_stub.mpb: - * DAnCE/MPC/config/dance_deployment_svnt.mpb: - * DAnCE/MPC/config/dance_domainapplication.mpb: - * DAnCE/MPC/config/dance_domainapplication_skel.mpb: - * DAnCE/MPC/config/dance_domainapplication_stub.mpb: - * DAnCE/MPC/config/dance_domainapplicationmanager.mpb: - * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb: - * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb: - * DAnCE/MPC/config/dance_exe.mpb: - * DAnCE/MPC/config/dance_executionmanager_skel.mpb: - * DAnCE/MPC/config/dance_executionmanager_stub.mpb: - * DAnCE/MPC/config/dance_extension_stub.mpb: - * DAnCE/MPC/config/dance_lib.mpb: - * DAnCE/MPC/config/dance_logger.mpb: - * DAnCE/MPC/config/dance_mocks.mpb: - * DAnCE/MPC/config/dance_nodeapplication.mpb: - * DAnCE/MPC/config/dance_nodeapplication_skel.mpb: - * DAnCE/MPC/config/dance_nodeapplication_stub.mpb: - * DAnCE/MPC/config/dance_nodeapplicationmanager.mpb: - * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb: - * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb: - * DAnCE/MPC/config/dance_nodemanager.mpb: - * DAnCE/MPC/config/dance_nodemanager_skel.mpb: - * DAnCE/MPC/config/dance_nodemanager_stub.mpb: - * DAnCE/MPC/config/dance_nodemanager_svnt.mpb: - * DAnCE/MPC/config/dance_plan_generator.mpb: - * DAnCE/MPC/config/dance_redirectionservice.mpb: - * DAnCE/MPC/config/dance_repositorymanager.mpb: - * DAnCE/MPC/config/dance_repositorymanager_skel.mpb: - * DAnCE/MPC/config/dance_repositorymanager_stub.mpb: - * DAnCE/MPC/config/dance_repositorymanagerbase.mpb: - * DAnCE/MPC/config/dance_targetmanager.mpb: - * DAnCE/MPC/config/dance_targetmanager_skel.mpb: - * DAnCE/MPC/config/dance_targetmanager_stub.mpb: - * DAnCE/MPC/config/dance_utils.mpb: - * DAnCE/NodeApplication/ComponentAttributesSetter.h: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Generator/PCVisitorBase.h: - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - * DAnCE/Plan_Launcher/launcher.cpp: - * DAnCE/RepositoryManager: - * DAnCE/RepositoryManager/PC_Updater.h: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/RepositoryManager/repository_manager_admin.h: - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_Impl.h: - * DAnCE/TargetManager/TargetManager_Impl.cpp: - * DAnCE/TargetManager/TargetManager_Impl_export.h: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/Target_Manager_Exec.cpp: - * DAnCE/TargetManager/Target_Manager_Module.h: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module_export.h: - * DAnCE/Utils/Plan_Handler.h: - * DAnCE/tests/CIAO/Components/ProcessColocation.idl: - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc: - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc: - * DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc: - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * MPC: - * MPC/config/ciao_connector_base.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_server.mpb: - * MPC/config/ciaoidldefaults.mpb: - * MPC/config/componentidldefaults.mpb: - * MPC/config/connectoridldefaults.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_skel.mpb: - * MPC/config/example_output.mpb: - * NEWS: - * bin: - * bin/ciao_tests.lst: - * bin/generate_component_mpc.pl: - * bin/update_package.py: - * ccm/CCM.mpc: - * ccm/CCM_Configurator.idl: - * ccm/CCM_Cookie.idl: - * ccm/CCM_Enumeration.idl: - * ccm/CCM_EventBase.idl: - * ccm/CCM_EventConsumerBase.idl: - * ccm/CCM_Events.idl: - * ccm/CCM_Exceptions.idl: - * ccm/CCM_Home.idl: - * ccm/CCM_HomeConfiguration.idl: - * ccm/CCM_HomeFinder.idl: - * ccm/CCM_Homes.idl: - * ccm/CCM_KeylessCCMHome.idl: - * ccm/CCM_Navigation.idl: - * ccm/CCM_Object.idl: - * ccm/CCM_Receptacle.idl: - * ccm/CCM_StandardConfigurator.idl: - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - * ciao: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * docs: - * docs/OMG-CCM-Tutorial.ppt: - * docs/TODO.html: - * docs/generate_component_mpc.html: - * docs/index.html: - * docs/schema/06-04-02.xsd: - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/cdp.xsd: - * docs/schema/cid.xsd: - * docs/schema/cpd.xsd: - * docs/schema/toplevel.xsd: - * docs/schema/unused_06-04-02.xsd: - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - * docs/tutorials/Quoter/Simple/Model/Quoter.xme: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * docs/tutorials/Quoter/Simple/descriptors/Domain.cdd: - * docs/tutorials/Quoter/Simple/descriptors/NodeMap.dat: - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - * docs/tutorials/Quoter/Simple/images/fig10.jpg: - * docs/tutorials/Quoter/Simple/images/fig11.jpg: - * docs/tutorials/Quoter/Simple/images/fig12.jpg: - * docs/tutorials/Quoter/Simple/images/fig2.jpg: - * docs/tutorials/Quoter/Simple/images/fig3.jpg: - * docs/tutorials/Quoter/Simple/images/fig4.jpg: - * docs/tutorials/Quoter/Simple/images/fig5.jpg: - * docs/tutorials/Quoter/Simple/images/fig5a.jpg: - * docs/tutorials/Quoter/Simple/images/fig6.jpg: - * docs/tutorials/Quoter/Simple/images/fig7.jpg: - * docs/tutorials/Quoter/Simple/images/fig8.jpg: - * docs/tutorials/Quoter/Simple/images/fig9.jpg: - * docs/value_factory_registration.html: - * etc/ciao.doxygen: - * etc/ciao_DAnCE.doxygen: - * etc/ciao_config_handlers.doxygen: - * examples: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMDevice/BMDevice.idl: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDisplay/BMDisplay.idl: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BasicSP_exec.h: - * examples/BasicSP/EC/EC.idl: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/EC/EC_exec.h: - * examples/DevGuideExamples: - * examples/DevGuideExamples/Messenger/Administrator.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.h: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * examples/DevGuideExamples/Messenger/History_exec_i.h: - * examples/DevGuideExamples/Messenger/History_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Publication_exec_i.h: - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Runnable_exec_i.h: - * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/GPS/GPS_exec.h: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Display/NavDisplay/NavDisplay_exec.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/RateGen/RateGen_exec.h: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/Aliased_Map.dat: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/step-by-step.html: - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component/Null_Interface.mpc: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Sender/Sender.mpc: - * performance-tests: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * performance-tests/Protocols/Controller/Controller.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/Sender/Sender_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Protocols/common/Protocols.mpc: - * rules.ciao.GNU: - * tests: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/CIDL/CodeGen/Basic.idl: - * tests/CIDL/CodeGen/Basic.mpc: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/IDL_Test: - * tests/IDL_Test/Cornucopia: - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - * tests/IDL_Test/Cornucopia/Cornucopia.mpc: - * tests/IDL_Test/Cornucopia/README: - * tests/IDL_Test/Included_Component: - * tests/IDL_Test/Included_Component/IC_Bar.idl: - * tests/IDL_Test/Included_Component/IC_Bar.mpc: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - * tests/IDL_Test/Included_Component/IC_Foo.mpc: - * tests/IDL_Test/Keywords: - * tests/IDL_Test/Keywords/Keyword_Clash.idl: - * tests/IDL_Test/Keywords/Keywords.mpc: - * tests/IDL_Test/Lem_Specific_Export: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.cpp: - * tests/IDL_Test/Reused_Facet_Interface: - * tests/IDL_Test/Reused_Facet_Interface/Basic.idl: - * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl: - * tests/IDL_Test/Reused_Facet_Interface/README: - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc: - * tests/Minimum/Minimum_Base/Minimum_Base.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Sender/Sender.mpc: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender_exec.cpp: - * tools: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/DataType_Handler.cpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/DnC_Dump.h: - * tools/Config_Handlers/Dump_Obj.h: - * tools/Config_Handlers/Dump_Obj.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * tools/Config_Handlers/PL_Handler.h: - * tools/Config_Handlers/PL_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/XML/XML_Helper.tpp: - * CCF: - * CCF/Bootstrap.rules: - * CCF/CCF: - * CCF/CCF/CIDL: - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CIDL/LexicalAnalyzer.cpp: - * CCF/CCF/CIDL/LexicalAnalyzer.hpp: - * CCF/CCF/CIDL/Parser.cpp: - * CCF/CCF/CIDL/Parser.hpp: - * CCF/CCF/CIDL/SemanticAction: - * CCF/CCF/CIDL/SemanticAction.hpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - * CCF/CCF/CIDL/SemanticAction/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Elements.hpp: - * CCF/CCF/CIDL/SemanticAction/Factory.hpp: - * CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl: - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - * CCF/CCF/CIDL/SemanticGraph: - * CCF/CCF/CIDL/SemanticGraph.hpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.hpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.cpp: - * CCF/CCF/CIDL/SemanticGraph/Elements.hpp: - * CCF/CCF/CIDL/SemanticGraph/Elements.cpp: - * CCF/CCF/CIDL/SemanticGraph/Executor.hpp: - * CCF/CCF/CIDL/SemanticGraph/Executor.cpp: - * CCF/CCF/CIDL/Token.hpp: - * CCF/CCF/CIDL/Traversal: - * CCF/CCF/CIDL/Traversal.hpp: - * CCF/CCF/CIDL/Traversal/Composition.hpp: - * CCF/CCF/CIDL/Traversal/Composition.tpp: - * CCF/CCF/CIDL/Traversal/Elements.hpp: - * CCF/CCF/CIDL/Traversal/Executor.hpp: - * CCF/CCF/CIDL/Traversal/Executor.cpp: - * CCF/CCF/CodeGenerationKit: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - * CCF/CCF/CodeGenerationKit/CommandLine.cpp: - * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: - * CCF/CCF/CodeGenerationKit/IndentationBuffer.hpp: - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - * CCF/CCF/CodeGenerationKit/IndentationIDL.hpp: - * CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp: - * CCF/CCF/CodeGenerationKit/IndentationJava.hpp: - * CCF/CCF/CodeGenerationKit/IndentationXML.hpp: - * CCF/CCF/CodeGenerationKit/Regex.hpp: - * CCF/CCF/CompilerElements: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/CompilerElements/Context.hpp: - * CCF/CCF/CompilerElements/Diagnostic.hpp: - * CCF/CCF/CompilerElements/ExH.hpp: - * CCF/CCF/CompilerElements/FileSystem.hpp: - * CCF/CCF/CompilerElements/Introspection.hpp: - * CCF/CCF/CompilerElements/Introspection.cpp: - * CCF/CCF/CompilerElements/Preprocessor.cpp: - * CCF/CCF/CompilerElements/Preprocessor.hpp: - * CCF/CCF/CompilerElements/PreprocessorToken.hpp: - * CCF/CCF/CompilerElements/PreprocessorToken.cpp: - * CCF/CCF/CompilerElements/ReferenceCounting.hpp: - * CCF/CCF/CompilerElements/TokenStream.hpp: - * CCF/CCF/IDL2: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parsing: - * CCF/CCF/IDL2/Parsing/Action.hpp: - * CCF/CCF/IDL2/Parsing/Elements.hpp: - * CCF/CCF/IDL2/Parsing/Recovery.hpp: - * CCF/CCF/IDL2/SemanticAction: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticAction/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Const.hpp: - * CCF/CCF/IDL2/SemanticAction/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Exception.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Const.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeFactory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueTypeMember.cpp: - * CCF/CCF/IDL2/SemanticAction/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Module.hpp: - * CCF/CCF/IDL2/SemanticAction/Native.hpp: - * CCF/CCF/IDL2/SemanticAction/NumericExpression.hpp: - * CCF/CCF/IDL2/SemanticAction/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Struct.hpp: - * CCF/CCF/IDL2/SemanticAction/TypeId.hpp: - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Union.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueType.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueTypeFactory.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticGraph: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/SemanticGraph/Array.hpp: - * CCF/CCF/IDL2/SemanticGraph/Array.cpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.tpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.cpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.cpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.hpp.m4: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.m4: - * CCF/CCF/IDL2/SemanticGraph/Graph.hpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.tpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.hpp: - * CCF/CCF/IDL2/SemanticGraph/IntExpression.cpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.cpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.hpp: - * CCF/CCF/IDL2/SemanticGraph/Literals.cpp: - * CCF/CCF/IDL2/SemanticGraph/Member.hpp: - * CCF/CCF/IDL2/SemanticGraph/Member.cpp: - * CCF/CCF/IDL2/SemanticGraph/Module.cpp: - * CCF/CCF/IDL2/SemanticGraph/Module.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp: - * CCF/CCF/IDL2/SemanticGraph/String.cpp: - * CCF/CCF/IDL2/SemanticGraph/String.hpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.cpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.hpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.ipp: - * CCF/CCF/IDL2/SemanticGraph/Translation.cpp: - * CCF/CCF/IDL2/SemanticGraph/TypeId.hpp: - * CCF/CCF/IDL2/SemanticGraph/TypeId.cpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.hpp: - * CCF/CCF/IDL2/SemanticGraph/ValueTypeMember.cpp: - * CCF/CCF/IDL2/Token.cpp: - * CCF/CCF/IDL2/Token.hpp: - * CCF/CCF/IDL2/Traversal: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/Traversal/Array.hpp: - * CCF/CCF/IDL2/Traversal/Array.cpp: - * CCF/CCF/IDL2/Traversal/Attribute.hpp: - * CCF/CCF/IDL2/Traversal/Attribute.cpp: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL2/Traversal/Elements.tpp: - * CCF/CCF/IDL2/Traversal/Elements.cpp: - * CCF/CCF/IDL2/Traversal/Enum.hpp: - * CCF/CCF/IDL2/Traversal/Enum.cpp: - * CCF/CCF/IDL2/Traversal/Exception.cpp: - * CCF/CCF/IDL2/Traversal/Exception.hpp: - * CCF/CCF/IDL2/Traversal/Fundamental.hpp: - * CCF/CCF/IDL2/Traversal/Fundamental.cpp: - * CCF/CCF/IDL2/Traversal/IntExpression.hpp: - * CCF/CCF/IDL2/Traversal/Interface.hpp: - * CCF/CCF/IDL2/Traversal/Interface.tpp: - * CCF/CCF/IDL2/Traversal/Interface.cpp: - * CCF/CCF/IDL2/Traversal/Member.cpp: - * CCF/CCF/IDL2/Traversal/Member.hpp: - * CCF/CCF/IDL2/Traversal/Module.cpp: - * CCF/CCF/IDL2/Traversal/Module.hpp: - * CCF/CCF/IDL2/Traversal/Native.cpp: - * CCF/CCF/IDL2/Traversal/Native.hpp: - * CCF/CCF/IDL2/Traversal/Operation.hpp: - * CCF/CCF/IDL2/Traversal/Operation.tpp: - * CCF/CCF/IDL2/Traversal/Operation.cpp: - * CCF/CCF/IDL2/Traversal/Sequence.hpp: - * CCF/CCF/IDL2/Traversal/Sequence.cpp: - * CCF/CCF/IDL2/Traversal/String.cpp: - * CCF/CCF/IDL2/Traversal/String.hpp: - * CCF/CCF/IDL2/Traversal/Struct.cpp: - * CCF/CCF/IDL2/Traversal/Struct.hpp: - * CCF/CCF/IDL2/Traversal/Translation.hpp: - * CCF/CCF/IDL2/Traversal/Translation.cpp: - * CCF/CCF/IDL2/Traversal/TypeId.hpp: - * CCF/CCF/IDL2/Traversal/TypeId.cpp: - * CCF/CCF/IDL2/Traversal/Union.hpp: - * CCF/CCF/IDL2/Traversal/Union.cpp: - * CCF/CCF/IDL2/Traversal/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/ValueType.cpp: - * CCF/CCF/IDL2/Traversal/ValueType.tpp: - * CCF/CCF/IDL2/Traversal/ValueTypeMember.hpp: - * CCF/CCF/IDL2/Traversal/ValueTypeMember.tpp: - * CCF/CCF/IDL3: - * CCF/CCF/IDL3/IDL3.mpc: - * CCF/CCF/IDL3/LexicalAnalyzer.hpp: - * CCF/CCF/IDL3/LexicalAnalyzer.cpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/SemanticAction: - * CCF/CCF/IDL3/SemanticAction.hpp: - * CCF/CCF/IDL3/SemanticAction/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Consumes.hpp: - * CCF/CCF/IDL3/SemanticAction/Elements.hpp: - * CCF/CCF/IDL3/SemanticAction/Emits.hpp: - * CCF/CCF/IDL3/SemanticAction/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/EventTypeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Home.hpp: - * CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventTypeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Provides.hpp: - * CCF/CCF/IDL3/SemanticAction/Publishes.hpp: - * CCF/CCF/IDL3/SemanticAction/Uses.hpp: - * CCF/CCF/IDL3/SemanticGraph: - * CCF/CCF/IDL3/SemanticGraph.hpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/SemanticGraph/Component.cpp: - * CCF/CCF/IDL3/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL3/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.hpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - * CCF/CCF/IDL3/SemanticGraph/Home.cpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - * CCF/CCF/IDL3/Token.hpp: - * CCF/CCF/IDL3/Traversal: - * CCF/CCF/IDL3/Traversal.hpp: - * CCF/CCF/IDL3/Traversal/Component.hpp: - * CCF/CCF/IDL3/Traversal/Component.tpp: - * CCF/CCF/IDL3/Traversal/Component.cpp: - * CCF/CCF/IDL3/Traversal/Elements.hpp: - * CCF/CCF/IDL3/Traversal/EventType.hpp: - * CCF/CCF/IDL3/Traversal/EventType.tpp: - * CCF/CCF/IDL3/Traversal/Home.hpp: - * CCF/CCF/IDL3/Traversal/Home.cpp: - * CCF/Config.rules: - * CCF/Documentation: - * CCF/Documentation/Build.html: - * CCF/Documentation/DesignNotes: - * CCF/Documentation/TODO: - * CCF/Example: - * CCF/Example/CIDL: - * CCF/Example/CIDL/LocalExecutorMapping: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/test-0.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-0_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-1.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-1_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-2.cidl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - * CCF/Example/CodeGenerationKit: - * CCF/Example/CodeGenerationKit/Indentation: - * CCF/Example/CodeGenerationKit/Indentation/IDL: - * CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp: - * CCF/Example/CodeGenerationKit/Indentation/XML: - * CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp: - * CCF/Example/ComponentDeploymentDescriptor: - * CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.hpp: - * CCF/Example/ComponentDeploymentDescriptor/SyntaxTree.cpp: - * CCF/Example/ComponentDeploymentDescriptor/Traversal.hpp: - * CCF/Example/ComponentDeploymentDescriptor/Traversal.cpp: - * CCF/Example/ComponentDeploymentDescriptor/cdd.cpp: - * CCF/Example/IDL2: - * CCF/Example/IDL2/CxxMapping: - * CCF/Example/IDL2/CxxMapping/Generator.cpp: - * CCF/Example/IDL2/CxxMapping/Generator.hpp: - * CCF/Example/IDL2/CxxMapping/GeneratorImpl.hpp: - * CCF/Example/IDL2/CxxMapping/driver.cpp: - * CCF/Example/IDL2/CxxMapping/test.idl: - * CCF/Test: - * CCF/Test/CIDL: - * CCF/Test/CIDL/Compiler: - * CCF/Test/CIDL/Compiler/Generator.cpp: - * CCF/Test/CIDL/Compiler/Generator.hpp: - * CCF/Test/CIDL/Compiler/GeneratorImpl.hpp: - * CCF/Test/CIDL/Compiler/driver.cpp: - * CCF/Test/CIDL/Compiler/result.cidl.orig: - * CCF/Test/CIDL/Compiler/test.cidl: - * CCF/Test/CompilerElements: - * CCF/Test/CompilerElements/CPP: - * CCF/Test/CompilerElements/CPP/driver.cpp: - * CCF/Test/IDL2: - * CCF/Test/IDL2/Compiler: - * CCF/Test/IDL2/Compiler/driver.cpp: - * CCF/Test/IDL2/Compiler/result.idl.orig: - * CCF/Test/IDL2/Compiler/test.idl: - * CCF/Test/IDL2/LexicalAnalyzer: - * CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl: - * CCF/Test/IDL2/Parser: - * CCF/Test/IDL2/Parser/Recovery: - * CCF/Test/IDL2/Parser/Recovery/interface.idl: - * CCF/Test/IDL2/Parser/Recovery/module.idl: - * CCF/Test/IDL2/SemanticGraph: - * CCF/Test/IDL2/SemanticGraph/HandBuilt: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/Builder.cpp: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/Builder.hpp: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/hand_built.cpp: - * CCF/Test/IDL2/Traversal: - * CCF/Test/IDL2/Traversal/Recreate: - * CCF/Test/IDL2/Traversal/Recreate/Generator.cpp: - * CCF/Test/IDL2/Traversal/Recreate/Generator.hpp: - * CCF/Test/IDL2/Traversal/Recreate/GeneratorImpl.hpp: - * CCF/Test/IDL2/Traversal/Recreate/recreate.cpp: - * CCF/Test/IDL3: - * CCF/Test/IDL3/Compiler: - * CCF/Test/IDL3/Compiler/Generator.hpp: - * CCF/Test/IDL3/Compiler/Generator.cpp: - * CCF/Test/IDL3/Compiler/GeneratorImpl.hpp: - * CCF/Test/IDL3/Compiler/driver.cpp: - * CCF/Test/IDL3/Compiler/result.idl.orig: - * CCF/Test/IDL3/Compiler/test.idl: - * CCF/Version: - * CIDLC: - * CIDLC/AttributeHeaderEmitters.hpp: - * CIDLC/AttributeHeaderEmitters.cpp: - * CIDLC/AttributeSourceEmitters_T.hpp: - * CIDLC/CIDLC.mpc: - * CIDLC/CIDLC.mwc: - * CIDLC/Collectors.hpp: - * CIDLC/CompositionEmitter.cpp: - * CIDLC/CompositionEmitter.hpp: - * CIDLC/CorbaTypeNameEmitters.cpp: - * CIDLC/CorbaTypeNameEmitters.hpp: - * CIDLC/CxxNamePrinter.hpp: - * CIDLC/CxxNamePrinter.cpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - * CIDLC/EmitterBase.cpp: - * CIDLC/EmitterBase.hpp: - * CIDLC/EmitterContext.hpp: - * CIDLC/EmitterContext.cpp: - * CIDLC/ExecImplGenerator.hpp: - * CIDLC/ExecImplGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.hpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/InterfaceEmitter.cpp: - * CIDLC/InterfaceEmitter.hpp: - * CIDLC/Literals.hpp: - * CIDLC/Literals.cpp: - * CIDLC/ModuleEmitter.hpp: - * CIDLC/ModuleEmitter.cpp: - * CIDLC/OperationHeaderEmitters.cpp: - * CIDLC/OperationHeaderEmitters.hpp: - * CIDLC/ParameterEmitter_T.hpp: - * CIDLC/README.html: - * CIDLC/RepositoryIdGenerator.hpp: - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - * CIDLC/SizeTypeCalculator.hpp: - * CIDLC/SizeTypeCalculator.cpp: - * CIDLC/UnescapedNamePrinter.hpp: - * CIDLC/Upcase.hpp: - * CIDLC/UtilityTypeNameEmitters.cpp: - * CIDLC/UtilityTypeNameEmitters.hpp: - * CIDLC/Version: - * CIDLC/cidlc.cpp: - * DAnCE/Deployment/Deployment_Core.idl: - * DAnCE/Interfaces: - * DAnCE/Interfaces/ExecutionManagerDaemon.idl: - * DAnCE/Interfaces/ExecutionManager_stub_export.h: - * DAnCE/Interfaces/Interfaces.mpc: - * DAnCE/Interfaces/NodeManagerDaemon.idl: - * DAnCE/Interfaces/NodeManager_stub_export.h: - * DAnCE/Interfaces/NodeManager_svnt_export.h: - * DAnCE/Interfaces/README: - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/TargetManager/TargetManager.cidl: - * DAnCE/TargetManager/TargetManagerImpl.idl: - * DAnCE/TargetManager/TargetManager_exec_export.h: - * DAnCE/TargetManager/TargetManager_stub_export.h: - * DAnCE/TargetManager/TargetManager_svnt_export.h: - * DAnCE/TargetManager/descriptors: - * DAnCE/TargetManager/descriptors/Domain.cdd: - * DAnCE/TargetManager/descriptors/NodeDetails.dat: - * DAnCE/TargetManager/descriptors/NodeManagerMap.dat: - * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - * DAnCE/tests/CIAO/Components/SimpleAttribute.cidl: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer.cidl: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter.cidl: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull.cidl: - * DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider.cidl: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher.cidl: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h: - * MPC/config/ciao_executionmanager_stub.mpb: - * MPC/config/ciao_nodeapplication.mpb: - * MPC/config/ciao_nodeapplicationmanager.mpb: - * MPC/config/ciao_nodemanager_stub.mpb: - * MPC/config/ciao_nodemanager_svnt.mpb: - * MPC/config/ciao_plan_generator.mpb: - * MPC/config/ciao_targetmanager_stub.mpb: - * MPC/config/ciao_targetmanager_svnt.mpb: - * MPC/config/ciaocidldefaults.mpb: - * MPC/config/cidlc.mpb: - * MPC/config/dance.mpb: - * MPC/config/dance_cdmw_idl.mpb: - * MPC/config/dance_component_server.mpb: - * MPC/config/dance_component_server_svnt.mpb: - * MPC/config/dance_deployment_stub.mpb: - * MPC/config/dance_deployment_svnt.mpb: - * MPC/config/dance_domain_application.mpb: - * MPC/config/dance_domain_application_manager.mpb: - * MPC/config/dance_exe.mpb: - * MPC/config/dance_executionmanager_stub.mpb: - * MPC/config/dance_extension_stub.mpb: - * MPC/config/dance_lib.mpb: - * MPC/config/dance_logger.mpb: - * MPC/config/dance_mocks.mpb: - * MPC/config/dance_node_application.mpb: - * MPC/config/dance_node_application_manager.mpb: - * MPC/config/dance_node_manager.mpb: - * MPC/config/dance_nodemanager_stub.mpb: - * MPC/config/dance_nodemanager_svnt.mpb: - * MPC/config/dance_plan_generator.mpc: - * MPC/config/dance_redirection_service.mpb: - * MPC/config/dance_repository_manager.mpb: - * MPC/config/dance_repository_manager_base.mpb: - * MPC/config/dance_utils.mpb: - * bin/msvc_cidlc.pl: - * bin/replace_dummy_with_dummylabel.sh: - * docs/cidlc.html: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.cidl: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.cidl: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h: - * examples/BasicSP/BMClosedED/BMClosedED.cidl: - * examples/BasicSP/BMClosedED/BMClosedED_exec_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_stub_export.h: - * examples/BasicSP/BMClosedED/BMClosedED_svnt_export.h: - * examples/BasicSP/BMDevice/BMDevice.cidl: - * examples/BasicSP/BMDevice/BMDevice_exec_export.h: - * examples/BasicSP/BMDevice/BMDevice_stub_export.h: - * examples/BasicSP/BMDevice/BMDevice_svnt_export.h: - * examples/BasicSP/BMDisplay/BMDisplay.cidl: - * examples/BasicSP/BMDisplay/BMDisplay_exec_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_stub_export.h: - * examples/BasicSP/BMDisplay/BMDisplay_svnt_export.h: - * examples/BasicSP/BasicSP_exec_export.h: - * examples/BasicSP/BasicSP_stub_export.h: - * examples/BasicSP/BasicSP_svnt_export.h: - * examples/BasicSP/EC/EC.cidl: - * examples/BasicSP/EC/EC_exec_export.h: - * examples/BasicSP/EC/EC_stub_export.h: - * examples/BasicSP/EC/EC_svnt_export.h: - * examples/DevGuideExamples/Messenger/Administrator.cidl: - * examples/DevGuideExamples/Messenger/Administrator_exec_export.h: - * examples/DevGuideExamples/Messenger/Administrator_stub_export.h: - * examples/DevGuideExamples/Messenger/Administrator_svnt_export.h: - * examples/DevGuideExamples/Messenger/Messenger.cidl: - * examples/DevGuideExamples/Messenger/Messenger_exec_export.h: - * examples/DevGuideExamples/Messenger/Messenger_stub_export.h: - * examples/DevGuideExamples/Messenger/Messenger_svnt_export.h: - * examples/DevGuideExamples/Messenger/Receiver.cidl: - * examples/DevGuideExamples/Messenger/Receiver_exec_export.h: - * examples/DevGuideExamples/Messenger/Receiver_stub_export.h: - * examples/DevGuideExamples/Messenger/Receiver_svnt_export.h: - * examples/Display/Display_Base/Display_Base_skel_export.h: - * examples/Display/Display_Base/Display_Base_stub_export.h: - * examples/Display/GPS/GPS.cidl: - * examples/Display/GPS/GPS_exec_export.h: - * examples/Display/GPS/GPS_stub_export.h: - * examples/Display/GPS/GPS_svnt_export.h: - * examples/Display/NavDisplay/NavDisplay.cidl: - * examples/Display/NavDisplay/NavDisplay_exec_export.h: - * examples/Display/NavDisplay/NavDisplay_stub_export.h: - * examples/Display/NavDisplay/NavDisplay_svnt_export.h: - * examples/Display/RateGen/RateGen.cidl: - * examples/Display/RateGen/RateGen_exec_export.h: - * examples/Display/RateGen/RateGen_stub_export.h: - * examples/Display/RateGen/RateGen_svnt_export.h: - * examples/Hello/Receiver/Receiver.cidl: - * examples/Hello/Receiver/Receiver_exec_export.h: - * examples/Hello/Receiver/Receiver_stub_export.h: - * examples/Hello/Receiver/Receiver_svnt_export.h: - * examples/Hello/Sender/Sender.cidl: - * examples/Hello/Sender/Sender_exec_export.h: - * examples/Hello/Sender/Sender_stub_export.h: - * examples/Hello/Sender/Sender_svnt_export.h: - * examples/Null_Component/Null_Component.cidl: - * examples/Null_Component/Null_Component_exec_export.h: - * examples/Null_Component/Null_Component_stub_export.h: - * examples/Null_Component/Null_Component_svnt_export.h: - * examples/Null_Component/Null_Interface_skel_export.h: - * examples/Null_Component/Null_Interface_stub_export.h: - * examples/Swapping/Receiver/Receiver.cidl: - * examples/Swapping/Receiver/Receiver_exec_export.h: - * examples/Swapping/Receiver/Receiver_stub_export.h: - * examples/Swapping/Receiver/Receiver_svnt_export.h: - * examples/Swapping/Sender/Sender.cidl: - * examples/Swapping/Sender/Sender_exec_export.h: - * examples/Swapping/Sender/Sender_stub_export.h: - * examples/Swapping/Sender/Sender_svnt_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip.cidl: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_stub_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_svnt_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.cidl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h: - * performance-tests/Protocols/Receiver/Receiver.cidl: - * performance-tests/Protocols/Receiver/Receiver_exec_export.h: - * performance-tests/Protocols/Receiver/Receiver_stub_export.h: - * performance-tests/Protocols/Receiver/Receiver_svnt_export.h: - * performance-tests/Protocols/Sender/Sender.cidl: - * performance-tests/Protocols/Sender/Sender_exec_export.h: - * performance-tests/Protocols/Sender/Sender_stub_export.h: - * performance-tests/Protocols/Sender/Sender_svnt_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.cidl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_stub_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_svnt_export.h: - * tests/CIDL/CodeGen/CodeGen.cidl: - * tests/CIDL/CodeGen/CodeGen_exec_export.h: - * tests/CIDL/CodeGen/CodeGen_stub_export.h: - * tests/CIDL/CodeGen/CodeGen_svnt_export.h: - * tests/Minimum/Receiver/Receiver.cidl: - * tests/Minimum/Receiver/Receiver_exec_export.h: - * tests/Minimum/Receiver/Receiver_stub_export.h: - * tests/Minimum/Receiver/Receiver_svnt_export.h: - * tests/Minimum/Sender/Sender.cidl: - * tests/Minimum/Sender/Sender_exec_export.h: - * tests/Minimum/Sender/Sender_stub_export.h: - * tests/Minimum/Sender/Sender_svnt_export.h: - - Merged in dds_ports branch, full changelogs pasted below. - - Fri Jul 10 18:02:14 UTC 2009 Marcel Smit - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/launcher.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - Got rid of ace/OS.h. Made these includes more specific. - - * DAnCE/Logger/Logger_Service.cpp: - Used the default way of parsing command line arguments. - - Fri Jul 10 17:23:09 UTC 2009 Johnny Willemsen - - * DAnCE/MPC/config/dance_targetmanager.mpb: - Updated base - - Fri Jul 10 07:17:09 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/Dump_Obj.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Req_Handler.cpp - Fixed includes because of refactoring of the deployment idl - - Thu Jul 9 18:04:09 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/MPC/config/dance_repository_manager.mpb - * DAnCE/MPC/config/dance_repository_manager_base.mpb - * DAnCE/MPC/config/dance_repositorymanager.mpb - * DAnCE/MPC/config/dance_repositorymanager_skel.mpb - * DAnCE/MPC/config/dance_repositorymanager_stub.mpb - * DAnCE/MPC/config/dance_repositorymanagerbase.mpb - * DAnCE/MPC/config/dance_target_manager.mpb - * DAnCE/MPC/config/dance_targetmanager.mpb - * DAnCE/MPC/config/dance_targetmanager_skel.mpb - * DAnCE/MPC/config/dance_targetmanager_stub.mpb - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp - * DAnCE/NodeApplication/ComponentAttributesSetter.h - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TargetManagerDaemon.idl - Splitted target and repository manager in seperate projects - - Thu Jul 9 13:23:09 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/CIAO_ExecutionManager_stub_export.h - * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/CIAO_Interfaces.mpc - * DAnCE/Deployment/CIAO_NodeManager_skel_export.h - * DAnCE/Deployment/CIAO_NodeManager_stub_export.h - * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/Deployment_DomainApplication_skel_export.h - * DAnCE/Deployment/Deployment_DomainApplication_stub_export.h - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl - * DAnCE/Deployment/Deployment_ExecutionManager_skel_export.h - * DAnCE/Deployment/Deployment_ExecutionManager_stub_export.h - * DAnCE/Deployment/Deployment_NodeApplicationManager_skel_export.h - * DAnCE/Deployment/Deployment_NodeApplicationManager_stub_export.h - * DAnCE/Deployment/Deployment_NodeManager_skel_export.h - * DAnCE/Deployment/Deployment_NodeManager_stub_export.h - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/Interfaces/ExecutionManager_stub_export.h - * DAnCE/Interfaces/ExecutionManagerDaemon.idl - * DAnCE/Interfaces/Interfaces.mpc - * DAnCE/Interfaces/NodeManager_stub_export.h - * DAnCE/Interfaces/NodeManager_svnt_export.h - * DAnCE/Interfaces/NodeManagerDaemon.idl - * DAnCE/Interfaces/README - * DAnCE/Logger/Logger.mpc - * DAnCE/MPC - * DAnCE/MPC/config - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/TargetManager/TargetManager.mpc - * MPC/config/ciao_executionmanager_skel.mpb - * MPC/config/ciao_executionmanager_stub.mpb - * MPC/config/ciao_nodemanager_skel.mpb - * MPC/config/ciao_nodemanager_stub.mpb - * MPC/config/ciao_nodemanager_svnt.mpb - * MPC/config/dance_domain_application.mpb - * MPC/config/dance_domain_application_manager.mpb - * MPC/config/dance_domainapplication.mpb - * MPC/config/dance_domainapplicationmanager.mpb - * MPC/config/dance_domainapplicationmanager_skel.mpb - * MPC/config/dance_domainapplicationmanager_stub.mpb - * MPC/config/dance_executionmanager_stub.mpb - * MPC/config/dance_extension_stub.mpb - * MPC/config/dance_node_application.mpb - * MPC/config/dance_node_application_manager.mpb - * MPC/config/dance_node_manager.mpb - * MPC/config/dance_nodeapplication.mpb - * MPC/config/dance_nodeapplication_skel.mpb - * MPC/config/dance_nodeapplication_stub.mpb - * MPC/config/dance_nodeapplicationmanager.mpb - * MPC/config/dance_nodeapplicationmanager_skel.mpb - * MPC/config/dance_nodeapplicationmanager_stub.mpb - * MPC/config/dance_nodemanager.mpb - * MPC/config/dance_nodemanager_skel.mpb - * MPC/config/dance_nodemanager_stub.mpb - * MPC/config/dance_nodemanager_svnt.mpb - Major splitting up in seperate libraries - - Thu Jul 9 13:00:47 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - Changed to meet the latest version of Dance. - - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - Changed help text to meet the actual value of the IOR files. - - * docs/tutorials/Quoter/Simple/descriptors/Domain.cdd: - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - Changed to meet the latest version of dance - - Thu Jul 9 11:02:09 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/Deployment.idl - * DAnCE/Deployment/Deployment_Application.idl - * DAnCE/Deployment/Deployment_ApplicationManager.idl - * DAnCE/Deployment/Deployment_Connection.idl - * DAnCE/Deployment/Deployment_Core.idl - * DAnCE/Deployment/Deployment_Data.idl - * DAnCE/Deployment/Deployment_DomainApplication.idl - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl - * DAnCE/Deployment/Deployment_ExecutionManager.idl - * DAnCE/Deployment/Deployment_NodeApplication.idl - * DAnCE/Deployment/Deployment_NodeApplicationManager.idl - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Deployment_PlanError.idl - * DAnCE/Deployment/Deployment_StartError.idl - * DAnCE/Deployment/Deployment_StopError.idl - * DAnCE/Deployment/Deployment_TargetManager.idl - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Utils/Plan_Handler.h - * tools/Config_Handlers/DnC_Dump.h - First step in refactoring all DAnCE IDL in seperate files - and create more seperate dlls - - Wed Jul 8 18:51:09 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/03.html: - Updated picl_to_idl command line parameters - - Wed Jul 8 15:12:09 UTC 2009 Johnny Willemsen - - * ccm/CCM.mpc - * ccm/CCM_Configurator.idl - * ccm/CCM_Cookie.idl - * ccm/CCM_Enumeration.idl - * ccm/CCM_EventBase.idl - * ccm/CCM_EventConsumerBase.idl - * ccm/CCM_Events.idl - * ccm/CCM_Exceptions.idl - * ccm/CCM_Home.idl - * ccm/CCM_HomeConfiguration.idl - * ccm/CCM_HomeFinder.idl - * ccm/CCM_Homes.idl - * ccm/CCM_KeylessCCMHome.idl - * ccm/CCM_Navigation.idl - * ccm/CCM_Object.idl - * ccm/CCM_Receptacle.idl - * ccm/CCM_StandardConfigurator.idl - * ccm/ComponentServer/CCM_ComponentServer.idl - * ciao/ComponentServer/CIAO_ComponentServer.idl - Moved CCM_Homes to their own file and added to each header whether - they are compliant or not and which section of the OMG spec 06-04-01 - they are defined in - - Wed Jul 8 14:08:09 UTC 2009 Marcel Smit - - * bin/generate_component_mpc.pl: - _lem_stub must not be created when -n is used as a command - line parameter. - Besides this, there were some dependency error. - Also added -o option. This option allows the user to specify - a library output dir. This dir is set to all projects. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Updated using the latest version of generate_component_mpc.pl. - - Wed Jul 8 11:48:45 UTC 2009 William R. Otte - - * MPC/config/dds4ccm_skel.mpb: - * MPC/config/example_output.mpb: - - Missing base projects. - - Tue Jul 7 18:32:03 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Properly init the UUID generator. - - Tue Jul 7 18:05:15 UTC 2009 William R. Otte - - * bin/generate_component_mpc.pl: - - Further updates. - - Tue Jul 7 17:31:48 UTC 2009 William R. Otte - - * bin/generate_component_mpc.pl: - - Updated to create a separate E.idl lib. - - * tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.cpp: - - Added exec implementation. - - Tue Jul 7 16:31:47 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Included_Component/IC_Foo.mpc: - * tests/IDL_Test/Included_Component/IC_Bar.mpc: - - Added 'after' lines for *_svnt projects, and add executor - projects. - - Tue Jul 7 15:43:57 UTC 2009 William R. Otte - - * tests/IDL_Test/Lem_Specific_Export: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.idl: - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc: - - Test which apparently shows the export file not being - generated for a LEM project. - - Tue Jul 7 00:10:41 UTC 2009 William R. Otte - - * MPC/config/ciao_connector_base.mpb: - * MPC/config/connectoridldefaults.mpb: - * MPC/config/dds4ccm_base.mpb: - - Adding new base projects. - - Mon Jul 6 19:47:03 UTC 2009 William R. Otte - - - * tests/IDL_Test/Included_Component: - * tests/IDL_Test/Included_Component/IC_Bar.idl: - * tests/IDL_Test/Included_Component/IC_Bar.mpc: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - * tests/IDL_Test/Included_Component/IC_Foo.mpc: - - New test. Codegen for IC_Bar attempts to generate - IC_Foo elements. - - * tests/IDL_Test/Forward_Declared_Ports: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Bar.idl: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Bar.mpc: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Bar_exec.h: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Bar_exec.cpp: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Foo.idl: - * tests/IDL_Test/Forward_Declared_Ports/FDP_Foo.mpc: - - Removed these files, was determined this test case was - invalid. - - Mon Jul 6 13:47:09 UTC 2009 Marcel Smit - - * DAnCE/Deployment/Module_Main.h: - No error message when ORB couldn't start. This should - be clear when reading the previous (error) messages. - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - Displaying help message without any other - (error) messages. - - * DAnCE/TargetManager/Target_Manager_Module.cpp: - Displaying help message without any other - (error) messages. Also checked parsed command line - options. - - Fri Jul 3 01:13:13 UTC 2009 William R. Otte - - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/XMI.cpp: - - Error/warning fixes. - - Thu Jul 2 01:47:53 UTC 2009 Johnny Willemsen - - * bin/generate_component_mpc.pl - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNull.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc - * DAnCE/tests/CIAO/Components/SimpleUser.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * examples/Display/GPS/GPS.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Null_Component/Null_Component.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL_Test/Cornucopia/Cornucopia.mpc - * tests/IDL_Test/Keywords/Keywords.mpc - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - Changed project names *_idle_gen to *_lem_gen. - - Wed Jul 1 22:18:53 UTC 2009 Jeff Parsons - - * performance-tests/Protocols/Receiver/Receiver.mpc: - * tests/Minimum/Minimum_Base/Minimum_Base.mpc: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - - Changed project names *_idle_gen to *_lem_gen. - - Wed Jul 1 21:36:05 UTC 2009 Johnny Willemsen - - * examples/Display/GPS/GPS.mpc: - * examples/Swapping/Sender/Sender.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Protocols/Sender/Sender.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - - Fixed missing afters - - Wed Jul 1 17:08:05 UTC 2009 Marcel Smit - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Resolved compiler issues on Windows - - * docs/generate_component_mpc.html: - Removed CIDL stuff. - - Wed Jul 1 16:27:07 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - - Conditionalized generation of value factory registration - with a check to see if the eventtype in question has a - concrete factory. Registration macro should be generated - only if this check returns true. - - Wed Jul 1 16:10:49 UTC 2009 Jeff Parsons - - * NEWS: - * docs/value_factory_registration.html: - - Updated to reflect removal of CIDL compiler. - - * MPC/config/ciao_server.mpb: - - Removed repeated occurrence ciao_client base project. - - Wed Jul 1 13:34:09 UTC 2009 Marcel Smit - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - No DLINFO in trace messages. - - * bin/generate_component_mpc.pl: - No CIDL_Files in mpc files anymore. Prevents mpc from - generating project files/make files. - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/04.html: - Mentioned the tutorials library path in MPC-file's. - - * docs/tutorials/Quoter/Simple/02.html: - Changed $CIAO_ROOT into %CIAO_ROOT%. This was intended in this - tutorial. - - Tue Jun 30 21:32:28 UTC 2009 Johnny Willemsen - - * docs/tutorials/Quoter/Simple/04.html: - Fixed typo - - Tue Jun 30 17:19:44 UTC 2009 Jeff Parsons - - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Administrator.mpc: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - - Changed project names for consistency. - - Tue Jun 30 15:56:11 UTC 2009 William R. Otte - - * bin/update_package.py: - - Old script that updates implementations in a package, can be - used as a basis for a better packaging script. - - Tue Jun 30 15:22:44 UTC 2009 Jeff Parsons - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - - Changes to project names for consistency and to - dependencies for completeness. - - Mon Jun 29 23:11:25 UTC 2009 Jeff Parsons - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.idl: - * examples/BasicSP/EC/EC.idl: - * examples/BasicSP/BMDevice/BMDevice.idl: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice.mpc: - - Modified example to use the newly added TAO IDL - compiler feature of generating facet servant code - for each interface, rather than navigating to each - interface from a component's list of provides ports. - This option is necessary in this example, since - two components use the same interface as a facet, - and now the generated facet servant code can be - shared. - - Mon Jun 29 19:43:45 UTC 2009 William R. Otte - - * docs/OMG-CCM-Tutorial.ppt: - - OMG tutorial slides. - - Mon Jun 29 18:49:06 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/Model/Quoter.xme: - Updated to meet the work listed in the HTML files. - - Mon Jun 29 00:31:31 UTC 2009 William R. Otte - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - - Updates to remove lateral references to export files and CIDLC. - - Fri Jun 26 22:47:14 UTC 2009 Johnny Willemsen - - * docs/tutorials/Quoter/Simple/01.html: - Updated link to MPC chapter, it is available in the MPC directory - - * docs/tutorials/Quoter/Simple/03.html: - Updated CIAO chapter - - Fri Jun 26 14:15:14 UTC 2009 Marcel Smit - - * DAnCE/TargetManager/TargetManager.mpc: - Added Dance_logger library to Dance_TargetManager_exec project. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h: - Removed these files since they are create by the IDL compiler - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h: - Removed these files since they are create by the IDL compiler - - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h: - Removed these files since they are create by the IDL compiler - - Fri Jun 26 08:26:00 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/images/fig7.jpg: - * docs/tutorials/Quoter/Simple/03.html: - Added modelling of IOR files. - - Fri Jun 26 07:13:00 UTC 2009 Marcel Smit - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Resolved a minor copy paste error. - - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - Resolved some linker errors on windows. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - In trace message one shouldn't use the CLINFO or DLINFO define. - - * docs/tutorials/Quoter/Simple/03.html: - Described how to connect a component factory to a component. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - In the current tutorial we're deploying unhomed components. To do that, - the appropriate functions should be added. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h: - Used the latest version of the IDL compiler - - - Thu Jun 25 15:11:59 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc: - * tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc: - - Renamed first file as second file, to avoid problems on some - platforms when .mpc files have the same name. - - * tests/CIDL/CodeGen/CodeGen.mpc: - - Fixed IDL flags in Reused_Facet_Interface_idl_gen project. - - Wed Jun 24 15:51:23 UTC 2009 William R. Otte - - * DAnCE/TargetManager/descriptors: - - Removed this file. - - Wed Jun 24 15:50:36 UTC 2009 William R. Otte - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_Impl.h: - * DAnCE/TargetManager/TargetManager_Impl_export.h: - - Stab at fixing linking problems. - - Wed Jun 24 13:56:48 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/images/fig4.jpg: - * docs/tutorials/Quoter/Simple/images/fig5a.jpg: - Updated to meet the latest version of the DAnCE spec. - - Wed Jun 24 07:31:43 UTC 2009 Marcel Smit - - * DAnCE/TargetManager/TargetManager.mpc: - Resolved typo (RepositoryManager_IDL=>TargetManager_IDL). - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Added lib path (like Hello example). - - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - Should match the current DAnCE spec. - - Tue Jun 23 18:11:56 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment_TargetManager.idl: - - bring in line with spec. - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerDaemon.idl: - * DAnCE/TargetManager/TargetManager_Impl.h: - * DAnCE/TargetManager/TargetManager_Impl.cpp: - * DAnCE/TargetManager/Target_Manager_Exec.cpp: - * DAnCE/TargetManager/Target_Manager_Module.h: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module_export.h: - * MPC/config/dance_target_manager.mpb: - - Initial pass at porting the TargetManager. Work is by no means - complete or workable. TargetManager will no longer be deployed as a component. - - * DAnCE/TargetManager/descriptors/Domain.cdd: - * DAnCE/TargetManager/descriptors/NodeDetails.dat: - * DAnCE/TargetManager/descriptors/NodeManagerMap.dat: - * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp: - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl: - - Removed these files. - - Mon Jun 22 09:22:17 UTC 2009 Johnny Willemsen - - * bin/generate_component_mpc.pl: - Update for the fact that avoids_ace_for_tao and anytypecode moved to the - base projects - - * bin/msvc_cidlc.pl: - * bin/replace_dummy_with_dummylabel.sh - * docs/cidlc.html - Deleted, not needed - - * CIAO-INSTALL.html: - * docs/index.html - * docs/TODO.html - Partly updated for CIDLC removal - - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TM_Client.mpc - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNull.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc - * DAnCE/tests/CIAO/Components/SimpleUser.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/DevGuideExamples/Messenger/Administrator.mpc - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc - * examples/DevGuideExamples/Messenger/Messenger.mpc - * examples/DevGuideExamples/Messenger/Receiver.mpc - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/RateGen/RateGen.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Null_Component/Null_Component.mpc - * examples/Null_Component/Null_Interface.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * MPC/config/componentidldefaults.mpb - * performance-tests/Benchmark/Benchmark.mpc - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc - * performance-tests/Protocols/common/Protocols.mpc - * performance-tests/Protocols/Controller/Controller.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - * tests/CIDL/CodeGen/Basic.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL_Test/Cornucopia/Cornucopia.mpc - * tests/IDL_Test/Keywords/Keywords.mpc - * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc - * tests/Minimum/Minimum_Base/Minimum_Base.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Updated base projects - - * examples/Hello/Receiver/Receiver_exec_export.h - * examples/Hello/Receiver/Receiver_stub_export.h - * examples/Hello/Receiver/Receiver_svnt_export.h - * examples/Hello/Sender/Sender_exec_export.h - * examples/Hello/Sender/Sender_stub_export.h - * examples/Hello/Sender/Sender_svnt_export.h - Removed - - Fri Jun 19 19:40:21 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Cornucopia/Cornucopia.mpc: - * tests/IDL_Test/Keywords/Keywords.mpc: - * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc: - - Added IDL compiler options to generate all export - header files. - - * tests/IDL_Test/Reused_Facet_Interface/Basic_stub_export.h: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen_svnt_export.h: - * tests/IDL_Test/Reused_Facet_Interface/Basic_skel_export.h: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen_stub_export.h: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen_exec_export.h: - * tests/IDL_Test/Cornucopia/Cornucopia_svnt_export.h: - * tests/IDL_Test/Cornucopia/Cornucopia_stub_export.h: - * tests/IDL_Test/Cornucopia/Cornucopia_skel_export.h: - * tests/IDL_Test/Cornucopia/Cornucopia_exec_export.h: - * tests/IDL_Test/Keywords/Keyword_Clash_stub_export.h: - * tests/IDL_Test/Keywords/Keyword_Clash_exec_export.h: - * tests/IDL_Test/Keywords/Keyword_Clash_svnt_export.h: - - Removed export header files, they're now generated. - - Fri Jun 19 18:03:10 UTC 2009 Johnny Willemsen - - * performance-tests/Protocols/Receiver/Receiver_exec.cpp - * performance-tests/Protocols/Receiver/Receiver_exec.h - * performance-tests/Protocols/Sender/Sender_exec.cpp - * performance-tests/Protocols/Sender/Sender_exec.h - Fixed compile errors - - Fri Jun 19 17:58:03 UTC 2009 William R. Otte - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - - Basic RM functionality appears to be restored. HTTP not yet tested. - - * tools/XML/XML_Helper.tpp: - - Removed Xerces init logging. - - Fri Jun 19 12:19:38 UTC 2009 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/cdp.xsd: - * docs/schema/cid.xsd: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/Config_Handlers/toplevel.cpp: - - Fixed the wchar issue in bugzilla 3691. - - Fri Jun 19 07:47:10 UTC 2009 Johnny Willemsen - - * MPC/config/componentidldefaults.mpb: - Added -Glem - - Thu Jun 18 18:52:10 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc: - - Fixed dependency mistakes. - - * tests/IDL_Test/Keywords/*.*: - - New test, covering all CIAO-related code generation when - the IDL file contains C++ keywords and escaped IDL - keywords. - - Thu Jun 18 18:48:02 UTC 2009 Johnny Willemsen - - * performance-tests/Protocols/Sender/Sender_exec.h - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc - Compile fixes - - Thu Jun 18 16:51:02 UTC 2009 Johnny Willemsen - - * CIAO_TAO.mwc: - Added performance-tests directory, removed CCF - - Thu Jun 18 14:35:02 UTC 2009 Johnny Willemsen - - * MPC/config/cidlc.mpb: - Deleted - - * MPC/config/dance_plan_generator.mpb - * MPC/config/dance_plan_generator.mpc - Renamed mpc to mpb - - Thu Jun 18 14:25:45 UTC 2009 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/cdp.xsd: - * docs/schema/cid.xsd: - * docs/schema/toplevel.xsd: - - Changes from 06-04-02. Shouldn't break existing plans. - - * docs/schema/unused_06-04-02.xsd: - - Unused elements from 06-04-02. - - Thu Jun 18 14:24:10 UTC 2009 William R. Otte - - * CCF: - * CIDLC: - - Removed these files. - - Thu Jun 18 13:54:43 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/Model/Quoter.xme: - Used to latest version of COSMIC to create this Quoter.xme - - Thu Jun 18 13:37:02 UTC 2009 Johnny Willemsen - - * examples/BasicSP/BasicSP.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender_exec.h - Compile fixes - - Thu Jun 18 13:34:02 UTC 2009 Johnny Willemsen - - * examples/BasicSP/EC/EC_exec.h - * examples/Display/GPS/GPS_exec.h - * examples/Display/NavDisplay/NavDisplay_exec.h - * examples/Display/RateGen/RateGen_exec.h - * performance-tests/Protocols/Sender/Sender_exec.h - Compile fixes - - Thu Jun 18 13:17:02 UTC 2009 Johnny Willemsen - - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDisplay/BMDisplay_exec.h - * examples/Display/GPS/GPS_exec.h - * examples/Display/NavDisplay/NavDisplay_exec.h - * examples/Display/RateGen/RateGen_exec.h - * performance-tests/Protocols/Receiver/Receiver.mpc - Compile fixes - - Thu Jun 18 13:04:02 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/04.html: - Updated to meet the latest versions - of GME/COSMIC/CIAO/DANCE - - * docs/tutorials/Quoter/Simple/descriptors/NodeMap.dat: - NodeManager should be specific: i.e. Broker.NodeManager. - - Thu Jun 18 13:02:07 UTC 2009 Marcel Smit - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - * docs/tutorials/Quoter/Simple/04.html: - - * docs/tutorials/Quoter/Simple/descriptors/NodeMap.dat: - - Thu Jun 18 13:00:05 UTC 2009 Johnny Willemsen - - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/EC/EC_exec.h - * examples/Display/GPS/GPS_exec.h - * examples/Display/NavDisplay/NavDisplay_exec.h - * examples/Display/RateGen/RateGen_exec.h - * examples/Swapping/Receiver/Receiver.mpc - Compile fixes - - Thu Jun 18 10:24:43 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - * docs/tutorials/Quoter/Simple/images/fig10.jpg: - * docs/tutorials/Quoter/Simple/images/fig11.jpg: - * docs/tutorials/Quoter/Simple/images/fig12.jpg: - Updated to meet the latest versions - of GME/COSMIC/CIAO/DANCE - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - Stock_Base_StockBroker_idle_gen project should be build - after Stock_Base_StockBroker_idl_gen project. - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - Stock_Base_StockDistributor_idle_gen project should be build - after Stock_Base_StockDistributor_idl_gen project. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - Naming convention of namespace is different now since CIDL - compiler is removed. - - Thu Jun 18 06:48:05 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/03.html: - - Updated to meet the current status of CIAO/DAnCE. - - * docs/tutorials/Quoter/Simple/images/fig2.jpg: - * docs/tutorials/Quoter/Simple/images/fig3.jpg: - * docs/tutorials/Quoter/Simple/images/fig5.jpg: - * docs/tutorials/Quoter/Simple/images/fig6.jpg: - * docs/tutorials/Quoter/Simple/images/fig7.jpg: - * docs/tutorials/Quoter/Simple/images/fig8.jpg: - * docs/tutorials/Quoter/Simple/images/fig9.jpg: - - Updated to meet the current status of GME/COSMIC - - Thu Jun 18 02:52:44 UTC 2009 William R. Otte - - * docs/schema/06-04-02.xsd - - Schema from the standard. Note that this is non-normative, and the - fact that we deviate from it is fine. - - Wed Jun 17 19:37:54 UTC 2009 William R. Otte - - * DAnCE/Logger/Logger_Service.cpp: - - Removed the short options from the logger. - - Wed Jun 17 18:07:10 UTC 2009 William R. Otte - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.cidl: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.cidl: - * examples/BasicSP/BMClosedED/BMClosedED.cidl: - * examples/BasicSP/BMDevice/BMDevice.cidl: - * examples/BasicSP/BMDisplay/BMDisplay.cidl: - * examples/BasicSP/EC/EC.cidl: - * examples/DevGuideExamples/Messenger/Administrator.cidl: - * examples/DevGuideExamples/Messenger/Messenger.cidl: - * examples/DevGuideExamples/Messenger/Receiver.cidl: - * examples/Display/GPS/GPS.cidl: - * examples/Display/NavDisplay/NavDisplay.cidl: - * examples/Display/RateGen/RateGen.cidl: - * examples/Null_Component/Null_Component.cidl: - * examples/Swapping/Receiver/Receiver.cidl: - * examples/Swapping/Sender/Sender.cidl: - * performance-tests/Benchmark/RoundTrip/RoundTrip.cidl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.cidl: - * performance-tests/Protocols/Receiver/Receiver.cidl: - * performance-tests/Protocols/Sender/Sender.cidl: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.cidl: - * tests/CIDL/CodeGen/CodeGen.cidl: - * tests/Minimum/Receiver/Receiver.cidl: - * tests/Minimum/Sender/Sender.cidl: - - Removed these files. - - Wed Jun 17 18:04:28 UTC 2009 William R. Otte - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender_exec.cpp: - - Compile fixes. - - Wed Jun 17 10:07:19 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNull.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc - * DAnCE/tests/CIAO/Components/SimpleUser.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/DevGuideExamples/Messenger/Administrator.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/RateGen/RateGen.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Null_Component/Null_Component.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * MPC/config/ciao_servant.mpb - * MPC/config/ciaocidldefaults.mpb - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - * tests/CIDL/CodeGen/Basic.idl - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/IDL_Test/Cornucopia/Cornucopia.mpc - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - * tools/Config_Handlers/XML_File_Intf.cpp - Zap ciaocidldefaults from the MPC files. Everything has to be rebuild to - sort out the compile/link issues, but at least now cidlc is not used anymore - - Wed Jun 17 08:43:19 UTC 2009 Marcel Smit - - * CIAO_TAO.mwc: - * CIAO_TAO_DanCE.mwc: - Removed CIDL - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Repositorymanager uses ciaodefaults instead of ciaobasedefaults - - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - Changed because the CIDL compiler was removed. - Changed TargetManagerImpl into TargetManager. - - * docs/tutorials/Quoter/Simple/03.html: - Minor changes. - - * DAnCE/TargetManager/TargetManager.cidl: - * DAnCE/TargetManager/TargetManagerImpl.idl: - Removed these files because the cidl compiler is not in use - anymore. - - Wed Jun 17 02:15:33 UTC 2009 William R. Otte - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - - Fleshed out the implementation of dance_rm_admin. - - Tue Jun 16 20:37:23 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Reused_Facet_Interface/*.*: - - New test, with a variety of IDL3 constructs but mostly - focused on an interface that is used in two separate - facets. The test will ensure that the facet servant - class and the facet executor IDL interface are - generated only once. - - Tue Jun 16 20:28:43 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation.cdp: - - added planlocality elements. - - * ciao/Containers/Session/Session_Container.cpp: - - Add newline to a log message. - - * tools/Config_Handlers/DP_Handler.cpp: - - Fix problem with parsing plan locality. - - Tue Jun 16 19:20:32 UTC 2009 William R. Otte - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * DAnCE/RepositoryManager: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/RepositoryManager/repository_manager_admin.h: - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - - Merge in from my RepositoryManager sprint branch. - - * DAnCE/RepositoryManager/Options.h: - * DAnCE/RepositoryManager/Options.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - - Removed these files. - - Tue Jun 16 19:11:49 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Fix for a segmentation fault with unhomed components. - - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation.cdp: - - Simple test to determine if PlanLocality constraints work or not. Note - that as this support has yet to be implemented, this test is currently designed - to fail. - - Tue Jun 16 18:46:22 UTC 2009 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/Administrator.mpc - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp - * examples/DevGuideExamples/Messenger/Administrator_exec_i.h - * examples/DevGuideExamples/Messenger/History_exec_i.cpp - * examples/DevGuideExamples/Messenger/History_exec_i.h - * examples/DevGuideExamples/Messenger/Messenger.mpc - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp - * examples/DevGuideExamples/Messenger/Publication_exec_i.h - * examples/DevGuideExamples/Messenger/Receiver.mpc - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h - * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp - * examples/DevGuideExamples/Messenger/Runnable_exec_i.h - * examples/Hello/Receiver/Receiver.mpc - Zap usage of cidlc - - Tue Jun 16 18:30:46 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Cornucopia/*.*: - - New subdirectory (IDL_Test) for tests of the IDL - compiler's recently added code generation of CIAO - servants, executor IDL and executor implementation - stencil classes. Also new test (Cornupcopia), which - includes IDL3 constructs, scoping relationships, - and build configurations not covered in other CIAO - tests or examples. - - Tue Jun 16 18:19:31 UTC 2009 William R. Otte - - * tools/Config_Handlers/PL_Handler.cpp: - - Addedmissing file. - - Tue Jun 16 17:59:43 UTC 2009 William R. Otte - - * ciao/Containers/Session/Session_Container.cpp: - - Removed misc debug statements. - - Tue Jun 16 17:49:18 UTC 2009 William R. Otte - - * MPC/config/ciaoidldefaults.mpb: - * MPC/config/componentidldefaults.mpb: - - Massaged the base projects a bit more. - - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc: - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - * bin/generate_component_mpc.pl: - - Updated to reflect the base project changes. - - Tue Jun 16 14:28:55 UTC 2009 William R. Otte - - * MPC/config/ciaoidldefaults.mpb: - - Added -Gsv. Thanks to MArcel for pointing out the omission. - - Tue Jun 16 13:34:22 UTC 2009 Johnny Willemsen - - * examples/Null_Component/Null_Component.mpc - * examples/Null_Component/Null_Component_exec.cpp - * examples/Null_Component/Null_Component_exec.h - Zapp cidlc - - Tue Jun 16 13:26:22 UTC 2009 William R. Otte - - * tools/Config_Handlers/PL_Handler.h: - - Missing from a prior commit. - - Tue Jun 16 12:55:09 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - - Reverting a mistaken commit. - - * DAnCE/tests/CIAO/Components/SimpleAttribute.cidl: - * DAnCE/tests/CIAO/Components/SimpleConsumer.cidl: - * DAnCE/tests/CIAO/Components/SimpleEmitter.cidl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleNull.cidl: - * DAnCE/tests/CIAO/Components/SimpleProvider.cidl: - * DAnCE/tests/CIAO/Components/SimplePublisher.cidl: - * DAnCE/tests/CIAO/Components/SimpleUser.cidl: - * examples/Hello/Sender/Sender.cidl - * examples/Hello/Receiver/Receiver.cidl - - Removed these files, no longer needed. - - Tue Jun 16 12:50:52 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/ProcessColocation.idl: - * DAnCE/tests/CIAO/Components/ProcessColocation.mpc: - * DAnCE/tests/CIAO/Components/ProcessColocation_exec_export.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_stub_export.h: - * DAnCE/tests/CIAO/Components/ProcessColocation_svnt_export.h: - - New component to test process colocation capabilities of CIAO/DAnCE. - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - - Re-added business logic accidentally removed. - - Tue Jun 16 12:45:52 UTC 2009 William R. Otte - - * MPC/config/ciaoidldefaults.mpb: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - - MPC base project for new tao_idl based container generation. - - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cpd.cpp: - - Updated XSC code for updated schema. - - Tue Jun 16 09:18:07 UTC 2009 Johnny Willemsen - - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Receiver/Receiver_exec.cpp - * examples/Hello/Receiver/Receiver_exec.h - * examples/Hello/Sender/Sender.mpc - * examples/Hello/Sender/Sender_exec.cpp - * examples/Hello/Sender/Sender_exec.h - Ported to IDL compiler - - * examples/Hello/descriptors/run_test.pl - Reduced timeouts - - Mon Jun 15 19:20:07 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - - Removed -Gex. Thanks to Jeff both for the initial porting work - and for pointing out the lingering -Gex. - - Mon Jun 15 14:52:10 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - - Checked in ported exec code from a misapplied patch. - - Mon Jun 15 14:41:02 UTC 2009 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd: - - Correction to schema. - - Mon Jun 15 14:37:09 UTC 2009 William R. Otte - - * examples/Hello/descriptors/run_test_without_ns.pl: - - Removed --instance-nc command line options. - - Mon Jun 15 14:05:45 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - - Ported to use IDL compiler instead of CIDL compiler. - - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/run_test_without_ns.pl: - - Ported to new DAnCE. - - * bin/ciao_tests.lst - - Added run_test_without_ns. - - Sat Jun 13 01:35:43 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - - Fixed a memory management error. Thanks to Jeff for pointing it out. - - Wed Jun 10 17:53:10 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/Deployment/Deployment_Packaging_Data.idl: - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/cid.xsd: - * docs/schema/cpd.xsd: - - Updated to match new structures defined by the DDS4CCM spec. - New generated XSC code/config handler implementation is forthcoming. - - Wed Jun 10 14:01:33 UTC 2009 Marcel Smit - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - Normalized "usage" texts. - - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - DomainDataManager is now an ACE_Singleton class. - Removed function like create-, get- and destroy - data manager. - - * examples/Hello/step-by-step.html: - Used "DANCE_ROOT" in stead of CIAO_ROOT/DAnCE" and - changed the domain-nc value. - - Mon Jun 8 15:27:56 UTC 2009 Marcel Smit - - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp: - Changed to meet the current XML schema's. - - * examples/Hello/step-by-step.html: - Changes regarding the use of the naming server. - - Mon Jun 8 09:58:27 UTC 2009 Marcel Smit - - * DAnCE/Logger/File_Logger_Backend.cpp: - Fixed Bugzilla #3692 - Incorrect behaviour of DANCE_LOG_FILE - variable when used globally. - Open DAnCE logfile with a+ in stead off w. - - Mon Jun 8 09:43:49 UTC 2009 Marcel Smit - - * DAnCE/Logger/File_Logger_Backend.cpp: - Added new line after log messages. - - * examples/Hello/step-by-step.html: - Made changes regarding the use of the naming server. - - Mon Jun 8 09:12:13 UTC 2009 Marcel Smit - - * examples/Hello/Receiver/Receiver.cidl: - Changed #ifndef SENDER_CIDL to #ifndef RECEIVER_CIDL. - - * examples/Hello/Sender/Sender.idl: - Changed CIAO_SENDER_IDL into SENDER_IDL (same format as - RECEIVER.IDL). - - * examples/Hello/descriptors/run_NodeDaemons.pl: - Making use of DANCE_ROOT environment variable. Using the - same command line parameters as in run_test.pl. - - * examples/Hello/step-by-step.html: - Adapted to the current status. - - Fri Jun 5 19:48:15 UTC 2009 William R. Otte - - * DAnCE/Logger/Logger_Service.cpp: - - Now swallows any command line arguments it finds. - - Tue Jun 2 03:43:30 UTC 2009 Marcel Smit - - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - - Added \n to debug statements. - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - - In a DANCE_DEBUG statement, an %C was declared without an input variable. - This results in an exception. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.h - - Changed code outlining. - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - - When logging the command line parameters in a logfile, every line is prefixed - with a timestamp, hostid, ...... This results in a log line which is hard to read. - The command line parameters are now logged using several lines. - - * examples/Hello/descriptors/run_test.pl - - Added logging regarding processes and commandline parameters - - -Tue Jul 14 02:45:22 UTC 2009 Phil Mesnier - - * NEWS: - updated new release. - -Mon Jul 13 12:32:13 CDT 2009 Phil Mesnier - - * CIAO version 0.7.1 released. - -Tue Jun 23 15:08:50 UTC 2009 Phil Mesnier - - * NEWS: - Added space for 0.7 -> 0.7.1 changes. - -Mon Jun 22 09:33:40 CDT 2009 Phil Mesnier - - * CIAO version 0.7 released. - -Thu Jun 18 23:03:06 UTC 2009 Phil Mesnier - - * tools/Config_Handlers/IRDD_Handler.h: - * tools/XML/XML_Schema_Resolver.cpp: - - There is a curious order-of-inclusion problem on macosx-leopoard - builds whereby including a non-ACE header before something that - includes ace/config.h causes a compiler error in - OS_NS_stdlib.inl. It seems that on that platform, the signature - of ::unsetenv() varies. I think this should be looked into in - greater depth after releasing x.7.0. - -Tue Jun 16 00:55:21 UTC 2009 William R. Otte - - * MPC/config/dance_plan_generator.mpc: - * MPC/config/dance_plan_launcher_base.mpc: - - Linking fixes for RACE. - -Mon Jun 15 02:22:01 UTC 2009 William R. Otte - - * CIAO-INSTALL.html: - * NEWS: - Minor updates. - -Sun Jun 14 06:58:05 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Updated for CB2009 Update 3 - -Thu Jun 11 19:32:56 UTC 2009 Steven Stallion - - * PROBLEM-REPORT-FORM: - - Added additional PRF question about build method (commit performed - on behalf of Chris Cleeland). - -Mon Jun 8 09:45:05 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Server_init.cpp - * ciao/Server_init.h - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.h - * DAnCE/Logger/Log_Macros.h - * DAnCE/Logger/Logger_Service.cpp - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp - * DAnCE/NodeApplication/Name_Utilities.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/RedirectionService/NameServiceRedirection.cpp - * DAnCE/RedirectionService/RedirectionService.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/URL_Parser.cpp - * DAnCE/RepositoryManager/URL_Parser.h - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/Starter/Starter.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - Unicode changes - -Sun Jun 7 17:58:05 2009 Johnny Willemsen - - * ciao/Server_init.cpp - * DAnCE/NodeApplication/Name_Utilities.cpp - Added include of Tokenizer_T.h - -Fri Jun 5 18:17:06 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer.h - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Server_init.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * tools/XML/XML_Schema_Resolver.h - Unicode fixes - -Thu Jun 4 19:12:06 UTC 2009 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp - Unicode fixes - -Thu Jun 4 14:06:06 UTC 2009 William R. Otte - - * NEWS: - - News updates for next release. - -Mon Jun 1 20:29:12 UTC 2009 William R. Otte - - * CIDLC/cidlc.cpp: - * MPC/config/ciaocidldefaults.mpb: - - Added two options: --suppress-lem and --suppress-svnt, which will - suppress generation of the local executor mapping and servant code, - respectively. - -Fri May 29 00:48:01 UTC 2009 William R. Otte - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Some tweaks to the generated _svnt files to properly compile with - the changes introduced in the previous commit . - -Thu May 28 19:07:27 UTC 2009 Jeff Parsons - - * CIDLC/ExecutorMappingGenerator.cpp: - - More tweaks to the application of the command line option - added in - - Thu May 28 14:01:45 UTC 2009 Jeff Parsons - -Thu May 28 18:52:27 UTC 2009 Jeff Parsons - - * CIDLC/ExecutorMappingGenerator.cpp: - - Applied check for the command line option added in - - Thu May 28 14:01:45 UTC 2009 Jeff Parsons - - in several places needed for correct generation of - the executor IDL file. - -Thu May 28 14:01:45 UTC 2009 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed cut/paste error in comment. - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - - Added command line option to generate an IDL module that - encloses the entire executor IDL file, and - corresponding 'using namespace' declarations in the - servant and executor impl header files. This change is - a temporary fix for build errors occurring when facet - executor IDL generation is duplicated across IDL files - for components which have an inheritance relationship - but are located in separate translation units. Thanks - to Will Otte for reporting - the problem and suggesting the fix. - -Wed May 27 23:58:23 UTC 2009 William R. Otte - - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * MPC/config/ciao_plan_generator.mpb: - - Updates for RACE. - -Fri May 22 12:58:33 UTC 2009 William R. Otte - - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/XMI.cpp: - - Warning fixes. - -Thu May 21 01:13:28 UTC 2009 Phil Mesnier - - * tools/Config_Handlers/ERE_Handler.h: - - fix fuzz. - -Wed May 20 01:41:39 UTC 2009 William R. Otte - - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerExt.idl: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/ERE_Handler.h: - * tools/Config_Handlers/Utils/Functors.h: - * tools/Config_Handlers/XMLSchema/Types.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/Literals.h: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XercesString.h: - - Updates for borland. - -Thu May 14 19:12:56 UTC 2009 Abdullah Sowayan - - * MPC/config/cidlc.mpb: - - Replaced: specific(nmake, vc71, vc8, vc9, vc10) - With: specific(prop:microsoft) - -Tue May 12 19:04:31 UTC 2009 William R. Otte - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Compile fix. - -Fri May 8 16:30:19 UTC 2009 William R. Otte - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/CCD_Handler.cpp: - * tools/Config_Handlers/CEPE_Handler.cpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/CRDD_Handler.cpp: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/Deployment.hpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: - * tools/Config_Handlers/ERE_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/PSPE_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp: - * tools/Config_Handlers/RDD_Handler.cpp: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/Utils/Functors.h: - * tools/Config_Handlers/XMI.hpp: - * tools/Config_Handlers/XMLSchema/Types.hpp: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/Config_Handlers/toplevel.cpp: - - New version of XSC generated code, and necessary porting in the handlers - as a potential fix for BCB2009 compilation issues. - -Mon May 4 15:52:14 UTC 2009 Phil Mesnier - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - - Fuzz fix. - -Wed Apr 29 02:27:23 UTC 2009 William R. Otte - - * MPC/config/xscdefaults.mpb: - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/cid.xsd: - * docs/schema/pcd.xsd: - * docs/schema/toplevel.xsd: - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/Deployment.hpp: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XMI.hpp: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/Config_Handlers/toplevel.cpp: - - Updates to work with SVN Head version of XSC. - -Fri Apr 24 09:18:44 UTC 2009 Vladimir Zykov - - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - - Extended a bit error reporting so that errors are not - missed in the final log. - -Thu Apr 23 11:07:37 UTC 2009 Johnny Willemsen - - * DAnCE/TargetManager/CmpClient.cpp - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp - Removed not needed unicode to ascii conversions - -Thu Apr 23 08:06:25 UTC 2009 Vladimir Zykov - - * bin/ciao_tests.lst: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp: - * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h: - * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - - Added and enabled a test for bug#3616. It's marked as - unfixed since currently there is a problem with XML - generation for anonymous types. - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Fixed a compilation error for bug#3607. - -Wed Apr 22 14:56:08 UTC 2009 Vladimir Zykov - - * tests/IDL3_to_XMI/XMI_For_Array/test.idl: - * tests/IDL3_to_XMI/XMI_For_Array/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Included_File/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/test.idl: - * tests/IDL3_to_XMI/XMI_For_Sequence/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - * tests/IDL3_to_XMI/Bug_3607_Regression/test.idl: - * tests/IDL3_to_XMI/Bug_3607_Regression/XMI.dtd: - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - - Extended and updated the tests. Now they share XMI.dtd which - is the same for all of them. - -Wed Apr 22 14:34:02 UTC 2009 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/be_global.cpp: - * tools/IDL3_to_XMI/Literals.cpp: - * tools/IDL3_to_XMI/Literals.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Fixed bug#3607. This also fixes a number of other things. In - particular XML generation for module reopening and forward - declared types. Proper xmi.id generation in a number of places. - XML generation for native types. Proper generation of associations - for arrays and sequences. Fixed several typos and beautified the - code. - -Tue Apr 21 06:50:32 UTC 2009 Johnny Willemsen - - * docs/fm/*: - Added FrameMaker 8 files for the CIAO pdf file. When making changes - make sure track changes is enabled. - - This documentation is based on original work contributed by - Object Computing, Inc. (OCI), St. Louis, MO, USA, - http://www.ociweb.com. - -Thu Apr 16 16:13:22 UTC 2009 Phil Mesnier - - * NEWS: - - Added new section anticipating version 0.7. - -Tue Apr 14 10:06:19 CDT 2009 Phil Mesnier - - * CIAO version 0.6.9 released. - -Tue Apr 14 13:57:16 UTC 2009 Phil Mesnier - - * NEWS: - - Reworded entries to be consistent with release note. - -Mon Apr 13 15:03:24 UTC 2009 Phil Mesnier - - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - - Scoreboard clean-up to avoid minimum corba builds for this test. - -Sun Apr 12 18:55:13 UTC 2009 Phil Mesnier - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/EC/EC.mpc: - - Scoreboard clean-up ACE_FOR_TAO does not build CIDLC which is - required for these examples. - -Sun Apr 12 01:58:41 UTC 2009 William R. Otte - - * MPC/config/dance_repository_manager.mpb: - - Linking error on static builds. - -Fri Apr 10 17:36:19 UTC 2009 Phil Mesnier - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - - Add dependency on IORTable so that the ExecutionMangaer_Module - builds on clean environments. - -Fri Apr 10 03:10:46 UTC 2009 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - - ace_for_tao fixes. - -Thu Apr 9 20:54:33 UTC 2009 William R. Otte - - * MPC/config/ciao_client.mpb: - - static linking error. - -Thu Apr 9 20:44:31 UTC 2009 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/RedirectionService/RedirectionService.mpc: - - avoids minimum corba. - -Thu Apr 9 14:57:50 UTC 2009 Abdullah Sowayan - - * docs/CIAO.pdf: - - Updated the CIAO chapter of the Dev Guide. - -Thu Apr 9 13:20:22 UTC 2009 Johnny Willemsen - - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp - * examples/Hello/Sender/starter.cpp - * performance-tests/Protocols/Controller/Controller.cpp - Unicode changes - -Wed Apr 8 23:11:22 UTC 2009 William R. Otte - - * examples/Hello/descriptors/DeploymentPlan.cdp: - - Removed some unicode characters that may be causing problems - on some platforms. - -Wed Apr 8 18:14:30 UTC 2009 William R. Otte - - * ciao/Containers/Servant_Activator.cpp: - - I'm not sure the absent port activator is an error, changing it to - a warning. I'll investigate later. - -Wed Apr 8 05:09:48 UTC 2009 James H. Hill - - * docs/Porting_Hints.txt: - - Reformatted the document so that the text wraps around the - 80th column. - -Tue Apr 7 14:40:41 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Fuzz error. - -Tue Apr 7 14:37:18 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - - Compile error. - -Mon Apr 6 18:18:58 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/Name_Utilities.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Stab at a fix for a memory corruption during deployment. - -Mon Apr 6 13:26:08 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - - Fixed compile error. - -Sun Apr 5 20:34:22 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - - Changed parent from ciao_logger to dance_logger. - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - - Properly check if _var is nil. - -Sat Apr 4 15:30:13 UTC 2009 Phil Mesnier - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - Fix fuzz errors. - -Sat Apr 4 03:39:28 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - - Fixed a couple memory management issues. - -Mon Mar 23 12:51:22 UTC 2009 Johnny Willemsen - - * ciao/Logger/File_Logger_Backend.h - * ciao/Logger/Logger_Service.cpp - * ciao/Logger/Logger_Service.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp - * tests/CIAO_ComponentServer/Basic/client.cpp - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp - Fixed unicode compile problems - -Fri Mar 20 19:00:22 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/tests/NameServiceTest/srv_main.cpp - * performance-tests/Benchmark/RoundTrip/client.cpp - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp - * performance-tests/Protocols/Controller/Controller.cpp - * performance-tests/Protocols/Receiver/Receiver_exec.cpp - * performance-tests/Protocols/Sender/Sender_exec.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - * tests/CIAO_ComponentServer/Basic/client.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - Fixed unicode compile problems - -Fri Mar 20 15:54:22 UTC 2009 Johnny Willemsen - - * DAnCE/RedirectionService/CCMObjectLocator.h: - Added missing export macro to resolve link problems - with CB2009 - - * DAnCE/tests/ObjectLocatorTest/DummyImpl.cpp: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.h: - Layout changes - -Mon Mar 16 20:11:22 UTC 2009 Johnny Willemsen - - * DAnCE/RedirectionService/CCMObjectLocator.h: - Made destructor virtual - - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.h: - Layout changes - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - Added naming - -Sun Mar 15 19:28:54 UTC 2009 Johnny Willemsen - - * MPC/config/ciao_executor.mpb: - Added ciao_container_base as base project, the generated svnt.h - files includes the EC.h file which includes the Container_BaseC.h - file. - -Fri Mar 13 08:00:54 UTC 2009 Johnny Willemsen - - * DAnCE/Starter/Starter.mpc: - Don't build with minimum corba - -Wed Mar 11 18:54:54 UTC 2009 Johnny Willemsen - - * MPC/config/ciaoidldefaults.mpb: - Added build_files as base project, that way also the mpc/mwc - files are added to the generated solution. This way we see - in the ms ide also for custom cidl projects the mpc files. - Thanks to Adam Mitz for suggesting this solution - -Wed Mar 11 12:40:08 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Updated workaround for cb2009 - -Tue Mar 10 13:03:08 UTC 2009 Johnny Willemsen - - * examples/Display/NavDisplayGUI_exec/RootPanel.cpp: - Fixed compile warning - -Tue Mar 10 11:39:08 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * CIDLC/ServantSourceGenerator.cpp: - Moved static methods to CIAO::Servant namespace to fix - linker problems with the CB2009 compiler. - -Tue Mar 10 11:01:08 UTC 2009 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager.mpc: - Added missing base project - -Mon Mar 9 13:39:08 UTC 2009 Johnny Willemsen - - * etc/*: - Added all CIAO doxygen files - -Mon Mar 8 12:50:15 UTC 2009 Johnny Willemsen - - * ciao/Containers/CIAO_Servant_Activator.mpc: - * MPC/config/ciao_servant_activator.mpb: - Disabled with minimum corba - -Mon Mar 8 12:42:15 UTC 2009 Johnny Willemsen - - * bin/generate_component_mpc.pl - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNull.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc - * DAnCE/tests/CIAO/Components/SimpleUser.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/DevGuideExamples/Messenger/Administrator.mpc - * examples/DevGuideExamples/Messenger/Messenger.mpc - * examples/DevGuideExamples/Messenger/Receiver.mpc - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/RateGen/RateGen.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Null_Component/Null_Component.mpc - * examples/Null_Component/Null_Interface.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * MPC/config/ciao_cs_client.mpb - * performance-tests/Benchmark/Benchmark.mpc - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/common/Protocols.mpc - * performance-tests/Protocols/Controller/Controller.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - * tests/CIDL/CodeGen/Basic.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/Minimum/Minimum_Base/Minimum_Base.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - Use avoids_ace_for_tao as base project - -Mon Mar 8 10:38:15 UTC 2009 Johnny Willemsen - - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - Use the ACE format specifiers, migrated this from the tao_idl - compiler be_sunsoft.cpp to these files - -Mon Mar 8 09:44:15 UTC 2009 Johnny Willemsen - - * tests/IDL3_to_XMI/Bug_3607_Regression/*: - new test for 3607 - - * bin/ciao_tests.lst: - Added new test and enabled other idl3_to_xmi tests for fuzz - -Mon Mar 8 09:12:15 UTC 2009 Johnny Willemsen - - * bin/generate_component_mpc.pl: - Generate a seperate project for compiling the E.idl file, makes - it easier for parallel builds and incredibuild - - * examples/Hello/Receiver/Receiver.mpc: - Updated to use a seperate project for the E.idl file - - * MPC/config/cidlc.mpb: - Added support for vc10 - - * tools/Config_Handlers/XSCRT/Traversal.hpp: - Removed commented out code - -Mon Mar 8 08:31:15 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * MPC/config/ciao_cs_client.mpb: - ciao_cs_client_svnt needs threads - -Mon Mar 8 08:29:15 UTC 2009 Johnny Willemsen - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Put the executables in CIAO_ROOT/bin, not ACE_ROOT/bin - - * MPC/config/taoidl3toidl2defaults.mpb: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - updated because these executables are now put in CIAO_ROOT/bin - -Mon Mar 8 08:19:15 UTC 2009 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/Messenger.mpc: - Removed not needed line - - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: - Updated include - -Sat Mar 7 15:40:15 UTC 2009 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp - * DAnCE/Starter/Starter.cpp - * DAnCE/Starter/Starter.h - * DAnCE/tests/NameServiceTest/srv_main.cpp - * examples/BasicSP/EC/controller.cpp - Unicode fixes - -Fri Mar 6 20:17:32 UTC 2009 Abdullah Sowayan - - * docs/CIAO.pdf: - - This work is based on the TAO 1.4a TAO Developers Guide chapter - on CIAO published by OCI, with some modification to bring the material - up to date. This is a continuing, the goal is to improve this - document with time to serve as the authoritative reference/documentation - for CIAO users. - - Thanks to OCI for making this chapter publicly available and allowing - us to modify it. - - -Fri Mar 6 18:54:15 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - Use ciao_logger as base project - - * examples/DevGuideExamples/Messenger/Messenger.mpc: - Layout changes - -Fri Mar 6 14:26:15 UTC 2009 Johnny Willemsen - - * DAnCE/TargetManager/DomainDataManager.cpp: - Resolve compile warnings - - * MPC/config/ciao_nodemanager_stub.mpb: - Use base project - -Fri Mar 6 12:01:15 UTC 2009 Johnny Willemsen - - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - layout changes - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - Moved moc files to their own project to resolve build problems - build incredibuild - -Fri Mar 6 08:27:15 UTC 2009 Marcel Smit - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * examples/Display/README.html: - Addapted to the new naming convention of - the dance executables. - -Thu Mar 5 18:22:15 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc: - Removed commented out line - - * DAnCE/TargetManager/CmpClient.cpp: - Datatype fix - - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - Updated to new CIAO - - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - Made compiling again, no testing has been done yet - - * DAnCE/TargetManager/TargetManagerExt.idl: - Doxygen change - - * tools/Config_Handlers/Config_Handlers.mpc: - No need to set dynamic flags - -Tue Mar 3 07:56:15 UTC 2009 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/History_exec_i.cpp - * examples/DevGuideExamples/Messenger/History_exec_i.h - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp - * examples/DevGuideExamples/Messenger/Publication_exec_i.h - * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp - * examples/DevGuideExamples/Messenger/Runnable_exec_i.h - Fixed fuzz error - - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl - Fixed typo - -Mon Mar 2 09:48:15 UTC 2009 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * MPC/config/dance_repository_manager.mpb: - RepositoryManager requires zlib - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - Generate void as empty argument name to generate code that - follows the ACE coding conventions - - * tools/Config_Handlers/DnC_Dump.h: - Layout change - -Mon Mar 2 10:05:15 UTC 2009 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl - * examples/DevGuideExamples/Messenger/History_exec_i.cpp - * examples/DevGuideExamples/Messenger/History_exec_i.h - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp - * examples/DevGuideExamples/Messenger/Publication_exec_i.h - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h - * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp - * examples/DevGuideExamples/Messenger/Runnable_exec_i.h - Minor improvements and simplification of this code - -Fri Feb 27 12:51:15 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Fixed compile error - -Thu Feb 26 20:42:57 UTC 2009 Phil Mesnier - - * DAnCE/Logger/Logger_Service.cpp: - - Fix for TCHAR ambiguity. - -Tue Feb 24 16:00:32 UTC 2009 William R. Otte - - * examples/Hello/descriptors/NodeManagerMap.dat: - - Added some random newlines to make sure the EM doesn't crash - while parsing the NM file. - -Tue Feb 24 15:57:43 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - - Added the ComponentInstallation and implementation to the CIAO - componentserver framework. - -Tue Feb 24 12:32:15 UTC 2009 Johnny Willemsen - - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/Starter/Starter.cpp: - Unicode fixes - -Tue Feb 24 10:47:54 UTC 2009 Marcel Smit - - * CIAO_DAnCE.mwc: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Resolved linker errors. - -Mon Feb 23 16:06:15 UTC 2009 Johnny Willemsen - - * examples/Display/NavDisplayGUI_exec/Command.h - * examples/Display/NavDisplayGUI_exec/DetailView.cpp - * examples/Display/NavDisplayGUI_exec/DetailView.h - * examples/Display/NavDisplayGUI_exec/MapView.cpp - * examples/Display/NavDisplayGUI_exec/MapView.h - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp - * examples/Display/NavDisplayGUI_exec/NodeItem.cpp - * examples/Display/NavDisplayGUI_exec/NodeItem.h - * examples/Display/NavDisplayGUI_exec/RootPanel.cpp - * examples/Display/NavDisplayGUI_exec/RootPanel.h - * examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp - * examples/Display/NavDisplayGUI_exec/Worker.cpp - Converting this project to Qt4, compiles now - - * ciao/Servants/Swapping/Dynamic_Component_Servant_T.cpp: - Removed commented out code - -Mon Feb 23 16:03:15 UTC 2009 Johnny Willemsen - - * config/qt4_qt3support.mpb: - Added base project for qt4_qt3support - -Mon Feb 23 15:02:15 UTC 2009 Johnny Willemsen - - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/lib - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc - * examples/Display/RateGen/RateGen.mpc - Put all libs in a new lib directory - -Mon Feb 23 14:42:15 UTC 2009 Johnny Willemsen - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - Made this test compile again - -Mon Feb 23 13:58:15 UTC 2009 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/TargetManager/TargetManager_exec.h - Removed ciao_preactivate/ciao_postactivate - -Mon Feb 23 13:25:15 UTC 2009 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Use seperate idl project and removed dummy label, it compiles, testing - has still to be done - -Mon Feb 23 11:30:15 UTC 2009 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.cpp: - Const change - - * DAnCE/TargetManager/CmpClient.cpp: - Fixed compile error - - * DAnCE/TargetManager/DomainDataManager.cpp: - Fixed some errors and commented out some code blocks that - have to be reworked - - * DAnCE/TargetManager/DomainDataManager.h: - Updated to the new ciao, partly disabled - - * DAnCE/TargetManager/DomainEvents.idl: - Updated include - - * DAnCE/TargetManager/ResourceCommitmentManager.cpp: - Const change - - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - Fixed compile errors - - * DAnCE/TargetManager/TargetManagerExt.idl: - Fixed type - - * DAnCE/TargetManager/TargetManagerImpl.idl: - Fixed include - - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc: - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc - Don't use ciao_output for a test - - * MPC/config/dance_domain_application_manager.mpb: - Add naming as base - -Mon Feb 23 09:52:15 UTC 2009 Johnny Willemsen - - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/descriptors/run_test.pl - * examples/BasicSP/EC/EC.mpc - * examples/BasicSP/lib: - Put all libs in the new lib directory - -Mon Feb 23 09:29:15 UTC 2009 Johnny Willemsen - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - Updated because of the fact that libs are not put in ACE_ROOT/lib - anymore - -Mon Feb 23 09:22:15 UTC 2009 Johnny Willemsen - - * examples/Null_Component/descriptors/run_test.pl: - Added libpath - -Mon Feb 23 08:19:15 UTC 2009 Johnny Willemsen - - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - Fixed build order - -Sun Feb 22 16:34:18 UTC 2009 Marcel Smit - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - Resolved a few typos. - - * examples/Hello/descriptors/run_NodeDaemons.pl - * examples/Hello/step-by-step.html - Adapted to match with the current status. - -Sun Feb 22 07:27:18 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp - * ciao/Containers/Container_Base.cpp - * ciao/Containers/Servant_Activator.cpp - * ciao/Containers/Servant_Activator.h - * ciao/Containers/Session/Session_Container.cpp - * ciao/Contexts/Context_Impl_T.cpp - * ciao/Server_init.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/RepositoryManager/Options.cpp - * DAnCE/RepositoryManager/RMadmin.cpp - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp - * examples/BasicSP/BMDevice/BMDevice_exec.cpp - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp - * examples/BasicSP/EC/client.cpp - * examples/BasicSP/EC/controller.cpp - * examples/Display/RateGen/controller.cpp - * examples/Hello/Sender/Sender_exec.cpp - * examples/Hello/Sender/starter.cpp - * examples/Swapping/Receiver/Receiver_exec.cpp - * examples/Swapping/Sender/Sender_exec.cpp - * examples/Swapping/Sender/Sender_exec_1.cpp - * examples/Swapping/Sender/Sender_exec_2.cpp - * examples/Swapping/Sender/starter.cpp - * performance-tests/Benchmark/Multi_Threaded/client.cpp - * performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/DnC_Dump_T.cpp - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.cpp - * tools/IDL3_to_XMI/be_helper.cpp - Updated debug statements - -Sun Feb 22 07:15:18 UTC 2009 Johnny Willemsen - - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_without_ns.pl - * examples/Hello/descriptors_RTCCM/rt_run_test.pl - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/lib - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - Put all libs in a project specific lib directory and then add - this directory to the libpath in the perl scripts. - -Sat Feb 21 20:06:18 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * examples/Display/GPS/GPS_exec.cpp - * examples/Hello/Sender/Sender_exec.cpp - * examples/Swapping/Sender/Sender_exec.cpp - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp - Updated debug statements - - * examples/Hello/descriptors/DeploymentPlan.cdp - Reverted accident checkin - -Sat Feb 21 19:53:18 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Small improvements to debug statements and nil usage - - * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl - * examples/BasicSP/descriptors/run_test.pl - * examples/Display/descriptors/basicNodeDaemon.pl - * examples/Display/descriptors/run_NodeDaemons.pl - * examples/Display/descriptors/run_test_without_ns.pl - * examples/Hello/descriptors/DeploymentPlan.cdp - * examples/Hello/descriptors/run_NodeDaemons.pl - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_without_ns.pl - * examples/Hello/descriptors_RTCCM/rt_run_test.pl - * examples/Null_Component/descriptors/run_test.pl - * tests/Bug_2130_Regression/descriptors/run_test.pl - Use DANCE_ROOT and dance_node_manager - -Fri Feb 20 14:49:18 UTC 2009 Johnny Willemsen - - * ccm/CCM.mpc - * ccm/ComponentServer/CCM_ComponentServer.mpc - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * ciao/Contexts/Context.mpc - * ciao/Servants/Servants.mpc - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/RedirectionService/RedirectionService.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * MPC/config/ccm_stub.mpb - * MPC/config/ciao_client.mpb - * MPC/config/ciao_output.mpb - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc - * performance-tests/Protocols/common/Protocols.mpc - * performance-tests/Protocols/Controller/Controller.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc - Added a ciao_output which is used by the core CIAO/DAnCE libraries and - then only these are installed under ACE_ROOT/lib, all examples/tests - just put their libs in the current directory. That fixes the clash - of creating the same dll's for different tests that are all placed - in ACE_ROOT/lib - -Fri Feb 20 12:36:18 UTC 2009 Marcel Smit - - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - Removed 'cidlflags -= --' and 'cidlflags += .... --'. - See also Bugzilla #3520 - - * examples/Hello/step-by-step.html: - Changed CVS in SVN. - Hello example is located in $CIAO_ROOT/examples. - -Fri Feb 20 11:11:18 UTC 2009 Johnny Willemsen - - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - Fixed this MPC file - -Fri Feb 20 09:53:18 UTC 2009 Johnny Willemsen - - * MPC/config/taoidl3toidl2defaults.mpb: - Updated to get CIAO_ROOT - -Thu Feb 19 22:54:14 UTC 2009 Phil Mesnier - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h: - - Fuzz fix. - -Thu Feb 19 19:21:46 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - * DAnCE/NodeApplication/ComponentInstallation_Impl.h: - * DAnCE/NodeApplication/ComponentInstallation_Impl.cpp: - - Moved these files to CIAO. - -Thu Feb 19 15:18:18 UTC 2009 Johnny Willemsen - - * MPC/config/ccm_stub.mpb - * MPC/config/taoidl3toidl2defaults.mpb: - Updated to get CIAO_ROOT/ccm - -Thu Feb 19 13:13:18 UTC 2009 Johnny Willemsen - - * MPC/config/ciaoidldefaults.mpb: - New base project for ciao projects that use idl. This adds CIAO_ROOT - and CIAO_ROOT/ccm to the idl compiler inclues - - * MPC/config/ciaolib_with_idl.mpb: - New ciao base project - - * bin/generate_component_mpc.pl - * ccm/CCM.mpc - * ccm/ComponentServer/CCM_ComponentServer.mpc - * ciao/CIAO.mpc - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * ciao/Containers/CIAO_Servant_Activator.mpc - * ciao/Servants/Servants.mpc - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Interfaces/Interfaces.mpc - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc - * DAnCE/tests/CIAO/Components/SimpleNull.mpc - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc - * DAnCE/tests/CIAO/Components/SimpleUser.mpc - * DAnCE/tests/NameServiceTest/NameServiceTest.mpc - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc - * examples/BasicSP/BasicSP.mpc - * examples/BasicSP/BMClosedED/BMClosedED.mpc - * examples/BasicSP/BMDevice/BMDevice.mpc - * examples/BasicSP/BMDisplay/BMDisplay.mpc - * examples/BasicSP/EC/EC.mpc - * examples/DevGuideExamples/Messenger/Administrator.mpc - * examples/DevGuideExamples/Messenger/Messenger.mpc - * examples/DevGuideExamples/Messenger/Receiver.mpc - * examples/Display/Display_Base/Display_Base.mpc - * examples/Display/GPS/GPS.mpc - * examples/Display/NavDisplay/NavDisplay.mpc - * examples/Display/RateGen/RateGen.mpc - * examples/Hello/Hello_Base/Hello_Base.mpc - * examples/Hello/Receiver/Receiver.mpc - * examples/Hello/Sender/Sender.mpc - * examples/Null_Component/Null_Component.mpc - * examples/Null_Component/Null_Interface.mpc - * examples/Null_Component/StaticDAnCEApp.mpc - * examples/Swapping/Hello_Base/Hello_Base.mpc - * examples/Swapping/Receiver/Receiver.mpc - * examples/Swapping/Sender/Sender.mpc - * performance-tests/Benchmark/Benchmark.mpc - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc - * performance-tests/Protocols/common/Protocols.mpc - * performance-tests/Protocols/Receiver/Receiver.mpc - * performance-tests/Protocols/Sender/Sender.mpc - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc - * tests/CIDL/CodeGen/Basic.mpc - * tests/CIDL/CodeGen/CodeGen.mpc - * tests/Minimum/Minimum_Base/Minimum_Base.mpc - * tests/Minimum/Receiver/Receiver.mpc - * tests/Minimum/Sender/Sender.mpc - * tools/Config_Handlers/DynAny_Handler/test.mpc - Use the new base projects - -Thu Feb 19 12:25:18 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/DataType_Handler.cpp: - Fixed GCC warning - -Thu Feb 19 09:27:18 UTC 2009 Marcel Smit - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - Resolved linking error. - -Wed Feb 18 20:52:18 UTC 2009 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - use the new minizip base project - -Wed Feb 18 20:45:18 UTC 2009 Johnny Willemsen - - * ciao/Containers/CIAO_Servant_Activator.mpc - Set correct -I option - -Wed Feb 18 20:26:18 UTC 2009 Johnny Willemsen - - * ccm/ComponentServer/CCM_ComponentServer.mpc - Set correct -I option - -Wed Feb 18 20:21:18 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - Set correct -I option - -Wed Feb 18 20:01:18 UTC 2009 Johnny Willemsen - - * ccm/CCM.mpc: - Set correct -I option - -Wed Feb 18 12:31:18 UTC 2009 Marcel Smit - - * CIAO-INSTALL.html: - To build CIAO using Xerces one has to set xerces3=1 or - xerces2=1 in default.features. - -Wed Feb 18 08:51:18 UTC 2009 Marcel Smit - - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * MPC/config/dance_repository_manager.mpb: - * MPC/config/dance_repository_manager_base.mpb: - Resolved minor fuzz errors. - -Wed Feb 18 00:52:18 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment_RepositoryManager.idl: - * DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Module.h: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.h: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - * MPC/config/dance_repository_manager.mpb: - * MPC/config/dance_repository_manager_base.mpb: - - Initial porting work. Still untested, so it will remain - disabled for the time being using dummy_label. - -Mon Feb 16 12:53:37 UTC 2009 Marcel Smit - - * CIAO-INSTALL.html: - Updated because "Boost System" and "Boost Regex" were also - needed to compile CIAO with Visual Studio. - -Mon Feb 16 09:55:37 UTC 2009 Johnny Willemsen - - * CIAO_DAnCE.mwc: - Updated because of the refactoring - -Fri Feb 13 19:58:37 UTC 2009 William R. Otte - - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * MPC/config/dance_plan_generator.mpc: - - Re-enabled the plan generator. - -Fri Feb 13 18:20:14 UTC 2009 William R. Otte - - * bin/ciao_tests.lst: - - Fixed tests. - -Fri Feb 13 13:58:38 UTC 2009 William R. Otte - - * MPC/config/ciao_client.mpb: - - linking error. - -Fri Feb 13 13:21:48 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - - Compilation fix. - -Fri Feb 13 13:14:27 UTC 2009 William R. Otte - - * DAnCE/Deployment.mwc: - - Removed this file. - -Fri Feb 13 01:37:22 UTC 2009 William R. Otte - - * ciao/Version.h: - - Version string was incorrect. - -Fri Feb 13 01:30:34 UTC 2009 William R. Otte - - * MPC/config/ciao_componentserver_stub.mpb: - * MPC/config/ciao_session_container.mpb: - - Additional compile fixes. - -Fri Feb 13 01:00:01 UTC 2009 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * MPC/config/ciao_componentserver_stub.mpb: - * MPC/config/dance_node_application.mpb: - * MPC/config/dance_node_application_manager.mpb: - * MPC/config/dance_node_manager.mpb: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - - Additional compile fixes. - -Thu Feb 12 22:47:28 UTC 2009 William R. Otte - - * DAnCE/Starter/Starter.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - - Compile fixes. - -Thu Feb 12 19:05:41 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - - Compile fix. - -Thu Feb 12 18:37:35 UTC 2009 William R. Otte - - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/RedirectionService/RedirectionService.h: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - - Compile fixes. - -Thu Feb 12 18:33:59 UTC 2009 William R. Otte - - * DAnCE/RedirectionService/NameServiceRedirection.h: - - Compile fixes. - -Thu Feb 12 18:31:40 UTC 2009 William R. Otte - - * DAnCE/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * ciao/Logger/Logger_Service.h: - * ciao/Logger/Logger_Service.cpp: - - Compile fixes. - -Thu Feb 12 17:48:35 UTC 2009 William R. Otte - - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - - Linking fixes. - -Thu Feb 12 16:52:56 UTC 2009 William R. Otte - - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - - Compile fixes. - -Thu Feb 12 16:18:49 UTC 2009 William R. Otte - - * DAnCE/Logger/DAnCELoggerFactory.h: - * DAnCE/Logger/Logger_Service.h: - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - - Compile/link fixes. - - * MPC/config/ciao_config_manager.mpb: - - Removed svn:executable property. - - * MPC/config/ciaocidldefaults.mpb: - - Ported in pre-merge fixes. - - * DAnCE/Starter/DAnCELoggerFactory.h: - - Removed this file. - -Thu Feb 12 15:52:16 UTC 2009 William R. Otte - - * DAnCE/RedirectionService/RedirectionService.mpc: - - Linking error. - -Thu Feb 12 15:15:11 UTC 2009 William R. Otte - - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * MPC/config/ciao_logger.mpb: - * MPC/config/dance_logger.mpb: - - Ordering/linking/build issues. - -Thu Feb 12 13:34:33 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/NodeApplicationManager-NodeApplication/NAM_NA.mpc: - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - - Fuzz fixes. - - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/RateGen/RateGen.mpc: - - Disabled this example until it can be ported. - - * DAnCE/tests/NodeApplicationManager-NodeApplication/NodeApplicationManager-NodeApplication.mpc: - - Removed this file. - -Thu Feb 12 10:36:44 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - Fixed fuzz errors - -Wed Feb 11 20:56:24 UTC 2009 William R. Otte - - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_domainapplicationmanager_dnc.mpb: - * MPC/config/ciao_events_base_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * MPC/config/ciao_rtevent_dnc.mpb: - * MPC/config/ciao_servant_dnc.mpb: - * MPC/config/ciao_static_dnc_app.mpb: - - _dnc_ projects are obsolete. - - * tools/Config_Handlers/CIAO_Events: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h: - * tools/Config_Handlers/CIAO_Events/test.cpp: - - These handlers are obsolete, and have been removed along with - ciaosvcs. This infrastructure will hopefully be replaced soon - with the connector framework. - -Wed Feb 11 20:01:10 UTC 2009 William R. Otte - - * docs/Porting_Hints.txt: - * NEWS: - - Porting hints for the new DAnCE. - -Wed Feb 11 19:33:59 UTC 2009 William R. Otte - - * ChangeLog: - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/Logger/File_Logger_Backend.h: - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/Logger/Log_Macros.h: - * DAnCE/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/RedirectionService/RedirectionService.h: - * DAnCE/Starter/DAnCELoggerFactory.h: - * DAnCE/Starter/Starter.h: - * DAnCE/Starter/Starter.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/MocksTest/MockObjectHome.h: - * DAnCE/tests/MocksTest/MockObjectHome.cpp: - * DAnCE/tests/MocksTest/MocksTest.cpp: - * DAnCE/tests/NameServiceTest/DummyImpl.h: - * DAnCE/tests/NameServiceTest/DummyImpl.cpp: - * DAnCE/tests/NameServiceTest/RegistrationPath.h: - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/NodeApplicationManager-NodeApplication.mpc: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.h: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.cpp: - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - * DAnCE/tests/ObjectLocatorTest/RegistrationPath.h: - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.h: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.cpp: - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * DAnCE/tests/RedirectionServiceTest/RegistrationPath.h: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - * MPC/config/ciao_logger.mpb: - * MPC/config/dance_logger.mpb: - * ciao/CIAO.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/Configurator_Factory.h: - * ciao/ComponentServer/Configurator_Factory.cpp: - * ciao/ComponentServer/Configurators/Config_Manager.cpp: - * ciao/ComponentServer/Configurators/Configurators.mpc: - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/CIAOLoggerFactory.h: - * ciao/Logger/File_Logger_Backend.h: - * ciao/Logger/File_Logger_Backend.cpp: - * ciao/Logger/Log_Macros.h: - * ciao/Logger/Logger_Service.h: - * ciao/Logger/Logger_Service.cpp: - * ciao/Servants/Servants.mpc: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * tests/CIAO_ComponentServer/Activator/Activator.mpc: - * tests/CIAO_ComponentServer/Basic/Basic.mpc: - * tools/XML/XML_Schema_Resolver.cpp: - - Fuzz errors. - -Wed Feb 11 19:21:09 UTC 2009 William R. Otte - - * NEWS: - - Updated news file. - -Wed Feb 11 19:05:10 UTC 2009 William R. Otte - - * tools/XML/XML_Helper.tpp: - - Ported writing code to xerces 3. - -Wed Feb 11 16:19:40 UTC 2009 William R. Otte - - * CIAO_TAO.mwc: - - Added ccm to this workspace. - -Wed Feb 11 16:01:21 UTC 2009 William R. Otte - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Removed ciaosvcs. - -Wed Feb 11 15:57:38 UTC 2009 William R. Otte - - * MPC/config/ciaocidldefaults.mpb: - - Fixed build order. - - * MPC/config/cidlc.mpb: - - Removed boost_system from the base projects. - - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp: - * tools/XML/XML_Helper.tpp: - - Warning fixes. - -Wed Feb 11 14:46:15 UTC 2009 William R. Otte - - * CCF: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/Documentation/Build.html: - * CIAO-INSTALL.html: - * CIAO.mwc: - * CIAO_DAnCE.mwc: - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * CIDLC: - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * COPYING: - * ChangeLog: - * DAnCE/Deployment: - * DAnCE/Deployment.mwc: - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/Deployment/DAnCE_Loader.h: - * DAnCE/Deployment/DAnCE_Properties.idl: - * DAnCE/Deployment/Deployment.idl: - * DAnCE/Deployment/Deployment_Application.idl: - * DAnCE/Deployment/Deployment_ApplicationManager.idl: - * DAnCE/Deployment/Deployment_Base.idl: - * DAnCE/Deployment/Deployment_Connection.idl: - * DAnCE/Deployment/Deployment_Core.idl: - * DAnCE/Deployment/Deployment_Data.idl: - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/Deployment/Deployment_DomainApplication.idl: - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl: - * DAnCE/Deployment/Deployment_ExecutionManager.idl: - * DAnCE/Deployment/Deployment_NodeApplication.idl: - * DAnCE/Deployment/Deployment_NodeApplicationManager.idl: - * DAnCE/Deployment/Deployment_NodeManager.idl: - * DAnCE/Deployment/Deployment_Packaging_Data.idl: - * DAnCE/Deployment/Deployment_PlanError.idl: - * DAnCE/Deployment/Deployment_RepositoryManager.idl: - * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl: - * DAnCE/Deployment/Deployment_TargetData.idl: - * DAnCE/Deployment/Deployment_TargetManager.idl: - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/Deployment/Deployment_stub_export.h: - * DAnCE/Deployment/Deployment_svnt_export.h: - * DAnCE/Deployment/Module_Main.h: - * DAnCE/DomainApplication: - * DAnCE/DomainApplication/DomainApplication.mpc: - * DAnCE/DomainApplication/Domain_Application_Export.h: - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Export.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager: - * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager_Export.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp: - * DAnCE/Interfaces: - * DAnCE/Interfaces/ExecutionManagerDaemon.idl: - * DAnCE/Interfaces/ExecutionManager_stub_export.h: - * DAnCE/Interfaces/Interfaces.mpc: - * DAnCE/Interfaces/NodeManagerDaemon.idl: - * DAnCE/Interfaces/NodeManager_stub_export.h: - * DAnCE/Interfaces/NodeManager_svnt_export.h: - * DAnCE/Interfaces/README: - * DAnCE/Logger: - * DAnCE/Logger/DAnCE_Logger_Export.h: - * DAnCE/Logger/File_Logger_Backend.h: - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/Logger/Log_Macros.h: - * DAnCE/Logger/Logger.mpc: - * DAnCE/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/NodeApplication: - * DAnCE/NodeApplication/ComponentAttributesSetter.h: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeApplication/ComponentInstallation_Impl.h: - * DAnCE/NodeApplication/ComponentInstallation_Impl.cpp: - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeApplication/Name_Utilities.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Export.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeApplicationManager: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Export.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager: - * DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Export.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Exec.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeManager/README: - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * DAnCE/Plan_Launcher: - * DAnCE/Plan_Launcher/Plan_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h: - * DAnCE/Plan_Launcher/launcher.cpp: - * DAnCE/RedirectionService: - * DAnCE/RedirectionService/CCMObjectLocator.h: - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - * DAnCE/RedirectionService/NameServiceRedirection.h: - * DAnCE/RedirectionService/NameServiceRedirection.cpp: - * DAnCE/RedirectionService/RedirectionService.h: - * DAnCE/RedirectionService/RedirectionService.cpp: - * DAnCE/RedirectionService/RedirectionService.mpc: - * DAnCE/RedirectionService/RedirectionService_Export.h: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/Starter: - * DAnCE/Starter/DAnCELoggerFactory.h: - * DAnCE/Starter/Starter.h: - * DAnCE/Starter/Starter.cpp: - * DAnCE/Starter/Starter.mpc: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/Utils: - * DAnCE/Utils/DAnCE_Utils.mpc: - * DAnCE/Utils/DAnCE_Utils_Export.h: - * DAnCE/Utils/Plan_Handler.h: - * DAnCE/Utils/Plan_Handler.cpp: - * DAnCE/bin: - * DAnCE/bin/.empty: - * DAnCE/bin/PythonDAnCE: - * DAnCE/bin/PythonDAnCE/__init__.py: - * DAnCE/bin/PythonDAnCE/generator: - * DAnCE/bin/PythonDAnCE/generator/__init__.py: - * DAnCE/bin/PythonDAnCE/generator/_path.py: - * DAnCE/bin/PythonDAnCE/generator/artifact.py: - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/footer.py: - * DAnCE/bin/PythonDAnCE/generator/header.py: - * DAnCE/bin/PythonDAnCE/generator/home_impl.py: - * DAnCE/bin/PythonDAnCE/generator/home_inst.py: - * DAnCE/bin/PythonDAnCE/generator/homed_comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/homed_comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/templet.py: - * DAnCE/bin/generate_plan.py: - * DAnCE/lib: - * DAnCE/lib/.empty: - * DAnCE/tests: - * DAnCE/tests/CIAO: - * DAnCE/tests/CIAO/Components: - * DAnCE/tests/CIAO/Components/SimpleAttribute.cidl: - * DAnCE/tests/CIAO/Components/SimpleAttribute.idl: - * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon.idl: - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer.cidl: - * DAnCE/tests/CIAO/Components/SimpleConsumer.idl: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter.cidl: - * DAnCE/tests/CIAO/Components/SimpleEmitter.idl: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.idl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull.cidl: - * DAnCE/tests/CIAO/Components/SimpleNull.idl: - * DAnCE/tests/CIAO/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider.cidl: - * DAnCE/tests/CIAO/Components/SimpleProvider.idl: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher.cidl: - * DAnCE/tests/CIAO/Components/SimplePublisher.idl: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleUser.idl: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h: - * DAnCE/tests/CIAO/ExecutionManager-Deployments: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments: - * DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentUnhomed.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - * DAnCE/tests/DeploymentPlanDump: - * DAnCE/tests/DeploymentPlanDump/CcmDance2-host1.cdp: - * DAnCE/tests/DeploymentPlanDump/CcmDance2-host2.cdp: - * DAnCE/tests/DeploymentPlanDump/CcmDance2.cdp: - * DAnCE/tests/DeploymentPlanDump/CcmDance4-host1.cdp: - * DAnCE/tests/DeploymentPlanDump/CcmDance4-host2.cdp: - * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc: - * DAnCE/tests/DeploymentPlanDump/NewCcmDance1.cdp: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences: - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1: - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/MocksTest: - * DAnCE/tests/MocksTest/MockObjectHome.h: - * DAnCE/tests/MocksTest/MockObjectHome.cpp: - * DAnCE/tests/MocksTest/MockTest.cdp: - * DAnCE/tests/MocksTest/MockTest.mpc: - * DAnCE/tests/MocksTest/MocksTest.cpp: - * DAnCE/tests/MocksTest/MocksTest_Export.h: - * DAnCE/tests/MocksTest/plCommand.In: - * DAnCE/tests/MocksTest/run_test.pl: - * DAnCE/tests/NameServiceTest: - * DAnCE/tests/NameServiceTest/Dummy.idl: - * DAnCE/tests/NameServiceTest/DummyImpl.h: - * DAnCE/tests/NameServiceTest/DummyImpl.cpp: - * DAnCE/tests/NameServiceTest/NameServiceTest.mpc: - * DAnCE/tests/NameServiceTest/RegistrationPath.h: - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/run_test.pl: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication: - * DAnCE/tests/NodeApplicationManager-NodeApplication/NodeApplicationManager-NodeApplication.mpc: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager: - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest: - * DAnCE/tests/ObjectLocatorTest/Dummy.idl: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.h: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.cpp: - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - * DAnCE/tests/ObjectLocatorTest/RegistrationPath.h: - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest: - * DAnCE/tests/RedirectionServiceTest/Dummy.idl: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.h: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.cpp: - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * DAnCE/tests/RedirectionServiceTest/RegistrationPath.h: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - * DAnCE/tests/scripts: - * DAnCE/tests/scripts/BasicSP: - * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl: - * DAnCE/tests/scripts/BasicSP/basicsp.dat: - * MPC: - * MPC/config/ccm.mpb: - * MPC/config/ccm_componentserver_stub.mpb: - * MPC/config/ccm_componentserver_svnt.mpb: - * MPC/config/ccm_configvalue.mpb: - * MPC/config/ccm_cookie.mpb: - * MPC/config/ccm_executor.mpb: - * MPC/config/ccm_stub.mpb: - * MPC/config/ccm_svnt.mpb: - * MPC/config/ciao.mpb: - * MPC/config/ciao_client.mpb: - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_componentserver_configurator.mpb: - * MPC/config/ciao_componentserver_stub.mpb: - * MPC/config/ciao_componentserver_svnt.mpb: - * MPC/config/ciao_config_handlers.mpb: - * MPC/config/ciao_config_handlers_base.mpb: - * MPC/config/ciao_config_manager.mpb: - * MPC/config/ciao_container_base.mpb: - * MPC/config/ciao_context_impl.mpb: - * MPC/config/ciao_cs_client.mpb: - * MPC/config/ciao_domainapplicationmanager_dnc.mpb: - * MPC/config/ciao_events_base_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * MPC/config/ciao_exe.mpb: - * MPC/config/ciao_executionmanager_stub.mpb: - * MPC/config/ciao_executor.mpb: - * MPC/config/ciao_lib.mpb: - * MPC/config/ciao_logger.mpb: - * MPC/config/ciao_nodeapplication.mpb: - * MPC/config/ciao_nodemanager_stub.mpb: - * MPC/config/ciao_noop_configurator.mpb: - * MPC/config/ciao_port_activator_stub.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_servant_activator.mpb: - * MPC/config/ciao_servant_dnc.mpb: - * MPC/config/ciao_server.mpb: - * MPC/config/ciao_session_container.mpb: - * MPC/config/ciao_targetmanager_stub.mpb: - * MPC/config/ciao_targetmanager_svnt.mpb: - * MPC/config/ciao_vcwarnings.mpb: - * MPC/config/ciaocidldefaults.mpb: - * MPC/config/cidlc.mpb: - * MPC/config/dance.mpb: - * MPC/config/dance_cdmw_idl.mpb: - * MPC/config/dance_component_server.mpb: - * MPC/config/dance_component_server_svnt.mpb: - * MPC/config/dance_deployment_stub.mpb: - * MPC/config/dance_deployment_svnt.mpb: - * MPC/config/dance_domain_application.mpb: - * MPC/config/dance_domain_application_manager.mpb: - * MPC/config/dance_exe.mpb: - * MPC/config/dance_executionmanager_stub.mpb: - * MPC/config/dance_extension_stub.mpb: - * MPC/config/dance_lib.mpb: - * MPC/config/dance_logger.mpb: - * MPC/config/dance_mocks.mpb: - * MPC/config/dance_node_application.mpb: - * MPC/config/dance_node_application_manager.mpb: - * MPC/config/dance_node_manager.mpb: - * MPC/config/dance_nodemanager_stub.mpb: - * MPC/config/dance_nodemanager_svnt.mpb: - * MPC/config/dance_redirection_service.mpb: - * MPC/config/dance_utils.mpb: - * NEWS: - * bin: - * bin/ciao_tests.lst: - * bin/generate_component_mpc.pl: - * ccm: - * ciao: - * ciao/CIAO.mpc: - * ciao/CIAO_FailureReasons.idl: - * ciao/CIAO_common.h: - * ciao/Client_init.h: - * ciao/Client_init.cpp: - * ciao/ComponentServer: - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_CS_Client_svnt_export.h: - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_stub_export.h: - * ciao/ComponentServer/CIAO_ComponentServer_svnt_export.h: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerResources.idl: - * ciao/ComponentServer/Configurator_Factory.h: - * ciao/ComponentServer/Configurator_Factory.cpp: - * ciao/ComponentServer/Configurators: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.inl: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: - * ciao/ComponentServer/Configurators/Basic_Config_Manager_export.h: - * ciao/ComponentServer/Configurators/Basic_Configurator_export.h: - * ciao/ComponentServer/Configurators/ComponentServer_Configurator_export.h: - * ciao/ComponentServer/Configurators/Config_Manager.h: - * ciao/ComponentServer/Configurators/Config_Manager.cpp: - * ciao/ComponentServer/Configurators/Configurators.mpc: - * ciao/ComponentServer/Configurators/NA_Configurator_Export.h: - * ciao/ComponentServer/Configurators/NoOp: - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.h: - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.cpp: - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc: - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator_export.h: - * ciao/ComponentServer/Configurators/RT: - * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h: - * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.inl: - * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp: - * ciao/ComponentServer/Configurators/RT/RTNA_Configurator_Export.h: - * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.h: - * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/Containers: - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/CIAO_Servant_Activator_export.h: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base.inl: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Container_Base_export.h: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.idl: - * ciao/Containers/Session/Session_Container.inl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Containers/Session/Session_Container_export.h: - * ciao/Containers/Swapping: - * ciao/Containers/Swapping/Dynamic_Component_Activator.h: - * ciao/Containers/Swapping/Dynamic_Component_Activator.inl: - * ciao/Containers/Swapping/Dynamic_Component_Activator.cpp: - * ciao/Containers/Swapping/Swapping_Container.h: - * ciao/Containers/Swapping/Swapping_Container.inl: - * ciao/Containers/Swapping/Swapping_Container.cpp: - * ciao/Containers/Swapping/Swapping_Container.mpc: - * ciao/Containers/Swapping/Swapping_Container_export.h: - * ciao/Contexts: - * ciao/Contexts/Context.mpc: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.inl: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_export.h: - * ciao/Contexts/Swapping: - * ciao/Contexts/Swapping/CIAO_UpgradeableContext.idl: - * ciao/Contexts/Swapping/Upgradeable_Context_Impl_T.h: - * ciao/Contexts/Swapping/Upgradeable_Context_Impl_T.cpp: - * ciao/Logger: - * ciao/Logger/CIAOLoggerFactory.h: - * ciao/Logger/CIAO_Logger_Export.h: - * ciao/Logger/File_Logger_Backend.h: - * ciao/Logger/File_Logger_Backend.cpp: - * ciao/Logger/Log_Macros.h: - * ciao/Logger/Logger.mpc: - * ciao/Logger/Logger_Service.h: - * ciao/Logger/Logger_Service.cpp: - * ciao/Servants: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/CIAO_Port_Activator_export.h: - * ciao/Servants/CIAO_Servant_Impl_export.h: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator.inl: - * ciao/Servants/Port_Activator.cpp: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Servants/Servants.mpc: - * ciao/Servants/StandardConfigurator_Impl.h: - * ciao/Servants/StandardConfigurator_Impl.cpp: - * ciao/Servants/Swapping: - * ciao/Servants/Swapping/CIAO_SwapExec.idl: - * ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h: - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h: - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp: - * ciao/Servants/Swapping/Dynamic_Component_Servant_T.h: - * ciao/Servants/Swapping/Dynamic_Component_Servant_T.cpp: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_T.h: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Servants/Swapping/Swapping_Servants.mpc: - * ciao/Server_init.h: - * ciao/Server_init.cpp: - * ciao/Valuetype_Factories: - * ciao/Valuetype_Factories/ConfigValue.h: - * ciao/Valuetype_Factories/ConfigValue.cpp: - * ciao/Valuetype_Factories/ConfigValue_Export.h: - * ciao/Valuetype_Factories/Cookie_Export.h: - * ciao/Valuetype_Factories/Cookies.h: - * ciao/Valuetype_Factories/Cookies.inl: - * ciao/Valuetype_Factories/Cookies.cpp: - * ciao/Valuetype_Factories/Factories.mpc: - * ciao/Version.h: - * docs: - * docs/CIAO_Style_Guide.txt: - * docs/TODO.html: - * docs/schema: - * docs/schema/Basic_Deployment_Data.xsd: - * docs/schema/CIAOEvents.xsd: - * docs/schema/CIAOServerResources.xsd: - * docs/schema/Deployment.xsd: - * docs/schema/Modified_Deployment.xsd: - * docs/schema/README.html: - * docs/schema/SANet_Network.xsd: - * docs/schema/ServerResourceUsage.txt: - * docs/schema/Spec_Defined_Deployment.xsd: - * docs/schema/Spec_Defined_XMI.xsd: - * docs/schema/Task_Map.xsd: - * docs/schema/XMI.xsd: - * docs/schema/ccd.xsd: - * docs/schema/cdd.xsd: - * docs/schema/cdp.xsd: - * docs/schema/ciaopolicy.xsd: - * docs/schema/cid.xsd: - * docs/schema/cpd.xsd: - * docs/schema/iad.xsd: - * docs/schema/pcd.xsd: - * docs/schema/toplevel.xsd: - * docs/schema/unused_elements.xsd: - * docs/schema/xsc-banner.h: - * docs/schema/xsc-banner.cpp: - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * examples: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/EC/EC_exec.h: - * examples/BasicSP/EC/EC_exec.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/BasicSP/descriptors/BasicSP.dat: - * examples/BasicSP/descriptors/BasicSP_Homed.cdp: - * examples/BasicSP/descriptors/BasicSP_Unhomed.cdp: - * examples/BasicSP/descriptors/run_test.pl: - * examples/DevGuideExamples: - * examples/DevGuideExamples/CIAO.mwc: - * examples/DevGuideExamples/Messenger: - * examples/DevGuideExamples/Messenger/Administrator.cidl: - * examples/DevGuideExamples/Messenger/Administrator.idl: - * examples/DevGuideExamples/Messenger/Administrator.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client.cpp: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * examples/DevGuideExamples/Messenger/Administrator_exec_export.h: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.h: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Administrator_stub_export.h: - * examples/DevGuideExamples/Messenger/Administrator_svnt_export.h: - * examples/DevGuideExamples/Messenger/History.idl: - * examples/DevGuideExamples/Messenger/History_exec_i.h: - * examples/DevGuideExamples/Messenger/History_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Message.idl: - * examples/DevGuideExamples/Messenger/Messenger.cidl: - * examples/DevGuideExamples/Messenger/Messenger.idl: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/DevGuideExamples/Messenger/Messenger_exec_export.h: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger_stub_export.h: - * examples/DevGuideExamples/Messenger/Messenger_svnt_export.h: - * examples/DevGuideExamples/Messenger/Publication.idl: - * examples/DevGuideExamples/Messenger/Publication_exec_i.h: - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver.cidl: - * examples/DevGuideExamples/Messenger/Receiver.idl: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Receiver_exec_export.h: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver_stub_export.h: - * examples/DevGuideExamples/Messenger/Receiver_svnt_export.h: - * examples/DevGuideExamples/Messenger/Runnable.idl: - * examples/DevGuideExamples/Messenger/Runnable_exec_i.h: - * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp: - * examples/DevGuideExamples/Messenger/StaticDAnCE: - * examples/DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - * examples/DevGuideExamples/Messenger/StaticDAnCE/README.txt: - * examples/DevGuideExamples/Messenger/StaticDAnCE/StaticDAnCEApp.cpp: - * examples/DevGuideExamples/Messenger/StaticDAnCE/plan.h: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors: - * examples/DevGuideExamples/Messenger/descriptors/Administrator.ccd: - * examples/DevGuideExamples/Messenger/descriptors/Administrator.cid: - * examples/DevGuideExamples/Messenger/descriptors/Administrator.cpd: - * examples/DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad: - * examples/DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad: - * examples/DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad: - * examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp: - * examples/DevGuideExamples/Messenger/descriptors/Application.cdp: - * examples/DevGuideExamples/Messenger/descriptors/Application.pcd: - * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat: - * examples/DevGuideExamples/Messenger/descriptors/Deployment.xsd: - * examples/DevGuideExamples/Messenger/descriptors/Domain.cdd: - * examples/DevGuideExamples/Messenger/descriptors/Libraries.iad: - * examples/DevGuideExamples/Messenger/descriptors/Messenger.ccd: - * examples/DevGuideExamples/Messenger/descriptors/Messenger.cid: - * examples/DevGuideExamples/Messenger/descriptors/Messenger.cpd: - * examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd: - * examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid: - * examples/DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd: - * examples/DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad: - * examples/DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad: - * examples/DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad: - * examples/DevGuideExamples/Messenger/descriptors/README_15a: - * examples/DevGuideExamples/Messenger/descriptors/Receiver.ccd: - * examples/DevGuideExamples/Messenger/descriptors/Receiver.cid: - * examples/DevGuideExamples/Messenger/descriptors/Receiver.cpd: - * examples/DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad: - * examples/DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad: - * examples/DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad: - * examples/DevGuideExamples/Messenger/descriptors/XMI.xsd: - * examples/DevGuideExamples/Messenger/descriptors/admin.dat: - * examples/DevGuideExamples/Messenger/descriptors/package.tpd: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/DevGuideExamples/readme.txt: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/GPS/GPS_exec.h: - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/GPS/GPS_tracing_exec.h: - * examples/Display/GPS/GPS_tracing_exec.cpp: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Display/NavDisplay/NavDisplay_exec.h: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/RateGen/RateGen_exec.h: - * examples/Display/RateGen/RateGen_exec.cpp: - * examples/Display/RateGen/controller.cpp: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/starter.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/NodeManagerMap.dat: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component/Null_Interface.mpc: - * examples/Null_Component/StaticDAnCEApp.mpc: - * examples/Null_Component/descriptors/NodeMap.dat: - * examples/Null_Component/descriptors/Null_Homed.cdp: - * examples/Null_Component/descriptors/Null_Unhomed.cdp: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Receiver/Receiver_exec.h: - * examples/Swapping/Receiver/Receiver_exec.cpp: - * examples/Swapping/Sender/Sender.mpc: - * examples/Swapping/Sender/Sender_exec.h: - * examples/Swapping/Sender/Sender_exec.cpp: - * examples/Swapping/Sender/Sender_exec_1.h: - * examples/Swapping/Sender/Sender_exec_1.cpp: - * examples/Swapping/Sender/Sender_exec_2.h: - * examples/Swapping/Sender/Sender_exec_2.cpp: - * performance-tests: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * performance-tests/Protocols/Controller/Controller.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/Sender/Sender_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Protocols/common/Protocols.mpc: - * rules.ciao.GNU: - * tests: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/CIAO_ComponentServer: - * tests/CIAO_ComponentServer/Activator: - * tests/CIAO_ComponentServer/Activator/Activator.mpc: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic: - * tests/CIAO_ComponentServer/Basic/Basic.mpc: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - * tests/CIAO_ComponentServer/SimpleComponent: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.cidl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.idl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_stub_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_svnt_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - * tests/CIDL/CodeGen/Basic.mpc: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc: - * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc: - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc: - * tests/IDL3/Events/Abstract/Abstract.mpc: - * tests/IDL3/Events/Any/Any.mpc: - * tests/IDL3/Events/Regular/Regular.mpc: - * tests/IDL3/Homes/Attributes/HomeAttributes.mpc: - * tests/IDL3/Homes/Basic/Basic.mpc: - * tests/IDL3/Homes/Factory/Factory.mpc: - * tests/IDL3/Homes/Finder/Finder.mpc: - * tests/IDL3/Homes/Inheritance/Inheritance.mpc: - * tests/IDL3/ImpliedIDL/All/all.mpc: - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc: - * tests/IDL3/ImpliedIDL/Events/Events.mpc: - * tests/IDL3/ImpliedIDL/Homes/Homes.mpc: - * tests/IDL3/Lookup/lookup_test.mpc: - * tests/Minimum/Minimum_Base/Minimum_Base.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Sender/Sender.mpc: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender_exec.cpp: - * tools: - * tools/Config_Handlers: - * tools/Config_Handlers/ADD_Handler.h: - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Any_Handler.h: - * tools/Config_Handlers/Any_Handler.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/CCD_Handler.h: - * tools/Config_Handlers/CCD_Handler.cpp: - * tools/Config_Handlers/CEPE_Handler.h: - * tools/Config_Handlers/CEPE_Handler.cpp: - * tools/Config_Handlers/CIAO_Events: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h: - * tools/Config_Handlers/CIAO_Events/test.cpp: - * tools/Config_Handlers/CPD_Handler.h: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/CRDD_Handler.h: - * tools/Config_Handlers/CRDD_Handler.cpp: - * tools/Config_Handlers/Common.h: - * tools/Config_Handlers/ComponentPropertyDescription_Handler.h: - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/Config_Handlers_Common_Export.h: - * tools/Config_Handlers/Config_Handlers_Export.h: - * tools/Config_Handlers/DD_Handler.h: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.h: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/DP_PCD_Handler.h: - * tools/Config_Handlers/DP_PCD_Handler.cpp: - * tools/Config_Handlers/DataType_Handler.h: - * tools/Config_Handlers/DataType_Handler.cpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/Deployment.hpp: - * tools/Config_Handlers/DnC_Dump.h: - * tools/Config_Handlers/DnC_Dump.cpp: - * tools/Config_Handlers/DnC_Dump_T.h: - * tools/Config_Handlers/DnC_Dump_T.cpp: - * tools/Config_Handlers/Dump_Obj.h: - * tools/Config_Handlers/Dump_Obj.cpp: - * tools/Config_Handlers/DynAny_Handler: - * tools/Config_Handlers/DynAny_Handler.mpc: - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h: - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/dynany_test.idl: - * tools/Config_Handlers/DynAny_Handler/test.cpp: - * tools/Config_Handlers/DynAny_Handler/test.mpc: - * tools/Config_Handlers/ERE_Handler.h: - * tools/Config_Handlers/ERE_Handler.cpp: - * tools/Config_Handlers/ESD_Handler.h: - * tools/Config_Handlers/ESD_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.h: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.h: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/ID_Handler.h: - * tools/Config_Handlers/ID_Handler.cpp: - * tools/Config_Handlers/IRDD_Handler.h: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.h: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/PCD_Handler.h: - * tools/Config_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/PSPE_Handler.h: - * tools/Config_Handlers/PSPE_Handler.cpp: - * tools/Config_Handlers/Package_Handlers: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.h: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PC_Intf.h: - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h: - * tools/Config_Handlers/Package_Handlers/SID_Handler.h: - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/Property_Handler.h: - * tools/Config_Handlers/Property_Handler.cpp: - * tools/Config_Handlers/RDD_Handler.h: - * tools/Config_Handlers/RDD_Handler.cpp: - * tools/Config_Handlers/RT-CCM: - * tools/Config_Handlers/RT-CCM/CB_Handler.h: - * tools/Config_Handlers/RT-CCM/CB_Handler.cpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp: - * tools/Config_Handlers/RT-CCM/CLA_Handler.h: - * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp: - * tools/Config_Handlers/RT-CCM/CNPM_Handler.h: - * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp: - * tools/Config_Handlers/RT-CCM/NPM_Handler.h: - * tools/Config_Handlers/RT-CCM/NPM_Handler.cpp: - * tools/Config_Handlers/RT-CCM/OC_Handler.h: - * tools/Config_Handlers/RT-CCM/OC_Handler.cpp: - * tools/Config_Handlers/RT-CCM/OR_Handler.h: - * tools/Config_Handlers/RT-CCM/OR_Handler.cpp: - * tools/Config_Handlers/RT-CCM/PM_Handler.h: - * tools/Config_Handlers/RT-CCM/PM_Handler.cpp: - * tools/Config_Handlers/RT-CCM/PS_Handler.h: - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - * tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h: - * tools/Config_Handlers/RT-CCM/SRD_Handler.h: - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/TPL_Handler.h: - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp: - * tools/Config_Handlers/RT-CCM/TP_Handler.h: - * tools/Config_Handlers/RT-CCM/TP_Handler.cpp: - * tools/Config_Handlers/RT-CCM/input.csr: - * tools/Config_Handlers/RT-CCM/test.cpp: - * tools/Config_Handlers/Req_Handler.h: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/STD_CID_Handler.h: - * tools/Config_Handlers/STD_CID_Handler.cpp: - * tools/Config_Handlers/STD_CPD_Handler.h: - * tools/Config_Handlers/STD_CPD_Handler.cpp: - * tools/Config_Handlers/STD_IAD_Handler.h: - * tools/Config_Handlers/STD_IAD_Handler.cpp: - * tools/Config_Handlers/STD_PCD_Handler.h: - * tools/Config_Handlers/STD_PCD_Handler.cpp: - * tools/Config_Handlers/STD_PC_Intf.h: - * tools/Config_Handlers/STD_PC_Intf.cpp: - * tools/Config_Handlers/SatisfierProperty_Handler.h: - * tools/Config_Handlers/SatisfierProperty_Handler.cpp: - * tools/Config_Handlers/Utils: - * tools/Config_Handlers/Utils/Exceptions.h: - * tools/Config_Handlers/Utils/Functors.h: - * tools/Config_Handlers/XMI.hpp: - * tools/Config_Handlers/XMI.cpp: - * tools/Config_Handlers/XMLSchema: - * tools/Config_Handlers/XMLSchema/Traversal.hpp: - * tools/Config_Handlers/XMLSchema/Traversal.ipp: - * tools/Config_Handlers/XMLSchema/Traversal.tpp: - * tools/Config_Handlers/XMLSchema/TypeInfo.hpp: - * tools/Config_Handlers/XMLSchema/TypeInfo.ipp: - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp: - * tools/Config_Handlers/XMLSchema/Types.hpp: - * tools/Config_Handlers/XMLSchema/Types.ipp: - * tools/Config_Handlers/XMLSchema/Types.tpp: - * tools/Config_Handlers/XMLSchema/Writer.hpp: - * tools/Config_Handlers/XMLSchema/Writer.ipp: - * tools/Config_Handlers/XMLSchema/Writer.tpp: - * tools/Config_Handlers/XML_File_Intf.h: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/XML_Typedefs.h: - * tools/Config_Handlers/XML_Typedefs.cpp: - * tools/Config_Handlers/XSCRT: - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/Config_Handlers/XSCRT/Elements.ipp: - * tools/Config_Handlers/XSCRT/Elements.tpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp: - * tools/Config_Handlers/XSCRT/Parser.hpp: - * tools/Config_Handlers/XSCRT/Parser.ipp: - * tools/Config_Handlers/XSCRT/Parser.tpp: - * tools/Config_Handlers/XSCRT/Traversal.hpp: - * tools/Config_Handlers/XSCRT/Traversal.ipp: - * tools/Config_Handlers/XSCRT/Traversal.tpp: - * tools/Config_Handlers/XSCRT/Writer.hpp: - * tools/Config_Handlers/XSCRT/Writer.ipp: - * tools/Config_Handlers/XSCRT/Writer.tpp: - * tools/Config_Handlers/XSCRT/XML.hpp: - * tools/Config_Handlers/XSCRT/XML.ipp: - * tools/Config_Handlers/XSCRT/XML.tpp: - * tools/Config_Handlers/XSCRT/XMLSchema.hpp: - * tools/Config_Handlers/XSC_XML_Handlers_Export.h: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/ccd.hpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/cdd.hpp: - * tools/Config_Handlers/cdp.hpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/cid.hpp: - * tools/Config_Handlers/cpd.hpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/Config_Handlers/iad.hpp: - * tools/Config_Handlers/pcd.hpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/test.cdp: - * tools/Config_Handlers/test.cpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/Config_Handlers/toplevel.hpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - * tools/XML: - * tools/XML/CIAO_XML_Utils_Export.h: - * tools/XML/XML.mpc: - * tools/XML/XML_Error_Handler.h: - * tools/XML/XML_Error_Handler.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - * tools/XML/XML_Schema_Resolver.h: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XML_Schema_Resolver.cpp: - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - * tools/tools.mwc: - - Merged in from prism_import branch. - - * DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl: - * DAnCE/Deployment/CIAO_ServerResources.idl: - * DAnCE/Deployment/Deployment_Container.idl: - * DAnCE/Deployment/Deployment_Events.idl: - * DAnCE/Deployment/NodeApp_CB_Impl.h: - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - * DAnCE/DomainApplicationManager/Deployment_Configuration.h: - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.inl: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMH_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_AMI_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_ActiveObject_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_ActiveObject_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.inl: - * DAnCE/DomainApplicationManager/Reply_Handler_i.h: - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp: - * DAnCE/DomainApplicationManager/Task_StartLaunch.h: - * DAnCE/DomainApplicationManager/Task_StartLaunch.cpp: - * DAnCE/ExecutionManager/DAM_Map.h: - * DAnCE/ExecutionManager/DAM_Map.cpp: - * DAnCE/ExecutionManager/Execution_Manager.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Impl.h: - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: - * DAnCE/NodeApplication/CIAO_NodeApplication_export.h: - * DAnCE/NodeApplication/Config_Manager.h: - * DAnCE/NodeApplication/Config_Manager.cpp: - * DAnCE/NodeApplication/Config_Manager_export.h: - * DAnCE/NodeApplication/Configurator_Factory.h: - * DAnCE/NodeApplication/Configurator_Factory.inl: - * DAnCE/NodeApplication/Configurator_Factory.cpp: - * DAnCE/NodeApplication/Container_Impl.h: - * DAnCE/NodeApplication/Container_Impl.inl: - * DAnCE/NodeApplication/Container_Impl.cpp: - * DAnCE/NodeApplication/NAConfig_Manager.h: - * DAnCE/NodeApplication/NAConfig_Manager.inl: - * DAnCE/NodeApplication/NAConfig_Manager.cpp: - * DAnCE/NodeApplication/NA_Configurator_Export.h: - * DAnCE/NodeApplication/NoOp_Configurator.h: - * DAnCE/NodeApplication/NoOp_Configurator.cpp: - * DAnCE/NodeApplication/NoOp_Configurator_export.h: - * DAnCE/NodeApplication/NodeApp_Configurator.h: - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: - * DAnCE/NodeApplication/NodeApp_Configurator_Export.h: - * DAnCE/NodeApplication/NodeApplication.cpp: - * DAnCE/NodeApplication/NodeApplication_Core.h: - * DAnCE/NodeApplication/NodeApplication_Core.inl: - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.inl: - * DAnCE/NodeApplication/RTConfig_Manager.h: - * DAnCE/NodeApplication/RTConfig_Manager.inl: - * DAnCE/NodeApplication/RTConfig_Manager.cpp: - * DAnCE/NodeApplication/RTNA_Configurator_Export.h: - * DAnCE/NodeApplication/RTNodeApp_Configurator.h: - * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: - * DAnCE/NodeApplicationManager/CIAO_NAM_Export.h: - * DAnCE/NodeApplicationManager/Containers_Info_Map.h: - * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: - * DAnCE/NodeApplicationManager/ImplementationInfo.h: - * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl: - * DAnCE/NodeApplicationManager/URL_Parser.h: - * DAnCE/NodeApplicationManager/URL_Parser.cpp: - * DAnCE/NodeManager/BaseMonitor.h: - * DAnCE/NodeManager/CIAO_Monitor.h: - * DAnCE/NodeManager/CIAO_Monitor.cpp: - * DAnCE/NodeManager/Monitor.mpc: - * DAnCE/NodeManager/MonitorCB.h: - * DAnCE/NodeManager/MonitorCB.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - * DAnCE/NodeManager/NAM_Map.h: - * DAnCE/NodeManager/NAM_Map.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: - * DAnCE/tests/NodeApplicationTest: - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DAnCE/tests/NodeApplicationTest/README: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_stub_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_svnt_export.h: - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - * DevGuideExamples: - * DevGuideExamples/CIAO.mwc: - * DevGuideExamples/Messenger: - * DevGuideExamples/Messenger/Administrator.cidl: - * DevGuideExamples/Messenger/Administrator.idl: - * DevGuideExamples/Messenger/Administrator.mpc: - * DevGuideExamples/Messenger/Administrator_Client.cpp: - * DevGuideExamples/Messenger/Administrator_Client_IDL2.cpp: - * DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * DevGuideExamples/Messenger/Administrator_Client_IDL3.cpp: - * DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * DevGuideExamples/Messenger/Administrator_exec_export.h: - * DevGuideExamples/Messenger/Administrator_exec_i.h: - * DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * DevGuideExamples/Messenger/Administrator_stub_export.h: - * DevGuideExamples/Messenger/Administrator_svnt_export.h: - * DevGuideExamples/Messenger/History.idl: - * DevGuideExamples/Messenger/History_exec_i.h: - * DevGuideExamples/Messenger/History_exec_i.cpp: - * DevGuideExamples/Messenger/Message.idl: - * DevGuideExamples/Messenger/Messenger.cidl: - * DevGuideExamples/Messenger/Messenger.idl: - * DevGuideExamples/Messenger/Messenger.mpc: - * DevGuideExamples/Messenger/Messenger_exec_export.h: - * DevGuideExamples/Messenger/Messenger_exec_i.h: - * DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * DevGuideExamples/Messenger/Messenger_stub_export.h: - * DevGuideExamples/Messenger/Messenger_svnt_export.h: - * DevGuideExamples/Messenger/Publication.idl: - * DevGuideExamples/Messenger/Publication_exec_i.h: - * DevGuideExamples/Messenger/Publication_exec_i.cpp: - * DevGuideExamples/Messenger/Receiver.cidl: - * DevGuideExamples/Messenger/Receiver.idl: - * DevGuideExamples/Messenger/Receiver.mpc: - * DevGuideExamples/Messenger/Receiver_exec_export.h: - * DevGuideExamples/Messenger/Receiver_exec_i.h: - * DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * DevGuideExamples/Messenger/Receiver_stub_export.h: - * DevGuideExamples/Messenger/Receiver_svnt_export.h: - * DevGuideExamples/Messenger/Runnable.idl: - * DevGuideExamples/Messenger/Runnable_exec_i.h: - * DevGuideExamples/Messenger/Runnable_exec_i.cpp: - * DevGuideExamples/Messenger/StaticDAnCE: - * DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - * DevGuideExamples/Messenger/StaticDAnCE/README.txt: - * DevGuideExamples/Messenger/StaticDAnCE/StaticDAnCEApp.cpp: - * DevGuideExamples/Messenger/StaticDAnCE/plan.h: - * DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * DevGuideExamples/Messenger/descriptors: - * DevGuideExamples/Messenger/descriptors/Administrator.ccd: - * DevGuideExamples/Messenger/descriptors/Administrator.cid: - * DevGuideExamples/Messenger/descriptors/Administrator.cpd: - * DevGuideExamples/Messenger/descriptors/Administrator_Exec.iad: - * DevGuideExamples/Messenger/descriptors/Administrator_Stub.iad: - * DevGuideExamples/Messenger/descriptors/Administrator_Svnt.iad: - * DevGuideExamples/Messenger/descriptors/Application-flattened.cdp: - * DevGuideExamples/Messenger/descriptors/Application.cdp: - * DevGuideExamples/Messenger/descriptors/Application.pcd: - * DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat: - * DevGuideExamples/Messenger/descriptors/Deployment.xsd: - * DevGuideExamples/Messenger/descriptors/Domain.cdd: - * DevGuideExamples/Messenger/descriptors/Libraries.iad: - * DevGuideExamples/Messenger/descriptors/Messenger.ccd: - * DevGuideExamples/Messenger/descriptors/Messenger.cid: - * DevGuideExamples/Messenger/descriptors/Messenger.cpd: - * DevGuideExamples/Messenger/descriptors/MessengerAssembly.ccd: - * DevGuideExamples/Messenger/descriptors/MessengerAssembly.cid: - * DevGuideExamples/Messenger/descriptors/MessengerAssembly.cpd: - * DevGuideExamples/Messenger/descriptors/Messenger_Exec.iad: - * DevGuideExamples/Messenger/descriptors/Messenger_Stub.iad: - * DevGuideExamples/Messenger/descriptors/Messenger_Svnt.iad: - * DevGuideExamples/Messenger/descriptors/README_15a: - * DevGuideExamples/Messenger/descriptors/Receiver.ccd: - * DevGuideExamples/Messenger/descriptors/Receiver.cid: - * DevGuideExamples/Messenger/descriptors/Receiver.cpd: - * DevGuideExamples/Messenger/descriptors/Receiver_Exec.iad: - * DevGuideExamples/Messenger/descriptors/Receiver_Stub.iad: - * DevGuideExamples/Messenger/descriptors/Receiver_Svnt.iad: - * DevGuideExamples/Messenger/descriptors/XMI.xsd: - * DevGuideExamples/Messenger/descriptors/admin.dat: - * DevGuideExamples/Messenger/descriptors/package.tpd: - * DevGuideExamples/Messenger/descriptors/run_test.pl: - * DevGuideExamples/readme.txt: - * MPC/config/ciao_component_dnc.mpb: - * MPC/config/ciao_container_dnc.mpb: - * MPC/config/ciao_deployment_stub.mpb: - * MPC/config/ciao_deployment_svnt.mpb: - * MPC/config/ciao_server_dnc.mpb: - * ciao/CCM_Base.idl: - * ciao/CCM_CCM2Context.idl: - * ciao/CCM_CCMException.idl: - * ciao/CCM_Component.idl: - * ciao/CCM_ComponentId.idl: - * ciao/CCM_Configurator.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Container_Ex.idl: - * ciao/CCM_Context.idl: - * ciao/CCM_Cookie.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_EnterpriseComponent.idl: - * ciao/CCM_Entity2Context.idl: - * ciao/CCM_EntityComponent.idl: - * ciao/CCM_EntityContext.idl: - * ciao/CCM_Enumeration.idl: - * ciao/CCM_EventBase.idl: - * ciao/CCM_EventConsumerBase.idl: - * ciao/CCM_Events.idl: - * ciao/CCM_ExecutorLocator.idl: - * ciao/CCM_Home.idl: - * ciao/CCM_HomeConfiguration.idl: - * ciao/CCM_HomeExecutorBase.idl: - * ciao/CCM_HomeFinder.idl: - * ciao/CCM_HomeRegistration.idl: - * ciao/CCM_KeylessCCMHome.idl: - * ciao/CCM_Navigation.idl: - * ciao/CCM_Object.idl: - * ciao/CCM_PrimaryKeyBase.idl: - * ciao/CCM_ProxyHomeRegistration.idl: - * ciao/CCM_Receptacle.idl: - * ciao/CCM_Session2Context.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_SessionContext.idl: - * ciao/CCM_SessionSynchronization.idl: - * ciao/CCM_StandardConfigurator.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/CCM_Transaction.idl: - * ciao/CIAO_SwapExec.idl: - * ciao/CIAO_UpgradeableContext.idl: - * ciao/Components.idl: - * ciao/Container_Base.h: - * ciao/Container_Base.inl: - * ciao/Container_Base.cpp: - * ciao/Context_Impl_Base.h: - * ciao/Context_Impl_Base.inl: - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_T.h: - * ciao/Context_Impl_T.cpp: - * ciao/Cookies.h: - * ciao/Cookies.inl: - * ciao/Cookies.cpp: - * ciao/CosPersistentState.idl: - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Activator.inl: - * ciao/Dynamic_Component_Activator.cpp: - * ciao/Dynamic_Component_Servant_Base.h: - * ciao/Dynamic_Component_Servant_Base.cpp: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Home_Servant_Impl_Base.h: - * ciao/Home_Servant_Impl_Base.cpp: - * ciao/Home_Servant_Impl_T.h: - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Object_Set_T.h: - * ciao/Object_Set_T.inl: - * ciao/Object_Set_T.cpp: - * ciao/Port_Activator.h: - * ciao/Port_Activator.inl: - * ciao/Port_Activator.cpp: - * ciao/Port_Activator_T.h: - * ciao/Port_Activator_T.cpp: - * ciao/Security.idl: - * ciao/Servant_Activator.h: - * ciao/Servant_Activator.cpp: - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_Utils_T.cpp: - * ciao/Session_Container.h: - * ciao/Session_Container.inl: - * ciao/Session_Container.cpp: - * ciao/StandardConfigurator_Impl.h: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/Swapping_Container.h: - * ciao/Swapping_Container.inl: - * ciao/Swapping_Container.cpp: - * ciao/Swapping_Servant_Home_Impl_Base.h: - * ciao/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Upgradeable_Context_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.cpp: - * ciao/extension: - * ciao/extension/CCM_ClientContainerInterceptor.idl: - * ciao/extension/CCM_ClientContainerInterceptorRegistration.idl: - * ciao/extension/CCM_ContainerClientRequestInfo.idl: - * ciao/extension/CCM_ContainerInterceptor.idl: - * ciao/extension/CCM_ContainerRequestInfo.idl: - * ciao/extension/CCM_ContainerServantRequestInfo.idl: - * ciao/extension/CCM_ContainerServerRequestInfo.idl: - * ciao/extension/CCM_ContainerStubRequestInfo.idl: - * ciao/extension/CCM_ExtensionComponent.idl: - * ciao/extension/CCM_ExtensionContext.idl: - * ciao/extension/CCM_InvalidRegistration.idl: - * ciao/extension/CCM_QoS.idl: - * ciao/extension/CCM_ServantContainerInterceptor.idl: - * ciao/extension/CCM_ServantContainerInterceptorRegistration.idl: - * ciao/extension/CCM_ServerContainerInterceptor.idl: - * ciao/extension/CCM_ServerContainerInterceptorRegistration.idl: - * ciao/extension/CCM_StubContainerInterceptor.idl: - * ciao/extension/CCM_StubContainerInterceptorRegistration.idl: - * ciao/extension/ExtensionContext.h: - * ciao/extension/ExtensionContext.cpp: - * ciaosvcs: - * ciaosvcs/Events: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp: - * ciaosvcs/Events/CIAO_Events.mpc: - * ciaosvcs/Events/CIAO_Events_Base: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h: - * ciaosvcs/Events/CIAO_Events_Export.h: - * ciaosvcs/Events/CIAO_RTEC: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * docs/schema/CIAOEvents.txt: - * examples/BasicSP/descriptors/BasicSP.cdp: - * examples/Hello/ReDaC-Usage.html: - * examples/Hello/descriptors/Hello.cid: - * examples/Hello/descriptors/Hello.cpd: - * examples/Hello/descriptors/Libraries.iad: - * examples/Hello/descriptors/Receiver.ccd: - * examples/Hello/descriptors/Receiver.cid: - * examples/Hello/descriptors/Receiver.cpd: - * examples/Hello/descriptors/Receiver_Exec.iad: - * examples/Hello/descriptors/Receiver_Stub.iad: - * examples/Hello/descriptors/Receiver_Svnt.iad: - * examples/Hello/descriptors/Sender.ccd: - * examples/Hello/descriptors/Sender.cid: - * examples/Hello/descriptors/Sender.cpd: - * examples/Hello/descriptors/Sender_Exec.iad: - * examples/Hello/descriptors/Sender_Stub.iad: - * examples/Hello/descriptors/Sender_Svnt.iad: - * examples/Hello/descriptors_ReDaC: - - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp: - * examples/Hello/descriptors_events: - * examples/Hello/descriptors_events/NodeManagerMap.dat: - * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat: - * examples/Hello/descriptors_events/NodeManagerMap_collocated.dat: - * examples/Hello/descriptors_events/README: - * examples/Hello/descriptors_events/RunEventTest.pm: - * examples/Hello/descriptors_events/ciao-events-example-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced: - * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced: - * examples/Hello/descriptors_events/ciao-events-example.ced: - * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced: - * examples/Hello/descriptors_events/ciao-events-federation-udp.ced: - * examples/Hello/descriptors_events/deploymentplan_events.cdp: - * examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp: - * examples/Hello/descriptors_events/deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_events/rtec.conf: - * examples/Hello/descriptors_events/run_NodeDaemons.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl: - * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl: - * examples/Hello/descriptors_events/run_test.pl: - * examples/Hello/descriptors_events/run_test_collocated.pl: - * examples/Hello/descriptors_events/run_test_federated.pl: - * examples/Hello/descriptors_events/run_test_filtered.pl: - * examples/Hello/descriptors_events/run_test_multicast.pl: - * examples/Hello/descriptors_events/run_test_multiple_senders.pl: - * examples/Hello/descriptors_events/run_test_simple.pl: - * examples/Hello/descriptors_events/run_test_udp.pl: - * examples/Hello/descriptors_events/run_test_udp_collocated.pl: - * examples/Hello/descriptors_shared_components: - * examples/Hello/descriptors_shared_components/deploymentplan.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp: - * examples/Null_Component/descriptors/Deployment.xsd: - * examples/Null_Component/descriptors/Domain.cdd: - * examples/Null_Component/descriptors/Null_Assembly.cid: - * examples/Null_Component/descriptors/Null_Assembly_Package.cpd: - * examples/Null_Component/descriptors/Null_Component.ccd: - * examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid: - * examples/Null_Component/descriptors/Null_Component_Package.cpd: - * examples/Null_Component/descriptors/Null_Component_exec.iad: - * examples/Null_Component/descriptors/Null_Component_stub.iad: - * examples/Null_Component/descriptors/Null_Component_svnt.iad: - * examples/Null_Component/descriptors/PackageConfiguration.pcd: - * examples/Null_Component/descriptors/Plan.cdp: - * examples/Null_Component/descriptors/TopLevelPackage.tpd: - * examples/Null_Component/descriptors/XMI.xsd: - * tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h: - * tools/Config_Handlers/Utils/Utils.mpc: - * tools/Config_Handlers/Utils/XML_Error_Handler.h: - * tools/Config_Handlers/Utils/XML_Error_Handler.cpp: - * tools/Config_Handlers/Utils/XML_Helper.h: - * tools/Config_Handlers/Utils/XML_Helper.tpp: - * tools/Config_Handlers/Utils/XML_Helper.cpp: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp: - * tools/Config_Handlers/Utils/XercesString.h: - * tools/Config_Handlers/Utils/XercesString.cpp: - - Removed these files. - -Wed Feb 11 13:35:59 UTC 2009 William R. Otte - - * Merged in from prism_import branch - - Wed Feb 11 02:15:21 UTC 2009 William R. Otte - - * CIAO-INSTALL.html: - * CIAO.mwc: - * CIAO_DAnCE.mwc: - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * COPYING: - * ChangeLogs: - * NEWS: - * PROBLEM-REPORT-FORM: - * README: - * Release: - * VERSION: - * bin: - * bin/ciao_tests.lst: - * ciaosvcs: - * examples: - * examples/BasicSP/EC/client.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/DevGuideExamples: - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Display/RateGen/controller.cpp: - * examples/Hello/Sender/starter.cpp: - * examples/Null_Component/StaticDAnCEApp.cpp: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Swapping/Sender/starter.cpp: - * performance-tests: - * performance-tests/Benchmark/Multi_Threaded/client.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Protocols/Controller/Controller.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/mico/mico-thrput-st/client.cc: - * rules.ciao.GNU: - - Merged in changes from HEAD. - - Wed Feb 11 01:36:39 UTC 2009 William R. Otte - - * DAnCE/Logger/Logger.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * MPC/config/dance_logger.mpb: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * examples/Hello/Sender/Sender_exec.h: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tests/Minimum/Receiver/Receiver.mpc: - - Windows fixes. - - Wed Feb 11 00:18:44 UTC 2009 William R. Otte - - * CCF: - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - * CCF/CCF/CodeGenerationKit/IndentationJava.hpp: - * CIDLC: - * CIDLC/AttributeHeaderEmitters.cpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/Literals.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/SizeTypeCalculator.cpp: - * CIDLC/cidlc.cpp: - * docs: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - * tools/IDL3_to_IDL2: - - Merged changes in from trunk - - Tue Feb 10 23:31:09 UTC 2009 William R. Otte - - * DAnCE/TargetManager/TargetManager.mpc: - - Disabled this for now. - - Tue Feb 10 19:13:45 UTC 2009 William R. Otte - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * ciao/Containers/Session/Session_Container.cpp: - - Loffinf changes. - - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - - compile fixes to the last commit. - - * VERSION: - * ciao/Version.h: - - Updated version number to current. - - * examples/DevGuideExamples: - * examples/DevGuideExamples/Messenger/Administrator.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.h: - * examples/DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * examples/DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - - Partially ported this example. - - Tue Feb 10 18:18:41 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment.idl: - * DAnCE/Deployment/Deployment_Application.idl: - * DAnCE/Deployment/Deployment_ApplicationManager.idl: - * DAnCE/Deployment/Deployment_Base.idl: - * DAnCE/Deployment/Deployment_Connection.idl: - * DAnCE/Deployment/Deployment_Core.idl: - * DAnCE/Deployment/Deployment_Data.idl: - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/Deployment/Deployment_DomainApplication.idl: - * DAnCE/Deployment/Deployment_DomainApplicationManager.idl: - * DAnCE/Deployment/Deployment_ExecutionManager.idl: - * DAnCE/Deployment/Deployment_NodeApplication.idl: - * DAnCE/Deployment/Deployment_NodeApplicationManager.idl: - * DAnCE/Deployment/Deployment_NodeManager.idl: - * DAnCE/Deployment/Deployment_Packaging_Data.idl: - * DAnCE/Deployment/Deployment_RepositoryManager.idl: - * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl: - * DAnCE/Deployment/Deployment_TargetData.idl: - * DAnCE/Deployment/Deployment_TargetManager.idl: - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/NodeApplication/ComponentInstallation_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h: - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - * DAnCE/Utils/Plan_Handler.h: - * DAnCE/Utils/Plan_Handler.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/MocksTest/MocksTest.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest/Dummy.idl: - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/Dummy.idl: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - * ciao/CIAO_FailureReasons.idl: - * ciao/Client_init.h: - * ciao/Client_init.cpp: - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: - * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.idl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Contexts/Context.mpc: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Server_init.cpp: - * ciao/Valuetype_Factories/Factories.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/EC/EC_exec.cpp: - * examples/BasicSP/EC/client.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Null_Component/StaticDAnCEApp.cpp: - * examples/Swapping/Sender/starter.cpp: - * ofccm/Cdmw/CDMW_Deployment.idl: - * ofccm/NodeApplication/ComponentInstallation_Impl.h: - * performance-tests/Benchmark/Multi_Threaded/client.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/mico/mico-thrput-st/client.cc: - * performance-tests/mico/mico-thrput-st/server.cc: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tools/Config_Handlers/Any_Handler.h: - * tools/Config_Handlers/Any_Handler.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - * tools/Config_Handlers/CIAO_Events/test.cpp: - * tools/Config_Handlers/DD_Handler.h: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/DP_Handler.h: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/dynany_test.idl: - * tools/Config_Handlers/DynAny_Handler/test.cpp: - * tools/Config_Handlers/DynAny_Handler/test.mpc: - * tools/Config_Handlers/ESD_Handler.h: - * tools/Config_Handlers/ESD_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.h: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/IDREF_Base.h: - * tools/Config_Handlers/IDREF_Base.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/RT-CCM/OR_Handler.h: - * tools/Config_Handlers/RT-CCM/OR_Handler.cpp: - * tools/Config_Handlers/RT-CCM/SRD_Handler.h: - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/test.cpp: - * tools/Config_Handlers/XML_Typedefs.h: - * tools/Config_Handlers/test.cpp: - * tools/IDL3_to_IDL2/cdmw_idl.cpp: - * tools/XML/XercesString.cpp: - - Fuzz. - - Fri Feb 6 22:06:51 UTC 2009 William R. Otte - - * bin/ciao_tests.lst: - - Added in tests that have been ported. - - Fri Feb 6 20:28:09 UTC 2009 William R. Otte - - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - - Fixes that should have been in previous commit. - - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component/descriptors/NodeMap.dat: - * examples/Null_Component/descriptors/Null_Homed.cdp: - * examples/Null_Component/descriptors/Null_Unhomed.cdp: - * examples/Null_Component/descriptors/run_test.pl: - - Ported this example to new CIAO/DAnCE. - - * examples/Null_Component/descriptors/Deployment.xsd: - * examples/Null_Component/descriptors/Domain.cdd: - * examples/Null_Component/descriptors/Null_Assembly.cid: - * examples/Null_Component/descriptors/Null_Assembly_Package.cpd: - * examples/Null_Component/descriptors/Null_Component.ccd: - * examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid: - * examples/Null_Component/descriptors/Null_Component_Package.cpd: - * examples/Null_Component/descriptors/Null_Component_exec.iad: - * examples/Null_Component/descriptors/Null_Component_stub.iad: - * examples/Null_Component/descriptors/Null_Component_svnt.iad: - * examples/Null_Component/descriptors/PackageConfiguration.pcd: - * examples/Null_Component/descriptors/Plan.cdp: - * examples/Null_Component/descriptors/TopLevelPackage.tpd: - * examples/Null_Component/descriptors/XMI.xsd: - - Removed these files. - - Fri Feb 6 19:51:02 UTC 2009 William R. Otte - - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/home_impl.py: - * DAnCE/bin/generate_plan.py: - - Fixes to better handle namespaces components may be declared in. - - * examples/BasicSP/descriptors/run_test.pl: - - Will run plan specified on commad line. - - * examples/BasicSP/descriptors/BasicSP_Homed.cdp: - - Same as the _Unhomed plan, except all components are explicitly homed. - - Fri Feb 6 19:36:03 UTC 2009 William R. Otte - - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/EC/EC_exec.cpp: - - Raised the priority of logging messages so they would appear - without CIAO_LOG_LEVEL being set. - - * examples/BasicSP/EC/controller.cpp: - * examples/BasicSP/descriptors/BasicSP_Unhomed.cdp: - * examples/BasicSP/descriptors/run_test.pl: - - Fixes necessary to make this test work. - - Fri Feb 6 19:22:40 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Better exception handling. - - Fri Feb 6 18:26:39 UTC 2009 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Better exception handling. - - * DAnCE/bin/PythonDAnCE/generator/artifact.py: - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/header.py: - * DAnCE/bin/generate_plan.py: - - Bugfixes for plangenerator. - - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/EC/EC_exec.h: - * examples/BasicSP/EC/EC_exec.cpp: - - Added component servant and executor factory operations. - - * examples/BasicSP/descriptors/BasicSP.dat: - * examples/BasicSP/descriptors/BasicSP_Unhomed.cdp: - * examples/BasicSP/descriptors/run_test.pl: - - Ported to new version of DAnCE. test script still needs to invoke correct controller. - - * examples/BasicSP/descriptors/BasicSP.cdp: - - Removed obsolete plan. - - Fri Feb 6 13:44:54 UTC 2009 William R. Otte - - * DAnCE/bin/PythonDAnCE: - * DAnCE/bin/PythonDAnCE/__init__.py: - * DAnCE/bin/PythonDAnCE/generator: - * DAnCE/bin/PythonDAnCE/generator/__init__.py: - * DAnCE/bin/PythonDAnCE/generator/_path.py: - * DAnCE/bin/PythonDAnCE/generator/artifact.py: - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/footer.py: - * DAnCE/bin/PythonDAnCE/generator/header.py: - * DAnCE/bin/PythonDAnCE/generator/home_impl.py: - * DAnCE/bin/PythonDAnCE/generator/home_inst.py: - * DAnCE/bin/PythonDAnCE/generator/homed_comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/homed_comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/templet.py: - * DAnCE/bin/generate_plan.py: - - First cut implementation of a very simple cdp generator. - - Thu Feb 5 19:36:49 UTC 2009 William R. Otte - - * ofccm/DAnCE_Scripts: - * ofccm/DAnCE_Scripts/em-log.conf: - * ofccm/DAnCE_Scripts/em.conf: - * ofccm/DAnCE_Scripts/integ_deployment.sh: - * ofccm/DAnCE_Scripts/integ_deployment.xsl: - * ofccm/DAnCE_Scripts/logger.conf: - * ofccm/DAnCE_Scripts/pl-log.conf: - * ofccm/DAnCE_Scripts/pl.conf: - * ofccm/DAnCE_Scripts/plb-log.conf: - * ofccm/DAnCE_Scripts/plb.conf: - * ofccm/DAnCE_Scripts/start_ExecutionManager.sh: - * ofccm/DAnCE_Scripts/start_PlanLauncher.sh: - * ofccm/DAnCE_Scripts/start_PlanLauncherBase.sh: - * ofccm/DAnCE_Scripts/start_demo_1.sh: - - * DAnCE/bin/em-log.conf: - * DAnCE/bin/em.conf: - * DAnCE/bin/integ_deployment.sh: - * DAnCE/bin/integ_deployment.xsl: - * DAnCE/bin/logger.conf: - * DAnCE/bin/pl-log.conf: - * DAnCE/bin/pl.conf: - * DAnCE/bin/plb-log.conf: - * DAnCE/bin/plb.conf: - * DAnCE/bin/start_ExecutionManager.sh: - * DAnCE/bin/start_PlanLauncher.sh: - * DAnCE/bin/start_PlanLauncherBase.sh: - * DAnCE/bin/start_demo_1.sh: - - Moved OFCCM specific scripts over to the ofccm directory. - - Thu Feb 5 19:07:02 UTC 2009 William R. Otte - - * tests/IDL3_to_XMI: - * tools/IDL3_to_XMI: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Ported this tool, and associated tests in from head. - - Thu Feb 5 18:37:55 UTC 2009 William R. Otte - - * bin/ciao_tests.lst: - - Ported this file in from trunk. - - * DAnCE/tests/NodeApplicationTest: - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl: - * DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.idl: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DAnCE/tests/NodeApplicationTest/README: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_stub_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_svnt_export.h: - * DAnCE/tests/NodeApplicationTest/run_test.pl: - * DAnCE/tests/NodeApplicationTest/run_test_ex.pl: - * DAnCE/tests/NodeApplicationTest/run_test_simple.pl: - - Removed obsolete test. - - Thu Feb 5 18:30:34 UTC 2009 William R. Otte - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added component factory functions, similar to those already generated for - Homes. - - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp: - - Added in generated factory functions from above. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - - Added ability to run a single plan by passing it as a command line - arguments. - - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentUnhomed.cdp: - - Test for unhomed components. - - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - - Fixes for unhomed components. - - Thu Feb 5 16:03:59 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - - First cut implementation of unhomed component deployment. Untested as yet. - - Thu Feb 5 14:40:18 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * tools/Config_Handlers/ERE_Handler.cpp: - - Fixes to enable external reference connections for non-provider connections. - - Thu Feb 5 00:39:48 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - - Fixed a segmentation fault. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - - Tests similar to those in NodeManager-Deployments, except across two nodes. - - Wed Feb 4 22:08:09 UTC 2009 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - - Removed CLINFO from the logging messages. - - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - - Test script to execute all deployments in this directory - - * tools/XML/XML_Helper.tpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - - Reduced logging. - - Wed Feb 4 21:18:18 UTC 2009 William R. Otte - - * ciao/Containers/Container_Base.cpp: - - Demoted the logging priority of failure to find a receptacle policy. - - * examples/Hello/descriptors/run_test.pl: - - removed some extraneous logging. - - Wed Feb 4 19:07:27 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * examples/Hello/descriptors/run_test.pl: - - fixing nameservice support. - - Wed Feb 4 01:26:49 UTC 2009 William R. Otte - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Added TAO_ROOT/utils. - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Logging changes. - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Compile fixes. - - * DAnCE/NodeApplication/Name_Utilities.cpp: - - Fixed segmentation faults. - - * DAnCE/tests/MocksTest/MockTest.mpc: - - Disabled. - - * examples/Hello/descriptors/run_test.pl: - - Fixes to use correct binaries and arguments. This test now runs. - - Tue Feb 3 14:24:17 UTC 2009 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * examples/Hello/descriptors/run_test.pl: - - Migrating changes to a new workspace. - - Mon Jan 12 17:41:29 UTC 2009 Abdullah Sowayan - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - - Use var types to encapsulates memory management instead - of using ptr types. This closes bugzilla 3538. - - Thu Dec 11 5:05:57 UTC 2008 Johnny Willemsen - - * ccm/CCM_KeylessCCMHome.idl: - Updated include - - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - * ciao/Containers/Session/Session_Container.h: - Layout changes - - * ciao/Containers/Session/Session_Container.cpp: - const/initialise pointer with 0 - - Fri Nov 28 16:05:57 UTC 2008 Johnny Willemsen - - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Added missing include - - Wed Nov 26 16:17:57 UTC 2008 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication.mpc: - Layout changes - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Layout changes to the help message - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/starter.cpp: - Unicode changes - - Wed Nov 26 15:04:57 UTC 2008 Johnny Willemsen - - * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc: - Added dynamic flags - - * ciao/Contexts/Swapping/CIAO_UpgradeableContext.idl: - Updated include - - * CIDLC/ExecutorMappingGenerator.cpp: - Update the include being generated - - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/Dummy.idl: - * DAnCE/tests/NameServiceTest/NameServiceTest.mpc: - * DAnCE/tests/NameServiceTest/run_test.pl: - Cleanup and wchar - - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - Fixed warning - - * examples/Swapping/Receiver/Receiver.mpc: - Disabled some projects - - * ofccm/NodeApplication/NodeApplication_Impl.h: - Updated include - - * tests/CIAO_ComponentServer/Basic/client.cpp: - Unicode changes - - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - Updated - - Wed Nov 26 14:22:57 UTC 2008 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager.mpc: - Disabled a few projects - - * DAnCE/tests/MocksTest/MocksTest.cpp: - Unicode change - - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - Fixed compile errors with msvc - - * examples/BasicSP/BasicSP.mpc: - Refactored this file a little bit. With msvc I do see that cidl - is each time executed even when nothing changes. This has to be fixed - - * MPC/config/dance_cdmw_idl.mpb: - Fixed after - - * ofccm/Cdmw/CDMW_Deployment.idl: - * ofccm/Cdmw/CDMW_IDL_Ext.idl: - Updated includes - - * ofccm/Cdmw/CDMW_IDL.mpc: - Use seperate idl project - - * ofccm/NodeApplication/ServerActivator_Impl.h: - Updated include - - Tue Nov 25 15:55:57 UTC 2008 Johnny Willemsen - - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - * ccm/ComponentServer/ComponentServer.idl: - * ccm/ComponentServer/ComponentServer.mpc: - * ccm/ComponentServer/ComponentServer_Base.idl: - * ccm/ComponentServer/ComponentServer_Client.idl: - Renamed with CCM prefix - - * ccm/CCM_Enumeration.idl: - * ccm/CCM_Object.idl: - Moved sequence CCMObjectSeq to CCM_Object - - * ciao/ComponentServer/CIAO_ComponentServer.idl: - Use CCMObjectSeq - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - Use CCMObjectSeq - - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/Containers/Session/Session_Container.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * ofccm/Cdmw/CDMW_IDL.idl - Updated include - - * examples/Swapping/Sender/Sender.mpc: - Disabled these projects - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - Explicitly list export header files - - Tue Nov 25 14:30:57 UTC 2008 Johnny Willemsen - - * ccm/ComponentServer/ComponentServer.mpc: - Only compile the IDL files as part of one project - - * ciao/Servants/Servants.mpc: - Move template files to seperate group - - * DAnCE/NodeApplication/Name_Utilities.cpp: - Fixed warning - - * ofccm/NodeApplication/NodeApplication_Impl.cpp: - Initialise pointers with 0 - - Tue Nov 25 08:30:57 UTC 2008 Johnny Willemsen - - * ciao/Servants/Swapping/CIAO_SwapExec.idl: - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h - * examples/Swapping/Receiver/Receiver_exec.h - * examples/Swapping/Sender/Sender_exec_1.h - * examples/Swapping/Sender/Sender_exec_2.h - * ofccm/NodeApplication/ComponentInstallation_Impl.h - * ofccm/NodeApplication/NodeApplication_Impl.cpp - * ofccm/NodeApplication/NodeApplication_Impl.h - * ofccm/NodeApplication/ServerActivator_Impl.cpp - * ofccm/NodeApplication/ServerActivator_Impl.h - Updated includes - - * ciao/Servants/Swapping/Swapping_Servants.mpc - * ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h - New files - - Mon Nov 24 20:08:57 UTC 2008 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.cpp: - Fixed compile error - - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Port_Activator_T.h: - Fixed signature deactivate - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Datatype/const changs - - * DAnCE/NodeApplication/Name_Utilities.cpp: - * DAnCE/NodeApplication/Name_Utilities.h: - Unicode changes - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Layout changes - - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - Datatype changes - - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - Fixed compile error - - * examples/Swapping/Sender/Sender_exec.h: - Fixed include - - Mon Nov 24 19:48:57 UTC 2008 Johnny Willemsen - - * ccm/ComponentServer/ComponentServer.mpc - Layout change - - * ciao/Containers/Session/Session_Container.cpp: - Catch exceptions as const - - * ciao/Contexts/Context_Impl_Base.h: - Updated include - - * ciao/Servants/Home_Servant_Impl_Base.h: - Include Container_BaseC.h, the forward declaration - gives problems with msvc8 - - * ciao/Servants/Port_Activator.h: - Corrected signature so that we match the base class - - * ciao/Servants/Servant_Impl_T.h: - Removed not needed forward declaration - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Unicode changes - - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - Const change - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Unicode and layout changes - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Layout changes and initialise pointer with 0 - - * examples/Hello/Sender/Sender_exec.cpp: - Unicode change - - * ofccm/Cdmw/CDMW_Deployment.idl: - * ofccm/Cdmw/CDMW_IDL_Ext.idl: - Updated includes - - Mon Nov 24 16:06:57 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeApplication/Name_Utilities.cpp: - - Files missing from last commit. - - Sun Nov 23 23:59:50 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Properties.idl: - - Rearranged, organized - - * DAnCE/DomainApplicationManager/Node_Locator.h: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - - Improved NameService support. - - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/run_test.pl: - - Updates to work with new DAnCE. - - * tools/Config_Handlers/XSCRT/Elements.hpp: - * tools/XML/XML_Helper.h: - - Compile fixes. - - * examples/Hello/ReDaC-Usage.html: - * examples/Hello/descriptors/Hello.cid: - * examples/Hello/descriptors/Hello.cpd: - * examples/Hello/descriptors/Libraries.iad: - * examples/Hello/descriptors/Receiver.ccd: - * examples/Hello/descriptors/Receiver.cid: - * examples/Hello/descriptors/Receiver.cpd: - * examples/Hello/descriptors/Receiver_Exec.iad: - * examples/Hello/descriptors/Receiver_Stub.iad: - * examples/Hello/descriptors/Receiver_Svnt.iad: - * examples/Hello/descriptors/Sender.ccd: - * examples/Hello/descriptors/Sender.cid: - * examples/Hello/descriptors/Sender.cpd: - * examples/Hello/descriptors/Sender_Exec.iad: - * examples/Hello/descriptors/Sender_Stub.iad: - * examples/Hello/descriptors/Sender_Svnt.iad: - * examples/Hello/descriptors_ReDaC: - * examples/Hello/descriptors_events: - * examples/Hello/descriptors_shared_components: - - Removed these files. - - Fri Nov 21 16:58:00 UTC 2008 William R. Otte - - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - - Better support for the naming service. - - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/run_test.pl: - - ported to new DAnCE. - - * examples/Hello/descriptors/Hello.cid: - * examples/Hello/descriptors/Hello.cpd: - * examples/Hello/descriptors/Libraries.iad: - * examples/Hello/descriptors/Receiver.ccd: - * examples/Hello/descriptors/Receiver.cid: - * examples/Hello/descriptors/Receiver.cpd: - * examples/Hello/descriptors/Receiver_Exec.iad: - * examples/Hello/descriptors/Receiver_Stub.iad: - * examples/Hello/descriptors/Receiver_Svnt.iad: - * examples/Hello/descriptors/Sender.ccd: - * examples/Hello/descriptors/Sender.cid: - * examples/Hello/descriptors/Sender.cpd: - * examples/Hello/descriptors/Sender_Exec.iad: - * examples/Hello/descriptors/Sender_Stub.iad: - * examples/Hello/descriptors/Sender_Svnt.iad: - - Removed superfluous files. - - * examples/Hello/descriptors_ReDaC: - * examples/Hello/descriptors_events: - * examples/Hello/descriptors_shared_components: - * examples/Hello/ReDaC-Usage.html: - - Removed these files, as these features are no longer supported. - - Tue Nov 18 15:40:23 UTC 2008 Johnny Willemsen - - * CIDLC/Literals.cpp: - Generate CIAO version info in the header of the generated file - - Tue Nov 18 15:22:23 UTC 2008 Johnny Willemsen - - * DAnCE/Utils/DAnCE_Utils.mpc: - * DAnCE/Utils/Plan_Handler.cpp: - Fixed compilation - - Tue Nov 18 15:15:23 UTC 2008 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.h: - * DAnCE/Deployment/Deployment_TargetManager.idl: - * DAnCE/TargetManager/DomainDataManager.h: - Layout changes - - * DAnCE/TargetManager/CmpClient.cpp: - wchar changes - - * DAnCE/TargetManager/DomainEvents.idl: - Updated includes - - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/TargetManager/TargetManagerImpl.idl - Updated for all refactoring - - * MPC/config/ciao_nodemanager_stub.mpb: - * MPC/config/ciao_targetmanager_stub.mpb: - * MPC/config/ciao_targetmanager_svnt.mpb: - * MPC/config/dance_nodemanager_stub.mpb: - * MPC/config/dance_nodemanager_svnt.mpb: - Updated these with unique lib names and correct aftes - - Tue Nov 18 14:55:23 UTC 2008 Johnny Willemsen - - * DAnCE/Interfaces/Interfaces.mpc: - Added custom idl projects and added DAnCE_NodeManager_svnt - - Tue Nov 18 14:16:23 UTC 2008 Johnny Willemsen - - * ciao/Contexts/Context.mpc: - Added missing dynamicflags - - * ciao/Servants/Servant_Impl_Utils_T.cpp: - Layout change - - * MPC/config/ciao_context_impl.mpb: - New base project - - * MPC/config/ciao_servant.mpb: - Use ciao_context_impl - - Mon Nov 17 16:08:23 UTC 2008 Johnny Willemsen - - * CCF/CCF/IDL2/Parser.hpp: - Undef interface when it is defined - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/DomainApplicationManager/Node_Locator.h - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.h - * DAnCE/NodeApplication/ServerActivator_Impl.cpp - * DAnCE/NodeApplication/ServerActivator_Impl.h - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - Various cleanup/layout changes - - Mon Nov 17 15:03:23 UTC 2008 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer.h - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp - * ciao/ComponentServer/CIAO_Container_Impl.h - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h - * ciao/ComponentServer/CIAO_ServerResources.idl - * ciao/Containers/Container_Base.cpp - * ciao/Containers/Container_Base.h - * ciao/Containers/Servant_Activator.cpp - * ciao/Containers/Servant_Activator.h - * ciao/Containers/Session/Session_Container.cpp - * ciao/Containers/Session/Session_Container.h - Layout changes - - * ciao/ComponentServer/Configurator_Factory.cpp - * ciao/ComponentServer/Configurator_Factory.h - No need to have a member variable - - Mon Nov 17 14:34:23 UTC 2008 Johnny Willemsen - - * ciao/Client_init.cpp - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp - * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp - * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp - * ciao/Containers/Container_Base.cpp - * ciao/Containers/Servant_Activator.cpp - * ciao/Containers/Session/Session_Container.cpp - * ciao/Servants/Servant_Impl_Base.cpp - * ciao/Server_init.cpp - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp - * CIDLC/ServantSourceGenerator.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp - Layout, %s->%C changes - - Mon Nov 17 14:17:23 UTC 2008 Johnny Willemsen - - * DAnCE/Deployment/DAnCE_Core.mpc: - Removed -Gos, this has to be enabled in the default.features - file through gen_ostream=1 - - Sun Nov 16 22:12:23 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Properties.idl: - - Added naming service and component IOR properties. - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/RedirectionService/NameServiceRedirection.cpp: - - Logging/layout changes. - - Fri Nov 14 22:18:16 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Support for dumping deployment plan at deployment time based on presence - of the gen_ostream MPC feature. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Logging improvements. - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/NodeManagerMap.dat: - - Porting of the basic Hello example to the new CIAO/DAnCE. - - Fri Nov 14 18:51:35 UTC 2008 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/Starter/Starter.cpp: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest/ObjectLocatorTest.mpc: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - * MPC/config/ciao_componentserver_svnt.mpb: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/Containers/Swapping/Swapping_Container.cpp: - - Warning fixes on Linux. - - Thu Nov 13 22:58:42 UTC 2008 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - - Refactored support for finding IORs of NodeManagers - to support Node Maps and NameService. - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp: - * DAnCE/Deployment/Module_Main.h: - - dance_plan_launcher executable. - - Wed Nov 12 21:26:14 UTC 2008 William R. Otte - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Log message fixes. - - Wed Nov 12 21:22:43 UTC 2008 William R. Otte - - * DAnCE/Deployment/Module_Main.h: - - Fix to prevent a segmentation fault. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp: - - Fixes to enable running EM as a standalone executable and enable - EM driven deployments. - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Minor log message fix. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - - Text excercising EM controlled deployment of a single component to single node. - - Wed Nov 12 19:53:23 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments: - - Destination for EM included tests. - - * DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp: - - Test verifying multiplex facet connections. - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components: - * DAnCE/tests/CIAO/Components: - - Moved components directory up one level. - - Wed Nov 12 19:35:47 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - - Improved exception handling. - - Wed Nov 12 19:30:30 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/ComponentAttributesSetter.h: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Changes necessary to support attribiute initialization. - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.cidl: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.idl: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec_export.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_stub_export.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_svnt_export.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp: - - Test that excercises the setting of attributes on homes and components - during deployment. - - Wed Nov 12 18:06:10 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Properties.idl: - - Added naming service integration properties. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp: - - Changes necessary to get simplex facet/receptacle connections working. - - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - - Removed some extra output. - - Wed Nov 12 17:14:28 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp: - Changes for facet/receptacle connections, not finished yet - - moving to different machine. - - Fri Nov 7 18:46:09 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp: - - Fiexes for enabling connection of a standard emits/sub connection. - - Fri Nov 7 18:28:14 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp: - - Fixes for enabling connection of a standard pub/sub connection. - - Fri Nov 7 15:10:58 UTC 2008 William R. Otte - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/Traversal/Array.cpp: - * CCF/CCF/IDL3/IDL3.mpc: - * CIDLC/CIDLC.mwc: - - Reverted to revision 80830, as changes proposed in bug #3849 - caused a segmentation fault in Linux. - - Fri Nov 7 14:57:53 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - Test plan that will excercise a publish/subscribe connection. - - Thu Nov 6 20:55:19 UTC 2008 William R. Otte - - * CCF/CCF/CIDL/CIDL.mpc: - - Added reference to '.' in Source_Files accidentally (?) removed - by Tue Nov 4 10:10:28 UTC 2008 Johnny Willemsen . - - Thu Nov 6 20:25:28 UTC 2008 Johnny Willemsen - - * CCF/CCF/IDL2/IDL2.mpc - * CCF/CCF/IDL3/IDL3.mpc - Set /P flag for the archiver with bmake - - Thu Nov 6 19:25:22 UTC 2008 William R. Otte - - * tools/Config_Handlers/XSCRT/XML.hpp: - * tools/XML/XML_Schema_Resolver.cpp: - - Added support for xerces versions < 3.0. - - Thu Nov 6 18:47:56 UTC 2008 William R. Otte - - * DAnCE/Logger/Log_Macros.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - - Warning fixes for Linux. - - Thu Nov 6 16:35:22 UTC 2008 William R. Otte - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - - Disabled this build. - - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - - Minor fixes. - - * tools/Config_Handlers/IRDD_Handler.h: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/XML_Typedefs.h: - * tools/Config_Handlers/XML_Typedefs.cpp: - * tools/XML/XML_Helper.tpp: - - Compilation fixes. - - Thu Nov 6 15:28:10 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl: - * DAnCE/tests/NameServiceTest/NameServiceTest.mpc: - * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc: - * ciao/Containers/Swapping/Dynamic_Component_Activator.h: - - Compilation fixes. - - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - - Added a run_test script. - - Wed Nov 5 20:08:28 UTC 2008 Johnny Willemsen - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - Various changes for CB2009 support - - Tue Nov 4 10:10:28 UTC 2008 Johnny Willemsen - - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - Fixed ambiguity problems with CodeGear C++ Builder 2009 - - * CCF/CCF/CIDL/CIDL.mpc - Set /P flag for the archiver with bmake - - Mon Nov 3 19:56:29 UTC 2008 William R. Otte - - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl: - * ciao/Containers/Session/Session_Container.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tools/XML/XML_Error_Handler.cpp: - * tools/XML/XML_Helper.tpp: - - Compile/link fixes on linux. - - Mon Nov 3 18:32:28 UTC 2008 Johnny Willemsen - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/Starter/Starter.h - * MPC/config/cidlc.mpb - * MPC/config/dance_node_manager.mpb - * tools/XML/XML.mpc - Fixed various compile/link problems - - Mon Nov 3 17:13:28 UTC 2008 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication.mpc: - Added missing base project - - Thu Oct 23 09:25:28 UTC 2008 Johnny Willemsen - - * ciao/Containers/Container_Base.h - * ciao/Containers/Servant_Activator.h - * ciao/Containers/Session/Session_Container.h - * ciao/Containers/Swapping/Dynamic_Component_Activator.h - * ciao/Contexts/Context_Impl_T.h - * CIDLC/ExecImplHeaderGenerator.cpp - * DAnCE/TargetManager/TargetManager_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h - * examples/BasicSP/BasicSP_exec.h - * examples/BasicSP/BMClosedED/BMClosedED_exec.h - * examples/BasicSP/BMDevice/BMDevice_exec.h - * examples/BasicSP/BMDisplay/BMDisplay_exec.h - * examples/BasicSP/EC/EC_exec.h - * examples/Display/GPS/GPS_exec.h - * examples/Display/GPS/GPS_tracing_exec.h - * examples/Display/NavDisplay/NavDisplay_exec.h - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h - * examples/Display/RateGen/RateGen_exec.h - * examples/Hello/Receiver/Receiver_exec.h - * examples/Hello/Sender/Sender_exec.h - * examples/Null_Component/Null_Component_exec.h - * examples/Swapping/Receiver/Receiver_exec.h - * examples/Swapping/Sender/Sender_exec.h - * examples/Swapping/Sender/Sender_exec_1.h - * examples/Swapping/Sender/Sender_exec_2.h - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h - * performance-tests/Protocols/Receiver/Receiver_exec.h - * performance-tests/Protocols/Sender/Sender_exec.h - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h - * tests/Minimum/Receiver/Receiver_exec.h - * tests/Minimum/Sender/Sender_exec.h - Use ::CORBA::LocalObject - - Wed Oct 22 13:07:28 UTC 2008 William R. Otte - - * ciao/Servants/Home_Servant_Impl_T.cpp: - - Removed debug change that caused segfault. - - Wed Oct 22 12:48:37 UTC 2008 William R. Otte - - * DAnCE/Starter/Starter.cpp: - * DAnCE/Starter/Starter.mpc: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - - Compilation fixes. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - - Fixes to have the container properly manage the lifecycle of - components during the teardown phase, so that the - SimpleComponentExplicitHome plan properly teardown. - - * ciao/Logger/Log_Macros.h: - - Removed non-interpreted flags from CIAO_TRACE macros. - - Tue Oct 21 19:23:20 UTC 2008 Johnny Willemsen - - * DAnCE/DomainApplication/Domain_Application_Impl.h: - Added missing post.h - - Tue Oct 21 18:51:20 UTC 2008 Johnny Willemsen - - * ccm/CCM.mpc: - Make sure CIAO_ROOT is added to the include dirs - - Fri Oct 10 01:02:20 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/Deployment/DAnCE_Properties.idl: - - Codify DAnCE configuration property names in IDL. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Implemented passivation, removal, and destruction logic. - - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Added new command line options. - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h: - * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h: - - Component with no ports to test lifecycle operations. - - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - - Fixes for test passing. - - * ccm/CCM_Object.idl: - - Removed CIAO-specific interfaces. - - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - - Fixes for proper component/servant lifecycle management. - - Tue Oct 7 19:20:38 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/Components: - * DAnCE/tests/CIAO/Components: - - Moved Components subdirectory to the NodeManager-Deployments - directory. - - Tue Oct 7 19:16:06 UTC 2008 William R. Otte - - * DAnCE/tests/CIAO/Components: - * DAnCE/tests/CIAO/Components/SimpleCommon.idl: - * DAnCE/tests/CIAO/Components/SimpleCommon.mpc: - * DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer.cidl: - * DAnCE/tests/CIAO/Components/SimpleConsumer.idl: - * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter.cidl: - * DAnCE/tests/CIAO/Components/SimpleEmitter.idl: - * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.idl: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider.cidl: - * DAnCE/tests/CIAO/Components/SimpleProvider.idl: - * DAnCE/tests/CIAO/Components/SimpleProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher.cidl: - * DAnCE/tests/CIAO/Components/SimplePublisher.idl: - * DAnCE/tests/CIAO/Components/SimplePublisher.mpc: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h: - * DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser.cidl: - * DAnCE/tests/CIAO/Components/SimpleUser.idl: - * DAnCE/tests/CIAO/Components/SimpleUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h: - * DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h: - - Several components that individually test a single port type. - - Tue Oct 7 14:50:57 UTC 2008 William R. Otte - - * DAnCE/Logger/Log_Macros.h: - * DAnCE/Logger/Logger_Service.cpp: - - Missing from previous commit. - - * DAnCE/tests/CIAO: - * tests/DAnCE: - * tests/DAnCE/NodeManager-Deployments: - * tests/DAnCE/NodeManager-Deployments/SimpleHome.cdp: - * tests/DAnCE/NodeManager-Deployments/nm_launcher.mpc: - * tests/DAnCE/NodeManager-Deployments/simple_nm_launcher.cpp: - - Moved test under DAnCE tree. - - Tue Oct 7 14:37:30 UTC 2008 William R. Otte - - * DAnCE/Logger/Log_Macros.h: - * DAnCE/Logger/Logger_Service.cpp: - - Bugfixes. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Fixes necessary to pass NodeManager-Deployments/SimpleHome.cdp. - - * DAnCE/RedirectionService/RedirectionService.cpp: - - Improved logging. - - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/DAnCE/NodeManager-Deployments: - * tests/DAnCE/NodeManager-Deployments/SimpleHome.cdp: - * tests/DAnCE/NodeManager-Deployments/nm_launcher.mpc: - * tests/DAnCE/NodeManager-Deployments/simple_nm_launcher.cpp: - - Simple test to excercise installation of a single home. - - Mon Oct 6 15:12:49 UTC 2008 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - - Codified some component server configvalue names in IDL. - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Fixed a couple bugs w.r.t respecting default vs. custom server timeouts. - - Wed Oct 1 20:42:34 UTC 2008 William R. Otte - - * ciao/Logger/Logger_Service.cpp: - - Enabling tracing inadvertantly disabled logging. - - Wed Oct 1 20:27:33 UTC 2008 William R. Otte - - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - - Fixed some incompatibilities with Xerces 3.0, and improved logging in the - XML_File_Intf. - - Wed Oct 1 02:08:47 UTC 2008 William R. Otte - - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Changes necessary for NodeApplicationManager-NodeApplication test to pass. - - Tue Sep 30 14:52:09 UTC 2008 William R. Otte - - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Changes necessary to pass NodeManager-NodeApplicationManager test. - - Tue Sep 30 14:32:34 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Loader.h: - * DAnCE/Deployment/Module_Main.h: - * DAnCE/Logger/Log_Macros.h: - * DAnCE/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Exec.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Starter/Starter.h: - * DAnCE/Starter/Starter.cpp: - - Fixed logging infrastructure, enableed NodeManager binary and ensured - its ability to start up. - - * ciao/Logger/Log_Macros.h: - - Fixed tracing facility. - - Mon Sep 29 17:26:48 UTC 2008 William R. Otte - - * DAnCE/Deployment/Deployment_Connection.idl: - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/RedirectionService/NameServiceRedirection.h: - * DAnCE/RedirectionService/RedirectionService.h: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/MocksTest/MocksTest.cpp: - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/RegistrationPath.h: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - * MPC/config/ccm_svnt.mpb: - * MPC/config/ciao_executor.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/dance_exe.mpb: - * ciao/Client_init.h: - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/Configurator_Factory.cpp: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/ComponentServer/Configurators/Config_Manager.h: - * ciao/ComponentServer/Configurators/RTConfig_Manager.h: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/Logger_Service.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Server_init.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.h: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * ofccm/Cdmw/CDMW_IDL.mpc: - * ofccm/NodeApplication/ComponentAttributesSetter.cpp: - * ofccm/NodeApplication/NodeApplication.mpc: - * ofccm/NodeApplication/ServerActivator_Impl.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tests/Minimum/Sender/Sender.mpc: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Compile fixes, converted from <> includes to "" includes where appropriate. - - Tue Jun 3 14:01:08 UTC 2008 William R. Otte - - * DAnCE/Deployment/Deployment_Connection.idl: - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/RedirectionService/NameServiceRedirection.h: - * DAnCE/RedirectionService/RedirectionService.h: - * DAnCE/tests/MocksTest/MocksTest.cpp: - * DAnCE/tests/RedirectionServiceTest/RegistrationPath.h: - * ciao/Client_init.h: - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/Configurator_Factory.cpp: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/ComponentServer/Configurators/Config_Manager.h: - * ciao/ComponentServer/Configurators/RTConfig_Manager.h: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/Logger_Service.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Server_init.h: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * ofccm/NodeApplication/ComponentAttributesSetter.cpp: - * ofccm/NodeApplication/ServerActivator_Impl.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Fixed includes. - - Sun May 25 22:53:30 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Stripped much of the functionality to prepare for CIAO-specific implementation. - - * DAnCE/Deployment/Deployment_common.h: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/RedirectionService/CCMObjectLocator.h: - * MPC/config/ciao_servant.mpb: - * MPC/config/cidlc.mpb: - * MPC/config/dance_component_server_svnt.mpb: - * MPC/config/dance_node_application.mpb: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc: - - compile/link errors. - - Tue May 20 18:43:42 UTC 2008 William R. Otte - - * CIDLC/ExecImplSourceGenerator.cpp: - - Fixed spelling error. - - * DAnCE/Deployment/Deployment_common.h: - - Added PROPERTY_MAP typedef, a hash map translating names to property values. - - * MPC/config/ciao_servant.mpb: - * MPC/config/cidlc.mpb: - * MPC/config/dance_component_server_svnt.mpb: - * MPC/config/dance_node_application.mpb: - * ciao/CIAO.mpc: - * ciao/Client_init.cpp: - * ciao/Contexts/Context.mpc: - * ciaosvcs/Events/CIAO_Events.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * ofccm/NodeApplication/NodeApplication.mpc: - * tests/CIAO_ComponentServer/Activator/Activator.mpc: - - Compile/link fixes. - - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/Logger_Service.h: - * ciao/Logger/Logger_Service.cpp: - - Compile fixes/bugfixes for bugs exposed by SimpleComponent unit test. - - * tests/CIAO_ComponentServer/Basic/run_test.pl: - - slight bugfix. - - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.cidl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.idl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_stub_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_svnt_export.h: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - - Simple unit test which manually deploys a simple component into the - CIAO_ComponentServer. - - * tools/Config_Handlers/XSCRT/XML.hpp: - * tools/XML/XML_Error_Handler.h: - * tools/XML/XML_Error_Handler.cpp: - * tools/XML/XML_Helper.tpp: - * tools/XML/XML_Schema_Resolver.h: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XML_Schema_Resolver.cpp: - - Updates for Xerces 2.0 - - Thu Apr 10 23:44:01 UTC 2008 William R. Otte - - * MPC/config/ciao_cs_client.mpb: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Bugfixes necessary to make the ServerActivator test work. - - * tests/CIAO_ComponentServer/Activator: - * tests/CIAO_ComponentServer/Activator/Activator.mpc: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - - A simple exceercise of the CIAO ServerActivator, that - spawns component servers then uses them to create - containers. - - Wed Apr 9 20:08:07 UTC 2008 William R. Otte - - * MPC/config/ciao_exe.mpb: - - Make sure CIAO executables are installed to CIAO_ROOT/bin - - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/Configurators/Configurators.mpc: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Logger/Log_Macros.h: - * ciao/Servants/Port_Activator.cpp: - - Fixes to make the Basic component server test work. - - * tests/CIAO_ComponentServer: - * tests/CIAO_ComponentServer/Basic: - * tests/CIAO_ComponentServer/Basic/Basic.mpc: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - - Simple test that excercises creating and removing containers. - - Thu Apr 3 21:14:56 UTC 2008 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: - * ciao/ComponentServer/Configurators/Configurators.mpc: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - - Fixes necessary to allow the componentserver executable to start up - in standalone mode (i.e., without a managing ServerActivator). - - Also, the name of the executable has changed to entirely lower-case. - - * ofccm/NodeApplication/NodeApplication.mpc: - - Renamed a project to avoid a duplicate name. - - Wed Apr 2 21:23:12 UTC 2008 William R. Otte - - * ccm/CCM.mpc: - * ccm/CCM_Exceptions.idl: - * ccm/CCM_Home.idl: - - Moved some exceptions to a new file, CCM_Exceptions.idl. - - * ciao/CIAO.mpc: - * ciao/CIAO_FailureReasons.idl: - - Created IDL representing CIAO failure reasons for inclusion in exceptions - thrown from CIAO. - - * MPC/config/ciao_server.mpb: - * ciao/Client_init.h: - * ciao/Client_init.cpp: - * ciao/Server_init.h: - * ciao/Server_init.cpp: - - Moved a bunch of stuff from Server_init to Client_init, in particular, - the server init funciton is now implemented in terms of the - client's. Also moved the configvalue map functions over. - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Fully implemented ServerActivator implementation that spawns new - processes. This class is for the most part implemented using - the template method pattern, with a little effort it could be - extended to support other spawning models. - - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_CS_Client_svnt_export.h: - * ciao/ComponentServer/CIAO_ComponentServer.h: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - - Moved the CIAO-specific derivations of the component - server-related interfaces to CIAO::Deployment module. - - Thu Mar 27 19:26:18 UTC 2008 William R. Otte - - * ofccm/Cdmw: - * DAnCE/Cdmw: - - Moved to ofccm specific directory. - - Thu Mar 27 19:09:00 UTC 2008 William R. Otte - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Compile fixes, runtime functionality not expected. - - Thu Mar 27 18:30:16 UTC 2008 William R. Otte - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Logging/format changes, don't expect this to compile, mostly - a bookmark before I start the real work. - - Thu Mar 27 18:13:07 UTC 2008 William R. Otte - - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - Logging/format changes, don't expect this to compile, mostly - a bookmark before I start the real work. - - Thu Mar 27 15:09:33 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Formatting and logging changes. I don't expect this to compile, - just bookmarking for future reference. - - * MPC/config/ciao_session_container.mpb: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/Servants/Servants.mpc: - * ciao/Server_init.h: - - Linux compile error fixes. - - Mon Mar 24 16:18:46 UTC 2008 William R. Otte - - * DAnCE/Logger/Log_Macros.h: - * ciao/Containers/Session/Session_Container.idl: - * ciao/Logger/Log_Macros.h: - - Files missing from previous commit. - - Thu Mar 20 13:04:53 UTC 2008 William R. Otte - - * DAnCE/Deployment/Deployment_RepositoryManager.idl: - * DAnCE/bin/integ_deployment.xsl: - - Added missing newlines at end of file. - - * DAnCE/Logger/Logger_Service.cpp: - - Added DANCE_ logging macros to match ACE_, so we can later have - DAnCE use a log handler that is separate from ACE. - - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - * DAnCE/NodeApplication/ComponentInstallation_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - * DAnCE/RedirectionService/NameServiceRedirection.cpp: - * DAnCE/RedirectionService/RedirectionService.cpp: - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/RM_Helper.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/RepositoryManager/RepositoryManager.cpp: - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - * DAnCE/RepositoryManager/URL_Parser.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - * DAnCE/Starter/Starter.cpp: - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/Utils/Plan_Handler.cpp: - * DAnCE/tests/DeploymentPlanDump/test.cpp: - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: - * DAnCE/tests/DeploymentTest1/test.cpp: - * DAnCE/tests/MocksTest/plCommand.In: - * DAnCE/tests/MocksTest/run_test.pl: - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: - - Use DANCE_ debug and error macros for diagnostics. - - * ciao/Logger/Logger_Service.cpp: - - Created CIAO_ debug/error macros, so the ciao logger can be replaced - later to not use the default ACE logger. - - * ciao/Logger/File_Logger_Backend.cpp: - * ciao/CIAO_common.h: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: - * ciao/ComponentServer/Configurators/RTConfig_Manager.cpp: - * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Swapping/Dynamic_Component_Activator.inl: - * ciao/Containers/Swapping/Swapping_Container.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Server_init.cpp: - - Use CIAO_ error/debug macros instead of ACE. - - Thu Mar 20 10:53:58 UTC 2008 William R. Otte - - * DAnCE/NodeApplication/NodeApplication.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/Contexts/Context.mpc: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servants.mpc: - - Linking/compile errors that didn't crop up until a realclean. - - Tue Mar 18 23:08:36 UTC 2008 William R. Otte - - * ofccm: - * ofccm/NodeApplication: - - Copy of the OFCCM compatible NodeApplication logic. - - Tue Mar 18 22:29:19 UTC 2008 William R. Otte - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator.inl: - * ciao/Servants/Port_Activator.cpp: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/Containers/Containers.mpc: - - Removed ciao_{post,pre}activate, and addressed some fallout from the - container refactoring. - - * ccm/CCM_SessionComponent.idl: - - Added configuration_complete to this local interface. The CCM spec does not - have this operation defined, only having it on the executor locator, which is not - a required way to implement executors (and, I believe, excluded by LWCCM!). - - - * DAnCE/TargetManager/TargetManager_exec.h: - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp: - * ccm/CCM_Object.idl: - * docs/TODO.html: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - * examples/BasicSP/BMClosedED/BMClosedED_exec.h: - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/BMDisplay/BMDisplay_exec.h: - * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/BasicSP/EC/EC_exec.h: - * examples/BasicSP/EC/EC_exec.cpp: - * examples/Display/GPS/GPS_exec.h: - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/GPS/GPS_tracing_exec.h: - * examples/Display/GPS/GPS_tracing_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.h: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/Display/RateGen/RateGen_exec.h: - * examples/Display/RateGen/RateGen_exec.cpp: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component/StaticDAnCEApp.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Receiver/Receiver_exec.h: - * examples/Swapping/Receiver/Receiver_exec.cpp: - * examples/Swapping/Sender/Sender.mpc: - * examples/Swapping/Sender/Sender_exec.h: - * examples/Swapping/Sender/Sender_exec.cpp: - * examples/Swapping/Sender/Sender_exec_1.h: - * examples/Swapping/Sender/Sender_exec_1.cpp: - * examples/Swapping/Sender/Sender_exec_2.h: - * examples/Swapping/Sender/Sender_exec_2.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp: - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender_exec.cpp: - - Fallout from removing ciao_{pre,post}activate and replacing it with - standards based configuration_complete. - - Mon Mar 17 03:49:06 UTC 2008 William R. Otte - - * MPC/config/ciao_servant_activator.mpb: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base.inl: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.inl: - * ciao/Containers/Session/Session_Container.cpp: - - Compile error fallout from previous commits. - - * docs/CIAO_Style_Guide.txt: - - Added guidance for allocation and guards. - - Tue Mar 11 06:34:45 UTC 2008 William R. Otte - - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/CIAO_Servant_Activator_export.h: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base.inl: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.inl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.inl: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/CIAO_Port_Activator_export.h: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator.inl: - * ciao/Servants/Port_Activator.cpp: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servants.mpc: - - Refactored the container interface in substantial ways. First, the containers should - now be implemented as locality constrained objects based on the Container_Base.idl - interface. This interface now contains _all_ methods that are used by servants during - deployment and teardown, as well as interfaces intended to be used by the external container - interface to initiate copmonent and home installations. - - The goal here is to remove any need to have component servants dependent on specific container - implementation at all. - - Note that there is still quite some implementation required here - new methods and changes to - old ones. Everything at least compiles, which is a start. - - Changes to existing clients of the internal container interface should be plug-n-pray, - modulo changing pointer to vars. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Codegen changes for above. Servants for Hello and BasicSP compile. - - * MPC/config/ciao_port_activator_stub.mpb: - * MPC/config/ciao_servant_activator.mpb: - - Base projects for above. - - * ciao/Servants/Servant_Activator.h: - * ciao/Servants/Servant_Activator.cpp: - - Moved to container directory. - - Mon Mar 10 17:41:46 UTC 2008 William R. Otte - - * MPC/config/ccm.mpb: - * MPC/config/ccm_executor.mpb: - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_executor.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/dance_component_server_svnt.mpb: - - MPC files which should have been in previous commit. - - Mon Mar 10 15:45:57 UTC 2008 William R. Otte - - * CIAO_TAO_DAnCE.mwc: - - * DAnCE/Cdmw/CDMW_Deployment.idl: - * DAnCE/Cdmw/CDMW_IDL.idl: - * DAnCE/Cdmw/CDMW_IDL.mpc: - * DAnCE/Cdmw/CDMW_IDL_Ext.idl: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/Logger/Logger.mpc: - * DAnCE/NodeApplication/ComponentAttributesSetter.h: - * DAnCE/NodeApplication/ComponentInstallation_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * MPC/config/ccm_componentserver_stub.mpb: - * MPC/config/ccm_componentserver_svnt.mpb: - * ccm/ComponentServer/ComponentServer.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - * tools/XML/XML.mpc: - - Changes to fix compilation from previous refactoring - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Containers.mpc: - - Addidional container implementation. - - * ciao/Server_init.h: - * ciao/Server_init.cpp: - - ditched the CaMelCaSe in the name utility class. - - Mon Mar 10 00:57:38 UTC 2008 William R. Otte - - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - * DAnCE/TargetManager/TM_Client.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/tests/NodeApplicationManager-NodeApplication/NodeApplicationManager-NodeApplication.mpc: - * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - * MPC/config/dance_mocks.mpb: - * MPC/config/dance_node_application.mpb: - * bin/generate_component_mpc.pl: - * ccm/ComponentServer/ComponentServer.mpc: - * ciao/CIAO.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/Containers/Containers.mpc: - * ciao/Contexts/Context.mpc: - * ciao/Servants/Servants.mpc: - * ciao/Valuetype_Factories/Factories.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/Null_Interface.mpc: - * examples/Null_Component/StaticDAnCEApp.mpc: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Sender/Sender.mpc: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * performance-tests/Protocols/Controller/Controller.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/common/Protocols.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/CIDL/CodeGen/Basic.mpc: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc: - * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc: - * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc: - * tests/IDL3/Events/Abstract/Abstract.mpc: - * tests/IDL3/Events/Any/Any.mpc: - * tests/IDL3/Events/Regular/Regular.mpc: - * tests/IDL3/Homes/Attributes/HomeAttributes.mpc: - * tests/IDL3/Homes/Basic/Basic.mpc: - * tests/IDL3/Homes/Factory/Factory.mpc: - * tests/IDL3/Homes/Finder/Finder.mpc: - * tests/IDL3/Homes/Inheritance/Inheritance.mpc: - * tests/IDL3/ImpliedIDL/All/all.mpc: - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc: - * tests/IDL3/ImpliedIDL/Events/Events.mpc: - * tests/IDL3/ImpliedIDL/Homes/Homes.mpc: - * tests/IDL3/Lookup/lookup_test.mpc: - * tests/Minimum/Minimum_Base/Minimum_Base.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Sender/Sender.mpc: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DynAny_Handler.mpc: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - * tools/XML/XML.mpc: - - Adjusting for the deep-sixing of ciao_server_dnc, ciao_component_dnc, - and ciao_client_dnc. This probably breaks a bunch of stuff. - - Mon Mar 10 00:37:35 UTC 2008 William R. Otte - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Updates for ccm refactoring. - - * MPC/config/ccm_stub.mpb: - * MPC/config/ciao_events_base_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * MPC/config/dance_deployment_stub.mpb: - - MPC generation errors. - - Sun Mar 9 22:28:28 UTC 2008 William R. Otte - - * MPC/config/ciao_client.mpb: - * MPC/config/ciao_componentserver_stub.mpb: - * MPC/config/ciao_componentserver_svnt.mpb: - * MPC/config/ciao_config_manager.mpb: - * MPC/config/ciao_container_base.mpb: - * MPC/config/ciao_server.mpb: - * MPC/config/ciao_session_container.mpb: - - MPC build fixes. - - * ciao/CIAO.mpc: - * ciao/Client_init.cpp: - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_ServerResources.idl: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.inl: - * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: - * ciao/ComponentServer/Configurators/Config_Manager.h: - * ciao/ComponentServer/Configurators/Configurators.mpc: - * ciao/ComponentServer/Configurators/NoOp_Configurator.h: - * ciao/ComponentServer/Configurators/RTConfig_Manager.h: - * ciao/ComponentServer/Configurators/Server_Configurator.h: - * ciao/ComponentServer/Configurators/Server_Configurator.cpp: - * ciao/Valuetype_Factories/Factories.mpc: - - Compile fixes for previous refactoring. - - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - - Updated forward declarations to handle new component server. - - * ciao/Server_init.h: - * ciao/Server_init.cpp: - - Merged functions from CIAO_Utils. - - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_container_dnc.mpb: - * MPC/config/ciao_server_dnc.mpb: - * MPC/config/ciaodll.mpb: - * ciao/CCM_Core.mpc: - * ciao/CIAO_Core.mpc: - * ciao/CIAO_ServerResources.idl: - * ciao/CIAO_Utils.h: - * ciao/CIAO_Utils.cpp: - * ciao/CIAO_Utils_export.h: - * ciao/ComponentServer/Configurators/NAConfig_Manager.h: - * ciao/ComponentServer/Configurators/NAConfig_Manager.inl: - * ciao/ComponentServer/Configurators/NAConfig_Manager.cpp: - - Removed these files. - - Sun Mar 9 21:12:29 UTC 2008 William R. Otte - - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Container_Base_export.h: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container_export.h: - * ciao/Contexts/Context.mpc: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_export.h: - * MPC/config/ciao_session_container.mpb - * MPC/config/ciao_container_base.mpb - - MPC file, changes to logging, new, and guard macros - to comply with new CIAO style guidelines. - - * ciao/Servants/Servants.mpc: - * MPC/config/ciao_servant_activator.mpb - - Split activator out to its own lib. - - Sun Mar 9 20:38:52 UTC 2008 William R. Otte - - * ccm/ComponentServer: - * ccm/ComponentServer/ComponentServer.idl: - * ccm/ComponentServer/ComponentServer.mpc: - * ccm/ComponentServer/ComponentServer_Base.idl: - * ccm/ComponentServer/ComponentServer_Client.idl: - * MPC/config/ccm_componentserver_stub.mpb: - * MPC/config/ccm_componentserver_svnt.mpb: - - Moved ComponentServer IDLS from DAnCE to CCM. - - * ciao/CIAO_common.h: - - Removed ciao_debug_level, the full range of debug message levels - should be used instead. - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - - Updated to reflect ComponentServer move above. - - * ciao/Servants/CIAO_Servant_Impl_export.h: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Servant_Activator.h: - * ciao/Servants/Servant_Activator.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Servants/Servants.mpc: - * ciao/Servants/StandardConfigurator_Impl.h: - - MPC file, changes to logging, and updated - to use _THROW_EX versions of new and guard macros. - - * docs/CIAO_Style_Guide.txt: - - Some additional style requirements for CIAO. - - * DAnCE/ComponentServer: - * DAnCE/ComponentServer/ComponentServer.idl: - * DAnCE/ComponentServer/ComponentServer.mpc: - * DAnCE/ComponentServer/ComponentServer_Base.idl: - * DAnCE/ComponentServer/ComponentServer_Client.idl: - * DAnCE/ComponentServer/DAnCE_ComponentServer_stub_export.h: - * DAnCE/ComponentServer/DAnCE_ComponentServer_svnt_export.h: - * MPC/config/dance_component_server_stub.mpb: - * MPC/config/dance_component_server_svnt.mpb: - - Removed these files. - - Sun Mar 9 17:04:55 UTC 2008 William R. Otte - - * MPC/config/ccm_stub.mpb: - - Updated to comply with previous commit. - - Sun Mar 9 16:59:05 UTC 2008 William R. Otte - - * ciao/ComponentServer: - * DAnCE/CIAO_ComponentServer: - - Moved CIAO component server to ciao source tree, where it should be. - - * ciao/ccm - * ccm - - Moved CCM idl directory to root, to better indicate its non-dependency - on CIAO, the CCM implementation. - - Sun Mar 9 16:56:42 UTC 2008 William R. Otte - - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.cpp: - - Additional fleshing of the Container implementation, note this is - not expected to compile, simply being committed to complete the - directory structure refactoring. - - Sun Mar 9 16:47:24 UTC 2008 William R. Otte - - * MPC/config/ccm_configvalue.mpb: - * MPC/config/ccm_cookie.mpb: - * MPC/config/ccm_stub.mpb: - * MPC/config/ccm_svnt.mpb: - - New base projects for the refactord CCM idls and valuetypes. - - * ciao/CIAO_Utils.h: - * ciao/CIAO_Utils.cpp: - * ciao/CIAO_Utils_export.h: - - Utility functions useful just about everywhere. - - * ciao/Logger: - - Renamed from CIAO_Logger - - * ciao/CCM_Core.mpc: - * ciao/CIAO_Core.mpc: - * ciao/Containers: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.inl: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Session: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.inl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Swapping: - * ciao/Containers/Swapping/Dynamic_Component_Activator.h: - * ciao/Containers/Swapping/Dynamic_Component_Activator.inl: - * ciao/Containers/Swapping/Dynamic_Component_Activator.cpp: - * ciao/Containers/Swapping/Swapping_Container.h: - * ciao/Containers/Swapping/Swapping_Container.inl: - * ciao/Containers/Swapping/Swapping_Container.cpp: - * ciao/Contexts: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.inl: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Swapping: - * ciao/Contexts/Swapping/CIAO_UpgradeableContext.idl: - * ciao/Contexts/Swapping/Upgradeable_Context_Impl_T.h: - * ciao/Contexts/Swapping/Upgradeable_Context_Impl_T.cpp: - * ciao/Servants: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator.inl: - * ciao/Servants/Port_Activator.cpp: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Servant_Activator.h: - * ciao/Servants/Servant_Activator.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Servants/StandardConfigurator_Impl.h: - * ciao/Servants/StandardConfigurator_Impl.cpp: - * ciao/Servants/Swapping: - * ciao/Servants/Swapping/CIAO_SwapExec.idl: - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h: - * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp: - * ciao/Servants/Swapping/Dynamic_Component_Servant_T.h: - * ciao/Servants/Swapping/Dynamic_Component_Servant_T.cpp: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_T.h: - * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Valuetype_Factories: - * ciao/Valuetype_Factories/ConfigValue.h: - * ciao/Valuetype_Factories/ConfigValue.cpp: - * ciao/Valuetype_Factories/ConfigValue_Export.h: - * ciao/Valuetype_Factories/Cookie_Export.h: - * ciao/Valuetype_Factories/Cookies.h: - * ciao/Valuetype_Factories/Cookies.inl: - * ciao/Valuetype_Factories/Cookies.cpp: - * ciao/Valuetype_Factories/Factories.mpc: - - Refactoring of the directory structure bloodbath. MPC files will come in - next commit. - - * ciao/ccm/CCM.mpc: - * ciao/ccm/CCM_Base.idl: - * ciao/ccm/CCM_CCM2Context.idl: - * ciao/ccm/CCM_CCMException.idl: - * ciao/ccm/CCM_Component.idl: - * ciao/ccm/CCM_ComponentId.idl: - * ciao/ccm/CCM_Configurator.idl: - * ciao/ccm/CCM_Container.idl: - * ciao/ccm/CCM_Container_Ex.idl: - * ciao/ccm/CCM_Context.idl: - * ciao/ccm/CCM_Cookie.idl: - * ciao/ccm/CCM_EnterpriseComponent.idl: - * ciao/ccm/CCM_Entity2Context.idl: - * ciao/ccm/CCM_EntityComponent.idl: - * ciao/ccm/CCM_EntityContext.idl: - * ciao/ccm/CCM_Enumeration.idl: - * ciao/ccm/CCM_EventBase.idl: - * ciao/ccm/CCM_EventConsumerBase.idl: - * ciao/ccm/CCM_Events.idl: - * ciao/ccm/CCM_ExecutorLocator.idl: - * ciao/ccm/CCM_Home.idl: - * ciao/ccm/CCM_HomeConfiguration.idl: - * ciao/ccm/CCM_HomeExecutorBase.idl: - * ciao/ccm/CCM_HomeFinder.idl: - * ciao/ccm/CCM_HomeRegistration.idl: - * ciao/ccm/CCM_KeylessCCMHome.idl: - * ciao/ccm/CCM_Navigation.idl: - * ciao/ccm/CCM_Object.idl: - * ciao/ccm/CCM_PrimaryKeyBase.idl: - * ciao/ccm/CCM_ProxyHomeRegistration.idl: - * ciao/ccm/CCM_Receptacle.idl: - * ciao/ccm/CCM_Session2Context.idl: - * ciao/ccm/CCM_SessionComponent.idl: - * ciao/ccm/CCM_SessionContext.idl: - * ciao/ccm/CCM_SessionSynchronization.idl: - * ciao/ccm/CCM_StandardConfigurator.idl: - * ciao/ccm/CCM_StateIdFactory.idl: - * ciao/ccm/CCM_Stub_Export.h: - * ciao/ccm/CCM_Svnt_Export.h: - * ciao/ccm/CCM_Transaction.idl: - * ciao/ccm/Components.idl: - * ciao/ccm/CosPersistentState.idl: - * ciao/ccm/Security.idl: - * ciao/ccm/extension: - - All spec defined IDLs were moved to ccm subdirectory. - - * ciao/CCM_Base.idl: - * ciao/CCM_CCM2Context.idl: - * ciao/CCM_CCMException.idl: - * ciao/CCM_Component.idl: - * ciao/CCM_ComponentId.idl: - * ciao/CCM_Configurator.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Container_Ex.idl: - * ciao/CCM_Context.idl: - * ciao/CCM_Cookie.idl: - * ciao/CCM_EnterpriseComponent.idl: - * ciao/CCM_Entity2Context.idl: - * ciao/CCM_EntityComponent.idl: - * ciao/CCM_EntityContext.idl: - * ciao/CCM_Enumeration.idl: - * ciao/CCM_EventBase.idl: - * ciao/CCM_EventConsumerBase.idl: - * ciao/CCM_Events.idl: - * ciao/CCM_ExecutorLocator.idl: - * ciao/CCM_Home.idl: - * ciao/CCM_HomeConfiguration.idl: - * ciao/CCM_HomeExecutorBase.idl: - * ciao/CCM_HomeFinder.idl: - * ciao/CCM_HomeRegistration.idl: - * ciao/CCM_KeylessCCMHome.idl: - * ciao/CCM_Navigation.idl: - * ciao/CCM_Object.idl: - * ciao/CCM_PrimaryKeyBase.idl: - * ciao/CCM_ProxyHomeRegistration.idl: - * ciao/CCM_Receptacle.idl: - * ciao/CCM_Session2Context.idl: - * ciao/CCM_SessionComponent.idl: - * ciao/CCM_SessionContext.idl: - * ciao/CCM_SessionSynchronization.idl: - * ciao/CCM_StandardConfigurator.idl: - * ciao/CCM_StateIdFactory.idl: - * ciao/CCM_Transaction.idl: - * ciao/CIAO_Logger: - * ciao/CIAO_Logger/CIAOLoggerFactory.h: - * ciao/CIAO_Logger/CIAO_Logger_Export.h: - * ciao/CIAO_Logger/File_Logger_Backend.h: - * ciao/CIAO_Logger/File_Logger_Backend.cpp: - * ciao/CIAO_Logger/Logger.mpc: - * ciao/CIAO_Logger/Logger_Service.h: - * ciao/CIAO_Logger/Logger_Service.cpp: - * ciao/CIAO_SwapExec.idl: - * ciao/CIAO_UpgradeableContext.idl: - * ciao/Components.idl: - * ciao/ConfigValue.h: - * ciao/ConfigValue.cpp: - * ciao/Container_Base.h: - * ciao/Container_Base.inl: - * ciao/Container_Base.cpp: - * ciao/Context_Impl_Base.h: - * ciao/Context_Impl_Base.inl: - * ciao/Context_Impl_Base.cpp: - * ciao/Context_Impl_T.h: - * ciao/Context_Impl_T.cpp: - * ciao/Cookies.h: - * ciao/Cookies.inl: - * ciao/Cookies.cpp: - * ciao/CosPersistentState.idl: - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Activator.inl: - * ciao/Dynamic_Component_Activator.cpp: - * ciao/Dynamic_Component_Servant_Base.h: - * ciao/Dynamic_Component_Servant_Base.cpp: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Dynamic_Component_Servant_T.cpp: - * ciao/Home_Servant_Impl_Base.h: - * ciao/Home_Servant_Impl_Base.cpp: - * ciao/Home_Servant_Impl_T.h: - * ciao/Home_Servant_Impl_T.cpp: - * ciao/Object_Set_T.h: - * ciao/Object_Set_T.inl: - * ciao/Object_Set_T.cpp: - * ciao/Port_Activator.h: - * ciao/Port_Activator.inl: - * ciao/Port_Activator.cpp: - * ciao/Port_Activator_T.h: - * ciao/Port_Activator_T.cpp: - * ciao/Security.idl: - * ciao/Servant_Activator.h: - * ciao/Servant_Activator.cpp: - * ciao/Servant_Impl_Base.h: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Impl_T.h: - * ciao/Servant_Impl_T.cpp: - * ciao/Servant_Impl_Utils_T.cpp: - * ciao/Session_Container.h: - * ciao/Session_Container.inl: - * ciao/Session_Container.cpp: - * ciao/StandardConfigurator_Impl.h: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/Swapping_Container.h: - * ciao/Swapping_Container.inl: - * ciao/Swapping_Container.cpp: - * ciao/Swapping_Servant_Home_Impl_Base.h: - * ciao/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Swapping_Servant_Home_Impl_T.cpp: - * ciao/Upgradeable_Context_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.cpp: - * ciao/extension: - * ciao/extension/CCM_ClientContainerInterceptor.idl: - * ciao/extension/CCM_ClientContainerInterceptorRegistration.idl: - * ciao/extension/CCM_ContainerClientRequestInfo.idl: - * ciao/extension/CCM_ContainerInterceptor.idl: - * ciao/extension/CCM_ContainerRequestInfo.idl: - * ciao/extension/CCM_ContainerServantRequestInfo.idl: - * ciao/extension/CCM_ContainerServerRequestInfo.idl: - * ciao/extension/CCM_ContainerStubRequestInfo.idl: - * ciao/extension/CCM_ExtensionComponent.idl: - * ciao/extension/CCM_ExtensionContext.idl: - * ciao/extension/CCM_InvalidRegistration.idl: - * ciao/extension/CCM_QoS.idl: - * ciao/extension/CCM_ServantContainerInterceptor.idl: - * ciao/extension/CCM_ServantContainerInterceptorRegistration.idl: - * ciao/extension/CCM_ServerContainerInterceptor.idl: - * ciao/extension/CCM_ServerContainerInterceptorRegistration.idl: - * ciao/extension/CCM_StubContainerInterceptor.idl: - * ciao/extension/CCM_StubContainerInterceptorRegistration.idl: - * ciao/extension/ExtensionContext.h: - * ciao/extension/ExtensionContext.cpp: - - Removed these files. - - Sun Mar 9 05:25:41 UTC 2008 William R. Otte - - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.mpc: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.cpp: - * DAnCE/CIAO_ComponentServer/Configurator_Factory.cpp: - - Updates for moves below. - - * DAnCE/CIAO_ComponentServer/Configurators: - * DAnCE/CIAO_ComponentServer/Configurators/Basic_Config_Manager_export.h: - * DAnCE/CIAO_ComponentServer/Configurators/Basic_Configurator_export.h: - * DAnCE/CIAO_ComponentServer/Configurators/ComponentServer_Configurator_export.h: - * DAnCE/CIAO_ComponentServer/Configurators/Config_Manager.h: - * DAnCE/CIAO_ComponentServer/Configurators/Config_Manager.cpp: - * DAnCE/CIAO_ComponentServer/Configurators/Configurators.mpc: - * DAnCE/CIAO_ComponentServer/Configurators/NAConfig_Manager.h: - * DAnCE/CIAO_ComponentServer/Configurators/NAConfig_Manager.inl: - * DAnCE/CIAO_ComponentServer/Configurators/NAConfig_Manager.cpp: - * DAnCE/CIAO_ComponentServer/Configurators/NoOp_Configurator.h: - * DAnCE/CIAO_ComponentServer/Configurators/NoOp_Configurator.cpp: - * DAnCE/CIAO_ComponentServer/Configurators/NoOp_Configurator_export.h: - * DAnCE/CIAO_ComponentServer/Configurators/RTConfig_Manager.h: - * DAnCE/CIAO_ComponentServer/Configurators/RTConfig_Manager.inl: - * DAnCE/CIAO_ComponentServer/Configurators/RTConfig_Manager.cpp: - * DAnCE/CIAO_ComponentServer/Configurators/RTNA_Configurator_Export.h: - * DAnCE/CIAO_ComponentServer/Configurators/RTNodeApp_Configurator.h: - * DAnCE/CIAO_ComponentServer/Configurators/RTNodeApp_Configurator.cpp: - * DAnCE/CIAO_ComponentServer/Configurators/Server_Configurator.h: - * DAnCE/CIAO_ComponentServer/Configurators/Server_Configurator.cpp: - - Moved all configurator related logic to subdirectory; imported - config managers from trunk. - - * MPC/config/ciao_componentserver_svnt.mpb: - * MPC/config/ciao_config_manager.mpb: - * MPC/config/ciao_servant_dnc.mpb: - * MPC/config/ciao_server_dnc.mpb: - * MPC/config/dance_deployment_stub.mpb: - * MPC/config/dance_deployment_svnt.mpb: - - Removed dependencies on events, as it won't work anyway until it is - re-implemented. - - * ciao/CIAO_ServerResources.idl: - - Renamed DAnCE namespace to Deployment to be consistent. - - * DAnCE/CIAO_ComponentServer/ComponentServer_Configurator_export.h: - * DAnCE/CIAO_ComponentServer/Config_Manager.h: - * DAnCE/CIAO_ComponentServer/Server_Configurator.h: - * DAnCE/CIAO_ComponentServer/Server_Configurator.cpp: - - Removed these files. - - Sat Mar 8 19:45:47 UTC 2008 William R. Otte - - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.mpc: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.cpp: - * DAnCE/CIAO_ComponentServer/ComponentServer_Configurator_export.h: - * DAnCE/CIAO_ComponentServer/Config_Manager.h: - * DAnCE/CIAO_ComponentServer/Configurator_Factory.h: - * DAnCE/CIAO_ComponentServer/Configurator_Factory.cpp: - * DAnCE/CIAO_ComponentServer/Server_Configurator.h: - * DAnCE/CIAO_ComponentServer/Server_Configurator.cpp: - - Fleshed out the container implementation a bit, pulled in some elements for - RTCORBA configuration from the trunk NodeApplication. - - * ciao/CCM_Core.mpc: - * ciao/CIAO_ServerResources.idl: - - Server resources IDL pulled in from trunk. - - Fri Mar 7 03:39:10 UTC 2008 William R. Otte - - * CIAO_TAO_DAnCE.mwc: - - Added DII libraries for attribute setter. - - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.idl: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.mpc: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.h: - * DAnCE/Cdmw/CDMW_IDL.idl: - * DAnCE/ComponentServer/ComponentServer.idl: - * DAnCE/ComponentServer/ComponentServer_Client.idl: - * DAnCE/DomainApplication/DomainApplication.mpc: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/Logger/File_Logger_Backend.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Starter/Starter.cpp: - * ciao/CIAO_Logger/File_Logger_Backend.h: - * ciao/CIAO_Logger/File_Logger_Backend.cpp: - * tools/Config_Handlers/XML_Typedefs.h: - - VC8 compiler error/warnings. - - Thu Mar 6 18:24:12 UTC 2008 William R. Otte - - * MPC/config/dance_component_server_svnt.mpb: - - Adding this long missing base project. - - Thu Mar 6 17:45:05 UTC 2008 William R. Otte - - * DAnCE/CIAO_ComponentServer/CIAO_CS_Client.idl: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.idl: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ServerActivator_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Component Server implementation, no-op implementations - for all servants. - - * DAnCE/ComponentServer/ComponentServer_Client.idl: - - Added newline at end of file. - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - - Warning fix. - - * MPC/config/ciao.mpb: - * MPC/config/ciao_exe.mpb: - * MPC/config/ciao_lib.mpb: - - Added ciao base projects to mirror dance base projects of similar name. - They are currently identical, but will be changed when the directory - restructuring proposal comes to consensus. - - * ciao/CIAO_Logger: - * ciao/CIAO_Logger/CIAOLoggerFactory.h: - * ciao/CIAO_Logger/CIAO_Logger_Export.h: - * ciao/CIAO_Logger/File_Logger_Backend.h: - * ciao/CIAO_Logger/File_Logger_Backend.cpp: - * ciao/CIAO_Logger/Logger.mpc: - * ciao/CIAO_Logger/Logger_Service.h: - * ciao/CIAO_Logger/Logger_Service.cpp: - - CIAO logger based on logger implemented for DAnCE. - - * ciao/CIAO_common.h: - - Added CLINFO define, which provides the default decorators - for all CIAO logging messages. - - Thu Mar 6 05:52:09 UTC 2008 William R. Otte - - * DAnCE/CIAO_ComponentServer/CIAO_CS_Client.idl: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.idl: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer.mpc: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_Impl.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_stub_export.h: - * DAnCE/CIAO_ComponentServer/CIAO_ComponentServer_svnt_export.h: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_Container_Impl.cpp: - * DAnCE/CIAO_ComponentServer/CIAO_ServerActivator_Impl.h: - * DAnCE/CIAO_ComponentServer/CIAO_ServerActivator_Impl.cpp: - * MPC/config/ciao_componentserver_stub.mpb - - Implementation skeletons for the CIAO component server. - - * DAnCE/ComponentServer/ComponentServer.idl: - * DAnCE/ComponentServer/ComponentServer.mpc: - * DAnCE/ComponentServer/ComponentServer_Base.idl: - * DAnCE/ComponentServer/ComponentServer_Client.idl: - - Refactored for some preliminary footprint optimizations. - - Wed Mar 5 16:48:16 UTC 2008 William R. Otte - - * tools/IDL3_to_IDL2/CdmwBE.cpp: - * tools/IDL3_to_IDL2/CdmwBEExtern.hpp: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_IDL2/be_extern.h: - * tools/IDL3_to_IDL2/be_init.cpp: - - Fixed to comply with new interfaces exptected by the IDL - compiler. Thanks to Jeff Parsons for the fixes. - - Wed Mar 5 16:09:13 UTC 2008 William R. Otte - - * ChangeLog: - - Cleared out non-branch changelog entries. - - Wed Mar 5 16:06:07 UTC 2008 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - * DAnCE/Starter/Starter.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/XMI.cpp: - - Warning fixes. - - Tue Mar 4 22:29:37 UTC 2008 William R. Otte - - * DAnCE/Cdmw/CDMW_Deployment.idl: - * DAnCE/Cdmw/CDMW_IDL.idl: - * DAnCE/Cdmw/CDMW_IDL.mpc: - * DAnCE/Cdmw/CDMW_IDL_Ext.idl: - * DAnCE/ComponentServer: - * DAnCE/ComponentServer/ComponentServer.idl: - * DAnCE/ComponentServer/ComponentServer.mpc: - * DAnCE/ComponentServer/DAnCE_ComponentServer_stub_export.h: - * DAnCE/ComponentServer/DAnCE_ComponentServer_svnt_export.h: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - * MPC/config/dance_component_server.mpb: - * MPC/config/dance_component_server_stub.mpb: - * ciao/Session_Container.cpp: - - Refactored generic component server interface into its - own directory and IDL files. - - * DAnCE/Logger/File_Logger_Backend.h: - * DAnCE/Logger/File_Logger_Backend.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/DnC_Dump.h: - * tools/Config_Handlers/DnC_Dump.cpp: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp: - - Changes necessary to cope with changes in ACE/TAO. - - * MPC/config/dance_deployment_stub.mpb: - * MPC/config/dance_deployment_svnt.mpb: - - Pulled over from OFDAnCE. - - * ciao/CCM_Core.mpc: - * ciao/CCM_Home.idl: - * ciao/ConfigValue.h: - * ciao/ConfigValue.cpp: - - Add an IDL type and config value factory from OFDAnCE. - - - * tools/IDL3_to_IDL2/CdmwBE.cpp: - * tools/IDL3_to_IDL2/CdmwBEExtern.hpp: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Some changes here I can't figure out, need Jeff to look. - Disabled until then. - - * tools/XML: - * tools/XML/CIAO_XML_Utils_Export.h: - * tools/XML/XML.mpc: - * tools/XML/XML_Error_Handler.h: - * tools/XML/XML_Error_Handler.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - * tools/XML/XML_Schema_Resolver.h: - * tools/XML/XML_Schema_Resolver.cpp: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - * MPC/config/ciao_config_handlers.mpb: - * MPC/config/ciao_config_handlers_base.mpb: - - Pulled XML utils over from OFDAnCE, missed in initial import. - - Tue Mar 4 05:39:19 UTC 2008 William R. Otte - - * MPC/config/ciao_config_manager.mpb: - * MPC/config/ciao_domainapplicationmanager_dnc.mpb: - * MPC/config/ciao_executionmanager_stub.mpb: - * MPC/config/ciao_nodeapplication.mpb: - * MPC/config/ciao_nodemanager_stub.mpb: - * MPC/config/ciao_noop_configurator.mpb: - * MPC/config/ciao_servant_dnc.mpb: - * MPC/config/ciao_server_dnc.mpb: - * MPC/config/ciaodll.mpb: - * MPC/config/dance_cdmw_idl.mpb: - * MPC/config/dance_deployment_stub.mpb: - * MPC/config/dance_deployment_svnt.mpb: - * MPC/config/dance_domain_application.mpb: - * MPC/config/dance_domain_application_manager.mpb: - * MPC/config/dance_exe.mpb: - * MPC/config/dance_executionmanager_stub.mpb: - * MPC/config/dance_extension_stub.mpb: - * MPC/config/dance_lib.mpb: - * MPC/config/dance_logger.mpb: - * MPC/config/dance_mocks.mpb: - * MPC/config/dance_node_application.mpb: - * MPC/config/dance_node_application_manager.mpb: - * MPC/config/dance_node_manager.mpb: - * MPC/config/dance_nodemanager_stub.mpb: - * MPC/config/dance_redirection_service.mpb: - * MPC/config/dance_utils.mpb: - - Pulled necessary mpb files from OFDAnCE to allow generation of - makefiles. - - * ciao/CCM_Core.mpc: - - ciao_deployment_*.mpb changes to dance_deployment_*.mpb. - - Tue Mar 4 05:19:46 UTC 2008 William Otte - - * MPC/config: - recovered from trunk. - - Tue Mar 4 05:10:21 UTC 2008 William R. Otte - - * DAnCE/DomainApplication/Domain_Application_Impl.h: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.h: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.h: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeApplication/ComponentInstallation_Impl.h: - * DAnCE/NodeApplication/ComponentInstallation_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - * DAnCE/RedirectionService/CCMObjectLocator.h: - * DAnCE/RedirectionService/CCMObjectLocator.cpp: - * DAnCE/tests/MocksTest/MockObjectHome.h: - * DAnCE/tests/MocksTest/MockObjectHome.cpp: - * DAnCE/tests/NameServiceTest/DummyImpl.h: - * DAnCE/tests/NameServiceTest/DummyImpl.cpp: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.h: - * DAnCE/tests/ObjectLocatorTest/DummyImpl.cpp: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.h: - * DAnCE/tests/RedirectionServiceTest/DummyImpl.cpp: - - Removed emulated exception macros using rm_exception_macros.pl - - Tue Mar 4 03:48:11 UTC 2008 William Otte - - * DAnCE: - * tools: - * docs/schema: - - Imports from OFDAnCE. - - Tue Mar 4 03:24:45 UTC 2008 William Otte - - * DAnCE: - * tools: - * docs/schema: - * MPC/config: - - Remove to make way for versions from OFDAnCE. - -Wed Feb 11 07:21:28 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Removed old code - -Tue Feb 10 05:39:28 UTC 2009 Phil Mesnier - - * NEWS: - revision bump. - -Mon Feb 09 12:01:28 CST 2009 Phil Mesnier - - * CIAO version 0.6.8 released. - -Fri Jan 30 11:59:52 UTC 2009 Johnny Willemsen - - * DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - Added missing after - -Wed Jan 28 20:22:52 UTC 2009 Adam Mitz - - * bin/ciao_tests.lst: - - This file moved here from $ACE_ROOT/bin, see bug 2748 and the - ACE ChangeLog entry for Wed Jan 28 20:22:45 UTC 2009. - -Mon Jan 12 19:14:46 UTC 2009 Johnny Willemsen - - * tools/Config_Handlers/Config_Handlers.mpc: - Don't add template files to the source files - -Fri Jan 9 22:18:07 UTC 2009 Abdullah Sowayan - - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Sender/Sender.mpc: - - Append "Minimum_" to the name of the generated libraries. The generated - libraries had the same name as those in $CIAO_ROOT/DevGuideExamples/Messenger - which cause some regression tests to fail. - -Wed Jan 7 15:11:48 UTC 2009 Abdullah Sowayan - - * DevGuideExamples/Messenger/Administrator.mpc: - * DevGuideExamples/Messenger/Receiver.mpc: - - Fixed build order dependency. - -Tue Jan 6 20:45:19 UTC 2009 Abdullah Sowayan - - * DevGuideExamples/Messenger/Administrator_exec_export.h: - * DevGuideExamples/Messenger/Administrator_stub_export.h: - * DevGuideExamples/Messenger/Administrator_svnt_export.h: - * DevGuideExamples/Messenger/Messenger_exec_export.h: - * DevGuideExamples/Messenger/Messenger_stub_export.h: - * DevGuideExamples/Messenger/Messenger_svnt_export.h: - * DevGuideExamples/Messenger/Receiver_exec_export.h: - * DevGuideExamples/Messenger/Receiver_stub_export.h: - * DevGuideExamples/Messenger/Receiver_svnt_export.h: - - Regenerate export files. - - * DevGuideExamples/Messenger/Administrator.cidl: - * DevGuideExamples/Messenger/Administrator.idl: - * DevGuideExamples/Messenger/Messenger.cidl: - * DevGuideExamples/Messenger/Messenger.idl: - * DevGuideExamples/Messenger/Receiver.cidl: - * DevGuideExamples/Messenger/Receiver.idl: - - use #include "" instead of #include <> - - * DevGuideExamples/Messenger/Administrator.mpc: - * DevGuideExamples/Messenger/Messenger.mpc: - * DevGuideExamples/Messenger/Receiver.mpc: - - Updated the files to remove the executor dependency on the servant. - - * DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - * DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - - Removed "requires += cidl" from the files above. We should be able - to build the example without needing to build the CIDLC compiler. - - * DevGuideExamples/Messenger/Administrator_exec_i.h: - * DevGuideExamples/Messenger/Administrator_exec_i.cpp: - * DevGuideExamples/Messenger/History.idl: - * DevGuideExamples/Messenger/History_exec_i.h: - * DevGuideExamples/Messenger/Messenger_exec_i.h: - * DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * DevGuideExamples/Messenger/Publication_exec_i.h: - * DevGuideExamples/Messenger/Receiver_exec_i.h: - * DevGuideExamples/Messenger/Receiver_exec_i.cpp: - * DevGuideExamples/Messenger/Runnable_exec_i.h: - - Updated the files above. The executor now does not depend - on the servant. - - * DevGuideExamples/Messenger/descriptors/run_test.pl: - - Use the executables in $CIAO_ROOT/bin. - -Fri Dec 26 12:22:14 UTC 2008 Vladimir Zykov - - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - - Reverted my previous change (Thu Dec 25 15:38:41 UTC 2008). - It was wrong to fix the linker errors that way. - - * tools/Config_Handlers/Utils/XML_Helper.cpp: - * tools/Config_Handlers/Utils/XML_Helper.tpp: - * tools/Config_Handlers/Utils/XML_Helper.h: - * tools/Config_Handlers/Utils/Utils.mpc: - - Provided a proper fix for the linker problem on Windows. - -Thu Dec 25 15:38:41 UTC 2008 Vladimir Zykov - - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - - Fixed linker errors on Windows. - - * tools/Config_Handlers/Utils/XML_Helper.cpp: - - Fixed a compile warning about unused variable. - -Wed Dec 24 16:09:22 UTC 2008 Vladimir Zykov - - * tools/IDL3_to_XMI/Literals.cpp: - * tools/IDL3_to_XMI/Literals.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Fixed more name clashes with macros, now on Windows. - -Wed Dec 24 11:00:29 UTC 2008 Vladimir Zykov - - * tools/Config_Handlers/Utils/XML_Helper.h: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h: - - Fixed compile errors on Windows. - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - - Fixed link errors on static builds. - - * tools/IDL3_to_XMI/Literals.cpp: - * tools/IDL3_to_XMI/Literals.h: - - Fixed a clash with macro on SunOS compilers. - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Fixed compile warnings. - -Tue Dec 23 15:11:07 UTC 2008 Vladimir Zykov - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * tools/Config_Handlers/Any_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/test.cpp: - * tools/Config_Handlers/RT-CCM/test.cpp: - - Fixed memory leaks in the tests and made few more TCHAR - related changes. - - * tools/Config_Handlers/Utils/XercesString.cpp: - * tools/Config_Handlers/Utils/XercesString.h: - - XStr now can be constructed from ACE_TCHAR. - - * tools/Config_Handlers/Utils/XML_Helper.cpp: - * tools/Config_Handlers/Utils/XML_Helper.h: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.h: - * tools/Config_Handlers/Utils/XML_Error_Handler.h: - * tools/Config_Handlers/Utils/Utils.mpc: - - Refactored the code so that XML_Helper now is a bit more - flexible in setting xml error handler and xml schema - resolver. - - * tools/tools.mwc: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/be_global.cpp: - * tools/IDL3_to_XMI/be_produce.cpp: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - * tools/IDL3_to_XMI/be_init.cpp: - * tools/IDL3_to_XMI/CIAO_IDL3_TO_XMI_Export.h: - * tools/IDL3_to_XMI/be_global.h: - * tools/IDL3_to_XMI/be_sunsoft.h: - * tools/IDL3_to_XMI/Literals.cpp: - * tools/IDL3_to_XMI/be_extern.h: - * tools/IDL3_to_XMI/identifier_helper.cpp: - * tools/IDL3_to_XMI/Literals.h: - * tools/IDL3_to_XMI/be_helper.cpp: - * tools/IDL3_to_XMI/identifier_helper.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/be_helper.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Made public an idl3_to_xmi utility for mapping IDL3 to - XML Metadata Interchange (XMI) format. - - * tests/IDL3_to_XMI/XMI_For_Array/test.idl: - * tests/IDL3_to_XMI/XMI_For_Array/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl: - * tests/IDL3_to_XMI/XMI_For_Included_File/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/test.idl: - * tests/IDL3_to_XMI/XMI_For_Sequence/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - - Added 3 tests for the idl3_to_xmi itility. - -Thu Dec 18 19:42:06 UTC 2008 Jeff Parsons - - * CIDLC/AttributeHeaderEmitters.cpp: - - Fixed formatting error in code generation for readonly - attributes. - -Thu Dec 18 19:01:19 UTC 2008 Jeff Parsons - - * CIAO_TAO_DAnCE.mwc: - - Replaced lines 'CCF' and 'CIDLC' with 'CIDLC/CIDLC.mwc' - so the big build can pick up the special options needed - to build CIDLC. - -Thu Dec 18 17:48:00 UTC 2008 Jeff Parsons - - * CIAO_TAO_DAnCE.mwc: - - Removed the line '$ACE_ROOT/contrib/minizip/minizip.mpc' - since it conflicts with the line '$ACE_ROOT/contrib'. - -Mon Dec 15 09:36:58 UTC 2008 Olli Savia - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - Updated to use ACE::isdotdir(). - -Fri Nov 28 11:36:00 UTC 2008 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication.cpp: - Unicode changes - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Corrected string test - - * DevGuideExamples/Messenger/Administrator_exec_i.h: - layout change - - * MPC/config/ciao_vcwarnings.mpb: - Added vc10 - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - Use ascii format specifiers - -Thu Nov 27 04:09:39 CST 2008 Simon Massey - - * CIAO version 0.6.7 released. - -Tue Nov 25 15:55:00 UTC 2008 Simon Massey - - * DevGuideExamples/Messenger/Receiver.mpc - Windows DLL import/export issue with CIDL generated bits. - -Mon Nov 17 15:58:12 UTC 2008 Johnny Willemsen - - * CCF/CCF/IDL2/Parser.hpp: - When interface is a define, undef it. Fixes bugzilla 3512 - -Fri Nov 14 23:11:35 UTC 2008 Adam Mitz - - * rules.ciao.GNU: - - Translate \ to / in $(CIAO_ROOT). - -Fri Nov 14 13:53:49 UTC 2008 Vladimir Zykov - - * tools/Config_Handlers/cid.cpp: - * tools/Config_Handlers/DP_Handler.cpp: - * tools/Config_Handlers/MDD_Handler.cpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/pcd.cpp: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * tools/Config_Handlers/Property_Handler.cpp: - * tools/Config_Handlers/ID_Handler.cpp: - * tools/Config_Handlers/toplevel.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/CRDD_Handler.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp: - * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/ccd.cpp: - * tools/Config_Handlers/RDD_Handler.cpp: - * tools/Config_Handlers/ERE_Handler.cpp: - * tools/Config_Handlers/Utils/XML_Helper.cpp: - * tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp: - * tools/Config_Handlers/Utils/Functors.h: - * tools/Config_Handlers/XML_File_Intf.cpp: - * tools/Config_Handlers/Deployment.cpp: - * tools/Config_Handlers/CCD_Handler.cpp: - * tools/Config_Handlers/cdd.cpp: - * tools/Config_Handlers/SatisfierProperty_Handler.cpp: - * tools/Config_Handlers/RT-CCM/PS_Handler.cpp: - * tools/Config_Handlers/RT-CCM/TP_Handler.cpp: - * tools/Config_Handlers/RT-CCM/CB_Handler.cpp: - * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp: - * tools/Config_Handlers/RT-CCM/CLA_Handler.cpp: - * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp: - * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp: - * tools/Config_Handlers/PSPE_Handler.cpp: - * tools/Config_Handlers/cdp.cpp: - * tools/Config_Handlers/cpd.cpp: - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp: - * tools/Config_Handlers/CEPE_Handler.cpp: - * tools/Config_Handlers/IRDD_Handler.cpp: - * tools/Config_Handlers/DD_Handler.cpp: - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/iad.cpp: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_IDL2/be_init.cpp: - * tools/IDL3_to_IDL2/be_extern.h: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp: - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: - * ciao/Client_init.cpp: - - Made wchar related changes. - -Tue Nov 11 16:07:06 UTC 2008 James H. Hill - - * CIDLC/ServantHeaderGenerator.cpp: - - Apparently, some compilers didn't like my updates below. The - problem was caused by not adding a space between the '<' and - '::' for a template class. - -Mon Nov 10 23:03:45 UTC 2008 James H. Hill - - * MPC/config/ciaocidldefaults.mpb: - - Fixed file formating. - -Mon Nov 10 23:00:09 UTC 2008 James H. Hill - - * MPC/config/ciaocidldefaults.mpb: - - Updated the CIDL custom define to append the '_Impl.ccd' - extension on the *documentation_outputext* attribute if - --gen-desc-file flag is specified on the command-line for - the CIDL compiler. - -Mon Nov 10 22:37:23 UTC 2008 James H. Hill - - * CIDLC/cidlc.cpp: - * CIDLC/DescriptorGenerator.cpp: - - Added a new command-line options --gen-desc-file for specifying the - filename of the component descriptor (.ccd) file. - - * CIDLC/ServantHeaderGenerator.cpp: - - Updated the servant header generator to produce type definitions - that map to traits in its context implementation subclass. - - * ciao/Context_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.h: - - Added type definitions for the different parameter types of the - template class. This will increase support for using such classes - in generative programming applications. - -Mon Nov 3 12:37:00 UTC 2008 Johnny Willemsen - - * DevGuidExamplesMessenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - For the moment disable this project until there is some more - time to sort out the link problems - -Thu Oct 30 12:56:00 UTC 2008 Johnny Willemsen - - * DAnCE/TargetManager/CmpClient.cpp: - Use %C to log ascii strings instead of using %s with - ACE_TEXT_CHAR_TO_TCHAR - -Thu Oct 30 10:30:00 UTC 2008 Simon Massey - - * NEWS - Updated. - -Wed Oct 29 14:25:00 UTC 2008 Simon Massey - - * DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc - change libpath to libpaths - - * DevGuideExamples/ChangeLog: - Incorperated into this file. - -Wed Oct 29 13:25:00 UTC 2008 Simon Massey - - * NEWS - Updated. - -Tue Oct 28 11:04:00 UTC 2008 Simon Massey - - * DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc - Add libpath += .. - -Sun Oct 26 20:00:00 UTC 2008 Johnny Willemsen - - * DevGuideExamples/Messenger/StaticDAnCE/plan.h - Added missing include - -Thu Oct 23 11:49:00 UTC 2008 Johnny Willemsen - - * DevGuideExamples/Messenger/Administrator_exec_i.h - * DevGuideExamples/Messenger/History_exec_i.h - * DevGuideExamples/Messenger/Messenger_exec_i.h - * DevGuideExamples/Messenger/Publication_exec_i.h - * DevGuideExamples/Messenger/Receiver_exec_i.h - * DevGuideExamples/Messenger/Runnable_exec_i.h - Don't use deprecated TAO_Local_RefCounted_Object - -Wed Oct 22 16:24:21 UTC 2008 Abdullah Sowayan - - * Messenger/Administrator_exec_i.h: - * Messenger/History_exec_i.h: - * Messenger/Messenger_exec_i.h: - * Messenger/Messenger_exec_i.cpp: - * Messenger/Publication_exec_i.h: - * Messenger/Runnable_exec_i.h: - - Fixed fuzz errors. When including files from ACE/TAO/CIAO, use "" instead of <>. - - Example: #include was changed to "ace/OS.h" - -Wed Oct 22 14:50:02 UTC 2008 Simon Massey - - * CIAO.mwc: - - Fixed fuzz errors by adding "// $Id $" to the top of each file. - -Wed Oct 22 14:15:02 UTC 2008 Abdullah Sowayan - - * Messenger/Administrator.cidl: - * Messenger/Administrator.idl: - * Messenger/Administrator.mpc: - * Messenger/Administrator_Client.cpp: - * Messenger/Administrator_Client_IDL2.cpp: - * Messenger/Administrator_Client_IDL2.mpc: - * Messenger/Administrator_Client_IDL3.cpp: - * Messenger/Administrator_Client_IDL3.mpc: - * Messenger/History.idl: - * Messenger/Message.idl: - * Messenger/Messenger.cidl: - * Messenger/Messenger.idl: - * Messenger/Messenger.mpc: - * Messenger/Publication.idl: - * Messenger/Receiver.cidl: - * Messenger/Receiver.idl: - * Messenger/Receiver.mpc: - * Messenger/Runnable.idl: - * Messenger/StaticDAnCE/README.txt: - * Messenger/StaticDAnCE/plan.h: - * Messenger/StaticDAnCE/run_test.pl: - * Messenger/descriptors/run_test.pl: - - Fixed fuzz errors by adding "// $Id $" to the top of each file. - -Wed Oct 22 14:06:39 UTC 2008 Abdullah Sowayan - - * readme.txt: - - Added a readme file. - -Wed Oct 22 13:11:00 UTC 2008 Simon Massey - - * Messenger/Messenger.idl: - * Messenger/StaticDAnCE/plan.h: - - Fixed tabs found fuzz errors. - - * Messenger/Administrator_Client.cpp: - * Messenger/StaticDAnCE/StaticDAnCEApp.cpp: - - Lack of ACE_TMAIN and specified ORB_init default parameters. - -Wed Oct 22 08:52:00 UTC 2008 Johnny Willemsen - - * DevGuideExamples/*: - Added examples of OCI TAO Developers Guide - -Tue Sep 16 12:46:00 UTC 2008 Johnny Willemsen - - * tools/Config_Handlers/XSCRT/Elements.hpp: - Added missing include, thanks to Mark Hebbel - for reporting this - -Tue Sep 16 12:15:00 UTC 2008 Johnny Willemsen - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp - * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp - * examples/BasicSP/EC/controller.cpp - * examples/Display/RateGen/controller.cpp - * examples/Hello/Sender/starter.cpp - * examples/Swapping/Sender/starter.cpp - * performance-tests/Benchmark/RoundTrip/client.cpp - * performance-tests/Protocols/Controller/Controller.cpp - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp - * tools/Config_Handlers/CIAO_Events/test.cpp - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/RT-CCM/test.cpp - * tools/Config_Handlers/test.cpp - ACE_TCHAR changes - -Mon Sep 15 16:34:00 UTC 2008 Simon Massey - - * NEWS: - Updated for x.6.6 - -Mon Sep 15 11:08:04 UTC 2008 Simon Massey - - * CIAO version 0.6.6 released. - -Tue Aug 5 15:13:53 UTC 2008 Jeff Parsons - - * performance-tests/Benchmark/RoundTrip/client.cpp: - - Replace a char type local variable with an int. On some - platforms, chars are unsigned - in such cases, checks for - < 0 or > 0 cause warnings because theya re always true or - always false. - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Added dance_utils.mpb as a base project to get the Dance_Utils - lib in the link list. The plan launcher executable doesn't - need it directly, but some versions of gcc are problematic, - giving warnings if such indirect linkings aren't in the - makefile explicitly. - -Thu Jul 31 17:17:06 UTC 2008 William R. Otte - - * tools/Config_Handlers/XSCRT/Elements.hpp: - - Stab at fixing a problem on Rawhide. - -Fri Jul 25 21:37:24 UTC 2008 James H. Hill - - * CIDLC/Literals.cpp: - - Bug fix related to ChangeLog entry - - Tue Jul 22 07:50:38 UTC 2008 James H. Hill - - This was resolved by converting C++ style comments that - preceded a close bracket '}' to a C style comment so that it - would force a newline to be generated, instead of thinking - the bracket was part of the comment (since there is no way to - really tell in this case). - -Fri Jul 25 16:05:00 UTC 2008 Simon Massey - - * NEWS: - - Tidied this up a little. - -Tue Jul 22 07:50:38 UTC 2008 James H. Hill - - * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp: - - Bug fix where using a curly brace, i.e., '{' or '}', inside a - string or comment caused the code generator to treat it as a - regular curly brace. This meant the code generator inserted a - newline when it was not supposed to. - -Fri Jul 04 10:43:00 UTC 2008 Simon Massey - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Remove extrainious character from Will's commit below. - -Thu Jul 3 19:21:37 UTC 2008 William R. Otte - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Added a strict ordering dependency with TAO_IDL_EXE, as some builds - appear to have a race between these two, causing some errors. - -Wed Jul 2 12:45:53 UTC 2008 Douglas C. Schmidt - - * Updated the COPYING file to make it consistent with what's on the website. - -Mon Jun 30 15:41:05 UTC 2008 Jeff Parsons - - * CIDLC/SizeTypeCalculator.cpp: - - Added missing support for bounded sequences. - -Wed Jun 25 11:53:00 UTC 2008 Simon Massey - - * DAnCE/TargetManager/CmpClient.cpp: - - Remove redundant "" 3rd parameter (orbID) from ORB_init() calls. - -Tue Jun 24 12:23:00 UTC 2008 Simon Massey - - * tools/Config_Handlers/test.cpp: - * tools/Config_Handlers/RT-CCM/test.cpp: - * tools/Config_Handlers/Package_Handlers/test.cpp: - * tools/Config_Handlers/CIAO_Events/test.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - * DAnCE/TargetManager/CmpClient.cpp: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - * performance-tests/mico/mico-thrput-st/server.cc: - * performance-tests/mico/mico-thrput-st/client.cc: - - Fix fuzz errors incorrect ACE_TMAIN/main use. - -Mon Jun 23 13:55:00 UTC 2008 Simon Massey - - * tools/IDL3_TO_IDL2/IDL3_TO_IDL2.mpc: - - Backed out change, this is not the reason. - -Fri Jun 20 08:50:00 UTC 2008 Simon Massey - - * tools/IDL3_TO_IDL2/IDL3_TO_IDL2.mpc: - - Added missing source dependancy. - -Thu Jun 19 14:11:00 UTC 2008 Simon Massey - - * DAnCE/NodeApplication/NodeApplication_Core.cpp: - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/RepositoryManager/RMadmin.cpp: - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - * examples/BasicSP/EC/client.cpp: - * examples/BasicSP/EC/controller.cpp: - * examples/Display/RateGen/controller.cpp: - * examples/Hello/Sender/starter.cpp: - * examples/Null_Component/StaticDAnCEApp.cpp: - * examples/Swapping/Sender/starter.cpp: - * performance-tests/Benchmark/Multi_Threaded/client.cpp: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: - - Remove redundant "" 3rd parameter (orbID) from ORB_init() calls. - -Mon Jun 16 19:04:42 UTC 2008 Abdullah Sowayan - - * tools/Config_Handlers/Utils/Functors.h: - - Untabify. - -Mon Jun 16 18:37:32 UTC 2008 Abdullah Sowayan - - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - - Untabify. - -Mon Jun 16 12:45:00 UTC 2008 Simon Massey - - * CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl: - * CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: - - Un-tabify. - -Sat May 31 23:31:20 UTC 2008 William R. Otte - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Modified to take advantage of MCPP preprocessing. - -Mon May 19 02:53:21 CDT 2008 Johnny Willemsen - - * CIAO version 0.6.5 released. - -Sun May 11 14:57:47 UTC 2008 James H. Hill - - * CCF/CCF/CodeGenerationKit/IndentationJava.hpp: - - Simple indentation implanter for Java source files. - -Wed May 7 06:53:02 UTC 2008 William R. Otte - - * DAnCE/Deployment/Deployment_common.h: - - Qualified equality operator with const to fix error with - Unbounded_Set. - -Thu May 1 00:48:38 UTC 2008 Abdullah Sowayan - - * CIAO_TAO.mwc: - - The location of ETCL moved from $ACE_ROOT to $ACE_ROOT/ace. - -Wed Apr 30 22:16:13 UTC 2008 James H. Hill - - * CIAO_TAO_DAnCE.mwc: - - The location of ETCL moved from $ACE_ROOT to $ACE_ROOT/ace. - -Mon Apr 28 14:27:32 UTC 2008 Johnny Willemsen - - * ciao/Context_Impl_T.h - * ciao/Dynamic_Component_Activator.h - * ciao/Servant_Activator.h - * CIDLC/ExecImplHeaderGenerator.cpp - * DAnCE/TargetManager/TargetManager_exec.h - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h - * examples/BasicSP/BasicSP_exec.h - * examples/BasicSP/BMClosedED/BMClosedED_exec.h - * examples/BasicSP/BMDevice/BMDevice_exec.h - * examples/BasicSP/BMDisplay/BMDisplay_exec.h - * examples/BasicSP/EC/EC_exec.h - * examples/Display/GPS/GPS_exec.h - * examples/Display/GPS/GPS_tracing_exec.h - * examples/Display/NavDisplay/NavDisplay_exec.h - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h - * examples/Display/RateGen/RateGen_exec.h - * examples/Hello/Receiver/Receiver_exec.h - * examples/Hello/Sender/Sender_exec.h - * examples/Null_Component/Null_Component_exec.h - * examples/Swapping/Receiver/Receiver_exec.h - * examples/Swapping/Sender/Sender_exec.h - * examples/Swapping/Sender/Sender_exec_1.h - * examples/Swapping/Sender/Sender_exec_2.h - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h - * performance-tests/Protocols/Receiver/Receiver_exec.h - * performance-tests/Protocols/Sender/Sender_exec.h - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h - * tests/Minimum/Receiver/Receiver_exec.h - * tests/Minimum/Sender/Sender_exec.h - Don't use TAO_Local_RefCounted_Object but ::CORBA::LocalObject now - LocalObject is also refcounted. Users can still sue TAO_Local_RefCounted_Object, - it just does nothing, actions have been takin in LocalObject.h - to prevent the usage of TAO_Local_RefCounted_Object in the - TAO distribution itself - - * CIAO_TAO.mwc - * CIAO_TAO_DAnCE.mwc - Added ETCL and monitoring - -Wed Apr 23 01:53:32 CDT 2008 Johnny Willemsen - - * CIAO version 0.6.4 released. - -Thu Mar 27 18:51:13 UTC 2008 William R. Otte - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Added minizip in ACE/contrib for RM. - -Thu Mar 27 14:12:41 UTC 2008 William R. Otte - - * MPC/config/ciaocidldefaults.mpb: - - Projects that use CILC should build after CIDLC. - -Wed Mar 26 15:27:44 UTC 2008 Adam Mitz - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Removed invalid and unneeded VPATH setting with the verbatim section. - -Mon Mar 24 02:25:23 UTC 2008 Douglas C. Schmidt - - * COPYING: Updated the license a bit based on feedback from Tom - Callaway . These changes will - enable ACE+TAO to be shipped with Fedora. - -Sun Mar 23 01:55:11 UTC 2008 William R. Otte - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Add CIDLC to these workspaces. - -Wed Feb 27 16:07:39 UTC 2008 Abdullah Sowayan - - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * CCF/Example/CodeGenerationKit/Indentation/IDL/indent_idl.cpp: - * CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp: - * CCF/Example/ComponentDeploymentDescriptor/cdd.cpp: - * CCF/Example/IDL2/CxxMapping/driver.cpp: - * CCF/Test/CIDL/Compiler/driver.cpp: - * CCF/Test/CompilerElements/CPP/driver.cpp: - * CCF/Test/IDL2/Compiler/driver.cpp: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/hand_built.cpp: - * CCF/Test/IDL2/Traversal/Recreate/recreate.cpp: - * CCF/Test/IDL3/Compiler/driver.cpp: - * CIDLC/cidlc.cpp: - - Disable check_for_improper_main_declaration fuzz check on these - files. The files have no dependency on ACE, thus they shouldn't - use ACE_TMAIN. - -Thu Feb 21 02:34:37 CST 2008 Johnny Willemsen - - * CIAO version 0.6.3 released. - -Tue Feb 12 19:29:09 UTC 2008 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - Fixed bug in thos MPC file - -Tue Feb 12 14:27:09 UTC 2008 Simon McQueen - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/Interfaces/Interfaces.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeManager/Monitor.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/Plan_Generator/Plan_Generator.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * DAnCE/Utils/DAnCE_Utils.mpc: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * tools/Config_Handlers/Config_Handlers.mpc: - - Add specific base projects to direct libraries into $ACE_ROOT/lib. - - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_component_dnc.mpb: - - Cop out and add tao_output into the dependency of these two projects. - These two are on the inheritance hierarchy of all CIAO test; example; - or tutorial libraries it seems so this should direct them all back - into $ACE_ROOT/lib where they were before. - -Tue Feb 12 10:18:14 UTC 2008 Simon McQueen - - * DAnCE/Deployment/DAnCE_Core.mpc: - * ciao/CCM_Core.mpc: - * ciaosvcs/Events/CIAO_Events.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc: - * tools/Config_Handlers/Config_Handlers.mpc: - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc: - * tools/Config_Handlers/Utils/Utils.mpc: - - Add specific tao_output base project dependencies to direct libraries - into $ACE_ROOT/lib. See bug #3192. - -Wed Jan 30 23:20:05 UTC 2008 Jeff Parsons - - * tools/IDL3_to_IDL2/be_produce.cpp: - - Changed use of exception FE_Bailout to Bailout, reflecting - the corresponding name change of the front end exception class. - -Fri Jan 11 18:02:07 UTC 2008 William R. Otte - - * MPC/config/cidlc.mpb: - Make sure CIDLC bits don't build on cross-compile targets. - -Wed Jan 9 17:55:33 UTC 2008 William R. Otte - - * CIAO_TAO_DAnCE.mwc: - Fix for MPC warning. - -Mon Dec 17 08:17:12 UTC 2007 Johnny Willemsen - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - Fixed compile error - -Sat Dec 15 15:02:12 UTC 2007 Johnny Willemsen - - * bin/PerlCIAO/perlciao.mpc - Use custom_only=1 for this MPC file - -Fri Dec 14 02:48:57 CST 2007 Johnny Willemsen - - * CIAO version 0.6.2 released. - -Tue Dec 11 13:49:18 UTC 2007 Jeff Parsons - - * NEWS: - - Updated file with my checkins since the last beta. - -Fri Dec 7 06:27:54 UTC 2007 Johnny Willemsen - - * bin/PerlCIAO/perlciao.mpc: - With vc9 set ConfigurationType to 10 to disable the creation - of the manifest file which fails because these projects don't - have source code - -Thu Dec 6 17:56:35 UTC 2007 Will Otte - - * CCF/CCF/CIDL/SemanticAction/Composition.cpp: - * CCF/CCF/IDL2/SemanticAction/Operation.cpp: - * CIDLC/CxxNamePrinter.cpp: - - Fixed warnings manifesting on Debian Etch. - -Mon Dec 3 17:42:25 UTC 2007 Abdullah Sowayan - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - - Replaced ACE_Thread_Mutex with TAO_SYNCH_MUTEX to comply with CIAO - coding standards and to silence fuzz warnings. - -Mon Dec 3 17:10:04 UTC 2007 Abdullah Sowayan - - - * docs/templates: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/Executor.idl: - * docs/templates/cidl_template.cidl: - - Removed these files. They are outdated and we don't need them anymore - since we now have a fully functinoal CIDLC compiler. - -Mon Dec 3 16:30:11 UTC 2007 Abdullah Sowayan - - * docs/templates/CIAO_Glue_Session_Template.h: - - Parts of CIAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX. - All occurrences of ACE_SYNCH_MUTEX were replaced with TAO_SYNCH_MUTEX for - consistency. - -Mon Dec 3 16:07:59 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/03.html: - - Fixed image links that were borken due to directory name case sensitivity, - this caused the images not to display in non-windows operating systems. - Thanks to Ashley Sterritt (sterrita at cs dot tc dot ie) for pointing - out the problem. - -Fri Nov 30 22:11:41 UTC 2007 Abdullah Sowayan - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - - Replaced ACE_Thread_Mutex with TAO_SYNCH_MUTEX to allow this code - to work in single-threaded builds. - -Fri Nov 30 19:06:05 UTC 2007 Abdullah Sowayan - - * DAnCE/Deployment/NodeApp_CB_Impl.h: - * DAnCE/Deployment/NodeApp_CB_Impl.cpp: - * DAnCE/DomainApplicationManager/Reply_Handler_i.h: - * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp: - * DAnCE/NodeManager/MonitorController.h: - * DAnCE/NodeManager/MonitorController.cpp: - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Servant_T.h: - * ciao/Home_Servant_Impl_T.h: - * ciao/Servant_Activator.h: - * ciao/Session_Container.h: - * ciao/Session_Container.cpp: - * ciao/Swapping_Container.h: - * ciao/Swapping_Container.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - - Parts of CIAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX. - All occurrences of ACE_SYNCH_MUTEX were replaced with TAO_SYNCH_MUTEX for - consistency. - -Mon Nov 26 16:57:33 UTC 2007 Abdullah Sowayan - - * ciao/Servant_Activator.h: - - The incarnate and etherealize (inherited from PortableServer::ServantActivator) - were implicitly virtual, made those methods explicitly virtual by using the virtual - key word. This is a cosmetic change to comply with ACE/TAO/CIAO coding standards. - - * ciao/Servant_Activator.cpp: - - Minor cosmetic changes. - -Fri Nov 23 19:29:54 UTC 2007 Johnny Willemsen - - * ciao/Servant_Impl_Base.cpp: - Layout change - - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_vc8warnings.mpb: - * MPC/config/ciao_vcwarnings.mpb: - Renamed vc8warnings to vcwarnings, this file is also for vc9 from now - -Thu Nov 22 15:41:13 UTC 2007 Abdullah Sowayan - - * ciao/Dynamic_Component_Activator.inl: - - New file. Inlined short methods to comply with ACE/TAO/CIAO - coding standards. - - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Activator.cpp: - - Minor changes necessary for the new inline file mentioned above. - - * ciao/Dynamic_Component_Activator.h: - - The incarnate and etherealize (inherited from PortableServer::ServantActivator) - were implicitly virtual, made those methods explicitly virtual by using the virtual - key word. This is a cosmetic change to comply with ACE/TAO/CIAO coding standards. - -Wed Nov 21 17:41:14 UTC 2007 Abdullah Sowayan - - * ciao/Context_Impl_Base.inl: - - New file. Inlined short methods to comply with ACE/TAO/CIAO - coding standards. - - * ciao/Context_Impl_Base.h: - * ciao/Context_Impl_Base.cpp: - - Minor changes necessary for the new inline file mentioned above. - - * ciao/Context_Impl_Base.cpp: - * ciao/Dynamic_Component_Servant_Base.cpp: - - Added a comment on why we have unecessary default constructor. - The default constructor is here to keep MSVC happy and should - not be used at all. The default constructor should be removed - in the future. Until then, ACE_ASSERT is used in the default - constructor to detect a runtime call to the default constructor. - -Wed Nov 21 16:36:28 UTC 2007 Abdullah Sowayan - - * ciao/Container_Base.inl: - - New file. Inlined short methods to comply with ACE/TAO/CIAO - coding standards. - - * ciao/Container_Base.h: - * ciao/Container_Base.cpp: - - Minor changes necessary for the new inline file mentioned above. - -Tue Nov 20 15:43:25 UTC 2007 Abdullah Sowayan - - * ciao/Port_Activator.inl: - - New file. Inlined short methods to comply with ACE/TAO/CIAO - coding standards. - - * ciao/Port_Activator.h: - * ciao/Port_Activator.cpp: - - Minor changes necessary for the new inline file mentioned above. - -Mon Nov 12 19:10:36 UTC 2007 Jeff Parsons - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Fixed incorrect path to generated executor stub in - source file list. - -Mon Nov 12 18:54:48 UTC 2007 Jeff Parsons - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Display/RateGen/RateGen.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockDistributor.mpc: - - Added line 'avoids += ace_tao_tao' in driver/client projects. - - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.h: - - Cosmetic changes (line lengths, ACE style guidelines). - -Fri Nov 9 15:06:04 UTC 2007 Jeff Parsons - - * MPC/config.ciaocidldefaults.mpb: - - Added a line to ensure that the XML descriptor generated by the - CIDL compiler gets cleaned up similarly to the other generated - files upon a 'make clean' operation. Thanks to Adam Mitz - for supplying the fix. - -Tue Nov 6 20:31:09 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/04.html: - - All DAnCE executables are placed in $CIAO_ROOT/bin when built. Updated - the tutorial to reflect the fact that the executables are in $CIAO_ROOT/bin - -Fri Nov 2 16:41:48 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - - Reverted what seems to be an accidental commit made at: - Mon Oct 29 16:40:08 UTC 2007 Friedhelm Wolf - - The changes causes the tutorial to not work (plan launcher fails). - -Mon Oct 29 19:10:34 UTC 2007 Jeff Parsons - - * examples/Display/NavDisPlayGUI/NavDisplayGUI.mpc: - - Modified exec project to reflect recent dependency changes, - and added svnt project that links to the GUI version of the - exec lib. - - * examples/Display/NavDisPlayGUI/NavDisplayGUI_exec.cpp: - * examples/Display/NavDisPlayGUI/NavDisplayGUI_exec.h: - - Cosmetic changes. - - * examples/Display/NavDisPlayGUI/NavDisplayGUI_exec_stub_export.h: - * examples/Display/NavDisPlayGUI/NavDisplayGUI_exec_exec_export.h: - * examples/Display/NavDisPlayGUI/NavDisplayGUI_svnt_export.h: - * examples/Display/NavDisPlayGUI/NavDisplayGUI_exec_svnt_export.h: - * examples/Display/NavDisPlayGUI/NavDisplayGUI_stub_export.h: - - Removed these unused files. - -Mon Oct 29 17:45:24 UTC 2007 Abdullah Sowayan - - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp: - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan.cdp: - - Corrected some entries, according to recent changes in library - names of the Hello example, so that the tests succeed. - -Mon Oct 29 16:40:08 UTC 2007 Friedhelm Wolf - - * examples/Hello/descriptors_events: - - Renamed deployment descriptor files and corrected some entries, - according to recent changes in library names of the Hello example, - so that the tests succeed. - -Mon Oct 29 01:37:04 UTC 2007 Abdullah Sowayan - - * examples/Hello/descriptors_RTCCM/rt-config-example.cdp: - * examples/Hello/descriptors_RTCCM/rt-example.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp: - - Recent changes to MPC files changed library names. As such, - the example was failing. Correct the library names in the files above. - -Sun Oct 28 19:11:39 UTC 2007 Abdullah Sowayan - - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/Receiver_Exec.iad: - * examples/Hello/descriptors/Receiver_Stub.iad: - * examples/Hello/descriptors/Receiver_Svnt.iad: - * examples/Hello/descriptors/Sender_Exec.iad: - * examples/Hello/descriptors/Sender_Stub.iad: - * examples/Hello/descriptors/Sender_Svnt.iad: - - Recent changes to MPC files changed library names. As such, - the example was failing. Correct the library names in the files above. - -Fri Oct 26 13:15:24 UTC 2007 Friedhelm Wolf - - * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: - - Removed some code, that accidentially was commited - -Fri Oct 26 01:01:37 UTC 2007 Friedhelm Wolf - - * examples/Hello/descriptors_events: - - Changed test scripts to perl and make them autobuild conform - -Thu Oct 25 21:28:13 UTC 2007 Jeff Parsons - - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - - Fixed mismatches of lib names. - -Thu Oct 25 15:44:50 UTC 2007 Friedhelm Wolf - - * examples/Hello/descriptors_events: - - Added scripts and README files for documentation purposes - -Wed Oct 24 16:17:41 UTC 2007 Abdullah Sowayan - - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - - Made the implementation of these files look like what is currently - generated by the CIDLC compiler. It seems that the files in question - were completley handwritten. The changes affects the signitures of - the entry point functions, and the implementation of the entry point - functions and factories. - - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/Receiver_Exec.iad: - * examples/Hello/descriptors/Sender_Exec.iad: - * examples/Hello/descriptors_RTCCM/rt-config-example.cdp: - * examples/Hello/descriptors_RTCCM/rt-example.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp: - * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp: - * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp: - * examples/Hello/descriptors_naming/deploymentplan_naming.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan.cdp: - * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp: - - Modified the entry point functions' signitures as per the comment above. - -Tue Oct 23 20:25:53 UTC 2007 Abdullah Sowayan - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Hello_Base/Hello_Base_skel_export.h: - - Minor cosmetic changes. - - * examples/Hello/Sender/Sender.mpc: - - Change 'after' lines to match recent changes to project names. - -Tue Oct 23 14:50:48 UTC 2007 Jeff Parsons - - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - - Fixed typo in IDL filename. - -Tue Oct 23 14:37:05 UTC 2007 Abdullah Sowayan - - * tests/CIDL/CodeGen/Basic.mpc: - * tests/CIDL/CodeGen/Basic_skel_export.h: - * tests/CIDL/CodeGen/Basic_stub_export.h: - * tests/CIDL/CodeGen/CodeGen.mpc: - * tests/CIDL/CodeGen/CodeGen_exec_export.h: - * tests/CIDL/CodeGen/CodeGen_stub_export.h: - * tests/CIDL/CodeGen/CodeGen_svnt_export.h: - - - Modified MPC files to reverse - the exec->svnt dependency. Also moved generated - EC.{h, inl, cpp} files from svnt buidl to - exec build. - - - Added file names to MPC projects so that all build files - are displayed in IDEs. - - - For non-component builds, changed _svnt suffix to _skel - for project names, library names, and export header file - names. - - - Separated IDL and CIDL/executor IDL processing into - separate projects. - - * tests/CIDL/CodeGen/Basic_svnt_export.h: - - Removed this file. - -Tue Oct 23 14:27:18 UTC 2007 Abdullah Sowayan - - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Sender/Sender_exec.h: - - Removed dependency on including Servant header files. - - * tests/Minimum/Sender/Sender_exec.cpp: - * tests/Minimum/Receiver/Receiver_exec.cpp: - - The generate context is a var type now (it used to be a pointer). - Do not compare it directly with 0, use CORBA::is_nil instead. - - Effectively, we just renegerated the executor files with a newer - cidlc compiler. - -Mon Oct 22 18:54:03 UTC 2007 Jeff Parsons - - * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp: - * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h: - - New files, factored out of existing files. - - * performance-tests/Benchmark/Benchmark_skel_export.h: - * tests/Minimum/Minimum_Base/Minimum_Base.mpc: - * tests/Minimum/Minimum_Base/Minimum_Base_skel_export.h: - * examples/Hello/Hello_Base/Hello_Base_skel_export.h: - * examples/Swapping/Hello_Base/Hello_Base_skel_export.h: - - New files, renamed from corresponding files removed, as - listed below. - - * performance-tests/Benchmark/Benchmark_svnt_export.h: - * tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h: - * tests/Minimum/Minimum_Base/Minimum.mpc: - * examples/Hello/Hello_Base/Hello_Base_svnt_export.h: - * examples/Swapping/Hello_Base/Hello_Base_svnt_export.h: - - Removed files, renamed as described above. - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * performance-tests/Protocols/Sender/Sender.mpc: - * performance-tests/Protocols/Controller/Controller.mpc: - * performance-tests/Protocols/Receiver/Receiver.mpc: - * performance-tests/Protocols/common/Protocols.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/server.cpp: - * performance-tests/Benchmark/Multi_Threaded/client.cpp: - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmark/README - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * tests/Minimum/Sender/Sender_exec.cpp: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender.mpc: - * tests/Minimum/Receiver/Receiver.mpc: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Receiver/Receiver_exec.h: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/Swapping/Sender/Sender.mpc: - * examples/Swapping/Receiver/Receiver.mpc: - * examples/Swapping/Hello_Base/Hello_Base.mpc: - - - Modified *_exec.{h, cpp} files and MPC files to reverse - the exec->svnt dependency. Also moved generated - EC.{h, inl, cpp} files from svnt build to - exec build. - - - Added file names to MPC projects so that all build files - are displayed in IDEs. - - - For non-component builds, changed _svnt suffix to _skel - for project names, library names, and export header file - names. - - - Separated IDL and CIDL/executor IDL processing into - separate projects. - -Fri Oct 19 18:19:12 UTC 2007 Abdullah Sowayan - - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl: - - Updated this template implementation to reflect enhancement done by: - Fri Oct 19 15:22:36 UTC 2007 Jeff Parsons - -Fri Oct 19 18:04:13 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/images/fig10.jpg: - * docs/tutorials/Quoter/Simple/images/fig11.jpg: - * docs/tutorials/Quoter/Simple/images/fig12.jpg: - * docs/tutorials/Quoter/Simple/images/fig2.jpg: - * docs/tutorials/Quoter/Simple/images/fig3.jpg: - * docs/tutorials/Quoter/Simple/images/fig4.jpg: - * docs/tutorials/Quoter/Simple/images/fig5.jpg: - * docs/tutorials/Quoter/Simple/images/fig6.jpg: - * docs/tutorials/Quoter/Simple/images/fig7.jpg: - * docs/tutorials/Quoter/Simple/images/fig8.jpg: - * docs/tutorials/Quoter/Simple/images/fig9.jpg: - - Update the images to reflect what the user would see - in CoSMIC 0.6 - - * docs/tutorials/Quoter/Simple/03.html: - - Slight modification to make the images appear pretty. - -Fri Oct 19 17:56:34 UTC 2007 Jeff Parsons - - * ciao/IFR_Base.idl: - - Removed this file - see below. - - * ciao/CCM_Home.idl: - * ciao/CCM_Core.mpc: - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Reverted all changes that attempted to replace dependency - on IFR_Client library with a dummy interface. The fact - that one or more config handlers must depend on IFR_Client - makes linking clashes between the dummy and real interfaces - unavoidable. - -Fri Oct 19 15:35:13 UTC 2007 Jeff Parsons - - * examples/Null_Component/StaticDAnCEApp.mpc: - * examples/Null_Component/Null_Component.mpc: - - Change 'after' lines to match recent changes to project names. - -Fri Oct 19 15:22:36 UTC 2007 Jeff Parsons - - * examples/Null_Component/plan.h: - * examples/Null_Component/StaticDAnCEApp.cpp: - - Reordered and reduced #includes, cosmetic changes. - - * examples/Null_Component/StaticDAnCEApp.mpc: - - Changed dependency to reflect recent changes in Null_Component.mpc, - added Header_File and Inline_File blocks to eliminate the - appearance of unwanted files in IDEs. - -Thu Oct 18 21:17:45 UTC 2007 Abdullah Sowayan - - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component/StaticDAnCEApp.mpc: - - Fixed fuzz warnings. Apparently, project and file names that are - longer than 38 charachters are not portable on all operating - systems. Thanks to Johnny Willemsen for explaining why fuzz - complains about long project and file names. - -Thu Oct 18 20:58:54 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/01.html: - * docs/tutorials/Quoter/Simple/02.html: - * docs/tutorials/Quoter/Simple/03.html: - * docs/tutorials/Quoter/Simple/04.html: - * docs/tutorials/Quoter/Simple/index.html: - - Updated the tutorial. - - * docs/tutorials/Quoter/Simple/descriptors/NodeMap.dat: - - Changed the name of this file to NodeMap.dat from Stock.dat - Naming everything Stock is confusing. - - * docs/tutorials/Quoter/Simple/descriptors/Stock.dat: - - Removed this file. - -Thu Oct 18 20:19:39 UTC 2007 Jeff Parsons - - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Removed unneeded lib TAO_IFR_Client from list, to avoid clash with - dummy IRObject interface added for CIAO_Client, CIAO_Container, - and CIAO_Server in - - Wed Oct 17 15:24:13 UTC 2007 Jeff Parsons - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * ciaosvcs/Events/CIAO_Events.mpc: - - Reverted changed inadvertently checked in with - - Wed Oct 17 15:24:13 UTC 2007 Jeff Parsons - -Thu Oct 18 19:29:01 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - - Fixed fuzz errors. - -Thu Oct 18 18:21:18 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Model/Quoter.xme: - - The entry points for the Servant and Executor were messed up. New - releases of CoSMIC generate the proper entry point signitures. - This change fixes the entry point signitures. - - * docs/tutorials/Quoter/Simple/descriptors/Broker.cpd: - * docs/tutorials/Quoter/Simple/descriptors/Default.pcd: - * docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd: - * docs/tutorials/Quoter/Simple/descriptors/Domain.cdd: - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - * docs/tutorials/Quoter/Simple/descriptors/StockBroker.ccd: - * docs/tutorials/Quoter/Simple/descriptors/StockBrokerMonolithicImpl.cid: - * docs/tutorials/Quoter/Simple/descriptors/StockBroker_exec.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockBroker_stub.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockBroker_svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockDistributor.ccd: - * docs/tutorials/Quoter/Simple/descriptors/StockDistributorMonolithicImpl.cid: - * docs/tutorials/Quoter/Simple/descriptors/StockDistributor_exec.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockDistributor_stub.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockDistributor_svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/StockQuoter.cid: - * docs/tutorials/Quoter/Simple/descriptors/StockQuoter.cpd: - * docs/tutorials/Quoter/Simple/descriptors/TopLevelPackage.tpd: - - Regenerated descriptors. Older descriptors were hand written, - we want users to use CoSMIC for this sort of stuff, especially - in the tutorial. - - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - - Increased spawn dealy for NodeApplication in order to have - this tutorial work on slower systems. - - * docs/tutorials/Quoter/Simple/descriptors/Broker.ccd: - * docs/tutorials/Quoter/Simple/descriptors/Broker.cid: - * docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad: - * docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad: - * docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd: - * docs/tutorials/Quoter/Simple/descriptors/Distributor.cid: - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad: - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad: - * docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad: - * docs/tutorials/Quoter/Simple/descriptors/Libraries.iad: - * docs/tutorials/Quoter/Simple/descriptors/Stock.cdp: - * docs/tutorials/Quoter/Simple/descriptors/Stock.cid: - * docs/tutorials/Quoter/Simple/descriptors/Stock.cpd: - * docs/tutorials/Quoter/Simple/descriptors/Stock.pcd: - * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp: - * docs/tutorials/Quoter/Simple/descriptors/package.tpd: - - Removed these files. - -Thu Oct 18 18:13:35 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.cidl: - * docs/tutorials/Quoter/Simple/Broker/StockBroker.idl: - - Use include guards, as is done with other IDL files in the distribution. - - Renamed the IDL files to exactly match the name of the component. The - name of the component and the IDL file must match, if they don't, one - has to do more work in CoSMIC to resolve conflicts. - - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - - Renamed from Broker.cpp. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - - Rengerate the MPC files with the new generate_component_mpc.pl - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - - Renamed for the reason mentioned above. Also, regenerated the autogenerated - code parts to leverage recent changes to CIDLC generated code. The executors - now have no dependency on the servants. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h: - - Regenerated. - - * docs/tutorials/Quoter/Simple/Broker/Broker.cidl: - * docs/tutorials/Quoter/Simple/Broker/Broker.cpp: - * docs/tutorials/Quoter/Simple/Broker/Broker.idl: - * docs/tutorials/Quoter/Simple/Broker/Broker.mpc: - * docs/tutorials/Quoter/Simple/Broker/Broker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp: - * docs/tutorials/Quoter/Simple/Broker/Broker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_svnt_export.h: - - Removed these files per the changes above. - -Thu Oct 18 17:45:41 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.cidl: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.idl: - - Use include guards, as is done with other IDL files in the distribution. - - Renamed the IDL files to exactly match the name of the component. The - name of the component and the IDL file must match, if they don't, one - has to do more work in CoSMIC to resolve conflicts. - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - - Renamed from Distributor.cpp. - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - - Rengerate the MPC files with the new generate_component_mpc.pl - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - - Renamed for the reason mentioned above. Also, regenerated the autogenerated - code parts to leverage recent changes to CIDLC generated code. The executors - now have no dependency on the servants. - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h: - - Regenerated. - - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.idl: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc: - * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_svnt_export.h: - - Removed these files per the changes above. - -Thu Oct 18 17:42:58 UTC 2007 Abdullah Sowayan - - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl: - - Use include guards, as is done with other IDL files in - the distribution. - - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - - Rengerate the MPC files with the new generate_component_mpc.pl - -Wed Oct 17 20:20:34 UTC 2007 Jeff Parsons - - * tests/IDL3/Events/Any/main.cpp: - - Added #include of Any.h. - -Wed Oct 17 18:47:50 UTC 2007 Jeff Parsons - - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Upgradeable_Context_Impl_T.cpp: - - Restored included files needed at instantiation time. - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp(create_rt_event_channel): - - Commented out unused arg. - -Wed Oct 17 17:18:04 UTC 2007 Abdullah Sowayan - - * DAnCE/TargetManager/descriptors/NodeDetails.dat: - * DAnCE/TargetManager/descriptors/NodeManagerMap.dat: - * DAnCE/tests/scripts/BasicSP/basicsp.dat: - * docs/tutorials/Quoter/Simple/descriptors/Stock.dat: - * examples/BasicSP/descriptors/BasicSP.dat: - * examples/Display/descriptors/NodeManagerMap.dat: - * examples/Hello/descriptors/NodeManagerMap.dat: - * examples/Hello/descriptors_RTCCM/NodeManagerMap.dat: - * examples/Hello/descriptors_events/NodeManagerMap.dat: - * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat: - * performance-tests/Benchmark/descriptors/test-multi-process.dat: - * performance-tests/Benchmark/descriptors/test.dat: - * performance-tests/Protocols/descriptors/test.dat: - * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat: - - Removed blank lines. Blank lines now cause the deployment to fail. - -Wed Oct 17 15:28:42 UTC 2007 Jeff Parsons - - * MPC/config/ciao_client_dnc.mpb: - * MPC/config/ciao_events_dnc.mpb: - - Removed ifr_client from base project list. - -Wed Oct 17 15:24:13 UTC 2007 Jeff Parsons - - * CIAO_TAO_DAnCE.mwc: - - Removed unnecessary directories, removing 24 unused builds. - - * ciao/IFR_Base.idl: - - New file, containing a dummy IRObject interface, to be used - as the return type for an unimplemented operation in CCM_Home. - - * ciao/CCM_Home.idl: - - Changed include of IFR_Base.idl from the one in - TAO_ROOT/tao/IFR_Client to the new file above. - - * ciao/CCM_Core.mpc: - - Removed dependency on IFR_Client lib from all projects. - - * ciao/Server_init.h: - * ciao/Client_init.cpp: - * ciao/Cookies.h: - * ciao/Servant_Impl_Base.h: - * ciao/StandardConfigurator_Impl.cpp: - * ciao/Swapping_Servant_Home_Impl_T.h: - * ciao/Swapping_Servant_Home_Impl_Base.cpp: - * ciao/Dynamic_Component_Activator.cpp: - * ciao/Server_init.cpp: - * ciao/Servant_Impl_Base.cpp: - * ciao/Servant_Activator.cpp: - * ciao/Swapping_Container.h: - * ciao/StandardConfigurator_Impl.h: - * ciao/Dynamic_Component_Activator.h: - * ciao/Dynamic_Component_Servant_Base.cpp: - * ciao/Servant_Activator.h: - * ciao/Context_Impl_Base.h: - * ciao/Container_Base.cpp: - * ciao/Session_Container.h: - * ciao/Cookies.cpp: - * ciao/Port_Activator.h: - * ciao/Client_init.h: - * ciao/Dynamic_Component_Servant_Base.h: - * ciao/Home_Servant_Impl_Base.h: - * ciao/Container_Base.h: - * ciao/Swapping_Servant_Home_Impl_Base.h: - * ciao/Session_Container.cpp: - * ciao/Upgradeable_Context_Impl_T.h: - * ciao/CIAO_common.h: - * ciao/Swapping_Container.cpp: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp: - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h: - * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h: - * ciaosvcs/Events/CIAO_EventService_Factory_impl.h: - - Removed unnecessary #includes, and general cleanup of - formatting and #includes to follow ACE style guidelines. - - * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc: - * ciaosvcs/Events/CIAO_Events.mpc: - - Added export header files to projects, so they will be seen - by developers using IDEs. - -Wed Oct 17 14:02:41 UTC 2007 Abdullah Sowayan - - * examples/Null_Component/plan.h: - - Fixed fuzz warning. - -Tue Oct 16 20:49:21 UTC 2007 Abdullah Sowayan - - * examples/Null_Component/Null_Component.cidl: - * examples/Null_Component/Null_Component.idl: - - Slight name fixes to make CIDLC and CoSMIC happy. For details, - check bugzilla 3086. - - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - - Renegerated the empty executor files. - - * examples/Null_Component/Null_Interface.mpc: - * examples/Null_Component/Null_Component.mpc: - - Regenerate with the newer generate_component_mpc.pl. - - * examples/Null_Component/Null_Interface_skel_export.h: - - Autogenerated. - - * examples/Null_Component/model/Null_Component.xme: - - Updated the model to take advantage of recent fixes to CoSMIC. For details, - check the CoSMIC ChangLog entry: - - Thu Oct 4 11:27:17 UTC 2007 Jeff Parsons - - * examples/Null_Component/descriptors/NodeMap.dat: - - Removed blank lines. Blank lines now cause the deployment to fail. - - * examples/Null_Component/descriptors/Domain.cdd: - * examples/Null_Component/descriptors/Null_Assembly.cid: - * examples/Null_Component/descriptors/Null_Assembly_Package.cpd: - * examples/Null_Component/descriptors/Null_Component.ccd: - * examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid: - * examples/Null_Component/descriptors/Null_Component_Package.cpd: - * examples/Null_Component/descriptors/Null_Component_exec.iad: - * examples/Null_Component/descriptors/Null_Component_stub.iad: - * examples/Null_Component/descriptors/Null_Component_svnt.iad: - * examples/Null_Component/descriptors/PackageConfiguration.pcd: - * examples/Null_Component/descriptors/Plan.cdp: - * examples/Null_Component/descriptors/TopLevelPackage.tpd: - - Updated descriptors to reflect changes made to CoSMIC model. - - * examples/Null_Component/plan.h: - - Update plan to reflect changes made to CoSMIC model. - - * examples/Null_Component/descriptors/package.tpd: - * examples/Null_Component/model/Null_Component.mga: - - Removed these files. - -Tue Oct 2 20:34:15 UTC 2007 Abdullah Sowayan - - * bin/generate_component_mpc.pl: - - Enhanced user displayed message. - -Tue Oct 2 19:52:30 UTC 2007 Abdullah Sowayan - - * docs/generate_component_mpc.html: - - Changed documentation to match changes made in: - Fri Sep 28 19:37:39 UTC 2007 Jeff Parsons - -Fri Sep 28 19:58:52 UTC 2007 Jeff Parsons - - * CIDLC/UtilityTypeNameEmitters.hpp: - - For some unknown reason, a class declaration was missing from - this file in updating on other machines, checking it in - explicitly to make sure. - -Fri Sep 28 19:37:39 UTC 2007 Jeff Parsons - - * CIDLC/CorbaTypeNameEmitters.cpp: - - Fixed incorrect code generation for a null return of an enum type. - - * CIDLC/ServantSourceGenerator.cpp: - - Changed generated include of Cookies.h to ciao/Cookies.h. - - * CIDLC/ExecImplHeaderGenerator.cpp: - * CIDLC/ExecImplSourceGenerator.cpp: - - Changed generated context member type from Foo_Context* to - CCM_Foo_Context_var. Also replaced include of Foo_svnt.h with - FooEC.h. These changes reverse the existing dependency of - the executor DLL on the servant DLL, which makes more sense - since the servant delegates to the executor, which should - not be coupled with any specific CCM implementation. - - * bin/generate_component_mpc.pl: - - Changed the script to generate default MPC files to reflect the - dependency changes above. Also split the IDL and CIDL processing - into separate projects. - -Fri Sep 21 22:11:16 UTC 2007 Friedhelm Wolf - - * docs/schema/CIAOEvents.txt: - - Added information about naming conventions for filter declaration. - -Mon Sep 3 14:49:07 UTC 2007 Douglas C. Schmidt - - * tools/Config_Handlers/IDD_Handler.cpp (CIAO): - * tools/Config_Handlers/IDD_Handler.cpp (CIAO): - * tools/Config_Handlers/ADD_Handler.cpp (CIAO): - * tools/Config_Handlers/MDD_Handler.cpp (CIAO): Changed - generateUUID() to generate_UUID() to match new ACE-ification of - the UUID class. - -Wed Sep 19 04:10:15 CDT 2007 Johnny Willemsen - - * CIAO version 0.6.1 released. - -Tue Sep 18 15:13:37 UTC 2007 Abdullah Sowayan - - * DAnCE/NodeApplication/NodeApp_Configurator.cpp: - - StaticDAnCE applications stopped working since the introduction - of this file. This change fixes the problem. For details look - into Bugzilla 3073. Thanks to William R. Otte for providing - the patch. - -Fri Sep 14 15:19:17 UTC 2007 Abdullah Sowayan - - * DAnCE/ExecutionManager/Execution_Manager.cpp: - - Fixed a couple of spelling errors to user diplayed messages. - -Fri Sep 14 14:42:06 UTC 2007 Friedhelm Wolf - - * docs/schema/CIAOEvents.txt: - Added information about supported federation types. - -Wed Sep 12 22:18:03 UTC 2007 Friedhelm Wolf - - * docs/schema/CIAOEvents.txt: - Added documentation about how to integrat TAO Real-Time Event Service - into an CIAO based deployment. - -Tue Sep 4 14:25:24 UTC 2007 Abdullah Sowayan - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - Untabify. - -Mon Sep 03 02:50:30 CDT 2007 Johnny Willemsen - - * CIAO version 0.6 released. - -Mon Aug 27 23:04:36 UTC 2007 Nilabja R - - * ciao/Servant_Impl_Base.h: - Deleted the Private Constructor in the class Servant_Impl_Base. - This strangely solves the problem on Bug 3060. - -Mon Aug 27 13:21:14 UTC 2007 Abdullah Sowayan - - * tools/Config_Handlers/ADD_Handler.cpp: - * tools/Config_Handlers/Any_Handler.h: - * tools/Config_Handlers/CCD_Handler.cpp: - * tools/Config_Handlers/CEPE_Handler.h: - * tools/Config_Handlers/CPD_Handler.h: - * tools/Config_Handlers/DP_PCD_Handler.h: - * tools/Config_Handlers/DP_PCD_Handler.cpp: - * tools/Config_Handlers/ERE_Handler.h: - * tools/Config_Handlers/IDD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * tools/Config_Handlers/Package_Handlers/SID_Handler.h: - * tools/Config_Handlers/Property_Handler.h: - * tools/Config_Handlers/RT-CCM/TPL_Handler.h: - * tools/Config_Handlers/Req_Handler.h: - * tools/Config_Handlers/Req_Handler.cpp: - * tools/Config_Handlers/STD_CID_Handler.cpp: - * tools/Config_Handlers/SatisfierProperty_Handler.h: - * tools/Config_Handlers/Utils/XML_Helper.h: - * tools/Config_Handlers/XSCRT/Traversal.hpp: - Untabify. - -Fri Aug 24 14:23:06 UTC 2007 Abdullah Sowayan - - * examples/BasicSP/EC/controller.cpp: - * examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/Display/NavDisplayGUI_exec/MapView.cpp: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Sender/starter.cpp: - * examples/Null_Component/plan.h: - * examples/Swapping/Receiver/Receiver_exec.h: - * examples/Swapping/Sender/starter.cpp: - Untabify. - -Thu Aug 23 22:21:16 UTC 2007 Abdullah Sowayan - - * DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp: - Untabify. - -Tue Aug 21 14:43:24 UTC 2007 Abdullah Sowayan - - * DAnCE/Interfaces/ExecutionManager_stub_export.h: - * DAnCE/Interfaces/NodeManager_stub_export.h: - * DAnCE/Interfaces/NodeManager_svnt_export.h: - * DAnCE/NodeApplication/CIAO_NodeApplication_export.h: - * DAnCE/NodeApplication/NA_Configurator_Export.h: - * DAnCE/NodeApplication/NoOp_Configurator_export.h: - * DAnCE/NodeApplication/NodeApp_Configurator_Export.h: - * DAnCE/NodeApplication/RTNA_Configurator_Export.h: - * DAnCE/NodeApplicationManager/CIAO_NAM_Export.h: - * DAnCE/TargetManager/TargetManager_exec_export.h: - * DAnCE/TargetManager/TargetManager_stub_export.h: - * DAnCE/TargetManager/TargetManager_svnt_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_exec_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_stub_export.h: - * DAnCE/tests/NodeApplicationTest/RoundTrip_svnt_export.h: - * ciao/CIAO_Client_Export.h: - * ciao/CIAO_Container_Export.h: - * ciao/CIAO_Server_Export.h: - * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h: - * ciaosvcs/Events/CIAO_Events_Export.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_exec_export.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_stub_export.h: - * docs/tutorials/Quoter/Simple/Broker/Broker_svnt_export.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec_export.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_stub_export.h: - * docs/tutorials/Quoter/Simple/Distributor/Distributor_svnt_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h: - * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_exec_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_stub_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec_svnt_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_stub_export.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_svnt_export.h: - * examples/Display/RateGen/RateGen_exec_export.h: - * examples/Hello/Hello_Base/Hello_Base_stub_export.h: - * examples/Hello/Hello_Base/Hello_Base_svnt_export.h: - * examples/Hello/Receiver/Receiver_exec_export.h: - * examples/Hello/Receiver/Receiver_stub_export.h: - * examples/Hello/Receiver/Receiver_svnt_export.h: - * examples/Hello/Sender/Sender_exec_export.h: - * examples/Hello/Sender/Sender_stub_export.h: - * examples/Hello/Sender/Sender_svnt_export.h: - * examples/Swapping/Hello_Base/Hello_Base_stub_export.h: - * examples/Swapping/Hello_Base/Hello_Base_svnt_export.h: - * examples/Swapping/Receiver/Receiver_exec_export.h: - * examples/Swapping/Receiver/Receiver_stub_export.h: - * examples/Swapping/Receiver/Receiver_svnt_export.h: - * examples/Swapping/Sender/Sender_exec_1_export.h: - * examples/Swapping/Sender/Sender_exec_2_export.h: - * examples/Swapping/Sender/Sender_exec_export.h: - * examples/Swapping/Sender/Sender_stub_export.h: - * examples/Swapping/Sender/Sender_svnt_export.h: - * performance-tests/Benchmark/Benchmark_stub_export.h: - * performance-tests/Benchmark/Benchmark_svnt_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_stub_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_svnt_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h: - * performance-tests/Protocols/Receiver/Receiver_exec_export.h: - * performance-tests/Protocols/Receiver/Receiver_stub_export.h: - * performance-tests/Protocols/Receiver/Receiver_svnt_export.h: - * performance-tests/Protocols/Sender/Sender_exec_export.h: - * performance-tests/Protocols/Sender/Sender_stub_export.h: - * performance-tests/Protocols/Sender/Sender_svnt_export.h: - * performance-tests/Protocols/common/Protocols_skel_export.h: - * performance-tests/Protocols/common/Protocols_stub_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h: - * tests/Bug_2130_Regression/interfaces/ENW_skel_export.h: - * tests/Bug_2130_Regression/interfaces/ENW_stub_export.h: - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h: - * tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h: - * tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h: - * tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h: - * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h: - * tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h: - * tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h: - * tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h: - * tests/IDL3/Events/Abstract/Abstract_stub_export.h: - * tests/IDL3/Events/Abstract/Abstract_svnt_export.h: - * tests/IDL3/Events/Regular/Regular_stub_export.h: - * tests/IDL3/Events/Regular/Regular_svnt_export.h: - * tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h: - * tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h: - * tests/IDL3/Homes/Basic/Basic_stub_export.h: - * tests/IDL3/Homes/Basic/Basic_svnt_export.h: - * tests/IDL3/Homes/Factory/Factory_stub_export.h: - * tests/IDL3/Homes/Factory/Factory_svnt_export.h: - * tests/IDL3/Homes/Finder/Finder_stub_export.h: - * tests/IDL3/Homes/Finder/Finder_svnt_export.h: - * tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h: - * tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h: - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h: - * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h: - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h: - * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h: - * tests/IDL3/ImpliedIDL/Events/Events_stub_export.h: - * tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h: - * tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h: - * tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h: - * tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h: - * tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h: - * tests/Minimum/Receiver/Receiver_exec_export.h: - * tests/Minimum/Receiver/Receiver_stub_export.h: - * tests/Minimum/Receiver/Receiver_svnt_export.h: - * tests/Minimum/Sender/Sender_exec_export.h: - * tests/Minimum/Sender/Sender_stub_export.h: - * tests/Minimum/Sender/Sender_svnt_export.h: - * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h: - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h: - * tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h: - * tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h: - * tools/Config_Handlers/XSC_XML_Handlers_Export.h: - * tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h: - - Regenerated export files to address compile-time problems - for static MSVC71 builds. - -Mon Aug 20 12:38:12 UTC 2007 Johnny Willemsen - - * docs/tutorials/Quoter/Simple/03.html: - Corrected invalid hyperlink - -Wed Aug 8 13:41:12 UTC 2007 Johnny Willemsen - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - Added needed include due to refactoring - -Wed Aug 8 07:03:33 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/identifier_helper.cpp (original_local_name): - - To the code that removes a prepended '_cxx_' from an indentifier, - added a check to make sure it was added automatically to avoid - a C++ keyword clash, and not by the user. - -Tue Aug 7 08:57:46 UTC 2007 Jeff Parsons - - * tests/IDL3/ImpliedIDL/All/include.idl: - * tests/IDL3/ImpliedIDL/All/raw_include.idl: - * tests/IDL3/ImpliedIDL/All/pass_through.idl: - - Added #ifndef guards. - -Mon Aug 6 13:00:10 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/identifier_helper.cpp (orig_sn): - - Fixed a problem with Borland BCB6 Pro not finding an implicit - conversion from ACE_CString to char*. - -Fri Aug 3 07:40:11 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/README: - * tests/IDL3/ImpliedIDL/All/README: - - Updated documentation in these directories. - -Fri Aug 3 07:01:35 UTC 2007 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.h: - * tools/IDL3_to_IDL2/identifier_helper.cpp: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/identifier_helper.h: - * tools/IDL3_to_IDL2/be_helper.h: - - - Changes incorporating enhancements by folks at Thales ATM to - better handle the mapping of escaped identifiers (masking - IDL keywords) and identifiers that are C++ keywords from - IDL3 to IDL2. Thanks to Hakim Souami - for leading this - effort. - - - Further changes to build on those above by adding keyword - handling support for scoped names and component port names. - - - Addition of the capability, also from Thales ATM, to - optionally generate #includes of IDL files without the - addition of the default '_IDL2' suffix. This feature is - necessary when included IDL files aren't available for - conversion or when 'system' IDL files are included and - contain only IDL declarations with no 'implied IDL' - mapping. It is also handy for users who may have similar - IDL files included and don't wish to run the conversion - on them needlessly. While Thales ATM's version of this - feature uses a list of 'excluded' filenames in a text - file, the feature in this version uses a command line - option '-x ' for each file to be excluded. - - * tests/IDL3/ImpliedIDL/All/raw_include.idl: - * tests/IDL3/ImpliedIDL/All/keyword_clash.idl: - - New files that expand the test coverage to include the new - festures described above. - - * tests/IDL3/ImpliedIDL/All/all.mpc: - * tests/IDL3/ImpliedIDL/All/pass_through.idl: - - Changes to existing test files to make use of the new files - listed above. - -Thu Aug 2 03:37:40 UTC 2007 Krishnakumar B - - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - - Added a dependency from BMDisplay_exec to BasicSP_exec. Fixes - problems due to build order. Thanks to Johnny and Gan for - reporting the problem. - -Fri Jul 27 06:50:14 CDT 2007 Johnny Willemsen - - * CIAO version 0.5.10 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2010a b/CIAO/ChangeLogs/ChangeLog-2010a deleted file mode 100644 index b156adb47e4..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2010a +++ /dev/null @@ -1,9061 +0,0 @@ -Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - - * CIAO version 0.7.7 released. - -Mon Mar 1 22:49:52 UTC 2010 William Otte - - * docs/OMG-CCM-Tutorial.ppt: - * DAnCE/docs/OMG-DnC-Tutorial.ppt: - - Split OMG-CCM-Tutorial into CIAO and DAnCE parts to - make for more manageably sized documents. Provided - updates to the DnC tutorial. - -Mon Mar 1 19:38:29 UTC 2010 Jeff Parsons - - * ccm/CCM.mpc: - - Removed the application of the -Ssi IDL compiler option to - Navigation.idl and Receptacles.idl, so that their direct - collocation related code can be compiled for a specialized - build that tests the direct collocation code generation - option. - -Mon Mar 1 10:00:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Fixed versioned namespace builds - -Sun Feb 28 23:13:23 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_domainapplicationmanager.mpb: - - Link error on static linux builds. - -Fri Feb 26 15:54:33 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - - Expanded NS/PlanLocality testing merged in, converted this test - to use dance_plan_launcher. - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - - Removed these files as they are no longer needed for above test. - -Fri Feb 26 13:08:03 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - - Avoids ace_for_tao, as Convert_Plan requires file connector. - -Fri Feb 26 12:37:53 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Unicode compile error. - -Fri Feb 26 08:27:17 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - When ndds nor dds4ccm_ndds is set, no need to compile - the derived projects. - -Fri Feb 26 07:40:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Optimized doxygen. - -Thu Feb 25 20:03:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - Set of cleanup of the core library. More will come after the release - of x.7.7. The code is at a much better level than with x.7.6 but - not at the level we aimed for x.7.7 because that was scheduled for - the end of March - -Thu Feb 25 16:23:49 UTC 2010 William R. Otte - - * NEWS: - Added news entries. - -Thu Feb 25 16:20:27 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - Compile error fix. - -Thu Feb 25 15:47:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Optimized logging regarding query condition. - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Optimized Doxygen documentation. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved compile error when QueryConditions are - enabled. - -Thu Feb 25 13:28:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Added doxygen documentation. - -Thu Feb 25 12:48:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Optimized get_one. Return false when DDS returns - DDS_RETCODE_NO_DATA (instead of throwing an exception). - -Thu Feb 25 12:43:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Layout changes. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Resolve runtime errors. - -Thu Feb 25 11:24:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Reverted some of the last changes. - -Thu Feb 25 10:14:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_base.mpb: - When no features is set, all dds4cmm should require - dummy_label. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Implemented some more Qos related methods. - -Thu Feb 25 09:08:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Implemented some get/set_qos methods. - -Thu Feb 25 08:32:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - Cleanup - -Thu Feb 25 08:29:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - Implemented set/get_qos methods. - -Thu Feb 25 08:16:54 UTC 2010 Johnny Willemsen - - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - Added missing base projects - -Thu Feb 25 07:46:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented methods wich were not implemented yet. - -Wed Feb 24 22:08:45 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Additional cleanup. - -Wed Feb 24 15:23:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved compiler errors. - -Wed Feb 24 15:01:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * connectors/dds4ccm/impl/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * connectors/dds4ccm/impl/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/TopicListener.h: - * connectors/dds4ccm/impl/ndds/TopicQos.h: - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h: - Implemented Qos operators and renamed header defines. - -Wed Feb 24 14:36:37 UTC 2010 William R. Otte - - * DAnCE/tools/Split_Plan/Split_Plan_impl.h: - - Fuzz fix. - -Wed Feb 24 13:21:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Removed all lem interfaces - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Fixed compile errors - - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - Some callbacks are ndds specific - -Wed Feb 24 11:43:52 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - ndds needs no-strict-aliasing - -Wed Feb 24 11:39:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - More cleanup - -Wed Feb 24 11:26:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.h - Cleaning up the implementation - -Wed Feb 24 10:45:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/Topic.h - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - * connectors/dds4ccm/impl/ndds/TopicListener.h - Cleaning up the implementation - -Wed Feb 24 08:09:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Resolved compiler warnings on Linux. - -Wed Feb 24 08:06:47 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Resolved compiler warnings. Also removed unnecessary - space characters. - -Wed Feb 24 07:28:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderQos.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DataWriterQos.h - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/PublisherQos.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/StringSeq.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriberQos.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h - * connectors/dds4ccm/impl/ndds/TimeUtilities.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - * connectors/dds4ccm/impl/ndds/TopicQos.h - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h - Guarded all RTI specific code - - * MPC/config/dds4ccm.mpb: - Don't compile anything related to dds4ccm when we don't have - a dds vendor installed - -Tue Feb 23 21:49:52 UTC 2010 William R. Otte - - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Rogue letter was causing a compile error. - -Tue Feb 23 16:22:42 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_convert_plan.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_tools.mpb: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Fuzz fixes. - -Tue Feb 23 16:13:24 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfix for how connections are handled when there are two - internalEndpoints but it is _not_ a local conneciton. - - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - - Corrected IOR file so test script finds controller. - -Tue Feb 23 15:33:33 UTC 2010 Abdul Sowayan - - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - - Added dance_config_handlers as a base project to DAnCE_Convert_Plan - project. Thanks to William Otte for the suggestion. - -Tue Feb 23 15:16:24 UTC 2010 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - - Added split_plan base project. - -Tue Feb 23 14:54:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Inserted forgotten new line character. - -Tue Feb 23 14:46:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - Resolved deployment errors related to generation of the connector - code. - -Tue Feb 23 14:34:59 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - CSLUnexpStat is not ready, yet. - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Layout changes. - - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - Resolved deployment errors related to generation of the connector - code. - -Tue Feb 23 14:28:22 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h: - - Missing file. - -Tue Feb 23 13:25:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl - Added various pragma's - - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/StringSeq.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * MPC/config/ciaoidldefaults.mpb - * MPC/config/componentidldefaults.mpb - Portability changes - -Tue Feb 23 14:08:20 UTC 2010 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Use the split plan library instead of internal split plan impl. - - * DAnCE/MPC/config/dance_convert_plan.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_tools.mpb: - - Base projects for convert_plan/split_plan. - - * DAnCE/tools: - * DAnCE/tools/Convert_Plan: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Tool allowing validation/conversion of XML deployment plans to - CDR. - - * DAnCE/tools/Split_Plan: - * DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_impl.h: - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Tool allowing users to split plans into locality constrained - partitions. Also contains important bugfixes for process - colocation. - -Tue Feb 23 13:40:49 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Added new 3832 tests - - * ciao/Logger/Logger_Service.cpp: - * ciao/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/Logger/Logger_Service.h: - Fixed service config macros which caused this service not - to get loaded on linux - - * tests/Bug_3832_Regression/* - * DAnCE/tests/Bug_3832_Regression/* - Added new test for 3832 - -Tue Feb 23 12:45:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - Making use of the CIAO_Debug_Level flag of the - CIAO logging framework. - -Tue Feb 23 11:54:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/dds4ccm_logger.mpb: - * connectors/dds4ccm/impl/logger: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - * connectors/dds4ccm/impl/logger/Logger.mpc: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - Created DDS4CCM_DEBUG, DDS4CCM_TRACE and DDS4CCM_ERROR macros. - For now these macros make use of the CIAO logging framework. In - the future, DDS4CCM should have it's own logging framework. - -Tue Feb 23 09:26:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Refactored get_one, making use of the read_w_condition - API method. - -Tue Feb 23 08:50:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - Added missing pragma - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - Disabled this project for the moment, rtiddsgen can't handle this - -Tue Feb 23 07:47:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - Updated to generate connector - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h - removed - -Tue Feb 23 07:22:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.h - * connectors/dds4ccm/impl/ndds/Utils.h - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * MPC/config/connectoridldefaults.mpb - * MPC/config/dds4ccm.mpb - * MPC/config/dds4ccm_base.mpb - * MPC/config/dds4ccm_ts_default.mpb - More portability changes - -Tue Feb 23 04:44:49 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: - - Tests to excercise process colocation when passed through the - EM. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - - Test script was broken and not actually running tests. - -Tue Feb 23 04:05:06 UTC 2010 William R. Otte - - * DAnCE/bin/PythonDAnCE/generator/__init__.py: - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/config_prop.py: - * DAnCE/bin/PythonDAnCE/generator/connection.py: - * DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py: - * DAnCE/bin/PythonDAnCE/generator/external_reference.py: - * DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py: - * DAnCE/bin/generate_plan.py: - - Improvements to allow more expressive plan generation. - -Tue Feb 23 04:03:46 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Additional error checking, and an improvements to how - colocation groups with NoConstraint are handled. - -Tue Feb 23 02:55:31 UTC 2010 Abdul Sowayan - - * examples/Hello/descriptors/NodeMap.dat: - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - - Added the files above to test PlanLocality feature. - -Tue Feb 23 02:39:25 UTC 2010 Abdul Sowayan - - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - - Update this example. It was out of date and as such, it - wouldn't work with CoSMIC generated descriptors (due - to missing entry points). - -Mon Feb 22 22:13:59 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/NodeMap.dat: - - Changed port number. - - * examples/Null_Component/descriptors/run_test_without_ns.pl: - - Enhanced this script so it would deploy all cdps (component deployment plans) - that are in the directory. - -Mon Feb 22 21:39:08 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp: - * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp: - Add a couple of deployment plans to test the PlanLocality feature. - -Mon Feb 22 20:48:36 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/NodeMap.dat: - * examples/Null_Component_Glfa/descriptors/NodeMap.dat: - - Fixed a small bug in these files. - - * examples/Null_Component/descriptors/run_test_without_ns.pl: - - Added a new test to deploy this example without using the naming service. - - * bin/ciao_tests.lst: - - Add run_test_without_ns.pl to the daily regression tests. - -Feb 22 14:26:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Extended test with an extra connector which handles a fixed - size struct. - -Mon Feb 22 13:48:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - Updated rti typesupport to ndds typesupport, everywhere we talk - about ndds - -Mon Feb 22 13:39:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/Topic.h - Portability improvements - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - Updated typesupport - -Mon Feb 22 12:47:38 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_nodeapplication.mpb - * DAnCE/NodeApplication/NodeApplication.mpc - Corrected after - -Mon Feb 22 12:46:38 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_nodeapplicationmanager.mpb - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - Corrected after - -Mon Feb 22 12:36:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Added empty source files to not pickup files that are already generated - by other projects in the same directory - -Mon Feb 22 12:30:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - Removed nddslib as base project - - * MPC/config/dds4ccm_base.mpb: - Added nddslib as base project - -Mon Feb 22 12:25:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - Layout changes - -Mon Feb 22 12:11:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Fixed casing problems - -Mon Feb 22 11:37:38 UTC 2010 Johnny Willemsen - - Reverted change below - -Mon Feb 22 10:34:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Added custom_only=1 - -Mon Feb 22 10:16:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h: - Updated ifdef guards - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: - Layout changes - - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - Simplified thse projects - -Mon Feb 22 09:49:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - Resolved MPC-warning. - -Mon Feb 22 09:29:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - Use the new dds4ccm_ts_defaults base project - -Mon Feb 22 08:29:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - Created typedefs of templated classes. - -Mon Feb 22 08:21:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Using the ACE_NEW_* macros (instead of C++ new). - -Mon Feb 22 08:22:38 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Layout change - - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - Shutdown the orb - - * MPC/config/connectoridldefaults.mpb: - No executor header file for a connector - -Mon Feb 22 08:20:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Layout and const changes - -Mon Feb 22 07:18:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - Simplified these base projects - -Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen - - * ChangeLogs/*: - Use full year - -Sat Feb 20 20:31:38 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - New base project for dds4ccm dds type support generation. This - base project will be soon be used for all dds4ccm examples and - tests. The typesupport files will now be linked together with - the tao type code to one shared library. dds4ccm should work - on the long term with multiple dds implementations, the fact - that you have an implementation doesn't mean you want to use - it with dds4ccm. with the new features dds4ccm_ndds, dds4ccm_opendds, - and dds4ccm_splice you can control which dds vendor dds4ccm - should use. At this moment ndds is supported and tested - - Thanks to Adam Mitz for extending MPC to make this base - project possible - -Fri Feb 19 15:44:38 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added #include, newly required due to reordering of - #includes in the front end. - -Fri Feb 19 15:11:38 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Improved AMI4CCM one step further - -Fri Feb 19 12:53:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.h - Added a boolean to the connectors to let the TAO_IDL - compiler generate whether we have a fixed or non fixed - type. The memory management is different and caused - compile and runtime problems with getter::get_one. - We now specialized the Getter::get_one method for - fixed and for non fixed types - -Fri Feb 19 11:53:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented some more ACE_NEW_* macros. - -Fri Feb 19 11:29:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented some more ACE_NEW_* macros. - -Fri Feb 19 10:51:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Changed value of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Prepared the test to receive the RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - -Fri Feb 19 08:43:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/*: - Added tests in order to test the TAO_IDL compliler. - -Fri Feb 19 08:35:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h - Removed from the archive, generated by tao_idl from now - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl - Added RTI typesupport pragma - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - Updated to let tao_idl generate the connector - -Thu Feb 18 16:07:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl - Added rti typesupport pragma - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h - Removed from the archive - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - Updated to generate the connector - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - Layout change - -Thu Feb 18 15:47:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/id3p_test/*: - Removed, obsolete - -Thu Feb 18 15:43:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - Added rti typesupport pragma - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h - Removed from the archive - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - Updated to generate the connector - -Thu Feb 18 15:36:06 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - Remove some tabs. - -Thu Feb 18 15:35:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: - Updated to use tao_idl generation - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h: - Removed from the archive - -Thu Feb 18 14:22:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - Implemented ACE_NEW_* macros. - -Thu Feb 18 13:48:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: - Removed dummy label to enable compilation. - -Thu Feb 18 13:44:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: - Removed dummy label. - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Receiver/*: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Sender/*: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/descriptors/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Receiver/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Sender/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/descriptors/*: - Removed these files since this is there to capture compiler errors. - -Thu Feb 18 13:26:06 UTC 2010 Marijke Hnegstmengel - - * connectors/dds4ccm/performance-tests/Latency: - * connectors/dds4ccm/performance-tests/Latency/Base: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Connector: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h: - * connectors/dds4ccm/performance-tests/Latency/descriptors: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/Receiver: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - First base of new latency test dds4ccm. - -Thu Feb 18 13:22:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Made better use of the ACE_NEW_* macros. - -Thu Feb 18 13:13:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Fixed gcc compile error - -Thu Feb 18 12:33:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Using the ACE_NEW_* marcros instead of the - regular C++ new. - -Thu Feb 18 11:36:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopics/*: - Test to check whether the generated exec code - compiles without errors when defining two topics - in one connector. - -Thu Feb 18 09:00:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/*: - Added test to test fixed size data. Fixed size data is handled - in a different way. This'll result in compliler errors when not - coded properly. - -Thu Feb 18 08:37:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Added some more tracing. - - * connectors/dds4ccm/tests/FixedSizeStruct/*: - Added test to test fixed size data. Fixed size data is handled - in a different way. This'll result in compliler errors when not - coded properly. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Improved the way the Receiver receives data. - -Thu Feb 18 08:30:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Fixed compile error with fixed size datatypes - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Layout and documentation fixes - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - No need for C.inl - -Wed Feb 17 15:24:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - Layout changes - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.h - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - Cleanup - -Wed Feb 17 13:57:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - Deleted reactor member which is not needed here - - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/RepositoryManager/Repository_Manager_Module.h: - Removed not needed include - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Cleanup base projects - -Wed Feb 17 12:14:57 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Generator/Plan_Generator_Impl.h - * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h - removed, not used at all - -Wed Feb 17 12:10:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - Added pragma - - * DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h: - Deleted - -Wed Feb 17 12:09:57 UTC 2010 Johnny Willemsen - - * DAnCE/NodeManager/Node_Manager_Module.h: - Removed obsolete header - - * DAnCE/MPC/config/dance_utils.mpb - * DAnCE/Utils - * DAnCE/Utils/DAnCE_Utils.mpc - * DAnCE/Utils/DAnCE_Utils_Export.h - * DAnCE/Utils/Plan_Handler.cpp - * DAnCE/Utils/Plan_Handler.h - Removed, not used at all - -Wed Feb 17 11:40:57 UTC 2010 Johnny Willemsen - - Cleanup of the repository manager - - * DAnCE/DAnCE/DAnCE_Loader.h: - * DAnCE/MPC/config/dance_repositorymanager.mpb: - * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h - Deleted - - * DAnCE/RepositoryManager/PC_Updater.h - * DAnCE/RepositoryManager/Repository_Manager.cpp - * DAnCE/RepositoryManager/repository_manager_admin.h - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RM_Helper.h - * DAnCE/RepositoryManager/URL_Parser.h - Cleanup - -Wed Feb 17 11:20:57 UTC 2010 Johnny Willemsen - - Cleanup of the target manager - - * DAnCE/MPC/config/dance_nodemanager.mpb: - * DAnCE/MPC/config/dance_targetmanager.mpb - Deleted, obsolete - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - layout change - - * DAnCE/NodeManager/NodeManager.mpc: - Reduced dependency - - * DAnCE/TargetManager/Target_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Module_export.h - * DAnCE/TargetManager/TargetManager_Impl_export.h - Deleted from the archive - - * DAnCE/TargetManager/Target_Manager.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.h - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TargetManager_Impl.cpp - * DAnCE/TargetManager/TargetManager_Impl.h - Simplified and cleanup - -Wed Feb 17 10:54:57 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/TM_Client.mpc - Moved to DAnCE/tests/TargetManager - -Wed Feb 17 09:49:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Stopping time when the run actualy starts. - -Wed Feb 17 09:41:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - Added rti typesupport trait - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: - Updated to use tao_idl generated connector - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: - Removed from the archive - -Wed Feb 17 09:36:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Check whether the get_listener returns nil. - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - Improved implementation. Sometimes unregister_handles hangs in - a never ending loop. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Improved implementation. Polling for the last sample in DDS now - is done using the reactor thread. - -Wed Feb 17 09:21:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Deleted, generated by tao_idl now - -Wed Feb 17 09:07:57 UTC 2010 Johnny Willemsen - - Simplified NodeManager - - * DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/NodeManager/NodeManager_Export.h - Removed - - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - Simplified - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - Fixed warning - -Tue Feb 16 20:34:27 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/idl/dds4ccm_Connector.idl: - - Removed the line '#define connector component' since we - now have backend and frontend connector support. - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - - Modified projects to generate and compile the - connector implementation. - - * examples/BasicSP/BMClosedED/BMClosedED.idl: - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Cosmetic changes. - -Tue Feb 16 20:04:57 UTC 2010 Johnny Willemsen - - Simplified execution manager - - * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Export.h - Removed - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.h - Simplified - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Layout changes - -Tue Feb 16 19:33:57 UTC 2010 Johnny Willemsen - - Simplified the plan_launcher, it was way to complex to - build - - * DAnCE/MPC/config/dance_plan_launcher.mpb - * DAnCE/MPC/config/dance_plan_launcher_base.mpb - * DAnCE/Plan_Launcher/Plan_Launcher.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.h - * DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - Deleted, all not used - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Updated to contain the Plan_Launcher implementation and main - -Tue Feb 16 18:45:57 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/launcher.cpp: - Removed, not used - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Layout changes - -Tue Feb 16 18:04:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/CIAO_ExecutionManagerDaemon.idl - * DAnCE/DAnCE/CIAO_Interfaces.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_executionmanager_skel.mpb - * DAnCE/MPC/config/ciao_executionmanager_stub.mpb - * DAnCE/RepositoryManager/RepositoryManager.cpp - Removed shutdown method, it was not used and a non spec interface - -Tue Feb 16 15:48:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/DAnCE_Properties.mpc: - Added mpc file which should have been committed earlier today - -Tue Feb 16 13:08:57 UTC 2010 Marijke Hemgstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/README: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Add attribute number_of_subscribers, made different test scripts. - -Tue Feb 16 12:47:57 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/DAnCE/DAnCE_Loader.h - * DAnCE/DAnCE/DAnCE_Properties.idl - * DAnCE/DAnCE/Deployment_common.h - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/DAnCE_Loader.h - * DAnCE/Deployment/DAnCE_Properties.idl - * DAnCE/Deployment/Deployment.idl - * DAnCE/Deployment/Deployment_Application.idl - * DAnCE/Deployment/Deployment_ApplicationManager.idl - * DAnCE/Deployment/Deployment_Base.idl - * DAnCE/Deployment/Deployment_common.h - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Deployment_Packaging_Data.idl - * DAnCE/Deployment/Deployment_RepositoryManager.idl - * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl - * DAnCE/Deployment/Deployment_stub_export.h - * DAnCE/Deployment/Deployment_svnt_export.h - * DAnCE/Deployment/Deployment_TargetData.idl - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.h - Removed DAnCE/Deployment to just contain the spec compliant IDL, - non compliant parts have been moved to DAnCE/DAnCE. All using - code has been updated. We did found some problems in the OMG IDL - 07-02-01 which has been reported to the OMG: - - LastConfiguration and InvalidReference are listed in 07-02-01 - but not used at all. - - PlanLocalityKind members have a Plan prefix to resolve a conflict - with LocalityKind::SameProcess. - All extensions for DDS4CCM have now a comment indicating that - -Tue Feb 16 12:32:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Resolved shutdown errors. - -Tue Feb 16 10:54:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - Added data listener and test thread switch for this - data listener. - -Tue Feb 16 09:45:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Improved code for thread switch. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Removed reader implementation since it's unnecessary. Also - optimized logging. - - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - Improved logging. - -Tue Feb 16 08:23:57 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc - * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_config_handlers.mpb - * DAnCE/MPC/config/ciao_config_handlers_base.mpb - * DAnCE/MPC/config/ciao_nodeapplication.mpb - * DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb - * DAnCE/MPC/config/ciao_plan_generator.mpb - * DAnCE/MPC/config/ciao_targetmanager_stub.mpb - * DAnCE/MPC/config/ciao_targetmanager_svnt.mpb - * DAnCE/MPC/config/dance_applicationmanager_skel.mpb - * DAnCE/MPC/config/dance_component_server.mpb - * DAnCE/MPC/config/dance_component_server_svnt.mpb - * DAnCE/MPC/config/dance_config_handlers.mpb - * DAnCE/MPC/config/dance_config_handlers_base.mpb - * DAnCE/MPC/config/dance_deployment_skel.mpb - * DAnCE/MPC/config/dance_deployment_svnt.mpb - * DAnCE/MPC/config/dance_domainapplication_skel.mpb - * DAnCE/MPC/config/dance_executionmanager_skel.mpb - * DAnCE/MPC/config/dance_extension_stub.mpb - * DAnCE/MPC/config/dance_nodeapplication_skel.mpb - * DAnCE/MPC/config/dance_nodemanager_skel.mpb - * DAnCE/MPC/config/dance_nodemanager_svnt.mpb - * DAnCE/MPC/config/dance_output.mpb - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/MPC/config/dance_repositorymanager.mpb - * DAnCE/MPC/config/dance_repositorymanager_skel.mpb - * DAnCE/MPC/config/dance_targetmanager.mpb - * DAnCE/MPC/config/dance_targetmanager_skel.mpb - * DAnCE/MPC/config/dance_tm_daemon.mpb - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TM_Client.mpc - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc - * DAnCE/tests/Config_Handlers/Config_Handlers.mpc - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc - * DAnCE/Utils/DAnCE_Utils.mpc - Cleanup of DAnCE base projects - -Mon Feb 15 19:48:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE - * DAnCE/DAnCE/CIAO_Interfaces.mpc - * DAnCE/DAnCE/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao - * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao/Module_Main.h - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_nodemanager_skel.mpb - * DAnCE/MPC/config/ciao_nodemanager_stub.mpb - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Exec.cpp - * DAnCE/TargetManager/TM_Client.mpc - Moved DAnCE/Deployment/ciao to DAnCE/DAnCE and removed the - CIAO_NodeManagerDeamon interface, it was not used at all - -Mon Feb 15 19:05:57 UTC 2010 Johnny Willemsen - - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl: - Fixed comments and removed commented out stuff - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module.cpp - Fixed typo in comment - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Fixed warning - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater.h - Layout and documentation fixes - - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - Unicode fixes - - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - Removed not used servant map - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Doxygen fixes - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RM_Helper.cpp - * DAnCE/RepositoryManager/RM_Helper.h - Layout changes - - * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl: - Removed, this interface was used, but not implemented at all - - * DAnCE/TargetManager/TargetManager.mpc: - Removed obsolete projects - - * DAnCE/TargetManager/TargetManager_Impl.cpp - * DAnCE/TargetManager/TargetManager_Impl.h - removed not used shutdown - -Mon Feb 15 14:04:57 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.h - * DAnCE/TargetManager/TargetManager_Impl.cpp - Various code improvements - -Mon Feb 15 13:32:57 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - Various code improvements - -Mon Feb 15 13:20:10 UTC 2010 Marcel Smit - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - Throwing exception when errors occur during shutdown. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - New line appended to log message. - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Throwing and catching exceptions when errors occur - during shutdown. When errors occur, ccm_remove is not - invoked and when it isn't, tests seems to be ok while they're - not. - - * connectors/dds4ccm/docs/ccm_dds.idl: - Layout changes. - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Added trace. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging. - -Mon Feb 15 13:15:57 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - Removed, not used - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - Reduced includes and dependencies - -Mon Feb 15 12:50:57 UTC 2010 Johnny Willemsen - - * DAnCE/Deployment/ciao - * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao/Module_Main.h - * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/CIAO_Interfaces.mpc - * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/Deployment_common.h - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb - * DAnCE/MPC/config/dance_nodeapplication_stub.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Exec.cpp - Moved the CIAO specific idl/code from DAnCE/Deployment to - DAnCE/Deployment/ciao and updated using code. Move - ApplicationManager to its own DLL and enabled in some projects - AMI. - -Mon Feb 15 09:50:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Optimized logging regarding domain_id. - -Mon Feb 15 09:35:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Changed the startup sequence. Don't use a sleep. - - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - Extended test time. - -Mon Feb 15 09:19:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Layout changes - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - Extend test with two connectors sharing the same topic. - -Fri Feb 12 19:08:36 UTC 2010 Johnny Willemsen - - * MPC/config/dance_applicationmanager.mpb: - * MPC/config/dance_applicationmanager_skel.mpb: - * MPC/config/dance_applicationmanager_stub.mpb: - New base projects for the dance am library - -Fri Feb 12 18:49:36 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Added some missing includes - -Fri Feb 12 18:31:36 UTC 2010 Johnny Willemsen - - * examples/Null_Component_Glfa/Null_Component.mpc: - Removed not needed after - -Fri Feb 12 15:50:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Reusing topic when reusing a domainparticipant. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Optimized logging. - -Fri Feb 12 13:18:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - Moved typed module ShapeType from the CCM_DDS module to the Shapes module - and renamed it to ShapeTypeConn. - -Fri Feb 12 12:37:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Moved typed module TestTopic from the CCM_DDS module to the TestTopic module - and renamed it to TestTopicConn. - -Fri Feb 12 11:31:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Changed number of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. This now - reflects the DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: - Moved typed connector to the test module. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Added a reader. Stopping reading after a while. - Also changes related to movement of the connector. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Changed timing. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - Added reader connection. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - Removed some unused settings. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - Sleeping 20 seconds. - -Thu Feb 11 15:41:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Thu Feb 11 15:26:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Don't need to test thread switch in the receiver because - on_offered_deadline_missed-status is not related to a subsciber and should not - be reaceived. - -Thu Feb 11 15:22:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated to reflect the latest status. - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Resolved test errors. - -Thu Feb 11 11:34:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Utils.h: - Added RELIABLE_READER_ACTIVITY_CHANGED_STATUS to string - conversion. - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - Layout changes. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Enabled listener. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - Added ON_LIVELINESS_LOST status test. - - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Removed ConnectorStatusListener from connection list. - -Thu Feb 11 10:42:55 UTC 2010 Johnny Willemsen - - * examples/Null_Component_Glfa/Null_Component.mpc: - Glem is required - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - Small cleanup - -Thu Feb 11 08:31:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Improved test by using a timer to check for last sample in DDS. - - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Incremented iterations - -Thu Feb 11 02:27:37 UTC 2010 Abdul Sowayan - - * bin/ciao_tests.lst: - - Add TAO/CIAO/examples/Null_Component_Glfa to the list of - daily tests we run so we can ensure that the feature - is still functional. - -Thu Feb 11 02:21:29 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Component.mpc: - * examples/Null_Component_Glfa/Null_Interface.mpc: - - Decorated project names with Glfa token so project names - won't clash with the Null_Component example. - -Wed Feb 10 22:22:55 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/idl/dds4ccm_Base.idl: - - Removed the line '#define connector component' - -Wed Feb 10 21:36:32 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Interface.mpc: - - Minor changes to the MPC files to accomodate Glfa changes. - -Wed Feb 10 21:15:28 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/StaticDAnCEApp.cpp: - * examples/Null_Component_Glfa/StaticDAnCEApp.mpc: - * examples/Null_Component_Glfa/plan.h: - - Removed these files. They are not relavent to the Glfa - example. - -Wed Feb 10 21:13:53 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Component.mpc: - - Added -Glfa option to the project. - -Wed Feb 10 21:02:03 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/*: - - We should have an example to test the -Glfa feature. - This is a place holder for now, more modifications - are needed to make this functional. - -Wed Feb 10 19:49:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Using refcounting of CORBA::LocalObject since it's thread safe. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Removed unnecessary debug statement. - -Wed Feb 10 15:33:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Use a High_Res_Timer in sender in order to make it possible to send more messages in a timeinterval. - -Wed Feb 10 14:23:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Checking whether a connection to the reader is in place before read. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Wait a while before informing the receiver that the samples - were written. - -Wed Feb 10 14:06:59 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - SharedDomainParticipant tests should work again. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Made DomainParticipant proxy class refcounted. Prevented - deleting the DomainParticipant proxy when still in use. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Optimized logging. - -Wed Feb 10 10:26:55 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - Removed generated headers - -Wed Feb 10 10:03:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented thread switch for DataReaderStateListener. - - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - Layout changes. - -Wed Feb 10 09:36:55 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended native example - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - Added the exec export flags to get svn head to compile - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - Added another pragma - -Wed Feb 10 08:12:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - Preparing thread switch DataReaderStateListener_T. - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Code alignment. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - Check on error listeners pointer. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging. Code alignment. - -Wed Feb 10 8:10:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - Removed unused parameter. - -Tue Feb 9 22:57:04 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - - Added generation of connector export header file, and cosmetic - changes. - - * MPC/config/connectoridldefaults.mpb: - - Added command line options to trigger generation of connector - implementation and connector export header file. - -Tue Feb 9 13:27:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Get and print throughput statistics, print latency one way, code optimalizations. - -Tue Feb 9 13:27:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - Moved typed module Hello to Hello namespace (instead of leaving - it in the CCM_DDS namespace). - -Tue Feb 9 13:25:17 UTC 2010 Johnny Willemsen - - * ciao/Valuetype_Factories/Cookies.h: - Layout change - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added commented out example using native that causes tao_idl to crash - -Tue Feb 9 12:49:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Code alignment in order to be consistent with other tests. - -Tue Feb 9 12:36:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Added test for thread switch. - -Tue Feb 9 12:24:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Added test for thread switch. - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Resolved compiler warnings on Linux. - -Tue Feb 9 12:02:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - Code alignment and optimized logging. - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Added thread switch test. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - Code aligning. - -Tue Feb 9 11:04:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - Added thread swich test to Sender component. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Optimized logging. - -Tue Feb 9 10:21:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Minor code changes. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Tested thread switch on sender side. Minor code changes. - -Tue Feb 9 10:15:43 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - Fixed memory leak - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Small updates - -Tue Feb 9 10:03:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Since on_data_on_readers is not available anymore, this test - didn't start. Resolved this by letting the receiver know that - all samples were written. - -Tue Feb 9 09:29:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Resolved compiler issue. - -Tue Feb 9 08:40:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - When DDS returns nil as a listener, we don't need - to create a proxy. Just return nil will be enough. - Implemented get_listener methods. - -Mon Feb 8 20:22:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Since on_data_on_readers is not available anymore, these tests - didn't start. Resolved this by start listening on ccm_activate. - -Mon Feb 8 15:14:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Added explicit global scope - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - Added pragma rti typesupport to indicate the name of the typesupport - header that will be generated by rtiddsgen. We need to know the - name of this file when generating the dds4ccm connectors by tao_idl - -Mon Feb 8 15:00:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Extended test with on_publication_matched. Also implemented test regarding - thread switch for all unexpected statusses to be received (instead of - one thread switch test for all statussses). - -Mon Feb 8 13:49:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - Add tests for thread switch. - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - Code aligning. - -Mon Feb 8 13:33:43 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Fixed incorrect path - -Mon Feb 8 13:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - Removed generated comments which didn't had any value - -Mon Feb 8 13:02:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - Resolved compiler issue. - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Extended test with thread switch test. - -Mon Feb 8 12:28:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Replaced DDS_STATUS_MASK_NONE with 0 since DDS_STATUS_MASK_NONE - is not part of the DDS spec. Also using the DDS namespace to - determine mask. - -Mon Feb 8 12:03:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Shouldn't propagate on_data_on_readers to the user component. - -Mon Feb 8 11:35:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Moved all empty inline methods from header to source file. - -Mon Feb 8 11:15:00 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Added test scenario for thread switch. - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging regarding thread switch test. - -Mon Feb 8 10:56:43 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: - Added missing after - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Layout change - -Mon Feb 8 09:54:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Only test thread switch when CIAO_DDS4CCM_CONTEXT_SWITCH is turned on. - -Mon Feb 8 07:46:43 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - Fixed memory leak - -Fri Feb 5 19:45:46 UTC 2010 Jeff Parsons - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Updates to eliminate build errors due to frontend - changes in home factories and finders. Further - work is needed for this tool to support home factories - and finders. - -Fri Feb 5 15:02:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Implemented thread switch. Test result was incorrectly printed. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - Code aligning. - -Fri Feb 5 14:07:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - Resolved compiler issues on windows. - -Fri Feb 5 13:11:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Test on thread handle is NIL. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Tested thread switch for StatusListener. - -Fri Feb 5 12:37:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - Code aligning. - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Tested thread switch for PortStatusListener. - -Fri Feb 5 12:10:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Added new tests. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - Tested thread switch for ConnectorStatusListener. - - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Tested thread switch for ReaderListener. - -Fri Feb 5 10:07:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - Renamed OnUnexpectedStatusHandler to DDSCallbackStatusHandler. - -Fri Feb 5 09:38:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.h: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Only use the DDS listener callbacks when the listener - connection is there or when logging is required. - -Fri Feb 5 07:25:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Resolved compiler issue. - -Thu Feb 4 15:44:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added a test related to 3819 - -Thu Feb 4 15:27:32 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/TimeConversion: - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - * connectors/dds4ccm/tests/TimeConversion/run_test.pl: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Added test for testing conversions from and to DDS::Time_t. - -Thu Feb 4 15:21:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Resolved runtime issues regarding logging an instance_handle - -Thu Feb 4 14:09:43 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Cleanup and log which attribute is causing the exception - -Thu Feb 4 13:21:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Resolved compiler issues on windows. - -Thu Feb 4 12:42:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Resolved compiler errors. - -Thu Feb 4 12:37:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - Resolved compiler errors. - -Thu Feb 4 12:31:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Added status logging for each DDS callback. Also implemented - thread switch. - -Thu Feb 4 11:45:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Corrected mask and according methods. - -Thu Feb 4 10:46:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - Code aligning. - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - Added implementation regarding - ReliableReaderActivityChangedStatus. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Added status logging for each DDS callback. - - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Added helper methods for status logging in - DDS callbacks. - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - Removed unnecessary comment. - - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - Rewritten to test all unexpected status. Also removed unused - DDS callbacks and realigned some code. - -Thu Feb 4 10:38:43 UTC 2010 Martin Corino - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - - Added cleanup code to kill off remaining ciao_componentserver processes - (in case of certain test failures) since these otherwise tend to choke test - machines. - -Thu Feb 4 10:30:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended this idl file - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - enabled this test for compilation again - -Thu Feb 4 10:25:43 UTC 2010 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.h: - Layout changes - - * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc: - New MPC file, this test compiles fine now - -Thu Feb 4 10:23:43 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/basic_visitor.cpp - * tools/IDL3_to_IDL2/basic_visitor.h - * tools/IDL3_to_IDL2/checking_visitor.cpp - * tools/IDL3_to_IDL2/checking_visitor.h - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp - * tools/IDL3_to_XMI/IR_Simulator_visitor.h - Merged changes from idl3_plus_backend2 branch to svn head - -Thu Feb 4 09:22:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Solve some compiler warnings. - -Wed Feb 3 15:08:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - Reduced scope of the try/catch blocks - -Wed Feb 3 13:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - Distribute the reactor through the connector code - -Wed Feb 3 12:10:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - Extended thread swit code, if you want to use this feature, - add CIAO_DDS4CCM_CONTEXT_SWITCH as 1 to your config.h file, - the code is not tested yet, when that is done, we will enable - this flag by default - -Wed Feb 3 11:59:43 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Split in publisher and subscriber proces. Use other time functions. Set some attributes. - -Wed Feb 3 11:30:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.h: - Thread switch for the on_inconsistent_topic - -Wed Feb 3 11:19:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More thread switch infrastructure code - -Wed Feb 3 08:10:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl: - New IDL3+ test file, fails to compile, when TAO_IDL can - handle this, we will add the mpc file - -Tue Feb 2 12:43:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - Added missing export - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - create eh when there is a reactor - -Tue Feb 2 12:36:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More rework for the thread switch - -Tue Feb 2 12:34:43 UTC 2010 Johnny Willemsen - - * tests/CIAO/CommandlinePassage/CommandlinePassage.mpc: - This test doesn't dependent on dds4ccm - -Tue Feb 2 12:32:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc: - This test doesn't dependent on dds4ccm - -Tue Feb 2 12:14:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More rework for the thread switch - -Tue Feb 2 10:44:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - The internal dds4ccm classes will get an ACE_Reactor point, if - that is set, they will handle the thread switch using that - reactor. From the connector side we than only have to pass a - zero pointer or a pointer to a valid reactor - -Tue Feb 2 09:49:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - removed not needed include of LocalObject - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - First rework to implement the required thread switch - -Mon Feb 1 19:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl: - Removed commented out code - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - Cleanup - - * MPC/config/ciao_dds4ccm_ndds_impl.mpb: - Deleted, not used - -Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen - - * CIAO version 0.7.6 released. - -Fri Jan 29 13:36:30 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated some more parts to match more closely to the current situation - -Thu Jan 28 19:19:30 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated several parts to match more closely to the current situation - -Thu Jan 28 08:50:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - Resolved dependency. - -Thu Jan 28 07:59:30 UTC 2010 Johnny Willemsen - - * tests/Bug_3817_Regression/Bar.idl: - Enabled all idl, this bug has been fixed by Jeff - -Wed Jan 27 14:26:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl - TAO_IDL has now partly support for templated modules in the front end, but - testing shows that this is enough for our current tets. Much more seperate - tests will be created and more work has to be done, but this is a good - step in the right direction - -Wed Jan 27 10:00:27 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Added !NO_IDL3_TO_XMI in order to disable idl3_to_xmi tests with cross - platform testing - -Wed Jan 27 09:41:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - Fixed msvc warnings - -Wed Jan 27 08:34:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Updated value of the keys. - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Added operators in order to convert DDS::Time_T to ACE_Time_Value and - vice versa. The logging now uses ACE_Time_Value to print the timestamp. - -Wed Jan 27 06:47:27 UTC 2010 Johnny Willemsen - - * tests/Bug_3817_Regression/Bar.idl: - Fixed fuzz and commented out the double provides, that will - make the scoreboard turn green again for the moment - -Tue Jan 26 23:07:18 UTC 2010 Abdul Sowayan - - * tests/Bug_3817_Regression/Bar.idl: - * tests/Bug_3817_Regression/Bar.mpc: - - Renamed to avoid project name conflicts with another regression - test. - - * tests/Bug_3817_Regression/Foo.idl: - * tests/Bug_3817_Regression/Foo.mpc: - - Removed these files. - -Tue Jan 26 22:48:49 UTC 2010 Abdul Sowayan - - * tests/Bug_3817_Regression: - * tests/Bug_3817_Regression/Foo.idl: - * tests/Bug_3817_Regression/Foo.mpc: - - This test show an example where TAO_IDL does not generate - correct executor code. - -Tue Jan 26 19:56:27 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Also build with cross compilation - -Tue Jan 26 14:33:35 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Reverted the implementation of 1 dp per qos_profile for - now. There are some issue regarding which need te be - resolved first. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Don't use delete_contained_entities. - - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Renaming variable. - -Tue Jan 26 14:12:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Compile warning solved. - -Tue Jan 26 13:02:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - Rename long project name. - -Tue Jan 26 11:39:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Resolved compiler errors/warnings on Linux. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Replaced InternalError with InternalErr. - -Tue Jan 26 11:20:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Performance: - * connectors/dds4ccm/performance-tests: - Renamed to performance-tests - -Tue Jan 26 10:41:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Performance - * connectors/dds4ccm/tests/Performance/Keyed - * connectors/dds4ccm/tests/Performance/Keyed/Base - * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.idl - * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Connector - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/Performance/Keyed/descriptors - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/run_test.pl - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/USER_QOS_PROFILES.xml - * connectors/dds4ccm/tests/Performance/Keyed/Receiver - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h - * connectors/dds4ccm/tests/Performance/Keyed/Sender - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.idl - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h - Add first base of performace tests. - -Tue Jan 26 09:29:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: - Resolved fuzz warnings. - -Tue Jan 26 07:43:32 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - Extended == and != operators. - Resolved compiler warnings. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/InstanceHandle/*: - Added test in order to test existing operators - for InstanceHandle_t. - -Mon Jan 25 18:25:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp - Const changes - -Mon Jan 25 13:59:21 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Resolved compiler issue on Linux. - -Mon Jan 25 13:19:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Fixed fuzz - -Mon Jan 25 13:08:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - Setting listener with the appropriate mask. This resolves - test errors regarding the StateListener. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Changed 'exception' with 'excep'. This'll resolved - test errors which aren't real errors. - -Mon Jan 25 12:04:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - dpf is now a process wide singleton. This uncovers some issues with - the sharing of the dp between connectors - -Mon Jan 25 11:17:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - Const, layout, and debug message changes - -Mon Jan 25 10:01:27 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_redirectionservice.mpb - * DAnCE/RedirectionService/* - * DAnCE/tests/ObjectLocatorTest/* - * DAnCE/tests/RedirectionServiceTest/* - Removed, redirectionservice isn't working in DAnCE and there are no - plans to add support for it - -Mon Jan 25 09:10:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - Resolved compiler. - -Mon Jan 25 09:01:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h: - Removed includes to files that have been removed - -Mon Jan 25 08:49:27 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - Always print usage messages - -Sat Jan 23 19:08:27 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - Always print usage messages - -Sat Jan 23 18:46:27 UTC 2010 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/DomainApplicationManager/Node_Locator.h - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - Unicode fixes - -Fri Jan 22 14:59:22 UTC 2010 Marcel Smit - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl: - * tests/IDL_Test/Included_Component/IC_Bar.idl: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - Resolved compiler errors due to pragma ciao lem implementation. - -Fri Jan 22 14:52:27 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/DomainEvents.idl: - Removed, not used - - * DAnCE/TargetManager/TargetManager_Impl.h: - Layout changes - -Fri Jan 22 14:23:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - Added operators in order to copy DDS_StringSeq - to and from DDS::StringSeq. - - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - Added == and != operator in order to compare a - DDS_InstanceHandle with a DDS::InstanceHandle_t. - - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - Implemented remaining methods. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented remaining implementation of QueryCondition. - -Fri Jan 22 12:46:27 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - Pass the instance id through the constructor - -Fri Jan 22 11:59:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Use the ami4ccm support in TAO_IDL. The support is partly hardcoded - for just this interface, this is a prototype to show how - ami4ccm could look like. This needs some more tweaks and testing - -Fri Jan 22 11:32:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl: - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - Resolved compiler errors due to pragma ciao lem implementation. - -Fri Jan 22 10:28:27 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Add debug line - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl - * DAnCE/tests/CIAO/Components/SimpleProvider.idl - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.idl - * examples/BasicSP/BMClosedED/BMClosedED.idl - * examples/BasicSP/BMDevice/BMDevice.idl - * examples/DevGuideExamples/Messenger/Messenger.idl - * examples/Display/GPS/GPS.idl - * examples/Display/GPS/GPSEI.idl - * examples/Hello/Sender/Sender.idl - * examples/Null_Component/Null_Component.idl - Updated for pragma ciao lem - -Thu Jan 21 14:58:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl: - Use the new pragma ciao lem - -Thu Jan 21 14:57:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Added include guards - -Thu Jan 21 14:40:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: - Make sure the executor is always there - -Thu Jan 21 14:37:27 UTC 2010 Johnny Willemsen - - * performance-tests/Benchmark/Benchmark.idl - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl - * performance-tests/Protocols/common/Protocols.idl - * performance-tests/Protocols/Receiver/Receiver.idl - Use the new pragma ciao lem - -Thu Jan 21 14:07:27 UTC 2010 Johnny Willemsen - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl - * tests/CIDL/CodeGen/Basic.idl - * tests/CIDL/CodeGen/CodeGen.idl - * tests/IDL_Test/Included_Component/IC_Bar.idl - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl - * tests/IDL_Test/Reused_Facet_Interface/Basic.idl - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl - Use the new pragma ciao lem - -Thu Jan 21 13:55:41 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Resolved last test errors. - -Thu Jan 21 13:48:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - Use the new pragma ciao lem - - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManagerExt.idl: - Deleted, not used - -Thu Jan 21 13:44:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/idl/dds4ccm_Base.idl - * connectors/dds4ccm/idl/dds4ccm_Connector.idl - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl - Use the new pragma ciao lem - -Thu Jan 21 12:32:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Running tests in the ORB reactor thread (instead of running in a - DDS callback thread). This is done because you're not allowed to - set query parameters in a DDS callback thread. - Therefore removed ConnectorStatusListener and implemented an - ACE_EventHandler. Also extended tests. - -Thu Jan 21 11:42:30 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - Removed some old comments - -Thu Jan 21 08:45:30 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - Compile with cross compile - -Thu Jan 21 08:07:30 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Lem_Pragma: - * tests/IDL_Test/Lem_Pragma/A.idl: - * tests/IDL_Test/Lem_Pragma/B.idl: - * tests/IDL_Test/Lem_Pragma/C.idl: - * tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc: - New test for the new ciao lem pragma support. All tests and examples - in the archive will be updated to use this new feature - -Wed Jan 20 12:28:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - Resolved compiler error on windows. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Throwing an exception when setting the query parameters. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - Added some more tests. - -Tue Jan 19 13:59:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Resolved compiler errors on Windows. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Throwing exception when get_expression_parameters does - not succeed. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Testing and catching proper exceptions. - -Tue Jan 19 10:57:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - Implemented get_expression_parameters. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Optimized logging. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented getter method for filter. - Introduced define in order to switch between ContentFilteredTopics - and QueryConditions. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - Resolved compile errors on windows. - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - Extended tests. - -Mon Jan 18 10:14:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Renamed set_topic methods on Reader. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented basics of filter method. - - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Now able to create a DDSDataReader with a - ContentFilteredTopic as input. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Resolved bug. - -Fri Jan 15 14:02:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Implemented get_listener methods. - Some renaming of variables. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Rewritten filter method. Now using DDS proxies instead - of DDS itself. - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Renaming some inconsistent named variables. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Removed unnecessary logging. - -Fri Jan 15 09:11:56 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/checking_visitor.cpp - * tools/IDL3_to_IDL2/checking_visitor.h - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp - * tools/IDL3_to_XMI/IR_Simulator_visitor.h - Updated for tao_idl changes - -Fri Jan 15 07:03:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Changed project names due to fuzz warnings. - -Thu Jan 14 19:13:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Changed variable name. - -Thu Jan 14 15:54:10 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Created a parameter list of variable size. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Extended test a bit more. - -Thu Jan 14 15:33:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Reverted DDS logging change. - -Thu Jan 14 14:53:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/*: - * bin/ciao_tests.lst: - Added test to test the QueryFilter on the DataReader. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Create a ContentFilteredTopic on a domainparticipant. - -Thu Jan 14 11:18:01 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended idl3+ test, added an example that doesn't compile yet, - commented that out on line 124 - -Thu Jan 14 11:19:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved fuzz error. - -Thu Jan 14 10:33:01 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/ccm_dds.idl: - Fixed problem in this IDL file - -Thu Jan 14 10:31:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - Deploying three connectors with different datatypes. - -Thu Jan 14 10:21:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/Base: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: - Removed these files. Moved to SharedDomainParticipant/SameDatatype. - -Thu Jan 14 10:11:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: - Added files for this test (see previous entry for more details). - -Thu Jan 14 10:08:40 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added SharedDomainParticipant for different datatypes. - - * connectors/dds4ccm/docs/TestCoverage.ods: - Changed to meet the latest status. - - * connectors/dds4ccm/idl/ccm_dds.idl: - code aligning. - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - Started with implementation of the QueryFilter attribute. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/*: - Moved existing SharedDomainParticipant test to SameDatatype sub directory. - Added a new SharedDomainParticipant test with which deploys three connectors - with different datatypes. - -Thu Jan 14 09:10:40 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/docs/TestCoverage.ods - Add new tests. - -Wed Jan 13 13:11:36 UTC 2010 Abdul Sowayan - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - - Don't hard code the fact that we are using RTI's CORBA Compatability Kit (CCK) in the - MPC projects. ndds_ts_defaults.mpb now uses the CCK by default. - -Wed Jan 13 12:20:40 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - Removed some unused libs. - -Wed Jan 13 07:08:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.cpp: - Solved compiler errors by removing these files. - -Tue Jan 12 15:56:45 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - SharedDomainParticipant test should work now. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Added logging when re-using a domainparticipant. - - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.cpp: - Rewritten this test. Deploy one connector three times instead of - deploying three seperate connectors. - -Tue Jan 12 13:55:31 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.h - * connectors/ami4ccm/ami4ccm/ami4ccm.idl - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Use new ami4ccm_stub library - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc - Layout changes - -Tue Jan 12 13:31:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Using a define for factory instance method. - - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: - Resolved compiler errors on windows. - -Tue Jan 12 11:08:30 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: - * connectors/ami4ccm/ami4ccm/ami4ccm.h: - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - New AMI4CCM stub library which is going to be used by - all connectors and components that want to use ami4ccm - - * MPC/config/ami4ccm_stub.mpb: - New base project - - * tests/Bug_3769_Regression/Foo.mpc - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc - * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc - * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc - * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc - * tests/Minimum/Receiver/Receiver.mpc - Layout changes - -Tue Jan 12 10:07:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Made the domainparticipantfactory a singleton. - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Outlining code. - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Resolved fuzz error. - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SharedDomainParticipant/*: - Added test to test whether the same domainparticipant is used - when two connectors in the same process sharing the same qos_profile. - -Tue Jan 12 08:43:30 UTC 2010 Johnny Willemsen - - * docs/index.html: - Fixed some broken links and removed some old ones. Thanks to - Sreejith for reporting this - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - Layout changes - -Mon Jan 11 13:56:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - Change in case. - -Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - Remove some tabs. - - -Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - Remove some tabs and change order in mpc files. - -Thu Jan 7 16:48:30 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/VariousTopicsEvent - * connectors/dds4ccm/tests/VariousTopicsEvent/Base - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h - * connectors/dds4ccm/tests/VariousTopicsState - * connectors/dds4ccm/tests/VariousTopicsState/Base - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/descriptors - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Sender - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - New tests for various topics with DDS_Event and DDS_State connectors. - - - -Thu Jan 7 15:52:30 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added DDS DataWriter test to the test framework. - -Thu Jan 7 15:50:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/*: - Added test which shows how to use the DDSDataWriter - directly. - -Thu Jan 7 13:26:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Provided every read/write operation on the dp map with a mutex. - -Thu Jan 7 11:41:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Resolved runtime issue. - -Thu Jan 7 09:43:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - Call passivate and remove on the base class after passivating - and removing his own stuff. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Setting listeners to nil. Also extended logging when deleting - subscriber. - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Call passivate and remove on the base class after passivating - and removing his own stuff. - Also setting listeners to nil when passivating. - - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Don't use remove_ref. Setting to nil should be enough. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - There should only one domainparticipant for the same - QOS profile. Build in check to prevent the creation of - another domainparticipant for the same QOS profile. - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Added a passivate method. This cleans up - DDS read conditions and wait conditions. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Extended log info with CLINFO. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Using %C instead of %c. Also extended logging info. - -Wed Jan 6 12:51:52 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Improved debug output - -Wed Jan 6 12:27:52 UTC 2010 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Changed the commandline flags, to: - -CIAOLogLevel - -CIAOTraceEnable - -CIAOLogFile - - * DAnCE/Logger/Logger_Service.cpp - Changed the commandline flags, to: - -DAnCELogLevel - -DAnCETraceEnable - -DAnCELogFile - -Wed Jan 6 10:39:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. Implemented the - various DANCE start/shutdown steps. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Implemented set_listener method. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Do not use listener when nil. - - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Added traces. get_listener should throw a - no implement exception. - -Wed Jan 6 09:39:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Separate DDS lifecycle from CCM lifecycle. DomainParticipant - now have a configuration_complete, an activate, a passivate - and a remove method. - - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented set_listener method. - -Tue Jan 5 19:25:18 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - Layout changes - -Tue Jan 5 14:01:18 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Improved shutdown of the DDS connector. - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Prevent a pointer creation when the passed listener - is nil. - -Tue Jan 5 09:37:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Update_T and DDS_Write_T - now have a configuration_complete, activate, passivate and remove - methods. - -Tue Jan 5 08:51:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Optimized error logging. - - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Read_T and DDS_StateListen_T - now have a configuration_complete, activate, passivate and remove - methods. - -Tue Jan 5 07:31:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Get_T and DDS_Listen_T - now have a configuration_complete, activate, passivate and remove - methods. - -Mon Jan 4 20:41:07 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Cosmetic changes. - -Mon Jan 4 19:43:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - First start on updating this document to the latest ideas - -Mon Jan 4 18:45:39 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Enabled some commented out idl3+ which now is accepted by the idl - compiler - -Mon Jan 4 13:29:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - Updated name of the AMI connector, it is tied to the sender, - so call it AMI_Sender - - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Print message before spawn - -Mon Jan 4 12:14:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Updated with the latest ideas - -Mon Jan 4 11:11:39 UTC 2009 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated AMI4CCM story - -Mon Jan 4 10:04:39 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added missing semi colon - -Thu Dec 31 12:48:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl - * examples/BasicSP/descriptors/run_test.pl - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_alias.pl - * tests/Bug_3769_Regression/descriptors/run_test.pl - * tests/IDL_Test/Double_Inherited_Component/run_test.pl - Check spawn of naming service - -Thu Dec 31 12:40:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Check return value of the plan and execution manager - - * DAnCE/Deployment/Module_Main.h: - Always destroy the orb - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Layout changes - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Rethrow the exception so that we don't fail silently - -Wed Dec 30 12:58:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Give the plan launcher some more time, on a vm it seems to take longer - -Wed Dec 30 12:50:39 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.h - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_RTComponentServer_Task.h - * ciao/Logger/CIAOLoggerFactory.h - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Logger/File_Logger_Backend.h - * ciao/Logger/Logger.mpc - * ciao/Logger/Logger_Service.cpp - * ciao/Logger/Logger_Service.h - * DAnCE/Deployment/Module_Main.h - * DAnCE/Logger/DAnCELoggerFactory.h - * DAnCE/Logger/File_Logger_Backend.cpp - * DAnCE/Logger/File_Logger_Backend.h - * DAnCE/Logger/Logger.mpc - * DAnCE/Logger/Logger_Service.cpp - * DAnCE/Logger/Logger_Service.h - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - Simplified logging infrastructure code - -Wed Dec 30 11:56:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Layout changes - -Wed Dec 30 10:31:39 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Removed commented out code - - * AnCE/NodeApplication/NodeApplication.mpc: - Removed commented out lines - - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - Removed, not used - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Removed commented out code - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Const changes - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - Removed commented out code - -Wed Dec 30 08:14:39 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/Module_Main.h: - Check if we get an object back and add more exception handling - -Tue Dec 29 11:22:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: - Layout changes - -Tue Dec 29 10:16:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Don't override trace/debug levels - -Tue Dec 29 09:57:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - Use sendc_ as prefix for the implicit ports and updated some more - parts to get a more consistent naming - -Mon Dec 28 17:31:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Started to update these documents with the current proto - -Mon Dec 28 12:43:39 UTC 2009 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Use ACE to parse commandline arguments - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Each second call to an attribute results in an exception - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Added missing try/catch for the attributes - - * DAnCE/Config_Handlers/RDD_Handler.cpp: - Unicode fixes - - * DAnCE/Config_Handlers/Utils/Functors.h: - C++ Builder 2010 fix - - * DAnCE/Logger/Logger_Service.cpp: - Use -a for enabling tracing, -t is already used - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - Removed ignore_failure, not used - - * DAnCE/RedirectionService/CCMObjectLocator.h: - Doxygen changes - - * DAnCE/RedirectionService/RedirectionService.mpc: - Layout change - -Wed Dec 23 20:14:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - Extended this example with more exceptions - -Wed Dec 23 15:20:54 UTC 2009 Marcel Smit - - * DAnCE/Logger/Logger_Service.cpp: - Using %s instead of %C - -Wed Dec 23 15:08:16 UTC 2009 Marcel Smit - - * DAnCE/Logger/Logger_Service.cpp: - Using ace functionality to parse commandline parameters. - - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - Removed CIAO/DANCE_LOG_LEVEL parameters. - -Wed Dec 23 14:38:39 UTC 2009 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Fixed CIAO_TRACE_ENABLE functionality - - * DAnCE/Logger/Logger_Service.cpp: - Fixed DANCE_TRACE_ENABLE functionality - -Wed Dec 23 14:08:39 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Fixed fuzz errors - -Wed Dec 23 14:05:39 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - * ciao/ComponentServer/Client_init.cpp: - Fixed fuzz errors - -Wed Dec 23 12:39:39 UTC 2009 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - Config handlers got moved - - * CIAO_DAnCE.mwc: - Config handlers got moved, don't generate DAnCE/tests - -Wed Dec 23 12:32:39 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - UnkeyedWriter test should be ok now. - -Wed Dec 23 12:23:03 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Reworked this test. DDS does not return an error when max_samples is - reached. Now a large block of data is send. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Removed this file. - -Wed Dec 23 10:44:14 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Set 'OK' in debug message when catching the expected InternalError - -Wed Dec 23 09:17:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved fuzz errors regarding trace. - -Wed Dec 23 09:04:04 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - Using %C instead of %s for char*. Also added ERROR for error logging. - -Wed Dec 23 08:44:50 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Removed some commented out logging. - -Wed Dec 23 08:40:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Wed Dec 23 08:27:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Wed Dec 23 08:06:34 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Reverted last changes. - -Wed Dec 23 08:02:27 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Tue Dec 22 17:14:22 UTC 2009 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Uncommented template module construct that was producing a bug, and - added an instantiation of that template module. - -Tue Dec 22 15:41:04 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Introduced CCM_AMI::ExceptionHolder which is just a local interface - where the executor will contain the AMI exception holder, but - this is hidden for the component developer. The example will now - fail because there is a problem in TAO related to attributes - and AMI, see bugzilla 3801 - -Tue Dec 22 14:34:04 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Added missing afters - - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - No need to derive from ReplyHandler - -Tue Dec 22 14:36:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Resolved runtime error. - -Tue Dec 22 14:21:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - Renamed setter data_writer to set_impl (to be consistent). - -Tue Dec 22 13:34:45 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - Implemented setter and getter for DDSQueryCondition. - -Tue Dec 22 13:01:04 UTC 2009 Johnny Willemsen - - * DAnCE/Starter - * DAnCE/Starter/Starter.cpp - * DAnCE/Starter/Starter.h - * DAnCE/Starter/Starter.mpc - * DAnCE/StaticConfigurator - * DAnCE/StaticConfigurator/README - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl - * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - Removed, really old stuff and not maintained - -Tue Dec 22 13:02:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - To be consistent, renamed data_reader () methods to set_impl. - -Tue Dec 22 12:47:04 UTC 2009 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/DynAny_Handler.mpc - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc - * DAnCE/Config_Handlers/test.cdp - * DAnCE/Config_Handlers/test.cpp - * DAnCE/Config_Handlers/Utils/Functors.h - * DAnCE/Config_Handlers/XML_File_Intf.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/Config_Handlers/Config_Handlers.mpc - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/tests/Config_Handlers/test.cdp - * DAnCE/tests/Config_Handlers/test.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - Moved more tests to DAnCE/tests and make sure DANCE_ROOT/docs/schema - is also used - -Tue Dec 22 09:39:04 UTC 2009 Johnny Willemsen - - * DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl - * DAnCE/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/Config_Handlers/Package_Handlers/test.cpp - * DAnCE/tests/Config_Handlers - * DAnCE/tests/Config_Handlers/DynAny_Handler - * DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers - * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp - Moved tests to the test directory - - * tools/tools.mwc: - Removed, not needed - -Tue Dec 22 09:32:04 UTC 2009 Johnny Willemsen - - * ciao/Logger/File_Logger_Backend.h - * DAnCE/Config_Handlers - * DAnCE/Config_Handlers/ADD_Handler.cpp - * DAnCE/Config_Handlers/Any_Handler.cpp - * DAnCE/Config_Handlers/CCD_Handler.cpp - * DAnCE/Config_Handlers/CEPE_Handler.cpp - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/CPD_Handler.cpp - * DAnCE/Config_Handlers/CRDD_Handler.cpp - * DAnCE/Config_Handlers/DataType_Handler.cpp - * DAnCE/Config_Handlers/DD_Handler.cpp - * DAnCE/Config_Handlers/DP_Handler.cpp - * DAnCE/Config_Handlers/DP_PCD_Handler.cpp - * DAnCE/Config_Handlers/ERE_Handler.cpp - * DAnCE/Config_Handlers/ESD_Handler.cpp - * DAnCE/Config_Handlers/ID_Handler.cpp - * DAnCE/Config_Handlers/IDD_Handler.cpp - * DAnCE/Config_Handlers/IDREF_Base.cpp - * DAnCE/Config_Handlers/IRDD_Handler.cpp - * DAnCE/Config_Handlers/IRDD_Handler.h - * DAnCE/Config_Handlers/MDD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp - * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp - * DAnCE/Config_Handlers/PCD_Handler.cpp - * DAnCE/Config_Handlers/PL_Handler.cpp - * DAnCE/Config_Handlers/Property_Handler.cpp - * DAnCE/Config_Handlers/PSPE_Handler.cpp - * DAnCE/Config_Handlers/RDD_Handler.cpp - * DAnCE/Config_Handlers/Req_Handler.cpp - * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp - * DAnCE/Config_Handlers/STD_PC_Intf.cpp - * DAnCE/Config_Handlers/XML_File_Intf.cpp - * DAnCE/docs/schema - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/MPC/config/ciao_config_handlers.mpb - * DAnCE/MPC/config/ciao_config_handlers_base.mpb - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - * docs/schema - * docs/schema/06-04-02.xsd - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/ccd.xsd - * docs/schema/cdd.xsd - * docs/schema/cdp.xsd - * docs/schema/CIAOEvents.xsd - * docs/schema/ciaopolicy.xsd - * docs/schema/CIAOServerResources.xsd - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - * docs/schema/Deployment.xsd - * docs/schema/iad.xsd - * docs/schema/Modified_Deployment.xsd - * docs/schema/pcd.xsd - * docs/schema/README.html - * docs/schema/SANet_Network.xsd - * docs/schema/ServerResourceUsage.txt - * docs/schema/Spec_Defined_Deployment.xsd - * docs/schema/Spec_Defined_XMI.xsd - * docs/schema/Task_Map.xsd - * docs/schema/toplevel.xsd - * docs/schema/unused_06-04-02.xsd - * docs/schema/unused_elements.xsd - * docs/schema/XMI.xsd - * docs/schema/xsc-banner.cpp - * docs/schema/xsc-banner.h - * MPC/config/ciao_config_handlers.mpb - * MPC/config/ciao_config_handlers_base.mpb - * tools/Config_Handlers - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/ADD_Handler.h - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/Any_Handler.h - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CCD_Handler.h - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/Common.h - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.h - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Config_Handlers_Common_Export.h - * tools/Config_Handlers/Config_Handlers_Export.h - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/CRDD_Handler.h - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/DD_Handler.h - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/DnC_Dump.h - * tools/Config_Handlers/DnC_Dump_T.cpp - * tools/Config_Handlers/DnC_Dump_T.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_Handler.h - * tools/Config_Handlers/DP_PCD_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.h - * tools/Config_Handlers/Dump_Obj.cpp - * tools/Config_Handlers/Dump_Obj.h - * tools/Config_Handlers/DynAny_Handler - * tools/Config_Handlers/DynAny_Handler.mpc - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h - * tools/Config_Handlers/DynAny_Handler/dynany_test.idl - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h - * tools/Config_Handlers/DynAny_Handler/test.cpp - * tools/Config_Handlers/DynAny_Handler/test.mpc - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/ESD_Handler.cpp - * tools/Config_Handlers/ESD_Handler.h - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/IDD_Handler.h - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/IDREF_Base.h - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/IRDD_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.h - * tools/Config_Handlers/Package_Handlers - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp - * tools/Config_Handlers/Package_Handlers/PC_Intf.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.h - * tools/Config_Handlers/PL_Handler.cpp - * tools/Config_Handlers/PL_Handler.h - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.h - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/RDD_Handler.h - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.cpp - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/STD_CID_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.h - * tools/Config_Handlers/STD_CPD_Handler.cpp - * tools/Config_Handlers/STD_CPD_Handler.h - * tools/Config_Handlers/STD_IAD_Handler.cpp - * tools/Config_Handlers/STD_IAD_Handler.h - * tools/Config_Handlers/STD_PC_Intf.cpp - * tools/Config_Handlers/STD_PC_Intf.h - * tools/Config_Handlers/STD_PCD_Handler.cpp - * tools/Config_Handlers/STD_PCD_Handler.h - * tools/Config_Handlers/test.cdp - * tools/Config_Handlers/test.cpp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/Utils - * tools/Config_Handlers/Utils/Exceptions.h - * tools/Config_Handlers/Utils/Functors.h - * tools/Config_Handlers/XMI.cpp - * tools/Config_Handlers/XMI.hpp - * tools/Config_Handlers/XML_File_Intf.cpp - * tools/Config_Handlers/XML_File_Intf.h - * tools/Config_Handlers/XML_Typedefs.cpp - * tools/Config_Handlers/XML_Typedefs.h - * tools/Config_Handlers/XMLSchema - * tools/Config_Handlers/XMLSchema/id_map.hpp - * tools/Config_Handlers/XMLSchema/Traversal.hpp - * tools/Config_Handlers/XMLSchema/Traversal.ipp - * tools/Config_Handlers/XMLSchema/Traversal.tpp - * tools/Config_Handlers/XMLSchema/TypeInfo.hpp - * tools/Config_Handlers/XMLSchema/TypeInfo.ipp - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp - * tools/Config_Handlers/XMLSchema/Types.hpp - * tools/Config_Handlers/XMLSchema/Types.ipp - * tools/Config_Handlers/XMLSchema/Types.tpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - * tools/Config_Handlers/XMLSchema/Writer.ipp - * tools/Config_Handlers/XMLSchema/Writer.tpp - * tools/Config_Handlers/XSC_XML_Handlers_Export.h - * tools/Config_Handlers/XSCRT - * tools/Config_Handlers/XSCRT/Elements.hpp - * tools/Config_Handlers/XSCRT/Elements.ipp - * tools/Config_Handlers/XSCRT/Elements.tpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp - * tools/Config_Handlers/XSCRT/Parser.hpp - * tools/Config_Handlers/XSCRT/Parser.ipp - * tools/Config_Handlers/XSCRT/Parser.tpp - * tools/Config_Handlers/XSCRT/Traversal.hpp - * tools/Config_Handlers/XSCRT/Traversal.ipp - * tools/Config_Handlers/XSCRT/Traversal.tpp - * tools/Config_Handlers/XSCRT/Writer.hpp - * tools/Config_Handlers/XSCRT/Writer.ipp - * tools/Config_Handlers/XSCRT/Writer.tpp - * tools/Config_Handlers/XSCRT/XML.hpp - * tools/Config_Handlers/XSCRT/XML.ipp - * tools/Config_Handlers/XSCRT/XML.tpp - * tools/Config_Handlers/XSCRT/XMLSchema.hpp - Moved Config_Handlers and schema to DAnCE - -Mon Dec 21 18:26:04 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/ComponentServer/CIAO_RTComponentServer.cpp - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * ciao/ComponentServer/Client_init.cpp - * ciao/Containers/CIAO_Servant_Activator.mpc - * ciao/Containers/Servant_Activator.cpp - * ciao/Containers/Session/Session_Container.cpp - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Logger/File_Logger_Backend.h - * ciao/Logger/Log_Macros.cpp - * ciao/Logger/Log_Macros.h - * ciao/Logger/Logger.mpc - * ciao/Logger/Logger_Service.cpp - * ciao/Logger/Logger_Service.h - * ciao/Servants/Home_Servant_Impl_T.cpp - * ciao/Servants/Servant_Impl_Base.cpp - * ciao/Servants/Servant_Impl_T.cpp - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/Logger/File_Logger_Backend.cpp - * DAnCE/Logger/Log_Macros.cpp - * DAnCE/Logger/Log_Macros.h - * DAnCE/Logger/Logger.mpc - * DAnCE/Logger/Logger_Service.cpp - * DAnCE/Logger/Logger_Service.h - * DAnCE/MPC/config/dance_cdmw_idl.mpb - * DAnCE/MPC/config/dance_mocks.mpb - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/MPC/config/dance_plan_launcher.mpb - * DAnCE/MPC/config/dance_plan_launcher_base.mpb - * DAnCE/MPC/config/dance_repositorymanager.mpb - * DAnCE/MPC/config/dance_targetmanager.mpb - * DAnCE/MPC/config/dance_utils.mpb - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp - * DAnCE/NodeApplication/Name_Utilities.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/ServerActivator_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/RedirectionService/CCMObjectLocator.cpp - * DAnCE/RedirectionService/NameServiceRedirection.cpp - * DAnCE/RedirectionService/RedirectionService.cpp - * DAnCE/RepositoryManager/PC_Updater.cpp - * DAnCE/RepositoryManager/repository_manager_admin.cpp - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RM_Helper.cpp - * DAnCE/RepositoryManager/URL_Parser.cpp - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/Starter/Starter.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - * DAnCE/tests/NameServiceTest/clt_main.cpp - * DAnCE/tests/NameServiceTest/srv_main.cpp - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp - * DAnCE/Utils/DAnCE_Utils.mpc - * DAnCE/Utils/Plan_Handler.cpp - * MPC/config/ciao_cs_client.mpb - * MPC/config/ciao_servant_activator.mpb - * MPC/config/dds4ccm_impl.mpb - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp - * tools/Config_Handlers/XML_File_Intf.cpp - CIAO_DEBUG/CIAO_ERROR/DANCE_DEBUG/DANCE_ERROR now have a level - as first argument. This controls at which level (and higher) the - message is printed. DDS4CCM will get its own level very soon. - All example/test code should use ACE_ERROR/ACE_DEBUG, these - are always printed. - Also cleaned up several base projects and various global search - and replace on layout, typos, and more - -Mon Dec 21 14:56:04 UTC 2009 Johnny Willemsen - - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp - * tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp - Use ACE_ERROR/ACE_DEBUG - -Mon Dec 21 12:52:38 UTC 2009 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Mon Dec 21 12:20:04 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added some more test idl - -Mon Dec 21 11:02:04 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Removed empty templated module, that is illegal - -Mon Dec 21 10:59:04 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - Using set_impl and get_impl on DomainParticipant. - -Mon Dec 21 10:25:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Using set_impl and get_impl on StatusCondition. - -Fri Dec 18 20:11:00 UTC 2009 Johnny Willemsen - - * testsIDL_Test/IDL3_Plus/KitchenSink.idl: - Extended test idl - -Fri Dec 18 18:58:00 UTC 2009 Johnny Willemsen - - Merge changes from Jeff Parsons related to templated modules - - Thu Dec 17 21:37:10 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Cornucopia/README: - - Updated this file with info about the non-template - IDL3+ constructs added to the test IDL. - - * tests/IDL_Test/IDL3_Plus/README: - - New file, containing info about the new test in this - directory. - - Thu Dec 17 21:15:05 UTC 2009 Jeff Parsons - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Changes needed to this back end required by front end - changes made to support IDL3+ grammar changes. - - Thu Dec 17 19:52:18 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Changes needed to this back end required by front end - changes made to support IDL template parameters as - base interfaces/valuetypes, supported interfaces, and - primary keys. - - Thu Dec 17 19:37:41 UTC 2009 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - New test in new directory (IDL3_Plus) to test IDL3+ - constructs, specifically template-related ones. - TAO_IDL supports IDL3+ only in the front - end currently, this test will be more meaningful as - back end support is added. - - Mon Nov 23 20:39:24 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Updated visit_* methods. New visit_* methods corresponding - to the revised IDL3+ grammar types, have not yet been - implemented. - -Fri Dec 18 15:28:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.h: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - Two other classes converted. Implemented getter and - setter for variable impl_. - -Fri Dec 18 14:49:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - Solve bug in test on_deletion - -Fri Dec 18 14:17:47 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Resolved compiler errors on linux. - -Fri Dec 18 10:48:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Continued working on separating dds lifecycle from - ccm lifecycle. The DDS entities are now created at - connection time. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Logging time difference of get_one. - - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: - Some debug statements were logged as error messages. - -Fri Dec 18 08:36:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - Change cdp for test. - -Fri Dec 18 08:32:09 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Added a datareader/writer in order to separate the - dds lifecycle from the ccm lifecycle. - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Don't call impl () recursive. Use impl_ to check - for nil. - - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - Turned off CIAO en DAnCE trace. - -Thu Dec 17 20:43:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - Change cdp for test. - -Thu Dec 17 18:42:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - Add profile to connectorFour. - -Thu Dec 17 13:08:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Reworked Topic in order to separate the DDS lifecycle - from the ccm lifecycle. - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Removed unnecessary comments. - -Thu Dec 17 12:56:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml - Forgotten profile Hello example. - -Thu Dec 17 12:35:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - Made impl (void) private. Resolved runtime errors. - -Thu Dec 17 12:29:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp - add '\n' in debug and error messages - -Thu Dec 17 12:21:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Change DURABILITY from VOLATILE to TRANSIENT through QoS file. - Add ConectorStatusListener to check on PUBLICATION_MATCHED status. - -Thu Dec 17 09:13:11 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Moved all connector idl into the connector directory - -Thu Dec 17 08:11:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved compiler issues. - -Wed Dec 16 20:05:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - Reworked Topic in order to separate the DDS lifecycle - from the ccm lifecycle. - -Wed Dec 16 19:42:36 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - Reworked this in order to separate the dds lifecycle from - the ccm lifecycle. The DDS entity is not passed in the - constructor but can be passed using the set_impl method. - Reworked the DataReader. - -Wed Dec 16 19:16:59 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - Reworked this in order to separate the dds lifecycle from - the ccm lifecycle. The DDS entity is not passed in the - constructor but can be passed using the set_impl method. - -Wed Dec 16 12:26:24 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Only invoke the listeners when there are valid samples. - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Made the waitset a class variable again. - -Wed Dec 16 11:12:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - Simplified receiver - -Wed Dec 16 11:02:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI: - Renamed directory to connector - -Wed Dec 16 10:36:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Cleanup tests, check returned readers, data, info and status. - -Wed Dec 16 09:32:33 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Resolved errors due to renaming namespaces. - -Wed Dec 16 09:04:31 UTC 2009 Marijke Hengstmengel - - *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: - *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - Cleanup tests, check returned reader and status. - -Wed Dec 16 08:55:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Using this when using members. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Added newline. - -Wed Dec 16 08:27:46 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Unicode fix - -Wed Dec 16 08:09:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Improved naming, everything is now in the Hello module and - everything related to AMI has a AMI_ prefix - -Tue Dec 15 18:12:46 UTC 2009 Johnny Willemsen - - * ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * ami4ccm/examples/Hello/AMI/AMI_exec.h: - Made code more consistent and error safe - -Tue Dec 15 15:59:46 UTC 2009 Johnny Willemsen - - * ami4ccm/examples/Hello/AMI/AMI.idl - * ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * ami4ccm/examples/Hello/AMI/AMI_exec.h - * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp - * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h - * ami4ccm/examples/Hello/descriptors/run_test.pl - * ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Simplified this example - -Tue Dec 15 15:59:57 UTC 2009 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Spreadsheet to keep track of test coverage. - -Tue Dec 15 15:21:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h - Cleanup test. Check DDS_entity. - -Tue Dec 15 15:04:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - Cleanup test. - -Tue Dec 15 14:58:21 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - Optimized code. Removed unused header files, indentation, removed empty lines. - -Tue Dec 15 14:32:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - Cleanup test. - -Tue Dec 15 13:39:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Cleanup test. - -Tue Dec 15 13:38:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Extended tests with checks on the received ReadInfo struct. - -Tue Dec 15 12:46:02 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Extended tests with checks on the received ReadInfo struct. - - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - Sleep for 30 (instead of 60) seconds. - -Tue Dec 15 10:31:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp - Solved compile errors. - -Tue Dec 15 10:23:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Optimized for loop (++i in stead of i++). - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Catching exceptions as const. - - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - Catching exceptions as const. - Extended tests on the listener callback. - -Tue Dec 15 09:01:46 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SLManyByMany: - * connectors/dds4ccm/tests/SLManyByMany/Base: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Connector: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/descriptors: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Sender: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - Add test StateListyener operations with MANY_BY_MANY option. - -Tue Dec 15 08:25:46 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - Use char* instead of tchar - - * ciao/Contexts/Context_Impl_Base.h: - Made constructor private - -Mon Dec 14 20:35:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - Removed virtual methods that where added by accident and which broke - the psl - -Mon Dec 14 20:31:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Use false and extended debug statements - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Extended debug info - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Removed not needed debug info - - * ciao/Servants/Servant_Impl_T.cpp: - Layout change - -Mon Dec 14 20:07:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Report which port has the real problem - -Mon Dec 14 19:23:21 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Resolved fuzz errors/warnings. - -Mon Dec 14 19:06:43 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - Resolved fuzz errors/warnings. - -Mon Dec 14 14:53:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Cleaned up code. Removed unused headers, made exception variables const - and outlined code. - -Mon Dec 14 14:36:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: - Solve duplicate project names - -Mon Dec 14 14:25:09 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - Resolved fuzz erros/warnings. - -Mon Dec 14 14:15:46 UTC 2009 Johnny Willemsen - - * DAnCE/tests/MocksTest/* - Removed, not compiled, not tested - -Mon Dec 14 14:10:11 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - Resolved fuzz erros/warnings. - -Mon Dec 14 13:59:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Print debug statement when we don't get a facet - - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_T.h: - Create the context in the base instead of in the generated - code - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - Layout change - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - Don't clear tracing flags - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Layout changes - -Mon Dec 14 13:42:56 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - Resolved errors in deployment plans related to local interfaces. - -Mon Dec 14 13:16:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - The deleted samples may be invalid. Therefore don't check - on valid_data flag. Implemented this for many_by_many. - -Mon Dec 14 12:56:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - The deleted samples may be invalid. Therefore don't check - on valid_data flag. - -Mon Dec 14 12:18:31 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added many_by_many listener test to test framework. - -Mon Dec 14 11:37:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp - Solve minor bug in test - -Mon Dec 14 11:18:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Removed generated header - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - Use ACE_CString for subplan names - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - Removed commented out code - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Removed not needed include - - * DAnCE/NodeManager/NodeManager_Impl.h - Added missing include - -Mon Dec 14 10:58:46 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SLDisabled: - * connectors/dds4ccm/tests/SLDisabled/Base: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Connector: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h: - * connectors/dds4ccm/tests/SLDisabled/descriptors: - * connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/Receiver: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Sender: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - Added test StateListener: NOT_ENABLED . - -Mon Dec 14 10:46:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - Don't override use trace levels - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Initialise all members to zero - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Improved logging - -Mon Dec 14 10:44:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/ListenManyByMany/*: - Added test in order to test many_by_many on the listener. - -Mon Dec 14 09:12:46 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Improved error reporting back to the end user - -Mon Dec 14 08:16:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/IDL3/Events/Any/run_test.pl: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - Resolved fuzz errors/warnings. - -Mon Dec 14 07:39:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.h - * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * docs/schema/Basic_Deployment_Data.xsd - * tests/IDL_Test/Cornucopia/Cornucopia.idl - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - Removed LocalFacet again as connection kind, we now use a - deployRequirement in order to let D&C know we have a local connection. - Use local interfaces for everything in dds4ccm and updated - all deployment plans for this. This does mean the connector - needs to create all executors as construction time, the - lifecycle of the connector is now that all executors - are created at construction, at the moment we do a - ccm_activate we need to create the real dds entities. - When we get an invocation before ccm_activate we do a - BAD_INVORDER exception. - - In the cdp we now use the following with a connection to - indicate that it has to be deployed as a local connection: - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - -Fri Dec 11 14:03:46 UTC 2009 Marcel Smit - - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - Resolved fuzz errors/warnings/ - -Fri Dec 11 13:19:30 UTC 2009 Marcel Smit - - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Display/descriptors/basicNodeDaemon.pl: - Resolved fuzz errors/warnings/ - -Fri Dec 11 12:00:05 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - Resolved script errors - -Fri Dec 11 11:50:16 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Extended tests - -Fri Dec 11 11:07:13 UTC 2009 Marcel Smit - - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - Resolved fuzz errors/warnings - - * performance-tests/Protocols/descriptors/run_test.pl: - Resolved fuzz warnings - -Fri Dec 11 10:52:33 UTC 2009 Marcel Smit - - * performance-tests/Benchmark/Multi_Threaded/run_test.pl: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 10:27:57 UTC 2009 Marcel Smit - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 09:44:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 09:30:29 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved script errors. - -Fri Dec 11 08:20:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Resolved warnings. - -Fri Dec 11 08:09:25 UTC 2009 Marcel Smit - - * performance-tests/Protocols/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 11 07:44:10 UTC 2009 Marcel Smit - - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_NodeDaemons.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 20:23:15 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Removed add_lib_path in order to resolve fuzz error. - -Thu Dec 10 20:05:00 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:40:19 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:31:15 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:26:16 UTC 2009 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.cpp: - Check return value sprintf and use is_nil - -Thu Dec 10 19:15:15 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 19:03:16 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - Removed generated headers - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - const changes and improved debug messages - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Const change - - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - Fixed typo in debug statement - -Thu Dec 109 17:02:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Resolved warning. - -Thu Dec 10 16:20:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:56:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:42:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:35:51 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:29:00 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 14:41:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Wait a few seconds before the actual writing starts. - - * connectors/dds4ccm/tests/ListenOneByOne/*: - Added one_by_one listener test. - - * bin/ciao_tests.lst: - Added one_by_one test to the test framework. - -Thu Dec 109 14:31:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Updater/Receiver: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Sender: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - Implement test for Updater functions - -Thu Dec 10 13:30:01 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added !FIXED_BUGS_ONLY for the connection tests since - there's a known issue in the connector. - -Thu Dec 10 12:44:31 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added ListenNotEnabled test to the test framework. - -Thu Dec 10 12:42:08 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Renamed get_many into write_many. - - * connectors/dds4ccm/tests/ListenNotEnabled/*: - * connectors/dds4ccm/tests/Listener/*: - Split the listener into three separate tests. Added - listener test where mode is NOT_ENABLED as starter. - -Thu Dec 10 11:01:16 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Extended logging - -Thu Dec 10 10:11:56 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 10:00:16 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixed compiler warnings about arguments not used - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Fixed invalid string comparison and const improvements - -Thu Dec 10 09:41:12 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc: - Removed some unnecessary defines. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - Removed unused class variable. - - * connectors/dds4ccm/tests/Listener/*: - Empty test framework for the listener test. - -Thu Dec 10 08:37:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/README: - * connectors/dds4ccm/tests/Reader/README: - Described the tests. - -Thu Dec 10 08:21:16 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.h: - Fixed bugs in the updater - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Merged a revised ami4ccm example that has local interfaces for the - reply handler, which reduces the footprint of ami4ccm and also - simplifies the code - -Thu Dec 10 08:06:08 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp: - Shorten the names of the projects in order to solve some fuzz warnings. - -Wed Dec 9 19:52:16 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * docs/schema/Basic_Deployment_Data.xsd - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - Merged changes from local_facets branch from Will Otte to svn head. - This is going to be used by at least ami4ccm. We are looking if there - is a different way to determine whether we need to connect a local - facet. - -Wed Dec 9 15:53:16 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Wed Dec 9 15:01:48 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved unicode compiler errors. - -Wed Dec 9 14:29:33 UTC 2009 Johnny Willemsen - - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base.inl: - Get rid of the receptacle policy map, this doesn't do a thing - -Wed Dec 9 14:26:17 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Extended tests with a timeout test on get_many. - -Wed Dec 9 13:58:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Don't need the ConnectorStatusListener anymore. - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Print debug message in stead of an error message. - -Wed Dec 9 13:54:33 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp (lookup_facet): - Log an error when we can't find a facet - -Wed Dec 9 13:53:47 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - On get_many should at least return 1 sample. - - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - Return _nil rather than 0. - -Wed Dec 9 13:11:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - Check whether instance_handle and instance match - -Wed Dec 9 12:55:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - Changed project names in order to resolve fuzz warnings. - -Wed Dec 9 12:48:35 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: - Shorten the shared name of DDS_ConnectorStatusListener_TestSec_Connector_lem_stub. - -Wed Dec 9 12:40:33 UTC 2009 Johnny Willemsen - - * bin/ciao_tests.lst: - Added Local_Facet test - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Resolved a bug whereby connection endpoints in the original plan - would be copied into two separate connections in a child plan. - -Wed Dec 9 12:37:33 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/Local_Facet: - Removed - - * tests/CIAO_ComponentServer/Local_Facet: - New test for testing local facets - - * ciao/ComponentServer/CIAO_ComponentServer.idl - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/ComponentServer/CIAO_Container_Impl.h - * ciao/Containers/Container_Base.idl - * ciao/Containers/Session/Session_Container.cpp - * ciao/Containers/Session/Session_Container.h - Added support to connect local facets by William Otte - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Made several methods pure virtual instead of not implemented - -Wed Dec 9 11:24:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings. - -Wed Dec 9 11:13:44 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added State_Connection_Test. - - * connectors/dds4ccm/tests/Event_Connection_Test/README: - Changed to meet the latest code updates. - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl: - Removed comments. - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - Logging debug messages (in stead of error messages). - - * connectors/dds4ccm/tests/State_Connection_Test/*: - Added this test in order to test all the connections a state connector - needs. - -Wed Dec 9 08:56:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - Support only the DDS_Event connector. Removed DDS_State connector stuff. - -Wed Dec 9 08:25:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp - Add newline at end of file - -Wed Dec 9 08:17:27 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/*: - Renamed to Event_Connection_Test. - -Wed Dec 9 08:14:57 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/Event_Connection_Test/*: - Renamed Get_Connection_Test to Event_Connection_Test. - -Wed Dec 9 07:47:33 UTC 2009 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Also exclude the tests directory - -Wed Dec 9 07:17:32 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Tue Dec 8 16:36:33 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixes to debug statements - -Tue Dec 8 16:31:33 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_test.pl: - Adapted to the new test framework. - -Tue Dec 8 15:54:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.h: - Added existence checks as mandated by the spec - -Tue Dec 8 15:29:40 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz warnings. - -Tue Dec 8 15:20:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - Cache dds executors - -Tue Dec 8 15:17:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings. - -Tue Dec 8 15:11:22 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - Resolved fuzz errors. - -Tue Dec 8 15:01:58 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors. - -Tue Dec 8 14:56:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - Provide access to the DDS entities - -Tue Dec 8 12:51:33 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Using a local waitset in stead of a global one. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Optimized get_many. - -Tue Dec 8 10:48:04 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added Getter test to the test framework. - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Implemented get_many. - -Tue Dec 8 09:05:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - Change QoS settings of test to generate a on_sample_lost callback. - -Tue Dec 8 08:56:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - RETCODE_NO_DATA should throw an exception since - there always must be data after when the timeout does - not occur. - - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Removed qos_profile config property. - -Tue Dec 8 08:47:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved some timing issues between sender and receiver. - -Tue Dec 8 08:17:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Solved errors duplicate projectnames - - -Tue Dec 8 07:21:52 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Minor changes in order to meet the spec. - - * connectors/dds4ccm/tests/Getter/*: - Added test for the getter. - -Mon Dec 7 15:37:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/PSLSampleLost: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Connector: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - Add test PortStatusListener:on_sample_lost - -Mon Dec 7 14:53:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - Implement get_dds_entity methods - - * NEWS - Added DDS4CCM_NDDS_LOG_VERBOSITY - -Mon Dec 7 13:28:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - Fixed runtime problems and refactored statelistener - -Mon Dec 7 13:25:55 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Reads according to DDS4CCM spec. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - NO_DATA shouldn't throw an exception but just return - an empty sequence. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Optimized test. Don't need to sleep prior to writing samples to DDS. - -Mon Dec 7 13:07:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.h - Introduced DDS_Get_T, DDS_Listen_T, DDS_Read_T, DDS_Update_T, and - DDS_Write_T templates which implement the dds4ccm extended ports - -Mon Dec 7 11:157:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - Add second port to test - -Mon Dec 7 11:12:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Instance state should be alive in all cases. - -Mon Dec 7 10:54:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented max_delivered_data. - -Mon Dec 7 10:30:38 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Rewritten test due to timing issues. Also added a 'no data' test. - -Mon Dec 7 10:07:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/PSLDeadline: - * connectors/dds4ccm/tests/PSLDeadline/Base: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Connector: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/descriptors: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLDeadline/Receiver: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Sender: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - Add test PortStatusListener:on_requested_deadline_missed for DDS_Listen port - -Mon Dec 7 06:52:05 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Extended this test to test a struct attribute of a component. - The descriptor file needs to be extended as well. - -Mon Dec 7 06:08:31 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Extended this test to test a sequence attribute of a component. - The descriptor file needs to be extended to capture data - for the sequence attribute(s). - -Mon Dec 7 03:02:18 UTC 2009 Abdullah Sowayan - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Fixed a small bug in a switch statement where one of the - cases did not have a 'break' statement. - -Sun Dec 6 19:22:45 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Changed layout debug message - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - Implement more portstatus listner functionality - -Sun Dec 6 18:49:47 UTC 2009 William R. Otte - - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Fixed the comparison for float to ensure the numeric literal isn't - converted to a double. - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - Float configproperty was incorrectly typed as a double. - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Fixed bug whereby floats/doubles weren't properly dereferences. - -Sat Dec 5 01:06:06 UTC 2009 Abdullah Sowayan - - * bin/ciao_tests.lst: - - Add bugzilla 3769 to the list of test to run. - -Sat Dec 5 00:59:20 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression: - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo.mpc: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - * tests/Bug_3769_Regression/descriptors/NodeMap.dat: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/model: - - Added bugzilla 3769. Component attributes of type double and float - do not get set properly by DAnCE. - -Fri Dec 4 20:41:45 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Introduced a PortStatusListener which is than the base of - the DataReaderListener - -Fri Dec 4 14:31:45 UTC 2009 Marcel Smit - - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - Resolved fuzz error. - -Fri Dec 4 14:28:18 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Enabled some more test for fuzz. - -Fri Dec 4 14:15:24 UTC 2009 Marcel Smit - - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - Adapted to the new test framework. Fuzz - errors/warnings should be resolved - -Fri Dec 4 13:53:04 UTC 2009 Marcel Smit - - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - Resolved some minor fuzz errors/warnings. - -Fri Dec 4 13:49:58 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - Add more infrastructure for the 5 extended ports this connector - provides - -Fri Dec 4 13:23:46 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - Resolved runtime errors in script. - -Fri Dec 4 13:14:10 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Fixed many_by_many. The last updates should be send to - the listener. - -Fri Dec 4 13:04:58 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/impl/ndds/DataListenerControl.cpp - * connectors/dds4ccm/impl/ndds/DataListenerControl.h - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl.h - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.h - Refactored data/state listener controls - -Fri Dec 4 12:56:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Refactored MANY_BY_MANY. - -Fri Dec 4 11:24:25 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented MANY_BY_MANY. First all new samples are handled. - After that the updated ones, by invoking on_many_updates on - the listener. The last step is to inform the listener - about the deleted samples. - -Fri Dec 4 10:38:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Resolved compiler errors. - -Fri Dec 4 10:21:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Extended logging - -Fri Dec 4 10:11:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - Removed listener callbacks that are handled by the subscriber - -Fri Dec 4 09:49:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/Updater/* - Use the stateconnector as starting point - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - First compile fixes - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle data_on_readers - -Fri Dec 4 09:34:09 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 4 09:04:34 UTC 2009 Marcel Smit - - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 4 08:32:42 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 3 20:12:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp - Layout changes - -Thu Dec 3 20:08:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - Added a lot of logging and made the subscriberlistener - working again - -Thu Dec 3 20:08:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Only returning valid data. - -Thu Dec 3 18:46:35 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Using a take in stead of take_next_sample. Also created - Created difference between ONE_BY_ONE and MANY_BY_MANY by - invoking on_one_update and on_many_updates on the listener. - -Thu Dec 3 15:13:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: - Resolved warning unused parameter. - -Thu Dec 3 14:06:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Removed the context switch. - Created difference between ONE_BY_ONE and MANY_BY_MANY by - introducing a take (in stead of take_next_sample). - -Thu Dec 3 13:57:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle everything related to the CSL at subscriber/publisher - level - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Corrected base project - -Thu Dec 3 13:52:57 UTC 2009 Marijke Hengstmengel - - *bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CSLUnexpStat: - * connectors/dds4ccm/tests/CSLUnexpStat/Base: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - Test ConnectorStatusListener:on_unexpected_status implemented - - -Thu Dec 3 12:56:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Let each layer initialise itself - -Thu Dec 3 12:06:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Added keys and max_dds_samples to idl. - -Thu Dec 3 11:07:49 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - UnkeyedWriter test may fail since DDS allows more - samples than configured in the QoS file. - -Thu Dec 3 11:06:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings on Windows. - -Thu Dec 3 11:03:34 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - Resolved some runtime errors. Expected_samples and name are not - used in Sender. - -Thu Dec 3 10:51:20 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Disabled the listener for now. No takes should be performed. - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Rewritten in order to test exceptions from the connector. - -Thu Dec 3 10:14:28 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Build in checks on received data. - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Write more samples - -Wed Dec 3 08:56:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Solved initialize warnings. - -Thu Dec 3 08:55:27 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - Reduced log level. - -Thu Dec 3 08:47:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - Adapted to the update Reader port. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Minor code optimization. - -Thu Dec 3 08:28:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Don't handle data_on_readers, if we install this listener, - the data reader listener will not get any on_data_available - -Wed Dec 2 14:57:57 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Use the word error to trigger the scoreboard parser - -Wed Dec 2 14:19:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Used operators to file readinfo sequences. - - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - Removed <== operator for readinfo_seq. Also added - instance handle when copying sample_info. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Added handle tests and test exceptions related to handles. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Changed timing. - -Wed Dec 2 13:58:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Add test to test list. - -Wed Dec 2 13:49:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/tests/CSLSampleRejected: - * connectors/dds4ccm/tests/CSLSampleRejected/Base: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Created test ConnectorStatusListener:on_sample_rejected - -Wed Dec 2 13:35:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle data_on_readers - -Wed Dec 2 13:12:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - Added a get_mask to all listeners, this should return the - mask the listener needs, this is then used by the connector - templates. This way a listener can listen for more callbacks - and update his mask without any connector to be updated - -Wed Dec 2 13:10:40 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_last. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Optimized tests. - -Wed Dec 2 11:52:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Cleaned up code by removing double code. Implemented - read_all. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Enabled read_all test. - -Wed Dec 2 11:33:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Added translate_statuskind - -Wed Dec 2 11:16:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - Implemented more CSL callbacks - -Wed Dec 2 10:57:20 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_one_last and read_one_all according to - spec. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Enabled read_one_last and read_one_all to test. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Sleep between writing samples to DDS. - - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Optimized logging. - -Wed Dec 2 10:26:57 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - Improved failure reporting in case we can't get the needed - entities - -Wed Dec 2 09:05:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Moved publisher and subscriber to the DDS_TopicBase - -Wed Dec 2 08:33:57 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added reader test to the test framework. - -Wed Dec 2 08:28:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Started with read_one_last. - - * connectors/dds4ccm/tests/Reader: - * connectors/dds4ccm/tests/Reader/Base: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/Connector: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp: - * connectors/dds4ccm/tests/Reader/README: - * connectors/dds4ccm/tests/Reader/Receiver: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/descriptors: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Added test to test the Reader. - -Tue Dec 01 12:39:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_one_all - -Tue Dec 01 11:50:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl.h - StateListenerControl - -Tue Dec 01 10:59:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - StateListener - -Tue Dec 01 09:42:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - Implemented empty listeners for each dds entity and first - part of DDS_State - -Tue Dec 01 08:33:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - Corrected mpc file for connector_stub - -Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Corrected warnings for unused parameters - - -Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - Corrected long project names and add tests to test list. - -Mon Nov 30 12:27:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - Empty state connector so that we can start with creating tests - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - Corrected ifdef guards - -Mon Nov 30 11:32:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline: - * connectors/dds4ccm/tests/CSLDeadline/Base: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Connector: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/descriptors: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLDeadline/Receiver: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - Test ConnectorStatusListener on_offered_deadline_missed. - - * connectors/dds4ccm/tests/CSLQoS: - * connectors/dds4ccm/tests/CSLQoS/Base: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Connector: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/descriptors: - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLQoS/Receiver: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - Test ConnectorStatusListener on_requested- and on_offered_incompatible_QoS. - -Mon Nov 30 09:21:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/Servants/Port_Activator_T.h: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - Doxygen fixes - -Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen - - * CIAO version 0.7.5 released. - -Thu Nov 26 20:18:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - Layout changes - - * ciao/ComponentServer/CIAO_RTComponentServer.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - Latest changes for rt component server to have server declared priorities - -Thu Nov 26 19:30:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - When creating the process options, calculate the size of the - commandline, the default of 1024 can be too small if the - system has multiple network interfaces - -Thu Nov 26 19:03:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Check if we successfully constructed the commandline - -Thu Nov 26 18:52:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - If the narrow of the callback IOR fails, print the IOR - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Const change - -Thu Nov 26 15:32:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/README: - * connectors/dds4ccm/tests/UnkeyedSamples/README: - Added test description - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - Removed keys. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Removed keys. Added qos_profile. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Started with configuring DDS in order to test the unkeyed - writer. - -Thu Nov 26 13:59:39 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - KeyedWriter is not fixed, yet. - -Thu Nov 26 13:48:39 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Removed some methods or made them pure virtual, no need to let - them throw no_implement, the derived template does implement it - -Thu Nov 26 13:29:51 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Removed CLINFO from log message in order to consistent with other - log messages. - -Thu Nov 26 13:11:06 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Resolved runtime errors. - - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Resolved test error: test took longer than 60 seconds. - -Thu Nov 26 12:56:39 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.h: - Removed not needed forward declaration - - * ciao/Servants/Servant_Impl_Base.cpp: - Keep a reference to the home servant so that it doesn't get deleted - when we have a reference to it - - * ciao/Servants/Servant_Impl_T.cpp: - Only print the refcount of the executor when it is > 1, than we have - a leak - -Thu Nov 26 12:54:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - Resolved some test errors when using write_many. - -Thu Nov 26 12:40:18 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Resolved test errors. Expected samples should always be in the - deployment plan. - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - Added expected samples. - - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Resolved test error by adding qos_profile to the deployment plan. - -Thu Nov 26 12:18:07 UTC 2009 Marcel Smit - - - * connectors/dds4ccm/examples/Quoter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Get_Connection_Test/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Removed these files since the default qos is coded. - -Thu Nov 26 12:12:36 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - Resolved compiler warnings on linux. - -Thu Nov 26 11:43:12 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Also reported messages when things go as planned. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Resolved some compiler error. - -Thu Nov 26 11:37:12 UTC 2009 Johnny Willemsen - - * examples/Hello/descriptors_RTCCM/*: - Deleted, not used - - * examples/Hello/Sender/Sender_exec.cpp: - Return the correct string - - * examples/Hello/descriptors/DeploymentPlan.cdp: - Removed rate attribute - -Thu Nov 26 10:50:12 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Give more feedback on the test itself - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - Layout changes, create topic with profile, and fixed key_fields set/get methods - -Thu Nov 26 10:42:12 UTC 2009 Marcel Smit - - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - Reverted some of my last changes. - Removed timer functionality. - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - Removed log_time attribute. - - * examples/Hello/descriptors/run_test.pl: - No sleep necessary anymore. - -Thu Nov 26 10:19:55 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Changed logging on exit. Reporting an error only when received < expected. - -Thu Nov 26 09:28:25 UTC 2009 Marcel Smit - - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - Reviced this example a bit. The receiver now uses the - orb reator thread to call the sender periodically. Therefore - the receiver is not blocked in the receiving CCM event method. - Also introduced a rate in the deployment plan; no hard coded - sleep of 200 seconds anymore. - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - Removed attribute Hertz since it was not used - - * examples/Hello/descriptors/DeploymentPlan.cdp: - Introduced rate for the receiver (see above). - - * examples/Hello/descriptors/run_test.pl: - Added a sleep of 60 seconds. - -Thu Nov 26 08:09:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Optimized logging for ConnectorStatusListener. - - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - Resolved fuzz warning (project names too long). - -Thu Nov 26 07:32:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - Since the connector is now cleaning up the DDS environment, shutting - down takes considerably longer. Therefore extended the shutdown times. - -Wed Nov 25 16:22:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Using the orb reactor thread in order to handle application specific - logic. - - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - Optimized logging. - -Wed Nov 25 15:50:57 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Logged errors instead of warnings when received!=expected. - - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: - Nothing is received when this deployment plan is ran. - -Wed Nov 25 15:40:59 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Resolved minor typos. - -Wed Nov 25 15:30:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/README: - * connectors/dds4ccm/tests/SetConnectorAttributes/README: - Added test description. - -Wed Nov 25 15:15:43 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/README: - * connectors/dds4ccm/tests/NonChangeableAttribute/README: - Added test description. - -Wed Nov 25 14:26:21 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - Implemented all with_profile methods - -Wed Nov 25 14:12:21 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/UnkeyedWriter: - * connectors/dds4ccm/tests/UnkeyedWriter/Base: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - Added an unkeyed writer test. - -Wed Nov 25 13:45:05 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SetConnectorAttributes: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - Added this test in order to test whether the connector attributes are set properly. - -Wed Nov 25 13:15:25 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Resolved typo in setting key_fields. - -Wed Nov 25 13:05:24 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Fix typo in debug statement - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - Removed updater functionality - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Added missing \n to debug messages - - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - Shortened timeouts - - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - For x.7.5, don't wait for worker threads - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Some cleanup and destroy dds entities at ccm_remove - -Wed Nov 25 10:54:24 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - Resolved some errors. - - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - No need to wait 60 seconds. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Optimized logging. - -Wed Nov 25 09:39:17 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Optimized logging. - -Wed Nov 25 09:37:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.cpp: - Renamed ConnectorStatusListener_TestSec_Connecto in order to resolve fuzz errors. - -Wed Nov 25 09:28:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Some code outlining. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Added connector status listener. - - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - Optimized logging. - -Wed Nov 25 09:21:31 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - layout change - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Added missing trace - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - Fixed trace and layout change - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Don't use the qos because the conversions are not fully implemented - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Use default qos - -Wed Nov 25 08:47:31 UTC 2009 Johnny Willemsen - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Hello/descriptors_RTCCM/rt_run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/BasicSP/descriptors/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - Use more realistic timeouts, this will shorten the test runs - a lot at the moment a test or example is broken - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h - Removed generated headers from these files - -Wed Nov 25 08:31:31 UTC 2009 Johnny Willemsen - - * examples/Hello/Receiver/Receiver_exec.cpp - * examples/Hello/Receiver/Receiver_exec.h - * examples/Hello/Sender/Sender_exec.cpp - * examples/Hello/Sender/Sender_exec.h - * examples/Null_Component/Null_Component_exec.cpp - * examples/Null_Component/Null_Component_exec.h - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h - * tests/Minimum/Receiver/Receiver_exec.cpp - * tests/Minimum/Receiver/Receiver_exec.h - * tests/Minimum/Sender/Sender_exec.cpp - * tests/inimum/Sender/Sender_exec.h - Removed generated headers from these files - -Wed Nov 25 08:19:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: - Fixed order error on Windows. - -Wed Nov 25 07:52:16 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added !FIXED_BUGS_ONLY to Get_Connection_Test since the updater - is not working, yet. - - * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: - No need to write samples to activate the listener. - - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Resolved compiler warnings. - -Tue Nov 24 19:34:00 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Resolved a bug whereby connection endpoints in the original plan - would be copied into two separate connections in a child plan. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfix with connection logic. - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - - Ported to new local interface support. - -Mon Dec 7 18:21:43 UTC 2009 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/DnC_Dump.cpp: - * tools/Config_Handlers/PSPE_Handler.cpp: - - Config handler updates. - -Mon Dec 7 17:51:30 UTC 2009 William R. Otte - - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp: - * tests/CIAO_ComponentServer/Local_Facet/client.cpp: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - - Added simple test for local facet connection logic. - -Mon Dec 7 17:04:43 UTC 2009 William R. Otte - - * tests/CIAO_ComponentServer/Local_Facet: - - Moved local facet test under ComponentServer. - - * tests/IDL_Test/Local_Facet: - - Removed these files. - -Mon Dec 7 14:52:43 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - - Integration. - -Mon Dec 7 14:11:14 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Servant_Impl_Base.h: - - Container code. - -Sat Dec 5 05:33:43 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Infrastructure to connect local interfaces. - - * tests/IDL_Test/Local_Facet/Local_Facet.mpc: - - Enabled test. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2010b b/CIAO/ChangeLogs/ChangeLog-2010b deleted file mode 100644 index 507b74c41cd..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2010b +++ /dev/null @@ -1,11911 +0,0 @@ -Sun Jul 04 18:57:33 CEST 2010 Johnny Willemsen - - * CIAO version 0.8 released. - -Fri Jul 2 08:58:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Policies/policies.mpc: - Resolved static link erros on Linux - -Fri Jul 2 08:40:01 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - Reverted last changes; too heavy. - -Fri Jul 2 08:29:09 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - Added missing base project. This resolves static linker errors - on Linux. - -Fri Jul 2 06:51:58 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - Add missing Common.h - -Fri Jul 2 03:41:14 UTC 2010 William R. Otte - - * DAnCE/docs/OMG-DnC-Tutorial.ppt: - * DAnCE/docs/sources/dance-deployment.odg: - - Updates for LocalityManager. - -Fri Jul 2 03:38:45 UTC 2010 William R. Otte - - * DAnCE/docs/sources/LocalityManager.graffle: - - Diagram updates. - -Thu Jul 1 21:22:31 UTC 2010 William R. Otte - - * DAnCE/docs/sources/LocalityManager.graffle: - - LocalityManager graphics. - -Thu Jul 1 10:50:47 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Warnings. - -Thu Jul 1 10:44:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Replaced incorrect error messages. - -Thu Jul 1 10:32:42 UTC 2010 Johnny Willemsen - - * DAnCE/tests/Parsing/run_test.pl: - Print a message when a test succeeded - - * DAnCE/tests/Parsing/test.cpp: - Explicitly catch Config_Error, that exception is now passed through - to this test. Also initialize the DAnCE Logger so that we can get - more output during manual testing - -Thu Jul 1 09:02:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - Resolved linker errors on windows when full_ccm is on - -Thu Jul 1 08:57:21 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Add AMI4CCM tutorial to list. - -Thu Jul 1 08:37:21 UTC 2010 Johnny Willemsen - - * CIAO_TAO.mwc: - Added tutorials directory - -Thu Jul 1 07:01:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - Slower rate. - -Wed Jun 30 21:38:41 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Interceptors/Best_Effort.cpp: - * DAnCE/LocalityManager/Interceptors/Standard_Error.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Better detection of bad any values passed in. - - * DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Earlier allocation of anys to ensure their state is valid - in the event of early exit due to exceptional conditions. - -Wed Jun 30 20:34:42 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - - Fix for crash on shutdown for windows. - -Wed Jun 30 16:05:10 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Fixed a bug where connections weren't properly collated. - -Wed Jun 30 15:02:07 UTC 2010 Adam Mitz - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - - In the case where there is no DDS implementation available, - install the IDL files so they can be included by some tests. - -Wed Jun 30 14:47:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: - Renamed Shapes_msg.idl to Shapes_ShapeType_msg.idl - -Wed Jun 30 14:38:33 UTC 2010 William R. Otte - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Fixed potential crash when a nonexistant instance reference is - provided. - -Wed Jun 30 13:33:21 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Fixed crash when no properties are passed - - * tests/Bug_3832_Regression/run_test.pl: - Fixed this test script - -Wed Jun 30 13:01:44 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc: - Fixed msvc71 link errors - -Wed Jun 30 12:08:56 UTC 2010 Marcel Smit - - * docs/OMG-CCM-Tutorial.pptx: - Updates regarding the DDS4CCM connector. Since the Hello example - was old, I've re-constructed these sheets using the current status. - -Wed Jun 30 11:35:20 UTC 2010 Marcel Smit - - * tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - Warning. - -Wed Jun 30 10:35:10 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html - Changes after review. - -Wed Jun 30 09:20:10 UTC 2010 Martin Corino - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Cosmetic logging change. - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - Fixed incorrect Compare functor for server registry set. - -Wed Jun 30 06:04:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html: - Changes after review. - -Tue Jun 29 17:54:23 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - - Fix for a segmentation fault that would occur when plans - with similar UUIDs were deployed/torn down in sequence. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Temperorarily disable thread pool in the NodeApplication. This - is expected to be re-enabled in the next release. - -Tue Jun 29 14:49:04 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Moved the plugin manager cleanup to the node manager. - -Tue Jun 29 14:37:39 UTC 2010 Marcel Smit - - * docs/OMG-CCM-Tutorial.pptx: - Changes regarding DDS4CCM connector. - -Tue Jun 29 14:35:04 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/docs/TestCoverage.odt - New doc, describing AMI4CCM tests. - -Tue Jun 29 14:29:36 UTC 2010 Adam Mitz - - * DAnCE/MPC/config/dance_split_plan.mpb: - - Removed a redundant "includes" that used an incorrect - syntax for environment variables: it used $FOO instead of $(FOO). - -Tue Jun 29 14:13:45 UTC 2010 Adam Mitz - - * ciao/Base/CIAO_Base.mpc: - - Corrected the name of the export header. - -Tue Jun 29 13:12:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated - -Tue Jun 29 13:09:53 UTC 2010 Johnny Willemsen - - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - Fixed nmake warning - - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - Cleanup code - -Tue Jun 29 12:42:04 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html - Changes text and layout - -Tue Jun 29 12:29:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl: - Using the -q option on the plan launcher - -Tue Jun 29 12:06:24 UTC 2010 Marcel Smit - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Added -q (quiet) option. This will suppress error messages. - - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - Using the -q option on the plan launcher - -Tue Jun 29 11:30:57 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_artifact_installation.mpb: - * DAnCE/MPC/config/dance_completion_counter.mpb: - * DAnCE/MPC/config/dance_config_handlers_base.mpb: - * DAnCE/MPC/config/dance_convert_plan.mpb: - * DAnCE/MPC/config/dance_deployment_scheduler.mpb: - * DAnCE/MPC/config/dance_installation_handlers.mpb: - * DAnCE/MPC/config/dance_installation_repository_manager.mpb: - * DAnCE/MPC/config/dance_locality_handler.mpb: - * DAnCE/MPC/config/dance_locality_manager.mpb: - * DAnCE/MPC/config/dance_logger.mpb: - * DAnCE/MPC/config/dance_plan_launcher.mpb: - * DAnCE/MPC/config/dance_skel.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_stub.mpb: - * DAnCE/MPC/config/dance_tools.mpb: - * MPC/config/ciao_deployment_handlers.mpb: - * MPC/config/ciao_logger.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciaoexe.mpb: - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - Added missing - // -*- MPC -*- - -Tue Jun 29 11:09:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html: - Minor changes. - -Tue Jun 29 10:57:10 UTC 2010 Martin Corino - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Fixed incorrect fix. - -Tue Jun 29 08:50:10 UTC 2010 Martin Corino - - * NEWS: - Updated. - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Corrected best effort interceptor installations. - -Tue Jun 29 08:50:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - Reverted last changes. - -Tue Jun 29 08:40:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - - * tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - Code layout. Catch InvalidStock exception. - - * tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: - Code layout. - -Tue Jun 29 08:37:04 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - Cleanup code. - -Mon Jun 28 23:55:35 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - - Additional documentation, and added a temporary property to trigger - best effort deployment. - - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.cpp: - - New specialization for extracting boolean values from property - sequences. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Added code to optionally enable best effort deployment semantics, - controlled by --best-effort to the NodeManager at startup. - - * NEWS: - - Updates. - -Mon Jun 28 19:53:55 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Moved plugin/interceptor registration into the NodeManager, so it is - only done once. - -Mon Jun 28 13:43:34 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html - Layout changes. - -Mon Jun 28 13:32:27 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/idl/dds4ccm_Connector.idl: - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl: - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl: - * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl: - * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl: - * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl: - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl: - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl: - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: - * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl: - * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl: - * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl: - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - ccm_dds.idl has become a system file. - -Mon Jun 28 13:34:05 UTC 2010 William R. Otte - - * DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp: - - Fix for wchar compile error. - -Mon Jun 28 13:31:10 UTC 2010 Martin Corino - - * DAnCE/MPC/config/dance_split_plan.mpb: - Fix for static link problems. - -Mon Jun 28 13:28:09 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/MPC/config/dance_locality_manager.mpb: - * DAnCE/MPC/config/dance_stub.mpb: - - Fix for static link problems. - -Mon Jun 28 13:24:10 UTC 2010 Martin Corino - - * DAnCE/MPC/config/dance_installation_handlers.mpb: - * DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc: - Fix for static link errors related to INet lib. - -Mon Jun 28 13:10:04 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.pptx: - Several small extensions and improvements - -Mon Jun 28 13:15:46 UTC 2010 William R. Otte - - * ciao/Base/CIAO_Base.mpc: - - Re-add tabs to the verbatim section to fix install target. - -Mon Jun 28 13:08:23 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp: - - Fixed a bug which would swallow all exceptions from events. - -Mon Jun 28 12:59:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: - Removed Shape_Attributes since we do not use this struct in this tutorial. - -Mon Jun 28 12:53:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - Renamed ShapesCOnnector to ShapeType_conn - -Mon Jun 28 12:13:08 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/StateListenerControl_T.h: - * connectors/dds4ccm/impl/StateListenerControl_T.cpp: - Added _get_component method to the listener controllers. - -Mon Jun 28 09:44:34 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc - Add typecode and lib . - -Mon Jun 28 09:34:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp: - Added filter_config to these tests. - - * tutorials/Quoter/Simple/descriptors/run_test.pl: - Resolved script error. - -Mon Jun 28 09:35:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl: - Small changes to let the PSAT connector compile when no dds vendor - is enabled - -Mon Jun 28 09:06:34 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc: - Wrong lib path. - -Mon Jun 28 08:42:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - Resolved warnings. - -Mon Jun 28 08:37:18 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Resolved minor valgrind issue. - - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - Optimized script in order to reveal the real errors better. - -Mon Jun 28 02:24:44 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.tpp: - * DAnCE/DAnCE/DAnCE_Utility.cpp: - * DAnCE/LocalityManager/Interceptors/Best_Effort.h: - * DAnCE/LocalityManager/Interceptors/Best_Effort.cpp: - * DAnCE/LocalityManager/Interceptors/Error_Interceptors.mpc: - - Added best effort interceptors. - -Sat Jun 26 20:46:09 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - - Error reporting improvements. - -Sat Jun 26 18:46:01 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h: - - Layout changes. - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - - Expanded supported exceptions in throw_exception_from_any. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Install standard error interceptor. - - * DAnCE/LocalityManager/Interceptors: - * DAnCE/LocalityManager/Interceptors/DAnCE_Error_Interceptors_export.h: - * DAnCE/LocalityManager/Interceptors/Error_Interceptors.mpc: - * DAnCE/LocalityManager/Interceptors/Standard_Error.h: - * DAnCE/LocalityManager/Interceptors/Standard_Error.cpp: - - Initial error interceptor drop. - -Sat Jun 26 17:48:39 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Unicode fixes. - -Sat Jun 26 13:34:04 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html - Fuzz - -Sat Jun 26 05:34:04 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - - Collapsed all interceptors into a single interface in preparation - for the best-effort interceptor. - - * DAnCE/DAnCE/DAnCE_Core.mpc: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp: - - Provided a default interceptor implementation with no-op - methods. All other interceptors should derive from this. - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Updates from the above. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Slight bugfix in the event an endpoint reference is nil. - - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.inl: - * DAnCE/LocalityManager/Scheduler/Events/Action_Base.h: - * DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Configured.h: - * DAnCE/LocalityManager/Scheduler/Events/Configured.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Connect.h: - * DAnCE/LocalityManager/Scheduler/Events/Connect.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.h: - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Install.h: - * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Passivate.h: - * DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Remove.h: - * DAnCE/LocalityManager/Scheduler/Events/Remove.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Start.h: - * DAnCE/LocalityManager/Scheduler/Events/Start.cpp: - - Re-factored the the deployment events to use a common - implementation specialized using the template method pattern. - This expands the error handling improvements from - Thu Jun 24 14:29:10 UTC 2010 Martin Corino to - all deployment events. - -Fri Jun 25 14:15:51 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - If no dds vendor has been enabled, than we have to use typecode - as base project - -Fri Jun 25 14:06:12 UTC 2010 Jeff Parsons - - * NEWS: - - Updated for next release. - -Fri Jun 25 13:53:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc: - Renamed Shapes_conn.idl to Shapes_ShapeType_conn to indicate which datatype - the connector provided. - -Fri Jun 25 13:46:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: - Renamed ShapeType to ShapeType_msg to indicate a DDS message. - -Fri Jun 25 13:41:21 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/ports/Shapes_Control_obj.mpc: - Moved the Shapes_Control_obj idl to the ports directory of the Shapes_asm. - -Fri Jun 25 13:27:42 UTC 2010 Johnny Willemsen - - * NEWS: - Extended the release notes for 0.8.0, ACE_FOR_TAO MPC configuration - is dropped for CIAO - -Fri Jun 25 13:02:45 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial - * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/artifacts.cdp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/connections.cdp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/implementation.cdp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/instance.cdp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Tutorial/images - * connectors/ami4ccm/tutorials/Hello/Tutorial/images/images.png - * connectors/ami4ccm/tutorials/Hello/Tutorial/images/system.png - Tutorial documents and associated code, pictures, cdp. - -Fri Jun 25 12:57:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - Implemented get_instance + code alignment. - -Fri Jun 25 12:54:45 UTC 2010 Johnny Willemsen - - * DAnCE/tests/Parsing/run_test.pl: - Improved this script to give more feedback - -Fri Jun 25 12:42:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener.h: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Created a singleton DDSDomainParticipant and - DDSTopic manager. This manager manages the reuse - of DomainParticipants and Topics. - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/Topic_T.h: - Removed unnecessary header files. - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved runtime errors. - -Fri Jun 25 09:40:42 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/NDDS_DDS4CCM_CIAO.mwc: - Updated because of directory renames - -Fri Jun 25 09:13:26 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - Use a better name for the instantiated templated module - -Fri Jun 25 08:43:11 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Use traits for return types - -Fri Jun 25 03:02:36 UTC 2010 James H. Hill - - * tutorials/Quoter/Simple/Model/Quoter.xme: - - Updated artifact location to be consistent with the - current state of the CIAO tutorial. - -Fri Jun 25 01:47:39 UTC 2010 James H. Hill - - * tutorials/Quoter/Simple/03.html: - * tutorials/Quoter/Simple/Model/Quoter.xme: - * tutorials/Quoter/Simple/images/fig10.jpg: - * tutorials/Quoter/Simple/images/fig11.jpg: - * tutorials/Quoter/Simple/images/fig12.jpg: - * tutorials/Quoter/Simple/images/fig2.jpg: - * tutorials/Quoter/Simple/images/fig3.jpg: - * tutorials/Quoter/Simple/images/fig4.jpg: - * tutorials/Quoter/Simple/images/fig5.jpg: - * tutorials/Quoter/Simple/images/fig6.jpg: - * tutorials/Quoter/Simple/images/fig6a.jpg: - * tutorials/Quoter/Simple/images/fig7.jpg: - - Updated CoSMIC portion of StockQuoter tutorial. - - * tutorials/Quoter/Simple/images/fig5a.jpg: - - Removed this file. - -Thu Jun 24 19:01:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp: - Removed all code for possible other DDS vendors, integrating more - vendors should be done using C++ template specialization instead - of hacking it into the methods for RTI DDS. This is now possible - because the core library is now a big C++ templated library, for - each vendor we can define a C++ template specialization - -Thu Jun 24 18:57:22 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Fixed typo in debug messages - - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp: - Fixed invalid entry points - -Tue Jun 24 18:159:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_defn.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_defn.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_obj.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/ports/Hello_Receiver_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/ports/Hello_Sender_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h - Changes in dir structure and naming. - -Thu Jun 24 18:07:39 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc: - Fixed casing after rename from Ports to ports - -Thu Jun 24 18:03:39 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Added base project to fix warnings on linux - -Thu Jun 24 17:57:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - Enabled some more test IDL - -Thu Jun 24 15:12:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataWriterListener_T.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.h: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/StateListenerControl_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - Consistently added/renamed header guard. - -Thu Jun 24 14:29:10 UTC 2010 Martin Corino - - * LocalityManager/Handler/LocalityActivator_Impl.cpp: - * LocalityManager/Handler/LocalityActivator_Impl.h: - Fixed detection of spawn failures or premature process exits. - - * DAnCE/DAnCE_Utility.cpp: - * DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE_Utility.tpp: - Added utility methods for handling exception to/from Any conversion. - - * LocalityManager/Scheduler/Events/Install.cpp: - Added default exception handling behaviour in case no post_install - interceptors have been registered. - Fixed exception reporting and propagation. - - * NodeApplication/NodeApplication_Impl.cpp: - Added correct exception detection and handling to locality manager - install handling. - -Thu Jun 24 14:04:01 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Use new way to get access to DDS entity - -Thu Jun 24 13:58:15 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/DataWriter.cpp: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Added new DataWriter class that just stores the pointer to the - underlying DDS entity - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - Use the new base which is not templated which is much easier for - the user - - * connectors/dds4ccm/impl/dds: - Removed this directory - -Thu Jun 24 13:00:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc: - This test needs anytypecode - -Thu Jun 24 12:43:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Changed code to get to the underlying dds entities - -Thu Jun 24 12:34:58 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - Changed code to get to the underlying dds entities - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Const change - -Thu Jun 24 12:13:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved compile errors. - -Thu Jun 24 11:42:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.h: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.h: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener.h: - * connectors/dds4ccm/impl/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Log_Macros.h: - * connectors/dds4ccm/impl/Log_Macros.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/StateListenerControl_T.h: - * connectors/dds4ccm/impl/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/StatusCondition.h: - * connectors/dds4ccm/impl/StatusCondition.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TimeUtilities.h: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Topic_T.h: - * connectors/dds4ccm/impl/Topic_T.cpp: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Utils.h: - * connectors/dds4ccm/impl/Utils.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds: - * connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/opendds: - * connectors/dds4ccm/impl/splice: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Policies/deadline_qos_test.h: - * connectors/dds4ccm/tests/Policies/dest_order_qos_test.h: - * connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h: - * connectors/dds4ccm/tests/Policies/dp_qos_test.h: - * connectors/dds4ccm/tests/Policies/dr_qos_test.h: - * connectors/dds4ccm/tests/Policies/dur_qos_test.h: - * connectors/dds4ccm/tests/Policies/dur_service_qos_test.h: - * connectors/dds4ccm/tests/Policies/duration.h: - * connectors/dds4ccm/tests/Policies/dw_qos_test.h: - * connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h: - * connectors/dds4ccm/tests/Policies/group_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/hist_qos_test.h: - * connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h: - * connectors/dds4ccm/tests/Policies/lifespan_qos_test.h: - * connectors/dds4ccm/tests/Policies/liveliness_qos_test.h: - * connectors/dds4ccm/tests/Policies/octet_seq.h: - * connectors/dds4ccm/tests/Policies/ownership_qos_test.h: - * connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h: - * connectors/dds4ccm/tests/Policies/partition_qos_test.h: - * connectors/dds4ccm/tests/Policies/presentation_qos_test.h: - * connectors/dds4ccm/tests/Policies/pub_qos_test.h: - * connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h: - * connectors/dds4ccm/tests/Policies/reliability_qos_test.h: - * connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h: - * connectors/dds4ccm/tests/Policies/sub_qos_test.h: - * connectors/dds4ccm/tests/Policies/tbf_qos_test.h: - * connectors/dds4ccm/tests/Policies/tp_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/tp_qos_test.h: - * connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h: - * connectors/dds4ccm/tests/Policies/user_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/dds/ContentFilterSetting.h: - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/dds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataListenerControl_T.h: - * connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter_T.h: - * connectors/dds4ccm/impl/dds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/Log_Macros.h: - * connectors/dds4ccm/impl/dds/Log_Macros.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.h: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher_T.h: - * connectors/dds4ccm/impl/dds/Publisher_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition_T.h: - * connectors/dds4ccm/impl/dds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition_T.h: - * connectors/dds4ccm/impl/dds/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/StateListenerControl_T.h: - * connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/dds/StatusCondition.h: - * connectors/dds4ccm/impl/dds/StatusCondition.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Subscriber_T.h: - * connectors/dds4ccm/impl/dds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/dds/TimeUtilities.h: - * connectors/dds4ccm/impl/dds/TopicDescription_T.h: - * connectors/dds4ccm/impl/dds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.h: - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic_T.h: - * connectors/dds4ccm/impl/dds/Topic_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.h: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Utils.h: - * connectors/dds4ccm/impl/dds/Utils.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.h: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - * connectors/dds4ccm/impl/dds/dds4ccm_dds_impl_export.h: - * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/dds/ndds: - - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/StringSeq.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/opendds: - * connectors/dds4ccm/impl/dds/splice: - Moved all core files up one level. - -Thu Jun 24 09:41:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp: - Fuzz - -Thu Jun 24 09:23:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher_T.cpp: - Passing the type datawriter onto the listener. - -Thu Jun 24 09:23:25 UTC 2010 Johnny Willemsen - - * bin/generate_component_mpc.pl: - Use dynamicflags += - -Thu Jun 24 08:52:51 UTC 2010 Johnny Willemsen - - * *.mpc: - Use dynamicflags += - -Thu Jun 24 08:29:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - Build in extra check for errors. - -Thu Jun 24 08:22:13 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Further cleanup to get this working on windows - - * MPC/config/dds4ccm_ddsonly.mpb: - Removed this file. - -Thu Jun 24 08:03:24 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Improvements to these files - -Thu Jun 24 07:39:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp: - Warnings. - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved compiler error related to templated DDS4CCM core. - -Thu Jun 24 07:34:01 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc: - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: - No need to use anytypecode as base project together with - dds4ccm_ts_default, dds4ccm_ts_default is now derived from typecode, - easier to maintain but also a slightly footprint reduction - -Thu Jun 24 07:13:02 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - RTI DDS needs the TAO_IDL typecodes, so use typecode as base project - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - Extended templates - - * connectors/dds4ccm/tests/Derived/Derived.mpc: - Cleanup - - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - Added some more test IDL - -Thu Jun 24 07:08:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter_T.h: - * connectors/dds4ccm/impl/dds/Publisher_T.h: - * connectors/dds4ccm/impl/dds/Subscriber_T.cpp: - Passed the typed DataReader onto the listener. When DDS invokes - a callback, we're able to use the typed datareader straight away. - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - Resolved compiler errors due to templated DDS4CCM core. - -Wed Jun 23 16:56:33 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/NDDS_DDS4CCM_CIAO.mwc: - - Added missing MPC file DDS4CCM_skel.mpc. - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - - Uncommented connector attributes that were causing - build problems. - - * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - - Added include of dds4ccm_Connector.idl, so we can - process ccm_dds_psat.idl as stub-only. - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - - Overhaul to fix numerous build problems. - -Wed Jun 23 13:52:17 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Added some missing base projects - -Wed Jun 23 13:42:51 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Removed projects, ccm_dds_psat.idl shouldn't be used to generate - a connector, it only contains the templated module - -Wed Jun 23 13:22:12 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - Added another commented out connector, seems to fail with TAO_IDL - -Wed Jun 23 13:09:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_defn.mpc - Rename _defn projects, cleanup code. - -Wed Jun 23 12:42:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc - Remove obsolete conn_xxx_idl_gen - -Wed Jun 23 12:16:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_defn.mpc - Add missing file. - -Wed Jun 23 12:08:51 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Initialise pointer with 0 - - * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: - When we get a CORBA exception, also log the _info from that exception - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Removed debug line that seems to be a left over - -Wed Jun 23 11:48:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp: - Renamed CCM_DDS_DomainPublisherListener to - CCM_DDS_DomainParticipantListener. - -Wed Jun 23 11:43:00 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp: - Added missing file. - -Wed Jun 23 11:38:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/dds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter_T.h: - * connectors/dds4ccm/impl/dds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher_T.h: - * connectors/dds4ccm/impl/dds/Publisher_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition_T.h: - * connectors/dds4ccm/impl/dds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition_T.h: - * connectors/dds4ccm/impl/dds/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/dds/StatusCondition.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Subscriber_T.h: - * connectors/dds4ccm/impl/dds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription_T.h: - * connectors/dds4ccm/impl/dds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic_T.h: - * connectors/dds4ccm/impl/dds/Topic_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Gave all the templated classes a proper name and all - templated files a proper file name. - - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/ReadCondition.cpp: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicDescription.cpp: - * connectors/dds4ccm/impl/dds/TopicListener.h: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - Removed these files. - -Wed Jun 23 11:28:53 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.cpp: - Moved method to non inline - -Wed Jun 23 11:09:38 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Layout, const, and initialise pointers with 0 changes - -Wed Jun 23 10:23:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_defn.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_obj.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h - Implement _defn.idl, improve mpc files, clean code . - -Wed Jun 23 10:22:33 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.cpp: - Catch exceptions as const, initialise pointers to 0 and fixed - an incorrect log line - -Wed Jun 23 08:58:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/ReadCondition.cpp: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicDescription.cpp: - * connectors/dds4ccm/impl/dds/TopicListener.h: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc: - Made almost all DDS4CCM classes templated classes. - - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: - Code alignment. - - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - Removed these files. - -Wed Jun 23 08:42:39 UTC 2010 Johnny Willemsen - - * tests/Bug_3832_Regression/run_test.pl: - Set DANCE_ROOT to get locality manager - -Wed Jun 23 07:10:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - Commented the attributes in the psat connector for the moment, they - are the last part not working yet, this way we can already build - psat on all build system, Jeff will sort out the attribute issue - later today - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Removed last dummy_label - -Wed Jun 23 07:05:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Removed -SS flag that caused an include of ccm_ddsS.h to not be - there - -Wed Jun 23 06:59:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - RTI DDS doesn't seem able to handle the ccm_dds.idl correctly - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Enabled a few more projects and fixed some dependencies - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - This works now with rti 4.5b rev 01 - -Tue Jun 22 19:00:58 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - - New file, hand-written template connector implementation. - - * connectors/dds4ccm/tests/PSAT/psat_conn.idl: - * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - - Renamed psat_conn.idl as PSAT_Connector.idl, since all - dependent filenames in the MPC file were based on - that name. - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - - Modified projects to reflect the new IDL file name - above. - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - - Removed comments to make the file more readable. - -Tue Jun 22 18:31:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Various cleanup, layout, const changes - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Corrected filenames - -Tue Jun 22 15:33:18 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - - Added user connection impl template file to the exec project. - -Tue Jun 22 15:21:58 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector.h: - - Changed the names of the derived connector impl template - classes to be the IDL connector name with '_Connector_T' - appended, so the IDL compiler can have a rule to use in - the general case for generating the name of the connector - impl base class. - -Tue Jun 22 14:06:31 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - - Removed dummy_label on connector impl build. - -Tue Jun 22 12:57:29 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl: - Enabled some more test idl - -Tue Jun 22 12:49:38 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl: - - Uncommented the IDL that was causing the redefition errors, - problem has been fixed. - -Tue Jun 22 12:08:58 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Disabled the cif tests until we have converted these to the locality - manager - - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - Layout changes - -Tue Jun 22 11:49:10 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - Removed not used member - -Tue Jun 22 11:32:21 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Added missing empty Source_Files section - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Added dummy_label back for the connector until Jeff has addressed - an issue in tao_idl - - * tests/Bug_3832_Regression/run_test.pl: - use dance_locality_manager - -Tue Jun 22 09:17:10 UTC 2010 Martin Corino - - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.cpp: - Fixed unused argument warning. - - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.inl: - Added missing file. - - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.h: - Added missing destructor. - Added missing constructor implementation. - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - Added missing baseproject. - - * DAnCE/MPC/config/dance_locality_handler.mpb: - Added missing baseproject. - -Tue Jun 22 08:35:13 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_defn.idl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_obj.idl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/Ports/Hello_Receiver_comp.idl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/Ports/Hello_Sender_comp.idl: - Add Id strings. - -Tue Jun 22 00:57:13 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme: - - Update to latest model. - -Mon Jun 21 23:15:11 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Updated scheduler to borrow the ORB thread in the event that it is - launched with a thread pool of size zero. This is used in the Locality - Manager to ensure that the thread switch tests pass in dds4ccm. - -Mon Jun 21 18:21:01 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl: - Corrected some mistakes and commented out the correct idl - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl: - Reverted some changes that should have go to another test - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - Layout changes - -Mon Jun 21 14:57:36 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl: - Readded some commented out IDL that doesn't work yet - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello.mpc: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc: - Made MPC project names unique - -Mon Jun 21 14:37:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Fixed valgrind invalid read errors and also changed this test to - be more precise in its testing - -Mon Jun 21 14:09:51 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Use correct data type to interate through a CORBA sequence - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - Layout changes - -Mon Jun 21 13:20:10 UTC 2010 Martin Corino - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Close plugin manager singleton in Locality Manager destructor. - Fixes pure virtual method exceptions. - -Mon Jun 21 11:16:10 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - Enabled ami4ccm some more interfaces - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl: - Commented out the uses multiple ports for the moment - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc: - Added this file - - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl: - Added some more test idl but this is commented out, uncovered an issue - in tao_idl - -Mon Jun 21 11:03:04 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello - * connectors/ami4ccm/tutorials/Hello/Hello_asm - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/Doc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/Ports - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/Ports/Hello_Receiver_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Doc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_obj.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Ports/Hello_defn.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/Doc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/Ports - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/Ports/Hello_Sender_comp.idl - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h - First base tutorial. - -Mon Jun 21 10:59:59 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl: - New file with some more test components, mpc is following when - this fails compiles without problems with tao_idl - -Mon Jun 21 08:46:04 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.h: - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Added some more documentation - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Some initial updates - -Mon Jun 21 07:45:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp: - Updated because of changes to generated entry points - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/Derived/Derived.idl: - * connectors/dds4ccm/tests/Derived/Derived.mpc: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - New test to validate code generation when an end user derives their - own connector from one of the standard defined connectors. This is - a reproducer for Jeff, the _conn.h/cpp file lack some traits and - generate the wrong template - -Mon Jun 21 05:03:16 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme: - * connectors/dds4ccm/examples/Shapes/models/Shapes.xme: - - Updated version of Shapes example. - -Sun Jun 20 21:28:17 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Warning fix. - -Sun Jun 20 21:25:03 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: - - Compile fixes. - -Sun Jun 20 17:48:00 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - - Layout changes. - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Scheduler integration - - - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.h: - * DAnCE/LocalityManager/Scheduler/Events: - * DAnCE/LocalityManager/Scheduler/Events/Configured.h: - * DAnCE/LocalityManager/Scheduler/Events/Configured.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Connect.h: - * DAnCE/LocalityManager/Scheduler/Events/Connect.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.h: - * DAnCE/LocalityManager/Scheduler/Events/Endpoint.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Install.h: - * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Passivate.h: - * DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Remove.h: - * DAnCE/LocalityManager/Scheduler/Events/Remove.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Start.h: - * DAnCE/LocalityManager/Scheduler/Events/Start.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - - Re-factored event scheduler events. - - * DAnCE/MPC/config/dance_completion_counter.mpb: - * DAnCE/MPC/config/dance_deployment_scheduler.mpb: - - Linking fixes/MPC optimization. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfixes. - - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Added factory methods, re-arranged configuration logic. - - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Deployment/Interceptors/Name_Utilities.h: - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - - Moved initial deployment interceptors into CIAO. - - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.h: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/LocalityManager/Daemon/Name_Utilities.h: - * DAnCE/LocalityManager/Daemon/Name_Utilities.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.cpp: - - Removed these files. - -Sun Jun 20 13:10:16 UTC 2010 James H. Hill - - * connectors/ami4ccm/models: - * connectors/ami4ccm/models/ami4ccm.xme: - - PICML model for the ami4ccm backend. - - * connectors/dds4ccm/models/dds4ccm.xme: - - Update of dds4ccm PICML model after updating the PICML metamodel to - completely support IDL statements it was currently lacking, such as - 'native' and array struct members. - - * connectors/dds4ccm/examples/Shapes/models/Shapes.xme: - - Regenerated Shapes example. - -Fri Jun 18 20:29:14 UTC 2010 William R. Otte - - * MPC/config/ciao_base.mpb: - - Missing from a previous commit. - -Fri Jun 18 19:40:33 UTC 2010 William R. Otte - - * tools/XML/XercesString.cpp: - - Attempt at a fix for a memory leak detected by valgrind. - -Fri Jun 18 19:06:00 UTC 2010 William R. Otte - - * ciao/Base: - * ciao/ComponentServer: - - Renamed ComponentServer to Base. - - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Fallout from above change. - -Fri Jun 18 18:38:59 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - Added new pragma to generate implementation header - - * connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h: - Removed this file, not needed anymore - -Fri Jun 18 18:32:21 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/idl/ccm_dds.idl: - - Added 2 pragma directives, both of a new type added to - the IDL compiler, directing it to generate an include - for the DDS connector impl template class. These added - directives are for the DDS_State and DDS_Event connectors. - -Fri Jun 18 18:18:54 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * MPC/config/ciao_deployment_handlers.mpb: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - - Fallout from removal of CIAO component server. - - * ciao/ComponentServer/CIAO_Base.mpc: - * ciao/ComponentServer/Client_init.h: - * ciao/ComponentServer/Server_init.h: - - Restructured into the CIAO_Base library. Directory will be - renamed in a future commit. - - * tests/CIF/Common/CIF_Common.mpc: - * tests/CIF/Navigation/Navigation.mpc: - * tests/CIF/Receptacle/Receptacle.mpc: - - Disabled until they can be re-implemented without the CIAO - compoenent server. - - * MPC/config/ciao_componentserver_stub.mpb: - * MPC/config/ciao_componentserver_svnt.mpb: - * MPC/config/ciao_cs_client.mpb: - * ciao/ComponentServer/CIAO_CS_Client.idl: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h: - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: - * ciao/ComponentServer/CIAO_ComponentServer_Task.h: - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer_Task.h: - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - - Removed the CIAO component server. - - * tests/CIAO_ComponentServer: - * tests/CIAO_ComponentServer/Activator: - * tests/CIAO_ComponentServer/Activator/Activator.mpc: - * tests/CIAO_ComponentServer/Activator/client.cpp: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic: - * tests/CIAO_ComponentServer/Basic/Basic.mpc: - * tests/CIAO_ComponentServer/Basic/client.cpp: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - * tests/CIAO_ComponentServer/Local_Facet: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp: - * tests/CIAO_ComponentServer/Local_Facet/client.cpp: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - * tests/CIAO_ComponentServer/SimpleComponent: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.idl: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h: - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - - Removed testing of CIAO component server. These features are already tested - in other places for the new infrastructure. - -Fri Jun 18 17:47:10 UTC 2010 Martin Corino - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Fixed incorrectly place #endif. - -Fri Jun 18 17:40:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Initialise pointer to 0 - - * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp: - * tools/XML/XML_Helper.tpp: - Layout changes - -Fri Jun 18 13:56:01 UTC 2010 William R. Otte - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - - Remove mcpp. - -Fri Jun 18 13:43:02 UTC 2010 William R. Otte - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - - Removed un-needed complex types from this example. - -Fri Jun 18 12:13:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - Set domain_id to 0 because the RTI shapes demo only listens - on Domain 0. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - Update. - -Fri Jun 18 12:13:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Layout changes - -Fri Jun 18 12:04:03 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Code cleanup - -Fri Jun 18 12:03:29 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Deployment_Event.cpp: - - Compile fix for non-inline builds. - -Fri Jun 18 11:40:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/artifacts.cdp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/connections.cdp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/implementation.cdp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Deployment/instance.cdp: - Update. - -Fri Jun 18 11:41:47 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Removed static - -Fri Jun 18 11:19:53 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Fixed double delete - -Fri Jun 18 07:21:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html: - Update. - -Fri Jun 18 06:43:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/02_idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/04_dds4ccm.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/05_coding.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Numbered html files. - -Fri Jun 18 06:39:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Outline of this tutorial. - -Fri Jun 18 03:30:20 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Deployment_Event.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Fuzz. - -Fri Jun 18 03:25:00 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Event.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.cpp: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - - Improved mechanism to wait on completion of deployment - events based on the completion counter. - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Updated to use new completion system. - - * DAnCE/tools/Completion/Completion_Counter_Base.h: - * DAnCE/tools/Completion/Completion_Counter_Base.inl: - - Added new method so subclasses can increment expected - events. Also resolved possible deadlock condition - by releasing locks before making outbound calls - on user code. - - * DAnCE/LocalityManager/Scheduler/Deployment_Events.tpp: - - Removed this file. - -Thu Jun 17 19:22:51 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - - Layout change. - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - - Bugfixes in the callback code to accomodate non-orb managed threadpools. - - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - - Changed how internal Activator is configured. - - * DAnCE/LocalityManager/Scheduler/Deployment_Events.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Linking fixes and minor changes in exception handling. - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Integration of Deployment Scheduler to NodeApplication. - -Thu Jun 17 19:18:13 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_nodeapplication.mpb: - - Link in the scheduler to the NodeApplication. - -Thu Jun 17 19:16:55 UTC 2010 William R. Otte - - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Store a reference in the POA in the property map. - -Thu Jun 17 19:15:04 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - - Added property to indentify the entity POA. - - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.tpp: - - Added a utility method to extract exceptions from an Any. - -Thu Jun 17 15:34:10 UTC 2010 Martin Corino - - * DAnCE/tools/Completion/Completion_Counter_Base.inl: - * DAnCE/tools/Completion/Completion_Counter_Base.h: - Added error collection. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp: - Fixed error propagation. - -Thu Jun 17 14:48:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Fuzz. - -Thu Jun 17 14:40:00 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - Changed in order to meet the generated code better. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html: - Generated executors. - -Thu Jun 17 13:05:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/images/images.png: - Added header and footer. - -Thu Jun 17 12:57:10 UTC 2010 Martin Corino - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Clean up. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Fixed plan teardown; added missing destroy of managers in process. - Added -f|--force argument to plan launcher. - -Thu Jun 17 12:56:13 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_Base.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl: - Use full path for the include - -Thu Jun 17 12:41:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Update. - -Thu Jun 17 12:28:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Update. - -Thu Jun 17 11:43:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - Extended and corrected some minor errors. - -Thu Jun 17 11:27:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl: - Removed COLOR enum since it isn't used. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/images: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/images/system.png: - Starter. - -Thu Jun 17 11:22:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - Cleanup - -Thu Jun 17 09:09:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_exec.cpp: - Renamed executor files. Also renamed artifacts. - -Thu Jun 17 08:41:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/ports/ShapesControl_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/ports/ShapesControl_obj.mpc: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/ShapesControl_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/ShapesControl_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/ShapesControl_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/ShapesReceiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/ShapesReceiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/ShapesReceiver_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/ShapesSender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/ShapesSender_exec.cpp: - Renamed directories (underscore between Shapes and Sender/Control/Receiver). - -Thu Jun 17 08:43:11 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Cleanup and some simplifications - -Thu Jun 17 08:33:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp: - Renamed file (underscore between Shapes and Sender/Control/Receiver). - -Thu Jun 17 08:15:26 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/run_test.pl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: - Reorganized descriptors directory. - -Thu Jun 17 08:06:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp: - Reorganized the mpc files. Also created a consistent format of the mpc-files regarding - the attributes like sharedname/includes. - -Thu Jun 17 07:58:29 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Const, layout, and memory management changes - -Thu Jun 17 07:43:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Cleanup, no caching in executors - -Thu Jun 17 04:21:51 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme: - - Complete model for the Shapes example. - -Wed Jun 16 19:13:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - Resolved memory leak. - -Wed Jun 16 18:42:26 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.h: - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Updater_T.h: - * connectors/dds4ccm/impl/dds/Writer_T.h: - Layout changes - -Wed Jun 16 14:20:13 UTC 2010 Simon Massey - - * connectors/dds4ccm/NDDS_DDS4CCM_CIAO.mwc: - - Removed refereance to $(CIAO_ROOT)/connectors/dds4ccm/impl/logger - directory removed by: Wed Jun 9 18:51:13 UTC 2010 Johnny Willemsen - -Wed Jun 16 13:49:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb: - Fuzz. - -Wed Jun 16 13:38:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp: - Added error handling. - -Wed Jun 16 12:58:24 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models/README: - * connectors/dds4ccm/models/README: - - Added several README documents. - -Wed Jun 16 12:51:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: - Created a _defn.idl file for definition like return values. - -Wed Jun 16 12:46:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp: - Cleanup, no caching in executors - -Wed Jun 16 12:04:34 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Deployment_Events.h: - - fuzz. - -Wed Jun 16 12:01:10 UTC 2010 Martin Corino - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Change to prevent loss of plan information. - -Wed Jun 16 11:37:27 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added shapes tutorial to the test framework. - -Wed Jun 16 11:35:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: - Implemented the shapes contoller. - -Wed Jun 16 10:36:10 UTC 2010 Martin Corino - - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp: - * DAnCE/tools/Split_Plan/Sub_UUID_Generator.h: - Changed to use a simpler way to generate unique sub plan - ids which are more readable as well. - -Wed Jun 16 09:17:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ShapesControl_obj.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesControl.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ports/Shapes_Control_obj.idl: - Added a non-DDS controller which controls the sender. Functionality needs to be - added. - -Wed Jun 16 09:01:10 UTC 2010 Martin Corino - - * DAnCE/MPC/config/dance_installation_handlers.mpb: - Added missing base project. - - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: - Improved thread safety. - -Wed Jun 16 06:43:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp: - Renamed names of entrypoints - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: - Resolved errors in deployment plan. - -Wed Jun 16 06:25:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Models: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/ShapesReceiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesControl.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ShapesSender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_conn.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: - * connectors/dds4ccm/tutorials/Shapes/Tutorial: - First iteration. - -Wed Jun 16 05:23:27 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models: - * connectors/dds4ccm/examples/Shapes/models/Shapes.xme: - - Shapes PICML model that can be used to generate IDL. - - * connectors/dds4ccm/models: - * connectors/dds4ccm/models/dds4ccm.xme: - - dds4ccm PICML library. - -Wed Jun 16 01:37:51 UTC 2010 William R. Otte - - * ChangeLog: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - * DAnCE/MPC/config/dance_deployment_scheduler.mpb: - - Fuzz fix. - -Wed Jun 16 01:25:06 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.inl: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.tpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Events.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.h: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler.cpp: - * DAnCE/LocalityManager/Scheduler/Deployment_Scheduler_export.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - * DAnCE/MPC/config/dance_deployment_scheduler.mpb: - - New asynchronus deployment scheduler. This is not currently - integrated with the NodeApplication and LocalityManager - - these updates will be committed shortly. - -Wed Jun 16 01:20:47 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.h: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - - Updates to comply with new handler/interceptor interface. - -Wed Jun 16 01:18:58 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Updates to comply with new handler interface. - -Wed Jun 16 01:17:50 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - - Added configuration hooks and reformatted IDL. - - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.cpp: - - Added method to reconstruct property sequence from property - map. - -Wed Jun 16 01:16:25 UTC 2010 William Otte - - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: - - Compile fix for OS X. - -Tue Jun 15 22:36:10 UTC 2010 Martin Corino - - Finishing integration of artifact installation. - - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: - Fixed problems with multiple installations of single artifacts - (i.e. reuse of artifacts in multiple instances). - - * DAnCE/DAnCE/DAnCE_Properties.idl: - Added some Locality Manager properties. - - * DAnCE/DAnCE/DAnCE_Utility.tpp: - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.cpp: - Added update_property_value template methods. - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - Added handling of search path properties. - - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Integrated Artifact Installation. - -Tue Jun 15 18:55:51 UTC 2010 Johnny Willemsen - - * tutorials/Quoter/Simple/03.html: - Updated several links - -Tue Jun 15 17:59:29 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/GetComponent/Event/*: - Added tests for _get_component on DDS_Event connector. - -Tue Jun 15 12:56:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Cleanup, no caching in executors - -Tue Jun 15 12:45:14 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp: - Cleanup, no caching in executors - -Tue Jun 15 11:06:40 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - Cleanup, no caching in executors - -Tue Jun 15 10:05:28 UTC 2010 Johnny Willemsen - - * docs/tutorials: - * tutorials: - Moved tutorials one level up - -Tue Jun 15 09:58:17 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * connectors/dds4ccm/tests/PSAT/psat_conn.idl: - * connectors/dds4ccm/tests/PSAT/psat_type.idl: - Started to add a connector instanatiation - -Tue Jun 15 09:42:41 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h - Change cdp, add more receiver instances and change therefore receiver - test properties. - -Tue Jun 15 08:13:41 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/SimplexMulti - * connectors/ami4ccm/tests/SimplexMulti/Base - * connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl - * connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc - * connectors/ami4ccm/tests/SimplexMulti/descriptors - * connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp - * connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl - * connectors/ami4ccm/tests/SimplexMulti/Receiver - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h - * connectors/ami4ccm/tests/SimplexMulti/Sender - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h - * bin/ciao_tests.lst - AMI4CCM test uses and uses multiple side by side. - - -Tue Jun 15 06:44:53 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: - Various layout changes, memory leaks, and code cleanup - -Mon Jun 14 14:50:45 UTC 2010 Adam Mitz - - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: - - Added the GetArchDir() call so that these tests can run in the - ARCH builds. - -Mon Jun 14 14:32:10 UTC 2010 Martin Corino - - * DAnCE/tools/Split_Plan/Split_Plan.h: - Added const iterator typedef. - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Some code reorganization in preparation for artifact installation - integration. - -Mon Jun 14 13:33:19 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added docs/tutorial/Quoter/Simple to the - test framework. - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - StockBrokerDriver in lib directory. - - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - StockDistributerDriver in lib directory. - - * docs/tutorials/Quoter/Simple/descriptors/Plan.cdp: - * docs/tutorials/Quoter/Simple/descriptors/run_test.pl: - Added run_test.pl en corrected errors in deployment plan. - -Mon Jun 14 12:51:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Added requires to fix warnings because of no target - -Mon Jun 14 12:35:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp: - Setting the component of the ports to nil on ccm_remove. - -Mon Jun 14 12:36:03 UTC 2010 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - Added dds4ccm and ami4ccm core directories - -Mon Jun 14 12:05:20 UTC 2010 Johnny Willemsen - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp: - Readded these files again, they now work again as expected - -Mon Jun 14 11:49:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp: - Removed unnecessary define. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/GetComponent/*: - Test whether _get_component is implemented on - all extended ports. - _get_component is not implemented on the DataListenerControl, - that's why !FIXED_BUG_ONLY. - -Mon Jun 14 11:35:10 UTC 2010 Martin Corino - - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Node_Splitter.h: - * DAnCE/tools/Split_Plan/Node_Splitter.cpp: - * DAnCE/tools/Split_Plan/Locality_Splitter.h: - * DAnCE/tools/Split_Plan/Locality_Splitter.cpp: - * DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp: - Improved locality splitting algorithm. - Added post splitting step to provide for finalization - functionality in splitters (Locality splitter uses - this to make sure a locality manager instance is always - provided). - Other small improvements. - - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Changed to make use of improved locality splitter (in - particular the guarenteed availability of locality - manager instance). - -Mon Jun 14 10:51:43 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.pptx: - Added a sheet with some implementation remarks - -Mon Jun 14 10:43:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp: - is_filter_interpreted is not supported with RTI DDS, throw an - exception in case someone wants to set it - -Mon Jun 14 09:30:10 UTC 2010 Martin Corino - - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp: - Fixed missing virtual destructors. - - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp: - Fixed wchar compile problems. - -Mon Jun 14 09:28:41 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - Add AMI4CCM test UsesMulti - - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp - Expand test for running indeed asynchronous. - -Mon Jun 14 09:07:19 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl: - Moved the new pragma ciao ami4ccm idl to the Base directory, that - way we only have to specify it once, anyone that includes the - UsesMulti.idl will get the additional needed UsesMultiA.idl included - -Mon Jun 14 08:10:41 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp - Change plan for uses multi asynchronous. - -Sun Jun 13 18:02:41 UTC 2010 Johnny Willemsen - - * DAnCE/tests/Parsing/test.cpp: - Disable DANCE tracing by default - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Fixed windows problems - -Sat Jun 12 09:32:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp: - Avoided 'Error' in log message. - -Sat Jun 12 09:30:28 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Corrected path to Parsing/PlanLauncher test. - -Sat Jun 12 06:31:42 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Corrected directory to Deployments tests of - ContentFilteredTopic test. - -Fri Jun 11 18:59:12 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - Added guards around RTI specific code - -Fri Jun 11 18:14:22 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: - Made project names unique - -Fri Jun 11 17:50:53 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc: - - Removed references to Conn_UsesMulti_Base_stub, it doesn't - exist. - -Fri Jun 11 17:27:41 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl: - - Added one of the newly supported pragma directives, to - facilitate the compilation of the multiplex receptacle's - associated struct and sequence, when the receptacle is - designated as an AMI port. - -Fri Jun 11 13:37:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - Using duplicates to return basic ports. - -Fri Jun 11 13:17:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - Using duplicate to return interfaces. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp: - Reorganized. - -Fri Jun 11 13:02:08 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc: - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc: - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc: - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc: - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc: - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc: - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc: - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc: - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc: - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc: - Use typecode as new base project when compiling the A.idl files, we - only need the typecodes, not the any operators, thanks to Jeff Parsons - to pointing this out - -Fri Jun 11 12:01:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - Removed the caching of the ports since the context already caches these. Also improved - error handling. - - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Removed blank line. - -Fri Jun 11 12:01:33 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - Fixed memory leaks - - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - A sleep of 999 seconds is really not something we want to do in - a test which we run as part or our test suite - -Fri Jun 11 11:44:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.h: - Various layout and cleanup changes - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Added -SS as idl option - -Fri Jun 11 11:34:18 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - Small improvements to this test code - -Fri Jun 11 11:11:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - Removed the caching of the ports since the context already caches these. - -Fri Jun 11 10:50:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - Added some missing header files. - -Fri Jun 11 10:48:40 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc: - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc: - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc: - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc: - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc: - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc: - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc: - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc: - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc: - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc: - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc: - Added anytypecode as base project when compiling the A.idl file - -Fri Jun 11 09:57:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: - Resolved some memory issues. Also removed the caching of the ports since the context - already caches these. - - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - Resolved some memory issues. - -Fri Jun 11 08:30:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - Renamed parent. - -Fri Jun 11 07:43:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Component: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp: - Rewritten test. Don't use a derived class to test whether connector attributes are - changeable or not but use _get_component instead. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - Removed these files. - -Fri Jun 11 05:59:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - Resolved compile errors due to the -d options - for the RTI dds gen. - -Thu Jun 10 18:37:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - Layout changes - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - Fixed MPC file when no ndds is available - -Thu Jun 10 15:20:31 UTC 2010 Marijke Hengstmengelt - - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp - Solve compile warnings. - -Thu Jun 10 15:10:34 UTC 2010 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test_msm.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Removed -m 1 option from the naming service command line. - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Removed unused ORB_Core.h header file. - -Thu Jun 10 13:33:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h: - Removed unnecessary header file ace/Reactor.h - -Thu Jun 10 12:12:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h: - Removed unnecessary header file ace/Task.h - -Thu Jun 10 12:06:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.h: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.h: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - Make sure the _get_component returns the connector so that the - end user can retrieve the component from the facet - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Improved this test, needs some more work to use DDS_Event - -Thu Jun 10 11:34:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - Removed unnecessary includes. - -Thu Jun 10 09:57:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Thu Jun 10 09:34:59 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Added empty _get_component - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Fixed a crash in this test - -Thu Jun 10 09:27:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: - No multi cast on the naming service necessary. Removed -m 1 option. - -Thu Jun 10 08:29:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - Code alignment. - - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl: - Fuzz. - -Thu Jun 10 08:16:35 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - Cleanup - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl: - Fixed problem in this file - -Thu Jun 10 07:46:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - For now, use the -d option for the RTI dds gen. - -Thu Jun 10 07:44:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - Also generate RTI dds gen files in subdirectory. - -Thu Jun 10 07:25:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - Prevent making all files again when a make is performed a second time. - -Thu Jun 10 07:10:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Resolved test issues. - -Wed Jun 9 21:57:22 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - - Changes to the asynch version of the worker thread class so it - will work with multiplex receptacles. - - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc: - - Restored typecode generation on *A.idl, the AMI4CCM_* - interface can a member of a struct in a component (if - it has an asynch uses port) and this component and its - contents must have typecodes. - -Wed Jun 9 18:51:13 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/Log_Macros.h: - * connectors/dds4ccm/impl/dds/Log_Macros.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/StatusCondition.cpp: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.cpp: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - Moved Log_Macros to the dds4ccm library and updated all includes - - * MPC/config/dds4ccm_logger.mpb: - * connectors/dds4ccm/impl/logger: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - * connectors/dds4ccm/impl/logger/Logger.mpc: - Removed these files, no need for a separate dds4ccm logging library - -Wed Jun 9 18:32:45 UTC 2010 William R. Otte - - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - - Fixed slight mistake in previous commit. - -Wed Jun 9 18:30:00 UTC 2010 William R. Otte - - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - - Use dance_locality_manager instead of NodeApplication. - -Wed Jun 9 14:01:26 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added ContentFilteredTopic deployment and Exception tests. - -Wed Jun 9 13:58:53 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - Check on whether the contentfiltered topic is nil or whether - the expression has been set before setting the filter parameters. - - * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/*: - Added test the check whether several deployment configuration - errors are handled properly. - - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/*: - Test to explicitly test errors on set_filter_parameters. - -Wed Jun 9 13:49:56 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - Cleanup code. Remove printf's. - -Wed Jun 9 11:58:56 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/AsynchT - * connectors/ami4ccm/tests/AsynchT/Base - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc - * connectors/ami4ccm/tests/AsynchT/descriptors - * connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl - * connectors/ami4ccm/tests/AsynchT/Receiver - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h - * connectors/ami4ccm/tests/AsynchT/Sender - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h - AMI4CCM asynchronous test. - -Wed Jun 9 10:13:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - Realigned code. - Only delete contentfilteredtopics which are created. - Using this to determine the name of a contentfiltered topic. - - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp: - Test passes when deployment succeeds. - - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl: - Extended IDL with a DDS_Read port. - - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp: - Setting two filters to test whether the names of the ContentFilteredTopics are - unique. - -Wed Jun 9 08:57:04 UTC 2010 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added string tests - -Wed Jun 9 08:04:49 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added the ContentFilteredTopic test 'ReadGet' to - the test framework. - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.h: - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - Added delete_contentfilteredtopic method. Improved logging. - - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - Calling delete_contentfilteredtopic on remove. - Improved logging. - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Deleted unnecessary code regarding the deletion of - ContentFilteredTopic. This is done by the - delete_contentfilteredtopic method. - - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - Improved logging. - -Wed Jun 9 07:00:31 UTC 2010 Johnny Willemsen - - * docs/tutorials/Quoter/Simple/04.html: - No need to pass in the component server - - * tests/Bug_3769_Regression/Foo.idl: - Removed comment for Jeff - - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added test for string sequences - -Tue Jun 8 22:03:27 UTC 2010 Adam Mitz - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test_msm.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - * tests/CIF/Navigation/run_test.pl: - * tests/CIF/Receptacle/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - - A refinement of yesterday's commit to all of the Perl scripts: - now using the TestTarget-specific GetArchDir. - -Tue Jun 8 17:22:32 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added StateListener and EventListener tests for - ContentFilteredTopic tests to the framework. - - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp: - Configured filters the correct way. Still some issues to resolve - in the core. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Minor code changes. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp: - Configured filters the correct way. - -Tue Jun 8 15:15:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - Renamed connector artifacts. - -Tue Jun 8 15:12:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp: - Renamed connector artifacts. - -Tue Jun 8 15:09:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc: - Resolved mpc issues - -Tue Jun 8 14:36:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc: - Resolved mpc issues - -Tue Jun 8 13:58:20 UTC 2010 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - Added array attributes example, just to validate compilation, no - runtime testing performed at all, probably config handlers need an - update - -Tue Jun 8 13:56:10 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/OneReplyH - * connectors/ami4ccm/tests/OneReplyH/Base - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc - * connectors/ami4ccm/tests/OneReplyH/descriptors - * connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl - * connectors/ami4ccm/tests/OneReplyH/Receiver - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h - * connectors/ami4ccm/tests/OneReplyH/Sender - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h - AMI4CCM test with one replyhandler for more than one request. - -Tue Jun 8 13:44:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ContentFilterSetting.h: - * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc: - Implemented DDS4LwCCM Beta 3 spec regarding contentfilteredTopics. - This could not be fully tested since passing structs from the deployment - plans to the connector didn't work yet. So all accompanying tests will - fail for now. - - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/*: - Added contentfilteredTopics for listeners on the Event connector. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/*: - Added test for the reader and getter extended ports, - having a different query. - - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/*: - Added contentfilteredTopics for listeners on the State connector. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc: - Renamed projects in order to prevent duplicate project names. - -Tue Jun 8 13:20:36 UTC 2010 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed checks for baz - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Fixed baz - -Tue Jun 8 13:16:57 UTC 2010 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed unresolved external and wrong check for structs - -Tue Jun 8 12:54:41 UTC 2010 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo.idl: - Added much more test cases - - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - Added empty accessors, cdp has to be extended and than the code - has to check the set values - -Tue Jun 8 10:12:10 UTC 2010 Martin Corino - - * DAnCE/DAnCE_ArtifactInstallation.idl: - * DAnCE/DAnCE_Core.mpc: - * tools/Artifact_Installation/DAnCE_Artifact_Installation.idl: - * tools/Artifact_Installation/Artifact_Installation_Impl.h: - * tools/Artifact_Installation/Artifact_Installation.mpc: - * MPC/config/dance_artifact_installation.mpb: - Changes to integrate Artifact Installation framework with the - rest of DAnCE. - -Tue Jun 8 09:32:33 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/ptc_09-10-26 DDS4CCM v1-0 WCB.pdf: - Removed this file, old draft document - -Tue Jun 8 09:30:45 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/DDSforCCM-meta.uml: - * connectors/dds4ccm/docs/ccm_dds.idl: - * connectors/dds4ccm/docs/ccm_dds_dlrl.idl: - Updated to beta 3 - -Tue Jun 8 09:20:20 UTC 2010 Johnny Willemsen - - * MPC/config/ami4ccm_lem_stub.mpb: - Because we need access to the container POA we need to link with - a CIAO implementation library - -Tue Jun 8 09:19:10 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Remove fixed_bugs flag from test OneProcess. - -Tue Jun 8 09:13:10 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/OneProcess/descriptors/PlanOne.cdp: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - Change testresult, all in one process should work synchronous. - -Tue Jun 8 07:51:10 UTC 2010 Martin Corino - - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: - * DAnCE/tools/Artifact_Installation/File_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.inl: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h: - * DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp: - Fuzz fizes and namespace semicolons removed. - -Tue Jun 8 07:21:30 UTC 2010 Johnny Willemsen - - * CIAO_TAO.mwc: - Added new ace INet library - -Tue Jun 8 06:33:00 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataWriter.h: - Various layout changes - -Mon Jun 7 22:36:24 UTC 2010 Adam Mitz - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test_msm.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - * tests/CIF/Navigation/run_test.pl: - * tests/CIF/Receptacle/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - - Use PerlACE::GetArchDir() to get the path to ciao_componentserver or - dance_locality_manager. - -Mon Jun 7 12:23:10 UTC 2010 Martin Corino - - * DAnCE/tools/Artifact_Installation: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_export.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: - * DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_export.h: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.inl: - * DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation.idl: - * DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/File_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp: - * DAnCE/tools/Artifact_Installation/Http_Installation_Handler.h: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_export.h: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.h: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp: - * DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.h: - New DAnCE Artifact Installation framework. - This implements a pluggable architecture for handling artifact installations in - CCM deployment plans. - Includes file:// and http:// installation handlers and a basic installation - repository (cache) manager for node installations. - - * DAnCE/MPC/config/dance_artifact_installation.mpb: - * DAnCE/MPC/config/dance_installation_repository_manager.mpb: - New MPC base projects for using the artifact installation framework. - - * CIAO_TAO_DAnCE.mwc: - Added INet library which is needed by http:// installation handler. - -Mon Jun 7 09:28:10 UTC 2010 Johnny Willemsen - - * CIAO-INSTALL.html: - Corrected some hyperlinks - -Sun Jun 6 17:44:14 UTC 2010 Johnny Willemsen - - * examples/BasicSP/BMDevice/BMDevice_exec.h: - * examples/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/BasicSP/EC/EC_exec.cpp: - Fixed compile errors - -Sat Jun 5 19:26:24 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_config_handlers_base.mpb: - - Fix for a linking error. - -Sat Jun 5 17:52:16 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Fixed fuzz - -Sat Jun 5 17:25:10 UTC 2010 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleEmitter.idl: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher.idl: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - * examples/BasicSP/BMDevice/BMDevice.idl: - * examples/BasicSP/EC/EC.idl: - * examples/BasicSP/descriptors/BasicSP_Homed.cdp: - * examples/BasicSP/descriptors/BasicSP_Unhomed.cdp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * tests/IDL_Test/Cornucopia: - Resolve problems with identifiers only difference in casing - -Sat Jun 5 14:03:14 UTC 2010 Johnny Willemsen - - * DAnCE/tests/CIAO/Components/SimpleEmitter.idl: - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher.idl: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - Fixed identifiers which only where different in casing - -Fri Jun 4 15:36:57 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - - Fixed illegal IDL - case difference between AMI4CCM connector - port type and port identifier. - -Fri Jun 4 14:52:06 UTC 2010 William R. Otte - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - Extended this test with more complex structure types. - -Fri Jun 4 14:05:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - Renamed filter into query. - -Fri Jun 4 13:02:28 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: - - Improved logging. - - * DAnCE/docs/schema/Basic_Deployment_Data.xsd: - - Layout change. - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - - Added sequence and struct attributes. - -Fri Jun 4 12:30:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.cpp: - Renamed files in order to reflect the meaning of them better. - -Fri Jun 4 12:10:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Removed unused variables. - -Fri Jun 4 11:58:11 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ContentFilteredTopic/*: - Moved this test to its own subdirectory in this directory. - This because of the fact that there will be more - ContentFilteredTopic coming.. - -Fri Jun 4 11:47:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp: - Renamed QueryFilter to QueryCondition in order to reflect what these tests - are about. - -Fri Jun 4 11:28:12 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/tests/QueryFilterListenEvent/*: - * connectors/dds4ccm/tests/QueryFilterListenState/*: - Moved these tests to the QueryCondition test directory. - -Fri Jun 4 11:20:33 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/*: - Grouped all QueryCondition tests in this - directory - - * connectors/dds4ccm/tests/QueryFilter/*: - * connectors/dds4ccm/tests/QueryFilterListenEvent/*: - * connectors/dds4ccm/tests/QueryFilterListenState/*: - Moved these to the QueryCondition directory. - -Fri Jun 4 10:44:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.cpp: - Resolved compile issues. - -Fri Jun 4 09:52:10 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Resolved compile issue. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - Removed unnecessary methods. - -Fri Jun 4 09:42:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp: - Preparation for the refactoring of contentfilteredTopics. Removed - DDS4CCM_USES_QUERY_CONDITION define since it's no longer needed. - Resolved issue with QueryCondition in combination with listeners. - Beware that the QueryFilter tests are using QueryCondition for now. - -Thu Jun 3 18:58:20 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - Enabled new filter attributes. CIAO has the restriction that these - attributes only appear on the connector, not on the user component - - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - Implement non changeable, had this ready earlier - -Thu Jun 3 15:38:18 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Added test case for attributes on a connector that originate - from a porttype declaration. - -Wed Jun 2 19:20:14 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_ddsonly.mpb: - Fuzz... - -Wed Jun 2 18:38:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Resolved MPC issues. - -Wed Jun 2 17:02:20 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Added support for generation of port name as part - of an attribute name originating in a porttype. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Uncommented test case added by Johnny Willemsen - . - -Wed Jun 2 13:50:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Built in check for maximum reference count; - -Wed Jun 2 13:27:23 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Removed !FIXED_BUG_ONLY flag for UserdataCopyCount test. - -Wed Jun 2 13:22:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Resolved test issues. - -Wed Jun 2 11:17:28 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_ddsonly.mpb: - DDS specific file compilation - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Making use of dds4ccm_ddsonly. - -Wed Jun 2 08:46:23 UTC 2010 Marcel Smit - - * DAnCE/tests/Parsing/InvalidConfigPropValueDeclaration.cdp: - * DAnCE/tests/Parsing/InvalidConnection.cdp: - * DAnCE/tests/Parsing/InvalidDatatypeValue.cdp: - * DAnCE/tests/Parsing/InvalidElement.cdp: - * DAnCE/tests/Parsing/InvalidReference.cdp: - Ready to deploy real components. - - * DAnCE/tests/Parsing/PlanLauncher: - * DAnCE/tests/Parsing/PlanLauncher/Component: - * DAnCE/tests/Parsing/PlanLauncher/Component/ParseError_Test_Component.idl: - * DAnCE/tests/Parsing/PlanLauncher/Component/ParseError_Test_Component.mpc: - * DAnCE/tests/Parsing/PlanLauncher/Component/ParseError_Test_Component_exec.h: - * DAnCE/tests/Parsing/PlanLauncher/Component/ParseError_Test_Component_exec.cpp: - * DAnCE/tests/Parsing/PlanLauncher/descriptors: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test.pl: - * DAnCE/tests/Parsing/PlanLauncher/descriptors/run_test_msm.pl: - * bin/ciao_tests.lst: - Added test which tests the return value of the PlanLauncher - when there're errors in a deployment plan. - -Wed Jun 2 07:53:38 UTC 2010 Marcel Smit - - * DAnCE/tests/Parsing: - * DAnCE/tests/Parsing/InvalidConfigPropValueDeclaration.cdp: - * DAnCE/tests/Parsing/InvalidConnection.cdp: - * DAnCE/tests/Parsing/InvalidDatatypeValue.cdp: - * DAnCE/tests/Parsing/InvalidElement.cdp: - * DAnCE/tests/Parsing/InvalidReference.cdp: - * DAnCE/tests/Parsing/Parsing.mpc: - * DAnCE/tests/Parsing/run_test.pl: - * DAnCE/tests/Parsing/test.cpp: - * bin/ciao_tests.lst: - Added deployment plans parsing test. - - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - Improved logging. - -Wed Jun 2 07:47:15 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added new disable test case which fails - -Wed Jun 2 06:18:53 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - Unicode fix, initialise pointers with 0 - - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Added missing methods that caused the connectors not to load - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Improved logging, fixed some memory leaks, simplified some code - -Tue Jun 1 21:29:09 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/ADD_Handler.cpp: - * DAnCE/Config_Handlers/CPD_Handler.cpp: - * DAnCE/Config_Handlers/DP_Handler.cpp: - * DAnCE/Config_Handlers/DataType_Handler.cpp: - * DAnCE/Config_Handlers/DnC_Dump.cpp: - * DAnCE/Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Config_Handlers/Dump_Obj.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - * DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp: - * DAnCE/Config_Handlers/IDD_Handler.cpp: - * DAnCE/Config_Handlers/MDD_Handler.cpp: - * DAnCE/Config_Handlers/PSPE_Handler.cpp: - * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp: - * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp: - * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp: - * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp: - * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp: - - Converted to using DANCE_{ERROR,DEBUG} in lieu of ACE_ constructs. - - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - - Pass Config_Error exceptions through. - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Proper exception handling to pass useful diagnostic to user in case of - parse error. - -Tue Jun 1 19:45:51 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/identifier_helper.cpp(orig_sn): - - Added generation of a leading '::' to all scoped names. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Added a template and a non-template attribute declaration - in a porttype, to test support of that language feature. - -Tue Jun 1 18:18:21 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - Some glue code for the upcoming filter attribute on the extended ports - -Tue Jun 1 15:25:30 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/UsesMulti - * connectors/ami4ccm/tests/UsesMulti/Base - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc - * connectors/ami4ccm/tests/UsesMulti/descriptors - * connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl - * connectors/ami4ccm/tests/UsesMulti/Receiver - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h - * connectors/ami4ccm/tests/UsesMulti/Sender - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h - AMI4CCM test uses multiple with asynchron invocations. - -Tue Jun 1 11:23:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Resolved linker errors on Windows for ndss. - -Tue Jun 1 08:36:07 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - Added infrastructure to provide the ContentFilterSetting - for each extended port. - -Tue Jun 1 07:24:32 UTC 2010 Johnny Willemsen - - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - Layout changes - - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - Layout changes - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/idl/dds4ccm_Base.idl: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - Implemented the resolution of issue 15225, 15172, 15173: - - InstahnceHandleManager is now a local interface instead of abstract - - All sequences are passed as inout instead of out - - The filter attribute on the reader has been renamed to query and - the QueryFilter members are now expression and parameters - - * connectors/dds4ccm/docs/09-10-23.pdf: - * connectors/dds4ccm/docs/09-10-25.pdf: - * connectors/dds4ccm/docs/09-10-27.pdf: - Removed these files, We are updating to DDS4CCM FTF2 - -Tue Jun 1 07:16:02 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - Resolved test error. - - * tests/CIF/Receptacle/client.cpp: - Organized code. - -Mon May 31 13:58:17 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/UserdataCopyCount: - * connectors/dds4ccm/tests/UserdataCopyCount/Base: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Component: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/UserdataCopyCount/Connector: - * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl: - * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: - Added test which counts how many times a userdata struct is copied. - -Mon May 31 11:24:42 UTC 2010 Johnny Willemsen - - * NEWS: - Updated for upcoming 0.8.0 - -Mon May 31 09:04:48 CEST 2010 Johnny Willemsen - - * CIAO version 0.7.9 released. - -Sat May 29 14:33:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/10-05-06.pdf: - * connectors/dds4ccm/docs/10-05-07.pdf: - * connectors/dds4ccm/docs/10-05-09.zip: - DDS4CCM Beta 3 documents - - * connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch1.doc: - * connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch2 v2.doc: - * connectors/dds4ccm/docs/DDS4CCM v1-1 b1.odt: - * connectors/dds4ccm/docs/DDS4CCM v1-1 b2- v2.odt: - Removed these files, draft beta 3 files - -Sat May 29 02:28:50 UTC 2010 Johnny Willemsen - - * tests/CIF/Navigation/run_test.pl: - No need to run at level 9 by default - -Sat May 29 02:08:18 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Policies/policies.mpc: - Added missing base project - -Sat May 29 02:03:39 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_convert_plan.mpb: - Layout changes - - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - Fixed FC8 compile errors - - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Layout changes - -Sat May 29 01:56:43 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Fix error in wchar. - -Sat May 29 01:54:07 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Utility.tpp: - - Fuzz. - -Fri May 28 16:17:00 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/DAnCE_Utility.h: - * ciao/Deployment/Handlers/CIAO_State.h: - Fixed fuzz - -Fri May 28 13:39:20 UTC 2010 Adam Mitz - - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Adjusted one of the "after" statements so that it builds correctly - with parallel make. - -Fri May 28 12:30:55 UTC 2010 Jeff Parsons - - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - - Added a missing build dependency. - -Fri May 28 10:00:01 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - Remove flag fixed_bug_only from test InterMulti. - -Thu May 27 15:38:01 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl - * connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h - Finished test after TAO_IDL changes. - -Thu May 27 07:27:01 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl - Increase SpawnWaitKill period . - -Wed May 26 20:28:00 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - - reduce timeouts. - -Wed May 26 19:58:29 UTC 2010 William R. Otte - - * bin/ciao_tests.lst: - - Added large deployment test. - -Wed May 26 19:51:40 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - - Updated plan. - -Wed May 26 15:48:09 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - - Removed these files, as we no longer support externalReference connections for - pub/sub connections. - -Wed May 26 15:01:32 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl: - - Fuzz. - -Wed May 26 14:43:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc: - Resolved static compile errors. - -Wed May 26 14:38:58 UTC 2010 Adam Mitz - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - - README was removed, so we can no longer install it. - -Wed May 26 14:34:58 UTC 2010 Jeff Parsons - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - - Added no-ops for get_all_publishers() and get_all_emitters() - if CCM_LW is not defined, so for generated connector servants, - we can skip generation of these methods. - -Wed May 26 14:15:33 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp: - - Removed the deault locality test, as we no longer support the former behavior, - that is, if instances are not explicitly included as part of a locality group, - they will no longer be considered as part of a seperate locality. - -Wed May 26 13:38:49 UTC 2010 William R. Otte - - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - - Enabled home attribute configuration. - -Wed May 26 13:25:01 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl - * connectors/ami4ccm/tests/InterMulti - * connectors/ami4ccm/tests/InterMulti/Base - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc - * connectors/ami4ccm/tests/InterMulti/descriptors - * connectors/ami4ccm/tests/InterMulti/Receiver - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h - * connectors/ami4ccm/tests/InterMulti/Sender - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h - AMI4CCM test multiple inheritance. - -Wed May 26 13:20:34 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/CIAO_State.h: - Fixed FC8 compile error - -Wed May 26 11:51:07 UTC 2010 Jeff Parsons - - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - - Added an item to the 'after' list of a build project - apparently - there is a build order problem on some platforms. - -Wed May 26 11:27:19 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Fixed error in this deployment plan - -Wed May 26 09:27:01 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h - Add enum in tests as in, out and return value. - -Wed May 26 08:04:01 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc - Changed the -GM option on the files *_Sender.idl - to -GC. Changed the -GM option with the lema_gen in the Base/*.mpc files - -Tue May 25 21:14:01 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc: - - Changed the -GM option on the file DelReplyH_Sender.idl - to -GC, eliminating the potential problem of generating - an unwanted *A.idl file. Some extra code generation - also depends on the "#pragma ciao ami4ccm receptacle xxx" - directive in this file. - -Tue May 25 20:56:22 UTC 2010 Johnny Willemsen - - * examples/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp: - * examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/Display/NavDisplayGUI_exec/NavUnit.cpp: - * examples/Display/NavDisplayGUI_exec/NodeItem.cpp: - * examples/Display/NavDisplayGUI_exec/QuitCmd.cpp: - * examples/Display/NavDisplayGUI_exec/RootPanel.cpp: - * examples/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp: - Fixed argument not used warning and various layout changes - -Tue May 25 20:07:40 UTC 2010 Jeff Parsons - - * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc: - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - * tests/IDL_Test/Inherited_Component/IhC_Foo.idl: - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl: - - - Removed dummy_label tags and updated build projects - - Added corresponding base and derived homes, with - attributes to test the recently added set_attributes() - generation for homes. - -Tue May 25 18:29:02 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Added checking to ensure that data values are consistent with - their stated types. - -Tue May 25 18:14:33 UTC 2010 Jeff Parsons - - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_Base.h: - - Added no-op set_attributes() method similar to that in - class Connector_Servant_Impl_Base. It can now be overridden - (or not, if there are no read/write attributes) in - generated home servants. - -Tue May 25 16:10:18 UTC 2010 William R. Otte - - * MPC/config/ciao_deployment_handlers.mpb: - - Fuzz. - -Tue May 25 16:07:32 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/MPC/config/dance_locality_manager.mpb: - * MPC/config/ciao_deployment_handlers.mpb: - - Static linking fix. - -Tue May 25 14:38:55 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc - Change flag of lema_gen Base from -GM back to -GC. - -Tue May 25 14:13:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp: - Resolved test error regarding enum declaration in the deployment - plans. - -Tue May 25 14:11:55 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - Fixed errors in these deployment plans - -Tue May 25 13:40:27 UTC 2010 Johnny Willemsen - - * tests/CIF/Navigation/Navigation.mpc: - Fixed windows problem - -Tue May 25 11:47:33 UTC 2010 Johnny Willemsen - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - Removed several directories that are not needed - - * README: - Removed this file, read CIAO-INSTALL.html - -Tue May 25 01:31:30 UTC 2010 Johnny Willemsen - - * DAnCE/tools/Split_Plan/Split_Plan.h: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * ciao/Deployment/Handlers/CIAO_State.h: - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - Fixed compile errors - -Tue May 25 01:12:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Fixed errors in these deployment plans - -Mon May 24 20:39:11 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - Fixed errors in these deployment plans - - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - Fixed logging line - -Mon May 24 20:07:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Fixed errors in this deployment plan - -Mon May 24 19:58:40 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Fixed errors in these deployment plans - -Mon May 24 19:48:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp: - Fixed errors in these deployment plans - -Mon May 24 19:34:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - Added connectors that use a union as datatype. Valuetypes doesn't - seem to work with dds - -Mon May 24 19:01:23 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed typos - -Mon May 24 15:39:39 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Added use case of a mixed parentage (abstract and - concrete) interface in a template module. - -Mon May 24 14:19:28 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - Implemented error handling. - -Mon May 24 14:04:52 UTC 2010 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/Components/SimpleLocalProvider.mpc: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - - Fuzz. - -Mon May 24 13:53:12 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - Make sure that rtiddsgen doesn't pick up ccm_dds idl - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Enabled several projects - -Mon May 24 09:45:25 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - - Various compile/warning fixes for Windows/unicode. - -Mon May 24 13:15:49 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Port_Activator_T.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - Layout changes - - * ciao/Servants/Servant_Impl_T.cpp: - Fixed logging statements - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - layout and const changes - - * tests/CIF/Common/CIF_Common.h: - Layout changes - - * DAnCE/DAnCE/Module_Main.h: - Deleted, not used - -Mon May 24 12:13:08 UTC 2010 Adam Mitz - - * ccm/CCM_stub.mpc: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Using $(MKDIR) instead of raw mkdir. - -Mon May 24 07:42:58 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - - Re-enabled tests. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp.bak: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp.bak: - - Removed these files. - -Mon May 24 11:31:20 UTC 2010 Johnny Willemsen - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/Deployment/Deployment_Core.mpc: - Enabled these again - - * DAnCE/DAnCE/DAnCE_Core.mpc: - Layout changes - -Mon May 24 03:30:26 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - - Fixed incorrectly scoped references to the exception - NonChangeable. - -Sun May 23 23:30:12 UTC 2010 Johnny Willemsen - - * CIAO_TAO.mwc: - Readded connectors again - -Sun May 23 12:40:12 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Additional logging. - - * DAnCE/tests/CIAO/Components/SimpleCommon.idl: - * DAnCE/tests/CIAO/Components/SimpleLocalProvider.idl: - * DAnCE/tests/CIAO/Components/SimpleLocalProvider.mpc: - * DAnCE/tests/CIAO/Components/SimpleLocalProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleLocalProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleLocalUser.idl: - * DAnCE/tests/CIAO/Components/SimpleLocalUser.mpc: - * DAnCE/tests/CIAO/Components/SimpleLocalUser_exec.h: - * DAnCE/tests/CIAO/Components/SimpleLocalUser_exec.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp: - - New test for local facets. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - - Bugfix for local facets. - -Sun May 23 07:50:46 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp.bak: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp.bak: - - Disabled the event nameservice test, as this isn't yet supported by - LocalityManager. - -Sun May 23 07:49:42 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Unicode fixes. - -Sun May 23 07:09:24 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Fixed a bug whereby naming service configuration was sometimes not - properly passed to LocalityManager, added new logging. - -Sun May 23 06:45:47 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - - Disable the "Home Attribute" portion of the test, as we don't - support that in LocalityManager yet. - -Sun May 23 00:21:10 UTC 2010 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Improved logging. - - * DAnCE/NodeApplication/NodeApplication.mpc: - - Removed ComponentAttributeSetter. - - * DAnCE/NodeApplication/ComponentAttributesSetter.h: - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - - Removed these files. - -Sun May 23 00:10:07 UTC 2010 William R. Otte - - * DAnCE/Deployment/Deployment_Core.mpc: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - - Temporarily disable the RepositoryManager project, until it works again. - -Sun May 23 01:34:33 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - - Fixed location of dance_locality_manager. - -Sat May 22 12:44:54 UTC 2010 William R. Otte - - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl: - - Ported to locality manager. - -Sat May 22 12:42:20 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Corrected severity of log message. - -Sat May 22 12:22:17 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_exec.cpp: - - Wchar fixes. - -Sat May 22 12:14:15 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - - Had Name_Utilites.h, instad of Name_Utilites.cpp. - -Sat May 22 12:12:08 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.h: - - Windows linking fix. - -Sat May 22 11:52:13 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_locality_manager.mpb: - - Static linking fix. - -Fri May 21 23:17:01 UTC 2010 Jeff Parsons - - * tests/IDL_Test/Keywords/Keywords.mpc: - * tests/IDL3/Lookup/lookup_test.mpc: - - Removed the temporary 'dummy_label' tags added to these - projects while bug fixes were in progress. - -Fri May 21 21:32:11 UTC 2010 Adam Mitz - - * NEWS: - - Documented "make install" - -Fri May 21 21:07:20 UTC 2010 Adam Mitz - - * DAnCE/Deployment/Deployment_Core.mpc: - - Reinstated installation info that was lost in the merge. - -Fri May 21 20:01:32 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.h: - * DAnCE/LocalityManager/Daemon/Deployment_Interceptors.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Added capability to pass selected instance naming context to - LocalityManager, so non naming service enabled deployments - won't stall out trying to resolve a naming server. - -Fri May 21 18:55:45 UTC 2010 William R. Otte - - * tests/IDL3/Lookup/lookup_test.mpc: - * tests/IDL_Test/Keywords/Keywords.mpc: - - Disabled temporarily as these aren't fixed yet, and it's making it - difficult to read the scoreboard. - -Fri May 21 16:53:49 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl: - - Fixed incorrect IDL. References to DDS_Write, DDS_Listen and DDS_Get - were incorrectly scoped inside the connector Large_Connector. They - are actually defined in the instantiated template module - LargeTypeConn. - -Fri May 21 16:13:17 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/RepositoryManager/Repository_Manager_Module.h: - - Compile fixes. - -Fri May 21 15:06:35 UTC 2010 Adam Mitz - - * DAnCE/MPC/config/dance_locality_handler.mpb: - - Fixed comment line that didn't start with //. - -Fri May 21 14:52:17 UTC 2010 Adam Mitz - - * MPC/config/dds4ccm_ts_default.mpb: - - Use a mapped keyword "dds_ts_flags" that's the same for any DDS - implementation. This would be used by projects for generic flags - accepted by any of the code generators, such as -D and -I. - -Fri May 21 14:38:43 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/MPC/config/dance_locality_handler.mpb: - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - - Fuzz fixes. - -Fri May 21 13:56:01 UTC 2010 William Otte - - * .: - Merged in locality_manager branch. details to follow: - - Fri May 21 03:57:04 UTC 2010 William R. Otte - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - - Ported tests. - - Fri May 21 03:54:36 UTC 2010 William R. Otte - - * examples/BasicSP/descriptors/BasicSP_Homed.cdp: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/Null_Homed.cdp: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - - Ported tests. - - Fri May 21 03:08:15 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Name_Utilities.h: - * DAnCE/LocalityManager/Daemon/Name_Utilities.cpp: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/tests/CIAO/CommandlinePassage/Component.cdp: - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/CIAO_Handler_Common.h: - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - - Various bug fixes, and added support for 1) attribute - initialization, 2) external reference endpoints. - - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp: - - Log message fix. - - * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtActivate.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeFailureAtStartup.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/1NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtActivate.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeFailureAtStartup.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/2NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtActivate.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeFailureAtStartup.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/5NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl: - - Ported DAnCE tests. - - * DAnCE/NodeApplication/Name_Utilities.h: - * DAnCE/NodeApplication/Name_Utilities.cpp: - - Removed these files. - - Thu May 20 19:29:49 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Core.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - - Windows compile fixes. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Bugfixes. - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - - Default connect_consumer behavior should throw an - InvalidName exception. - - Wed May 19 18:37:49 UTC 2010 wotte - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * MPC/config/ciao_componentserver_stub.mpb: - - Build ordering issues. - - Wed May 19 12:17:27 UTC 2010 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_Properties.idl: - * ciao/ComponentServer/Client_init.h: - * ciao/ComponentServer/Server_init.h: - - * ciao/Deployment: - - * ciao/Deployment/Handlers: - - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * ciao/Deployment/Handlers/CIAO_Handler_Common.h: - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h: - * ciao/Deployment/Handlers/CIAO_State.h: - * ciao/Deployment/Handlers/CIAO_State.cpp: - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - * ciao/Deployment/Interceptors: - - First round CIAO deployment handlers. - - Wed May 19 12:11:34 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Core.mpc: - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - * DAnCE/DAnCE/DAnCE_Properties.idl: - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/DAnCE/DAnCE_Utility.cpp: - * DAnCE/DAnCE/DAnCE_Utility.tpp: - - * DAnCE/Deployment/Deployment_Core.mpc: - - * DAnCE/LocalityManager/Daemon: - - * DAnCE/LocalityManager/Daemon/Locality_Manager.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl_Export.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - - * DAnCE/LocalityManager/Handler: - - * DAnCE/LocalityManager/Handler/DAnCE_Locality_Handler_export.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - - * DAnCE/MPC/config/dance_locality_handler.mpb: - * DAnCE/MPC/config/dance_locality_manager.mpb: - * DAnCE/MPC/config/dance_nodeapplication.mpb: - * DAnCE/MPC/config/dance_skel.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_stub.mpb: - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/NodeManager/NodeManager_Impl.h: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - * DAnCE/tests/CIAO/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleAttributeExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/TwoComponentsOneHome.cdp: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - - * DAnCE/tests/LocalityManager: - - * DAnCE/tests/LocalityManager/SpawnMultiple: - - * DAnCE/tests/LocalityManager/SpawnMultiple/Deployment.cdp: - * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: - - * DAnCE/tests/LocalityManager/SpawnOne: - - * DAnCE/tests/LocalityManager/SpawnOne/Deployment.cdp: - * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: - - * DAnCE/tools: - - First round LocalityManager implementation. - - * DAnCE/DAnCE/Deployment_common.h: - - Removed this file. - - Tue May 11 23:06:20 UTC 2010 wotte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Fixed error when --help is passed, reverse -a and -m in usage. - - Wed Apr 14 15:06:32 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_ArtifactInstallation.idl: - * DAnCE/DAnCE/DAnCE_Core.mpc: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - * DAnCE/Deployment/Deployment_Application.idl: - * DAnCE/Deployment/Deployment_ApplicationManager.idl: - * DAnCE/Deployment/Deployment_Core.mpc: - * DAnCE/Deployment/Deployment_InvalidComponentExecParameter.idl: - * DAnCE/Deployment/Deployment_InvalidConnection.idl: - * DAnCE/Deployment/Deployment_InvalidNodeExecParameter.idl: - * DAnCE/Deployment/Deployment_InvalidProperty.idl: - * DAnCE/Deployment/Deployment_ResourceNotAvailable.idl: - * DAnCE/LocalityManager: - - Integrated new IDL. - - * DAnCE/DAnCE/DAnCE_Properties.mpc: - * DAnCE/Deployment/DAnCE_Core.mpc: - - Removed these files. - -Fri May 21 13:51:16 UTC 2010 Adam Mitz - - * ccm/ComponentServer/CCM_ComponentServer.mpc: - - Added two generated inline files to the list. - -Fri May 21 11:20:01 UTC 2010 Marcel Smit - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - Removed RTEvents since it isn't used. - -Fri May 21 08:50:29 UTC 2010 Marcel Smit - - * CIAO_TAO_DAnCE.mwc: - Adding CosEvent.mpc - - * tests/CIF/Navigation/client.cpp: - Implemented test for same_component - method. - - * bin/ciao_tests.lst: - * tests/CIF/Receptacle/*: - Added test for Receptacles. - -Thu May 20 21:13:32 UTC 2010 Adam Mitz - - * DAnCE/Deployment/DAnCE_Core.mpc: - * ccm/CCM_lem_stub.mpc: - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/Containers.mpc: - * ciao/Servants/Servants.mpc: - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - - List generated headers and inline files so they can be installed. - -Thu May 20 15:15:44 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.h: - Resolved fuzz error. - -Thu May 20 14:31:53 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Navigation/client.cpp: - Optimized interface. - Also implemented parse_args. - -Thu May 20 14:19:29 UTC 2010 Johnny Willemsen - - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - Unicode fixes - -Thu May 20 13:01:03 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.cpp: - No initialization. Also removed some - unnecessary code. - -Thu May 20 11:16:29 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - - * ciao/ComponentServer/Client_init.h: - Code alignment - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Minor changes to get_all_facets - - * tests/CIF: - Tests for Component Implementation Framework - - * tests/CIF/Common/*: - Base library for all CIF tests. - - * tests/CIF/Navigation/*: - Test which tests the Navigation interface. - - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - Code alignment. - -Thu May 20 10:33:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch2.doc: - * connectors/dds4ccm/docs/DDS4CCM v1-1 b2.odt: - FTF2 batch 2 documents - -Wed May 19 18:14:05 UTC 2010 Adam Mitz - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - - Set the install_dir for AMI4CCM. - -Wed May 19 11:00:22 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/Topic.cpp: - Layout and const changes - -Wed May 19 09:49:23 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - Fixed mismatched delete - -Tue May 18 21:48:11 UTC 2010 Adam Mitz - - * DAnCE/Config_Handlers/Config_Handlers.mpc: - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc: - * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc: - * DAnCE/DAnCE/DAnCE_Properties.mpc: - * DAnCE/Deployment/DAnCE_Core.mpc: - * DAnCE/DomainApplication/DomainApplication.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/ExecutionManager/ExecutionManager.mpc: - * DAnCE/Logger/Logger.mpc: - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc: - * DAnCE/NodeManager/NodeManager.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/RepositoryManager/RepositoryManager.mpc: - * DAnCE/TargetManager/TargetManager.mpc: - * ccm/CCM_lem_stub.mpc: - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ciao/ComponentServer/CIAO_ComponentServer.mpc: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Contexts/Context.mpc: - * ciao/Logger/Logger.mpc: - * ciao/Servants/Servants.mpc: - * ciao/Valuetype_Factories/Factories.mpc: - * ciao/install_versionh.mpc: - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/logger/Logger.mpc: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - * tools/XML/XML.mpc: - - Enabled "make install" for CIAO with the gnuace makefiles (bug 3244) - - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - * DAnCE/tests/NameServiceTest/clt_main.cpp: - * DAnCE/tests/NameServiceTest/srv_main.cpp: - * DAnCE/tests/NodeManager-NodeApplicationManager/NodeManager-NodeApplicationManager.mpc: - - Adjusted tests and examples to be able to build outside of the - CIAO_ROOT tree, which is how we can verify that an "installed" CIAO - is properly installed. - -Tue May 18 14:10:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - Resolved unresolved externals on windows. - -Tue May 18 12:10:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile: - * connectors/dds4ccm/tests/OneFile/Multiple: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Added compilation tests which tests whether the declaration of a - topic and a connector in one single IDL file compiles correctly. - -Tue May 18 12:11:16 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Fixed generation problems when no dds vendor is enabled - -Tue May 18 11:07:53 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - Add multiple level of inheritance, more interfaces, different in, - out and return types. - -Tue May 18 10:30:53 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Add AMI4CCM tests: DelReplyH and OneProcess. - -Tue May 18 06:02:55 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Make sure ndds_ts_flags is always there - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Fixed duplicate project names - -Mon May 17 18:48:45 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - Override _add_ref and _remove_ref to track when these are called - -Mon May 17 18:14:28 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Renamed LatencyTT to Latency and put all AMI4CCM together - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - Print number left - - * connectors/dds4ccm/performance-tests/Latency: - * connectors/dds4ccm/performance-tests/LatencyTT: - Renamed LatencyTT to Latency - -Mon May 17 16:21:41 UTC 2010 Johnny Willemsen - - * DAnCE/tools/Completion/CompletionHandler_T.h: - * DAnCE/tools/Completion/Completion_Counter_Base.h: - * DAnCE/tools/Completion/Completion_Counter_Base.inl: - * DAnCE/tools/Split_Plan/Locality_Splitter.cpp: - * DAnCE/tools/Split_Plan/Node_Splitter.cpp: - * DAnCE/tools/Split_Plan/Sub_UUID_Generator.cpp: - Removed not needed semi colon which gives compile errors - with FC8 - -Mon May 17 14:36:43 UTC 2010 Johnny Willemsen - - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - Unicode fixes - -Mon May 17 14:12:45 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT: - Started with new test that creates its own connector - -Mon May 17 13:04:51 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added more test constructs - - * tests/IDL_Test/IDL3_Plus/README: - Removed old comments, we now do a full compilation and code generation - -Mon May 17 13:33:53 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - Removed unused variable. - -Wed May 12 15:38:53 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/DelReplyH - * connectors/ami4ccm/tests/DelReplyH/Base - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc - * connectors/ami4ccm/tests/DelReplyH/descriptors - * connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl - * connectors/ami4ccm/tests/DelReplyH/Receiver - * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl - * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc - * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp - * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h - * connectors/ami4ccm/tests/DelReplyH/Sender - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h - Test deleting replyhandlers. - -Wed May 12 11:28:53 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 11:15:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 10:13:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 09:50:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 09:28:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - * connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 09:01:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h: - * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl: - * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Connector/QFLE_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilterListenState/Connector/QFLS_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenState/Receiver/QFLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilterListenState/Sender/QFLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenState/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Wed May 12 09:16:58 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp - Solved some compile warnings. - -Wed May 12 06:37:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp: - * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp: - * connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 18:21:09 UTC 2010 Marcel Smit - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - Removed dummy_label so that it will be visible on the scoreboard. - -Tue May 11 17:50:32 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - - Tweaks to help the C++ compiler deal with the results of the -o option - to the IDL compiler. - -Tue May 11 12:45:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 13:39:20 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess - * connectors/ami4ccm/tests/OneProcess/Base - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc - * connectors/ami4ccm/tests/OneProcess/descriptors - * connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp - * connectors/ami4ccm/tests/OneProcess/descriptors/PlanOne.cdp - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl - * connectors/ami4ccm/tests/OneProcess/Receiver - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h - * connectors/ami4ccm/tests/OneProcess/Sender - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h - Test with Client, AMI-Connector and Receievr in one node. - -Tue May 11 11:59:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 11:44:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 09:39:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl: - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 09:16:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: - Resolved build issues. - -Tue May 11 09:11:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 08:48:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 08:42:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 08:07:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Tue May 11 07:34:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - Resolved test errors. - -Mon May 10 14:10:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the module of this test. This - way the IDL type and all CCM_DDS typed interfaces are all in the - module. - -Mon May 10 14:05:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the CoherentWriterTest module, this - way the IDL type and all CCM_DDS typed interfaces are all in the - CoherentWriterTest module. - -Mon May 10 13:52:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the CoherentUpdateTest module, this - way the IDL type and all CCM_DDS typed interfaces are all in the - CoherentUpdateTest module. - -Mon May 10 12:53:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - Added -o to the lem_gen project. - -Mon May 10 12:43:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - Added (IDL)compiler test which tests whether the -o option of the - IDL compiler works properly. - -Mon May 10 11:39:09 UTC 2010 Marcel Smit - - * DAnCE/Config_Handlers/RDD_Handler.cpp: - Resolved wchar compile issues. - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - Increased log level for masks. - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - No need for ACE_TEXT when using ACE_CString. - -Mon May 10 08:02:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - Instantiate the Typed CCM_DDS module inside the Hello module, this - way the IDL type and all CCM_DDS typed interfaces are all in the - Hello module. - -Mon May 10 07:53:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the Shapes module, this - way the IDL type and all CCM_DDS typed interfaces are all in the - Shapes module. - -Mon May 10 07:28:20 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp - Solved 'not used' warnings. - -Fri May 7 08:51:02 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp: - Instantiate the Typed CCM_DDS module inside the Quoter module, this - way the IDL type and all CCM_DDS typed interfaces are all in the - Quoter module. - -Thu May 6 18:16:12 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Reverted change from Abdul, it breaks svn head with ndds - -Thu May 6 14:34:22 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Added a test case where an instantiated template module - reopens a pre-existing module, which is legal IDL but was - causing a bogus redefinition error (now fixed). - -Thu May 6 12:21:20 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/InterReturn - * connectors/ami4ccm/tests/InterReturn/Base - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc - * connectors/ami4ccm/tests/InterReturn/descriptors - * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl - * connectors/ami4ccm/tests/InterReturn/Receiver - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h - * connectors/ami4ccm/tests/InterReturn/Sender - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h - AMI4CCM test for return values. - -Thu May 6 11:37:14 UTC 2010 Abdul Sowayan - - * MPC/config/dds4ccm_ts_default.mpb: - - Minor enhancement to treat all DDS implementation uniformally. - opendds_ts_flags now is used for all DDS implementations. - In the future, this perhaps should be changed to just dds_ts_flags. - -Thu May 6 10:16:20 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl: - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp: - Removed the hand written connector and use the default DDS_Event - connector - -Thu May 6 09:54:26 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended this file with a new constuct which is commented out because - tao_idl doesn't like it - -Wed May 5 17:25:23 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - Do the correct cast - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Layout changes - - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - Do correct cast, added missing trace statements - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - Use false for bool - -Wed May 5 09:53:34 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - For the moment just allocate the proxies on each invocation - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Layout change - -Wed May 5 08:44:29 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - Fixed incorrect trace statements - -Wed May 5 08:21:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - Added some more debug statements - -Tue May 4 18:16:17 UTC 2010 Johnny Willemsen - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - Fixed layout of debug message - - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - Let the proxy methods return DDS::CCM_* pointers - -Tue May 4 12:41:49 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc: - * connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h: - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc: - * connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc: - * connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h: - Renaming changes for AMI4CCM: - Rename interface AMI4CCM from AMI_ to AMI4CCM_. - Rename Ports in cdp files and ami4ccm.idl: The_Connector to AMI4CCM_Connector - and The_Port to ami4ccm_port, change xxx_run to xxx_uses and xxx_provides. - Rename Callback ami_handler to ReplyHandler ami4ccm_handler. - Change -GC option to -GM option for lema_gen (for right naming of replyhandler) - -Tue May 4 07:03:51 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - Layout changes, removed some reinterpret_casts that where not needed - -Tue May 4 06:25:06 UTC 2010 Johnny Willemsen - - * ccm/CCM_Session2Context.idl: - Added missing include - - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - Added some dds pragmas - -Mon May 3 17:27:30 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/DDS4CCM FTF2 Issue List batch1.doc: - * connectors/dds4ccm/docs/DDS4CCM v1-1 b1.odt: - DDS4CCM FTF2 batch one documents - -Mon May 3 17:09:39 UTC 2010 Johnny Willemsen - - * ccm/CCM_Session2Context.idl: - Added missing include - -Mon May 3 07:12:50 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp - Add test to testsuite , solve some warnings. - -Mon May 3 06:18:50 UTC 2010 Johnny Willemsen - - * ccm/CCM_Home.idl: - Disabled a few exceptions with LwCCM - -Thu Apr 29 14:27:45 UTC 2010 Johnny Willemsen - - * examples/Display/descriptors/run_test_without_ns.pl: - Did some improvements to this script but it doesn't run yet - -Thu Apr 29 13:43:17 UTC 2010 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/StaticDAnCE: - * examples/DevGuideExamples/Messenger/StaticDAnCE/Messenger_StaticDAnCE.mpc: - * examples/DevGuideExamples/Messenger/StaticDAnCE/README.txt: - * examples/DevGuideExamples/Messenger/StaticDAnCE/StaticDAnCEApp.cpp: - * examples/DevGuideExamples/Messenger/StaticDAnCE/plan.h: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/Null_Component/StaticDAnCEApp.cpp: - * examples/Null_Component/StaticDAnCEApp.mpc: - Removed these files, static dance is completely deprecated - -Thu Apr 29 11:26:18 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Removed not needed include - - * ccm/CCM_CCM2Context.idl: - Updated includes - - * ccm/CCM_EventConsumerBase.idl: - * ccm/CCM_ExecutorLocator.idl: - Check for compliancy and list the section from the OMG specification - - * ccm/CCM_lem_stub.mpc: - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - Updated for removed files - - * ccm/Components.idl: - Updated includes - - * ciao/ComponentServer/Server_init.cpp: - * ciao/Containers/Container_Base.h: - Removed not needed include - - * ciao/Containers/Session/Session_Container.h: - Added needed includes - - * ciao/Servants/Connector_Servant_Impl_Base.h: - Updated includes - - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - Docu change - - * ccm/CCM_Component.idl: - * ccm/CCM_Container.idl: - * ccm/CCM_Container_Ex.idl: - Removed these files, IDL compiler now generates more specific includes - -Wed Apr 28 19:13:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Removed ACE_TEXT since this isn't necessary. - -Wed Apr 28 17:50:13 UTC 2010 Martin Corino - - Redesign and reimplementation of plan splitter library and tool. - More modular design implementing multiple splitting levels and providing - framework with which changes and/or additions can be more easily implemented. - - * tools/Split_Plan/Split_Plan.mpc: - * tools/Split_Plan/Split_Plan.cpp: - Updated existing files. - - * tools/Split_Plan/Node_Splitter.h: - * tools/Split_Plan/Node_Splitter.cpp: - * tools/Split_Plan/Locality_Splitter.h: - * tools/Split_Plan/Locality_Splitter.cpp: - * tools/Split_Plan/Sub_UUID_Generator.cpp: - * tools/Split_Plan/Sub_UUID_Generator.h: - * tools/Split_Plan/Split_Plan_exec.cpp: - * tools/Split_Plan/Split_Plan.h: - Added new files. - - * tools/Split_Plan/Split_Plan_impl.h: - * tools/Split_Plan/Split_Plan_impl.cpp: - Removed deprecated files. - - * DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DomainApplicationManager/DomainApplicationManager_Impl.h: - Changed to use new Split_Plan (template) class. - -Wed Apr 28 14:41:13 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc - Change too long projrct names. - -Wed Apr 28 14:15:13 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterInArgs - * connectors/ami4ccm/tests/InterInArgs/Base - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc - * connectors/ami4ccm/tests/InterInArgs/descriptors - * connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl - * connectors/ami4ccm/tests/InterInArgs/Receiver - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h - * connectors/ami4ccm/tests/InterInArgs/Sender - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h - * connectors/ami4ccm/tests/InterOutArgs - * connectors/ami4ccm/tests/InterOutArgs/Base - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc - * connectors/ami4ccm/tests/InterOutArgs/descriptors - * connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl - * connectors/ami4ccm/tests/InterOutArgs/Receiver - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h - * connectors/ami4ccm/tests/InterOutArgs/Sender - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h - AMI4CCM tests for interfaces with different in- and out arguments. - -Wed Apr 28 10:10:13 UTC 2010 Martin Corino - - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - Fixed total byte check in Convert_Plan_Impl::write_cdr_plan(). - -Wed Apr 28 09:45:48 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - * docs/OMG-CCM-Tutorial.pptx: - Converted to MS Powerpoint 2007 format - -Wed Apr 28 09:29:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h: - Resolved fuzz error. - -Tue Apr 27 13:03:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - Resolved typos. - -Tue Apr 27 12:54:48 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt - Small changes to AMi4CCM - -Tue Apr 27 12:25:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - Removed WriteManyHandler since it wasn't used. - -Tue Apr 27 08:55:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - Renamed projects. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - Moved templated connector from the CCM_DDS namespace to the - connectors namespace. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: - Renamed projects and added own connector executor files. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - Added these in order to test if the NonChangeable exception is - thrown after the connector attributes are set for the first time. There - created a new class, derived from the (generated) connector class and created - an extra entry point. - - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp: - Calling the new entry point. - -Tue Apr 27 06:55:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - Implemented get_datareaders. - -Tue Apr 27 06:25:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Implemented get_discovered_participant_data and - get_discovered_topic_data. - - * connectors/dds4ccm/impl/dds/ndds/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/TopicBuiltinTopicData.h: - Created streaming operators for ParticipantBuiltinTopicData and - TopicBuiltinTopicData. - -Mon Apr 26 17:35:11 UTC 2010 Johnny Willemsen - - * ccm/CCM_EntityComponent.idl: - * ccm/CCM_Object.idl: - * ccm/CCM_PrimaryKeyBase.idl: - * ccm/CCM_ProxyHomeRegistration.idl: - * ccm/CCM_Receptacle.idl: - * ccm/CCM_Session2Context.idl: - * ccm/CCM_SessionSynchronization.idl: - * ccm/CCM_StateIdFactory.idl: - * ccm/CCM_Transaction.idl: - Improved spec compliance - -Mon Apr 26 14:56:48 UTC 2010 Johnny Willemsen - - * ccm/CCM_Base.idl: - * ccm/CCM_CCM2Context.idl: - * ccm/CCM_CCMException.idl: - * ccm/CCM_ComponentId.idl: - * ccm/CCM_Context.idl: - * ccm/CCM_EnterpriseComponent.idl: - * ccm/CCM_Entity2Context.idl: - * ccm/CCM_EntityContext.idl: - Checked these file for spec compliance and list from which section - this is coming - -Mon Apr 26 14:52:13 UTC 2010 Marijke Hengstmengel - - * docs/OMG-CCM-Tutorial.ppt - Add changes for AMI4CCM. - -Mon Apr 26 10:16:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Implemented create_multitopic and delete_multitopic. - - * connectors/dds4ccm/impl/dds/Publisher.cpp: - DDSDataWriter on proxy was set twice. This let to - test issues. These should be resolved now. - -Fri Apr 23 19:33:13 UTC 2010 Martin Corino - - * MPC/config/dance_domainapplicationmanager.mpb: - * MPC/config/dance_domainapplication.mpb: - * ExecutionManager/ExecutionManager.mpc: - Fixes for static link problems. - - -Fri Apr 23 14:12:01 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ContentFilteredTopic: - * connectors/dds4ccm/tests/ContentFilteredTopic/Base: - * connectors/dds4ccm/tests/ContentFilteredTopic/Base/CFT_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Base/CFT_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/Component/CFT_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/Connector: - * connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Connector/CFT_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl: - Added a test which checks the uniqueness of - a contentfilteredTopic. - - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - Changed naming convention. - -Fri Apr 23 13:37:21 UTC 2010 Johnny Willemsen - - * CIAO-INSTALL.html: - Updated some links - -Fri Apr 23 14:34:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - Move lib dir into project. - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - Add test for void operation with an in- and out argument. - -Fri Apr 23 12:29:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - Extra loginfo about whether a threadswitch is used or not. - -Fri Apr 23 12:03:38 UTC 2010 Johnny Willemsen - - * ccm/CCM_Home.idl: - Enable the key exceptions for the moment, we need more work in TAO_IDL - -Fri Apr 23 11:24:40 UTC 2010 Johnny Willemsen - - * ccm/CCM_Home.idl: - Don't include IFR with LwCCM - -Fri Apr 23 09:43:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader_T.h: - Resolved compile issues. - - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl: - Renamed improper naming. - -Fri Apr 23 09:28:12 UTC 2010 Johnny Willemsen - - * ccm/CCM_Home.idl: - Disable Key exceptions with LwCCM - -Fri Apr 23 09:21:03 UTC 2010 Johnny Willemsen - - * ccm/CCM_Enumeration.idl: - Disabled for LwCCM - -Fri Apr 23 09:15:17 UTC 2010 Johnny Willemsen - - * ccm/CCM_StateIdFactory.idl: - Disabled completely for LwCCM - - * docs/TODO.html: - Removed reference to ciao_pre/post methods - -Fri Apr 23 09:08:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Created a unique name for a contentfilteredTopic, using - a prefix in combination with the name of the original topic. - This'll prevent errors when more than one filter is used in - several connectors. - -Fri Apr 23 09:53:31 UTC 2010 Marijke Hengstmengel - - * docs/OMG-CCM-Tutorial.ppt - Made changes for AMI4CCM. - -Fri Apr 23 08:47:31 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Removed !FIXED_BUG_ONLY flag from the - QueryFilter test. - - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - Created a templated base class for Subscribing ports. - This in preparation of a issue with contentfilteredTopics. - It also reduces the amount of code. - -Fri Apr 23 07:10:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - Setting and getting the pointer to the DataWriter proxy - by using the PropertyQosProfile of the DDSDataWriter. - -Thu Apr 22 14:31:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - It appears that when a contentfilteredTopic is created - a new DataReader is created. The listening mask on this - Reader contains a DDS_DATA_AVAILABLE-mask while it should - use the mask which was originally set when the listener was set. - -Thu Apr 22 13:47:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - When PropertyQosProfile cannot be found, return nil. - - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - Optimized logging. - - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Also set PropertyQosProfile (proxy) after set a - contentfiltered topic. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Removed unused methods. - -Thu Apr 22 11:15:04 UTC 2010 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.h: - Doxygen changes - -Thu Apr 22 10:54:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - Resolved compile issue. - -Thu Apr 22 10:32:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - Check whether provided datareader is not nil. Also removed - some unnecessary code from DataReaderStateListener_T. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Optimizated logging. - -Thu Apr 22 09:11:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReader_T.h: - * connectors/dds4ccm/impl/dds/DataReader_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Created a type specific datareader proxy. This proxy - manages the QueryConditions, ContentFilteredTopic and - Readconditions for both the Getter, the reader and - the listeners. This proxy is used in the ports. - - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - Retrieve the pointer to the type specific datareader - proxy from a PropertyQosProfile. This way we don't have - to create new datareader proxies (which should perform better). - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Optimization - -Tue Apr 20 18:57:26 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Removed now-redundant check for non-local uses type in - generation of connect_* methods. - -Tue Apr 20 17:49:15 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Disabled generation of implied IDL operations for facets - and receptacles if the underlying interface type is local. - Ports using local interfaces are used only by the - container, and not exposed to clients. - -Tue Apr 20 09:47:50 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - Removed avoids - -Mon Apr 19 18:33:22 UTC 2010 Jeff Parsons - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - - Removed get_all_receptacles() and get_all_publishers(), - since these methods are now always generated, except - when the LwCCM flag is present. - -Mon Apr 19 15:31:00 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp(visit_uses): - - Removed generation of the connect_* method if the uses type - is a local interface. When compiling the generated *_IDL2.idl - file, the IDL compiler will check arguments for a - local/remote mismatch, so we skip this method (which takes - the interface as an IN parameter) for now. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Removed the comments around the 'local' qualifier of the - interface which produced the error mentioned above. - -Mon Apr 19 14:30:09 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp: - - Added newlines to the ends of thes files. - -Mon Apr 19 06:51:35 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - Add ccm_lw as base project - -Fri Apr 16 20:29:16 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - - Added missing 'after' line in new project. - -Fri Apr 16 20:20:07 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - - Changes to reflect differences in IDL code generation - from C++ generation, which was what this file was - for in the original TAO_IDL backend. - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed a bug in code generation for the multiplex - uses *Connection struct. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Commented out the 'local' qualifier on an interface, - temporarily until a design question involving our use - in DDS3CCM of local interfaces in regular CORBA calls. - The IDL compiler still flags this as illegal, and we - get an actual error due to an implied IDL operation - that contains the formerly local interface as a parameter. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - - Added new projects to convert KitchenSink.idl to IDL2, - process that IDL, and compile the resulting C++. - -Fri Apr 16 16:41:36 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added missing code generation for a home's supported - interfaces - as base interfaces of the explicit home - interface. Also changed layout of code generated for - component and explicit home equivalent interfaces. - -Fri Apr 16 16:07:23 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Restored some line that had been mistakenly checked in as - commented out. - -Fri Apr 16 15:30:10 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed 'unused arg' warnings. - -Thu Apr 15 19:01:37 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Fixed bug where the uses multiple helper types - struct xxxConnection and sequence xxxConnections - were generated twice for connectors with uses - multiple ports. - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Changed names of ports in connector Comp2_T to follow - the connector name. - -Thu Apr 15 17:11:58 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp: - * tools/IDL3_to_IDL2/idl3p_checking_visitor.h: - - New visitor that checks module scopes. If they - contain only template module or porttype - declarations, code generation for that module - must be skipped, since it would be empty. - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - - Added new files to project. - - * tools/IDL3_to_IDL2/basic_visitor.h: - - Removed some pure virtual methods repeated from - the ast_visitor base class. - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp(visit_module): - - Added creation and launch of the new visitor. When it's - finished, a member flag is checked to see if code - generation is necessary or not. - -Thu Apr 15 09:56:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - Layout changes - - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - Stored pointer to our proxy as class variable. The - proxy is reused. - -Thu Apr 15 09:30:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - Resolved test issues regarding portstatuslisteners. - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - Layout and naming changes. - -Thu Apr 15 10:14:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl - Add extra operation for checking code generation. - -Thu Apr 15 09:38:31 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp - Add test to test suite. - -Thu Apr 15 08:47:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp - Solve some compile warnings. - -Thu Apr 15 07:21:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - Stored pointer to our proxy as class variable. The - proxy is reused. - - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - Optimized logging. - -Wed Apr 14 19:13:15 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - - Fixed bug in code generation where the - ACE_(U)INT64_LITERAL macros were generated in - IDL. - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Changes to support IDL3+ in this tool. There are more - changes forthcoming before support is complete. - -Wed Apr 14 15:00:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/NoReplyH - * connectors/ami4ccm/tests/NoReplyH/Base - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc - * connectors/ami4ccm/tests/NoReplyH/descriptors - * connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl - * connectors/ami4ccm/tests/NoReplyH/Receiver - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h - * connectors/ami4ccm/tests/NoReplyH/Sender - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h - test AMI4CCM with no reply handlers. - -Wed Apr 14 12:41:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - Reverted latest change. - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - Since DataReaderListener_T is derived from PortStatusListener_T, - it should use the PortStatusListener_T mask to define - his own mask. - -Wed Apr 14 12:13:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - Resolved compile issue. Also extended test. - - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - Reset domain_id. - -Wed Apr 14 11:59:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc - Changes some includes. - -Wed Apr 14 10:14:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - No narrow in the critical code path. - - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: - Removed connector status listener connection since - it wasn't used. - -Wed Apr 14 09:49:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - No narrow in the critical code path. - -Wed Apr 14 08:44:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc: - Change to long project names. - -Wed Apr 14 07:29:12 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - Removed obsolete include - - * ciao/Servants/Servant_Impl_Base.cpp: - Removed unneeded return after throw - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - layout changes for debug message - - * examples/DevGuideExamples/Messenger/Administrator_Client.cpp: - Don't use full CCM methods - - * performance-tests/Benchmark/RoundTrip/client.cpp: - Const changes - -Wed Apr 14 07:13:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - Used portstatuslistener instead of DataReaderListener to - determine listening mask. - -Wed Apr 14 07:11:12 UTC 2010 Johnny Willemsen - - * MPC/config/taobaseidl3toidl2defaults.mpb: - * MPC/config/taoidl3toid2_ccm_lw.mpb: - * MPC/config/taoidl3toidl2defaults.mpb: - Added support for LwCCM - -Wed Apr 14 05:56:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - Layout changes. Turned a class variable into a local variable. - - * connectors/dds4ccm/tests/SetConnectorAttributes/Component: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - Added in order to test the setting of connector attributes - properly. - - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - Changed in order to test the setting of connector attributes - properly. - -Tue Apr 13 15:22:31 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - Add AMI4CCM test to suite. - -Tue Apr 13 15:06:31 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/Exceptions - * connectors/ami4ccm/tests/Exceptions/Base - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc - * connectors/ami4ccm/tests/Exceptions/descriptors - * connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl - * connectors/ami4ccm/tests/Exceptions/Receiver - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h - * connectors/ami4ccm/tests/Exceptions/Sender - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h - Test in server thrown exceptions are passed back correctly. - -Tue Apr 13 11:43:31 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Changed layout of a debug statement - - * ciao/ComponentServer/Client_init.cpp: - Always register ConfigValue factory - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Added missing newline to debug statement - -Tue Apr 13 11:35:31 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - When we get a CORBA exception, print its details in the log - -Tue Apr 13 10:59:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Layout change - - * ccm/CCM_Session2Context.idl: - Disable for LwCCM - -Tue Apr 13 10:06:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - Removed the receptacle administration, if the user - component has receptacles, than tao_idl already generates code - to get all of these and that code also uses the context - -Tue Apr 13 08:53:31 UTC 2010 Johnny Willemsen - - * tests/IDL3/ImpliedIDL/All/convert.idl: - Disabled some parts for LwCCM - -Tue Apr 13 07:03:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h - * ciao/Servants/Servant_Impl_Base.h - Enabled some types for LwCCM - -Mon Apr 12 18:39:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_Base.h: - Disabled some more code with LwCCM - -Mon Apr 12 18:29:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp (remove): - Reworked to work with LwCCM - -Mon Apr 12 18:15:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Reworked consumer table to work with LwCCM - -Mon Apr 12 17:48:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - Reworked facet table to work with LwCCM - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Removed code which is already in the base class - -Mon Apr 12 12:33:31 UTC 2010 Johnny Willemsen - - * performance-tests/Benchmark/RoundTrip/client.cpp: - Const change - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - Use regular guards instead of rw guards - -Mon Apr 12 12:20:31 UTC 2010 Johnny Willemsen - - * performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp - * performance-tests/Benchmark/RoundTrip/client.cpp - * performance-tests/Benchmark/RoundTripClient/client.cpp - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl - Only use LwCCM methods - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - Fixed compile warnings - -Mon Apr 12 11:40:31 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Disabled some methods for LwCCM - -Mon Apr 12 10:00:13 UTC 2010 Martin Corino - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - - Changes to allow tests to run in multiplatform setup. - -Mon Apr 12 06:56:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_EventConsumerBase.idl: - Removed ciao specific extensions which are not used anymore - -Fri Apr 9 17:56:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - Resolved compile error. - -Fri Apr 9 13:36:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Throw CORBA::BAD_PARAM with 0 for string - -Fri Apr 9 12:49:53 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - Moved connector declaration to the namespace of the test. - Give an error when this test does not run. - Also made some layout changes. - -Fri Apr 9 12:28:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp: - Moved connector declaration to the namespace of the test. - Give an error when this test does not run. - Also made some layout changes. - - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - Moved connector declaration to the namespace of the test. - Resolved test error. Number of subscribers is less than expected. - Give an error when this test does not run. - Also made some layout changes. - - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - Renamed QoS profile. - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - Removed unnecessary code. - -Fri Apr 9 11:42:31 UTC 2010 Johnny Willemsen - - * tests/IDL3/Connectors: - New test to validate that connectors don't support consumes/emits/ - publishes - - * bin/ciao_tests.lst: - Added new IDL3/Connectors test. This executes tao_idl and validates - that it fails - -Fri Apr 9 10:21:31 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Add debug statement, would have saved us a day of time to analyze - a runtime problem :-( - -Fri Apr 9 10:17:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Fixed default behaviour - -Fri Apr 9 09:46:31 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl - * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl - * examples/BasicSP/descriptors/run_test.pl - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_alias.pl - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl - * examples/Hello/descriptors/run_test_without_ns.pl - * examples/Null_Component/descriptors/run_test.pl - * examples/Null_Component/descriptors/run_test_without_ns.pl - * examples/Null_Component_Glfa/descriptors/run_test.pl - * tests/Bug_2130_Regression/descriptors/run_test.pl - * tests/Bug_3769_Regression/descriptors/run_test.pl - * tests/Bug_3834_Regression/descriptors/run_test.pl - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl - Don't change tracing flags - -Fri Apr 9 08:48:31 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Throw exceptions by default - -Fri Apr 9 08:23:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_Context.idl - * ccm/Security.idl - * ciao/Contexts/Context_Impl_Base.cpp - * ciao/Contexts/Context_Impl_Base.h - Disable more features with LwCCM - -Fri Apr 9 08:07:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_Navigation.idl: - * ccm/CCM_PrimaryKeyBase.idl: - * ccm/CCM_Receptacle.idl: - Disable more types and methods with LwCCM - - * ciao/ComponentServer/Client_init.cpp - * ciao/Servants/Connector_Servant_Impl_Base.cpp - * ciao/Servants/Connector_Servant_Impl_Base.h - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp - * ciao/Servants/Servant_Impl_Base.cpp - * ciao/Servants/Servant_Impl_Base.h - Disabled several methods, we need to reimplement - some methods for LwCCM, they use regular CCM types. Tagged - these methods as a todo - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Disabled part of this test with LwCCM - -Fri Apr 9 07:32:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_HomeRegistration.idl: - * ccm/CCM_ProxyHomeRegistration.idl: - Disable these interfaces with LwCCM - -Thu Apr 8 19:03:20 UTC 2010 Jeff Parsons - - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - - Updated hand-crafted executor to reflect the additional attriutes - added in - - Wed Apr 7 16:48:30 UTC 2010 Jeff Parsons - -Thu Apr 8 12:02:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - In preparation of an upcoming fix. - -Thu Apr 8 11:28:53 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: - Solved test issues. In order to receive a subscription matched in the - Receiver and a publication matched in the Sender, there must be connection - between a datareader and a datawriter configured in the deployment plan. - Sender should receive a publication matched since it only uses a - publisher (and no subscriber). - Layout changed. - -Thu Apr 8 10:15:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - Solved test issues. In order to receive a subscription matched in the - Receiver and a publication matched in the Sender, there must be connection - between a datareader and a datawriter configured in the deployment plan. - Sender should receive a publication matched since it only uses a - publisher (and no subscriber). - Layout changed. - -Thu Apr 8 09:56:31 UTC 2010 Johnny Willemsen - - * MPC/config/ccm_lw.mpb: - Added -Gcl - - * ciao/Servants/Servant_Impl_T.cpp: - Fix for LwCCM - -Thu Apr 8 08:47:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Thu Apr 8 07:42:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_ComponentId.idl - * ccm/CCM_ExecutorLocator.idl - LwCCM updates - -Thu Apr 8 07:29:31 UTC 2010 Johnny Willemsen - - * ccm/CCM_Entity2Context.idl - * ccm/CCM_EntityComponent.idl - * ccm/CCM_EntityContext.idl - * ciao/ComponentServer/Client_init.cpp - * ciao/Contexts/Context_Impl_Base.cpp - * ciao/Contexts/Context_Impl_Base.h - * ciao/Servants/Connector_Servant_Impl_Base.cpp - * ciao/Servants/Connector_Servant_Impl_Base.h - * ciao/Servants/Servant_Impl_Base.cpp - * ciao/Servants/Servant_Impl_Base.h - * ciao/Servants/Servant_Impl_Utils_T.cpp - * ciao/Servants/StandardConfigurator_Impl.cpp - * ciao/Servants/StandardConfigurator_Impl.h - Disabled more idl and code for lwccm. This is really work - in progress, some lwccm code uses methods from full ccm which - means that code has to be rewritten to use other types. First step - is to update all IDL and get code to compile to see what runs - and what not - -Thu Apr 8 06:48:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl: - Resolved fuzz error. - -Thu Apr 8 06:38:31 UTC 2010 Johnny Willemsen - - * MPC/config/avoids_ccm_lw.mpb: - * MPC/config/ccm_lw.mpb: - Fixed typo - -Wed Apr 7 19:00:31 UTC 2010 Johnny Willemsen - - * MPC/config/ciaoidldefaults.mpb: - Update for lwccm - - * ccm/CCM_CCM2Context.idl: - * ccm/CCM_Configurator.idl: - * ccm/CCM_Context.idl: - * ccm/CCM_Events.idl: - * ccm/CCM_Home.idl: - * ccm/CCM_HomeConfiguration.idl: - * ccm/CCM_HomeFinder.idl: - * ccm/CCM_Navigation.idl: - * ccm/CCM_Object.idl: - * ccm/CCM_Receptacle.idl: - * ccm/CCM_SessionSynchronization.idl: - * ccm/CCM_StandardConfigurator.idl: - * ccm/CCM_StateIdFactory.idl: - * ccm/CCM_Transaction.idl: - * ccm/CosPersistentState.idl: - Disabled a lot of interfaces, methods, and types when ccm_lw - is enabled - -Wed Apr 7 16:48:30 UTC 2010 Jeff Parsons - - * examples/Hello/Sender/Sender.idl: - - Added attributes to test support of sequence type, since there - is already a test case in this component for attributes of - enum type. - -Wed Apr 7 14:08:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc: - Removed unnecessary define. - - * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - Corrected previous commit. - -Wed Apr 7 13:46:12 UTC 2010 Jeff Parsons - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - - Commented out an unused argument. - -Wed Apr 7 12:12:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h: - * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl: - Moved templated connector to the namespace of the connector. - - * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - Removed this file since we don't need it in this test. - - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - Moved templated connector to the namespace of the connector. - -Wed Apr 7 11:09:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/*: - Rewritten this test in order to be more consistent. - Also renamed files. - -Wed Apr 7 07:14:22 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/PortUsage/*: - Added test which tests the number of DataReaders and - DataWriters used in DDS. - -Wed Apr 7 07:06:31 UTC 2010 Johnny Willemsen - - * MPC/config/avoids_ccm_lw.mpb: - * MPC/config/ccm_lw.mpb: - New base projects for future use, to be used for explicitly - supporting LwCCM by disabling features - -Wed Apr 7 06:58:31 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QosProfile/*: - Added test which tests whether deployment fails when an - incorrect profile name is given. - -Wed Apr 7 06:48:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - Resolved test errors. These errors are related to the fact that - CIAO now throws an InvalidName exception when the given name of - a local facets is unknown. The name of a local facet is - configured in the deployment plans. - -Wed Apr 7 06:14:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Resolved compile errors. - -Tue Apr 6 18:51:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Prevented memory leak by using xxx_var variables and - then test whether they're nil. - - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp: - Moved Connector declaration to the ListenManyByMany module. - Also resolved test errors. - - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp: - Moved Connector declaration to the ListenOneByOne module. - Also resolved test errors. - -Tue Apr 6 13:53:12 UTC 2010 Johnny Willemsen - - * ciao/Containers/Container_Base.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - Updated doxygen and removed several methods which where not used at all - -Tue Apr 6 12:40:12 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp (get_facet_executor): - Throw an exception as default, see 6.4.3.3 from the CCM spec - -Tue Apr 6 11:19:12 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed some more runtime problems - -Tue Apr 6 11:12:12 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed connecting of local facets - -Tue Apr 6 09:47:12 UTC 2010 Marcel Smit - - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - Resolved compile issue on Linux. - -Tue Apr 6 08:51:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Layout changes - - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - Made use of typedefs for templated classes. - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - When an extended port is partially or fully connected, - all basic ports in this extended port are initialised. - When an extended port is not connected. non of the basic - ports will be connected. - This means that the performance should increase and - the usage of ports (and configuring them in the deployment - plans) is more strict. - - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Fixed QueryCondition support. - Also rewritten/added some Doxygen. - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - Removed connector status listener since the sample rejected status isn't part - of a 'subscriber only' component. - - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp: - DDS4CCM used to create all extended and basic ports by default. Now that has changed, some tests - log errors since they do expect a publisher or subscriber. Since these DDS entities are not there - by default anymore, some tests had to be rewritten. - Removed some unnecessary code. - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - Optimized log output. - -Fri Apr 2 19:40:00 UTC 2010 Jeff Parsons - - * ciao/Servants/Servant_Impl_Base.cpp: - - Cosmetic changes to debug output. - - * ciao/Servants/Servant_Impl_Base.h: - - Removed pure virtual methods that are present in the base - class Connector_Servant_Impl_Base. - -Fri Apr 2 16:47:27 UTC 2010 Jeff Parsons - - * ciao/Containers/Session/Session_Container.cpp: - - Changes related to the creation of the - Connector_Servant_Impl_Base class. - - * ciao/Contexts/Context_Impl_T.h: - - Cosmetic changes. - -Fri Apr 2 16:39:42 UTC 2010 Jeff Parsons - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - - New files, containing the parts of class - Servant_Impl_Base (which is now derived from - class Connector_Servant_Impl_Base) pertaining - to facets and receptacles, since event sources - and sinks are not allowed in connectors. - - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - - Similar split from Servant_Impl_Utils_T.cpp, - containing static methods pertaining only to - facets and receptacles. - - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servants.mpc: - * ciao/Servants/Home_Servant_Impl_T.h - * ciao/Servants/StandardConfigurator_Impl.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Servants/StandardConfigurator_Impl.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_Base.cpp: - - Other changes necessary to enable a connector - to inherit from a smaller base class than a - component, with no-ops for all inherited - methods pertaining to event sources or sinks. - The non-skeleton base class of Servant_Impl - is now determined by a trait in the CONTEXT - template parameter, which is set in generated - code according to the type (component or connector) - the servant is implementing. - -Fri Apr 2 15:36:11 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - - Added necessary files and library to connector project. - -Fri Apr 02 10:50:48 CEST 2010 Johnny Willemsen - - * CIAO version 0.7.8 released. - -Fri Apr 02 08:10:13 UTC 2010 Martin Corino - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - 2nd attempt to fix link error in static build. - -Thu Apr 01 08:03:13 UTC 2010 Martin Corino - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - Another fix for link error in static build. - -Wed Mar 31 17:49:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Use a loop to send, not using ace reactor - -Wed Mar 31 15:26:54 UTC 2010 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Small changes to debug statements to get consistent logging - - * ciao/Servants/Servant_Impl_T.cpp: - Log a message when we can't set the session context - -Wed Mar 31 13:49:23 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitechSink.idl: - - Added full definition of eventtype that recently had 2 forward - declarations uncommented. Missing full definition was causing - 'unresolved' link errors. - -Wed Mar 31 13:37:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Use take instead of take_next_sample - -Wed Mar 31 09:45:13 UTC 2010 Martin Corino - - * DAnCE/NodeManager/Node_Manager.cpp: - * DAnCE/NodeManager/NodeManager.mpc: - Added CIAO logger initialization to be able to see logging - from reused CIAO components (like Server activator). - -Wed Mar 31 09:38:13 UTC 2010 Martin Corino - - * DAnCE/TargetManager/TargetManager.mpc: - Fix for link error in static build. - -Wed Mar 31 07:51:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - Fixed incorrect types with qsort - -Tue Mar 30 19:26:54 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Uncommented multiple forward declared eventtype case, - problem has been fixed. - -Tue Mar 30 10:31:13 UTC 2010 Martin Corino - - * tools/Completion/CompletionHandler_T.h: - Fix compile warnings concerning non-virtual destructor. - -Tue Mar 30 09:24:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/* - Removed, LatencyTT will be removed to Latency, that is the ping - pong latency test with two topics - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - Catch some exceptions by const - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Print statuskind - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Reduced sleep time - -Tue Mar 30 09:14:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - Fixed compile errors - -Tue Mar 30 08:35:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - Layout changes. - - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - Resolved linking issues on Windows. - -Tue Mar 30 08:22:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Reverted my previous changes. Committed too soon.. - -Mon Mar 29 13:11:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - Added booleans to determine which ports were connected. - This to prevent starting unnecessary DataReaders/DataWriters. - - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Added booleans to determine which ports were connected. - This to prevent starting unnecessary DataReaders/DataWriters. - Added tracing. - -Mon Mar 29 12:43:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h: - Reduced number of atomic variables - -Mon Mar 29 12:18:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - Use more ACE_UINT64 to avoid truncations - -Mon Mar 29 12:03:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - Added several projects - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Added another export macro - -Mon Mar 29 10:33:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - Fixed this MPC file - -Mon Mar 29 10:15:13 UTC 2010 Martin Corino - - * tools/Completion/Completion_Counter_Base.h: - * tools/Completion/Completion_Counter_Base.inl: - Fix compile warnings concerning non-virtual destructor. - -Fri Mar 26 15:50:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Getter_T.h: - Changed doxygen documentation. - - * connectors/dds4ccm/impl/dds/Reader_T.h: - Added doxygen documentation. - -Fri Mar 26 13:03:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Removed unnecessary code. - -Fri Mar 26 12:20:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - Added extra component and connector in order to detect runtime errors during shutdown. - The shutdown errors which occured were related to the implementation of topic reuse - in the dds4ccm connector. - -Fri Mar 26 10:07:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Don't use find_topic since it creates a new topic which has - to be deleted. Use lookup_description instead. This way, there're no - errors when deleting the DomainParticipant. - -Fri Mar 26 08:25:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - Fixed warnings on linux. - -Thu Mar 25 19:14:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Improved deletion of topics. - Improved logging. - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - Improved deletion of DomainParticipants - Improved logging. - -Thu Mar 25 15:44:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - Optimized logging. Throwing an exception when the connector - was unable to delete the DomainParticipant. - -Thu Mar 25 15:27:13 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl - Add extra inactive reader and writer, optional with cmd line argument -b. - -Thu Mar 25 13:55:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Created administration for topic reuse. This should solve - the shutdown errors of the hello example. - -Thu Mar 25 12:32:13 UTC 2010 Martin Corino - - * EM-Redeployment: - * EM-Redeployment/run_test.pl: - * EM-Redeployment/README: - Added test for faultless redeployments. - - * Components/SimpleFailure.mpc: - * Components/SimpleFailure_exec.cpp: - * Components/SimpleFailure_exec.h: - * Components/SimpleFailure.idl: - * EM-Launch-Failures: - * EM-Launch-Failures/5NodeFailureAtStartup.cdp: - * EM-Launch-Failures/1NodeNoFailure.cdp: - * EM-Launch-Failures/2NodeNoFailure.cdp: - * EM-Launch-Failures/5NodeNoFailure.cdp: - * EM-Launch-Failures/1NodeFailureAtActivate.cdp: - * EM-Launch-Failures/2NodeFailureAtActivate.cdp: - * EM-Launch-Failures/1NodeFailureAtStartup.cdp: - * EM-Launch-Failures/2NodeFailureAtStartup.cdp: - * EM-Launch-Failures/run_test.pl: - * EM-Launch-Failures/5NodeFailureAtActivate.cdp: - * EM-Launch-Failures/README: - Added test for redeployments after launch failures. - -Thu Mar 25 12:14:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp: - Resolve start errors throughput test. - -Thu Mar 25 12:14:13 UTC 2010 Martin Corino - - * Deployment/DAnCE_Core.mpc: - * DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DomainApplication/DomainApplication.mpc: - * DomainApplication/Domain_Application_Impl.cpp: - Fixes for Visual Studio warnings and errors. - -Thu Mar 25 11:44:13 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_SharedMem.cdp - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_UDPv4.cdp - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.mpc - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h - Change from 2 topics, 2 idl types and 2 connectors to 2 topics, 1 idl type and 1 connector. - -Thu Mar 25 10:52:13 UTC 2010 Martin Corino - - * tools/Completion/Completion_Counter_Base.h: - * tools/Completion/Completion_Counter_Base.inl: - Fuzz fixes. - -Thu Mar 25 10:33:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - Layout changes. - Addes -q as a commandline parameter. One can set the qos_profile name with - this commandline parameter. - - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: - Copied from the LatencyTT test. - - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: - Changed this script in order to run more test with different - qos names. - -Thu Mar 25 08:52:13 UTC 2010 Martin Corino - - * Deployment/DAnCE_Core.mpc: - * DomainApplicationManager/DomainApplicationManager.mpc: - * DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DomainApplicationManager/DomainApplicationManager_Impl.h: - * DomainApplication/Domain_Application_Impl.h: - * DomainApplication/DomainApplication.mpc: - * DomainApplication/Domain_Application_Impl.cpp: - * ExecutionManager/ExecutionManager_Impl.cpp: - * ExecutionManager/ExecutionManager_Impl.h: - * ExecutionManager/ExecutionManager.mpc: - * tools/Completion/CompletionHandler_T.h: - * tools/Completion/Completion_Counter_Base.h: - * tools/Completion/Completion_Counter_Base.inl: - * tools/Completion/Completion_Counter_Base.cpp: - - Changed implementation of deployment operations global to local entities - (preparePlan, startLaunch etc.) to use a combination of AMH and AMI to - make this part of the deployment fully asynchronous. - The sequentiality of the operations is still maintained (i.e. a plan needs to - be fully prepared before a launch operation can be started etc.). - -Thu Mar 25 07:39:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_SharedMem.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_UDPv4.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/USER_QOS_PROFILES.xml: - Merged two deployment plans into one. - Merged two qos files into one. - - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl: - Changed run_test.pl to run all deployment plans in this directory. - - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/USER_QOS_PROFILES.xml.shmem: - Removed these files. - -Wed Mar 25 13:52:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp - Reuse the DDS4CCM_DEFAULT_DOMAINID, this is unique on all - build systems - -Wed Mar 24 13:33:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Resolved fuzz errors. - -Wed Mar 25 13:31:27 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/DDSLatency - * connectors/dds4ccm/performance-tests/DDSLatency/Base - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml - DDS Latency test without DDS4CCM - - -Wed Mar 25 12:24:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - Layout changes - - * connectors/dds4ccm/impl/dds/Publisher.cpp: - Added some more logging - - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - Fixed typo - -Wed Mar 25 11:41:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - Reuse the DDS4CCM_DEFAULT_DOMAINID, this is unique on all - build systems - -Wed Mar 25 11:21:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl - Don't change log/trace levels in the scripts - -Wed Mar 24 10:35:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Resolved issues in delete_topic. When more than one topic - with the same name are created, this first topic is reused. - Use _refcount_value to determine the last topic. This last - topic has to be deleted. - -Wed Mar 24 09:59:35 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Errors in CSLUnexpStat are fixed. - -Wed Mar 24 09:11:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Utils.h: - * connectors/dds4ccm/impl/dds/ndds/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Added RELIABLE_WRITER_CACHE_CHANGED_STATUS. - - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.h: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/ndds/ReliableReaderActivityChangedStatus.h: - Added RELIABLE_WRITER_CACHE_CHANGED_STATUS and fixed - issues regarding RELIABLE_DR_CHANGED_STATUS. - -Wed Mar 24 07:11:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Created passivate on Reader. This prevents precondition_not_met errors. - - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - Setting internal reader to nil in set_impl. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Layout changes. - -Tue Mar 23 15:16:13 UTC 2010 Martin Corino - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Fixed exit codes so these can really be used to check exit status in test scripts. - -Tue Mar 23 13:54:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - Optimized logging. - - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl: - Removed unused attribute. - - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - Layout changes. Changed starting up since the sender does not start when the - thread switch is turned on. - -Tue Mar 23 11:43:27 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Enabled dds throughput test - - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/USER_QOS_PROFILES.xml: - Deleted - - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: - Added - -Tue Mar 23 11:41:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - TAO sequence doesn't have maximum setter - - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors: - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl: - Added one button perl script - -Tue Mar 23 11:27:07 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/DDSThroughput - * connectors/dds4ccm/performance-tests/DDSThroughput/Base - * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl - * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/USER_QOS_PROFILES.xml - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/USER_QOS_PROFILES.xml - Throughput test without CCM. - -Tue Mar 23 07:27:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Layout changes - - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - Throw an exception when something goes wrong during - shutdown. - - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - When an error occurs during return_loan, a log message is - generated. - - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - When an error occurs during return_loan, a log message is - generated. - Renamed ccm_dds_writer_i to ccm_dds_writer_ - -Mon Mar 22 19:47:27 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Removed some code that was just doing nothing and check for is_nil - before invoking a method on an object reference - -Mon Mar 22 19:32:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Fixed this cdp again - -Mon Mar 22 19:23:27 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Extended logging when retrieving the entry points fails - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - Added skel export macro - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Build svnt library - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - First set of fixes after all rename actions - -Mon Mar 22 18:07:32 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - - Removed exec export macro and include from AMI_Hello_idl_gen - project. The former was not used, probably intended to - be used for the same thing as the lem stub export macro - and include in AMI_Hello_lem_gen. This latter project had - no command to actually generate the export header file, - so -Gxhst was added to that project. - -Mon Mar 22 17:44:03 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/examples/Hello/Connector: - - Removed this directory again, after SVN automatically restored - it after my update with modified files in that directory. - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - - Cosmetic changes. - -Mon Mar 22 16:08:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: - Enabled these projects again - -Mon Mar 22 15:43:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Build more projects - -Mon Mar 22 14:33:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/ccm_dds.idl: - Layout changes. - -Mon Mar 22 14:11:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - No return_loan was invoked when using ONE_BY_ONE mode. Therfor - a precondition_not_met error was given when the datareader - was removed. - -Mon Mar 22 13:29:41 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryFilterListenState/*: - Added test which tests the Queryfilter in combination - with a StateListener. - - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - Layout changes. - - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - Added trace info for configuration_complete, activate, - passivate and remove. - - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Removed unnecessary method. Removed unnecessary - log info. - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Optimized comments. - -Mon Mar 22 12:11:27 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Layout change - - * connectors/ami4ccm/examples/Hello/Base/AMI.mpc: - Removed - - * connectors/ami4ccm/examples/Hello/Base/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/Base/AMI_exec.h - Moved to the HandCrafted subdirectory, this could should be - generated by TAO_IDL - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl: - Added another ciao lem - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Added some more subprojects to generate all ami4ccm code - -Mon Mar 22 10:35:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Receiver/QFLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilterListenEvent/Sender/QFLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/Plan.cdp: - Layout changes and cleanup. - -Fri Mar 19 10:01:27 UTC 2010 Johnny Willemsen - - * MPC/config/connectoridldefaults.mpb: - Moved file extension rules to TAO - -Mon Mar 22 08:52:11 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryFilterListenEvent/*: - Added Queryfilter test for the Listener - -Fri Mar 19 19:05:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/dds/DataReader.h - * connectors/dds4ccm/impl/dds/DataWriter.cpp - * connectors/dds4ccm/impl/dds/Publisher.cpp - * connectors/dds4ccm/impl/dds/Reader_T.cpp - Layout/docu changes - -Fri Mar 19 15:30:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test: - Started IDL Test for AMI4CCM code generation - -Fri Mar 19 10:35:27 UTC 2010 Johnny Willemsen - - * MPC/config/ciaoidldefaults.mpb: - Moved commandline arg handling to TAO MPC file, it are features - of tao_idl - -Fri Mar 19 10:33:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h - Fixed gcc warnings - -Thu Mar 18 18:38:35 UTC 2010 Jeff Parsons - - * MPC/config/ami4ccm_lem_stub.mpb: - * MPC/config/ami4ccm_servant.mpb: - - New base projects for AMI4CCM applications. - - * connectors/ami4ccm/ami4ccm/ami4ccm_lem_stub.mpc: - - Removed this MPC file and copied its projects to - the modified file below. - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - - Copied the lem-related projects from the removed - file above, and added a servant project. - -Thu Mar 18 14:52:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - The CORBA representative of the DDS entities were passed to - the underlying ports. There's no need to do that and so there's no - need to keep these interfaces as a member in the proxy classes - of the ports. - We're now passing the proxies to the underlying implementation. - -Thu Mar 18 12:36:29 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - Add dds4ccm performance tests. - -Thu Mar 18 12:26:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl - _Seq to Seq update - -Thu Mar 18 11:51:29 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Throughput - * connectors/dds4ccm/performance-tests/Throughput/Base - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc - * connectors/dds4ccm/performance-tests/Throughput/Connector - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc - * connectors/dds4ccm/performance-tests/Throughput/descriptors - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl - * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml - * connectors/dds4ccm/performance-tests/Throughput/Receiver - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h - * connectors/dds4ccm/performance-tests/Throughput/SecConnector - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc - * connectors/dds4ccm/performance-tests/Throughput/Sender - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h - Throughput test DDS4ccm. - -Thu Mar 18 11:50:27 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer.cpp: - Add more failure reporting to the user - -Thu Mar 18 09:44:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Replaced the DataReader of the Getter when a - contentfiltered topic is created by the Reader (i.e. the - user creates a filter on the DataReader). Therefor - the template arguments of the Reader should be - extended with 'FIXED'. Because of that, several other - template classes needed to be extended with this. - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Optimized logging. - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Added check whether DDS4CCM_USES_QUERY_CONDITION and - CIAO_DDS4CCM_CONTEXT_SWITCH are not already defined. - - * connectors/dds4ccm/impl/logger/Log_Macros.h: - Layout changes. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - The getter test also runs when DDS4CCM_USES_QUERY_CONDITION is 0. - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc: - Resolved compile issues related to renaming '_Seq' into 'Seq'. - -Thu Mar 18 07:59:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h - * connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl - * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.idl - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl - * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h - * connectors/dds4ccm/tests/NoModule/NoModule.idl - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - Use Seq as postfix for the dds4ccm user sequences instead of _Seq - - * MPC/config/dds4ccm_ts_default.mpb: - Use the new rtiddsgen 4.5 features to only show errors and the - RTI DDS sequences now get a RTISeq postfix - -Wed Mar 17 19:11:41 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - - Added a template module containing a porttype and connector - declaration that is instantiated to create an AMI - connector. - -Wed Mar 17 11:09:27 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed unicode - -Wed Mar 17 10:12:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/impl/dds/DataReader.cpp - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/dds/DataWriter.cpp - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/dds/Publisher.cpp - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/dds/QueryCondition.cpp - * connectors/dds4ccm/impl/dds/Subscriber.cpp - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/dds/Topic.cpp - * connectors/dds4ccm/impl/dds/TopicDescription.cpp - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp - Make sure we get the global CORBA namespace - -Wed Mar 17 09:42:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc - * connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc - * connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - Layout fixes - -Wed Mar 17 08:58:27 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - Added default includes - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp - * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc - * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - Simplified these projects - -Wed Mar 17 07:46:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - Fixed compile issues for State connectors. - -Tue Mar 16 15:50:10 UTC 2010 Johnny Willemsen - - * ciao/Logger/Log_Macros.h - * DAnCE/Logger/Log_Macros.h - Fixed enable/disable macros - -Tue Mar 16 11:39:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - Don't need to check for the existence of a ContentFilteredTopic. - It's now ok to just delete the existent DataReader. - - * connectors/dds4ccm/impl/dds/DataReader.cpp: - Implemented get_topicdescription. - - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Rewritten ContentFilteredTopic implementation using - just the DDS entities. - -Mon Mar 15 20:21:10 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.h: - Const change - - * ciao/Logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * DAnCE/Logger/Log_Macros.h: - Disable tracing by default - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - Added svnt macros - -Mon Mar 15 15:20:10 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.mpc: - Changed too long project names. - -Mon Mar 15 14:14:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.h: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/StatusCondition.h: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicDescription.cpp: - * connectors/dds4ccm/impl/dds/TopicListener.h: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - * connectors/dds4ccm/impl/dds/Utils.h: - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/StringSeq.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Added dds4ccm_conf header file. In this file, all defines and includes can be - managed. Therefor we don't check if a define is there, we just check its - value. This should force the user to include this file when needed. - -Mon Mar 15 11:55:10 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/LatencyTT: - * connectors/dds4ccm/performance-tests/LatencyTT/Base: - * connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/Connector: - * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/README: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector: - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h: - New Latency test which used Two Topics to calculate round trip time. - -Mon Mar 15 11:50:10 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Updated ciao lem pragma - -Mon Mar 15 11:28:10 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Added CCM_AMI::AMI_Base connector, all AMI4CCM implied - connectors will be derived from this base connector - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - Uses now ccm - - * connectors/ami4ccm/ami4ccm/ami4ccm_lem_stub.mpc: - new file to generate the lem stub dll - -Mon Mar 15 10:48:10 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Removed unnecessary logging. - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Removed unnecessary narrowing of a DataReader. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Shutdown timer when ccm_remove is invoked. - -Fri Mar 12 20:49:58 UTC 2010 William R. Otte - - * DAnCE/docs/OMG-DnC-Tutorial.ppt: - - Updated runtime diagram. - - * DAnCE/docs/sources/dance-deployment.odg: - - Source for runtime diagram. - -Fri Mar 12 14:47:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - Don't delete the datareader when a ContentFilteredTopic is - used. - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Implemented delete_contentfilteredtopic. Also trying to - delete the contentfiltered topic when it's topic is deleted. - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Removed commented code. - -Fri Mar 12 14:00:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp - Tests are using ACE logging, not CIAO logging - -Fri Mar 12 13:34:08 UTC 2010 Johnny Willemsen - - * ccm/CCM_lem_stub.mpc: - Added missing after - -Fri Mar 12 13:10:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - Layout and const changes - -Fri Mar 12 12:53:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - Rewritten interaction between sender and receiver. - -Fri Mar 12 11:27:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Resolved runtime issue regarding QueryCondition. - -Fri Mar 12 11:06:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp: - Since the default participants are also shared, this test fails since - both topics will be created on the same participant. Now the sender - deploys the first topic and the receiver deploys the second (which - is different from the first but has the same topic name). - -Fri Mar 12 10:45:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp: - Renamed topic names. - - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Resolved linking issues on Windows. - -Fri Mar 12 09:12:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Resolved runtime issue regarding different structs with the - same topic name. - -Thu Mar 11 20:03:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Improved logging. - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Code layout. Do not call delete_datareader when applying - filter. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Test whether DDS returns samples at all. - -Thu Mar 11 19:45:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - Use different QoS settings - -Thu Mar 11 14:33:08 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Document DDS4CCM_NDDS_LOG_VERBOSITY - -Thu Mar 11 14:08:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Using the right port. - -Thu Mar 11 13:41:08 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - added some dds4ccm sheets - -Thu Mar 11 13:30:45 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Decrease roundtrip_time with clock_overhead_time. Set buffersizes in Qos file. - -Thu Mar 11 08:34:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Also reusing the topic for the default qos. - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - Resolved bug regarding reusing the domainparticipant for - default qos. - -Thu Mar 11 07:46:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl: - Moved templated connector to the VTopics namespace. - - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc: - Added an union connector. - - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc: - Added a valuetype connector. - - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc: - Added the union and valuetype connectors to these mpc files. - -Wed Mar 10 22:59:02 UTC 2010 William R. Otte - - * tests/IDL_Test/Glfa/B.mpc: - - Fixes for linking issues. - -Wed Mar 10 22:57:02 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - - Tweaked export directives to solve linking issue on Windows. - -Wed Mar 10 22:55:39 UTC 2010 William R. Otte - - * tests/IDL_Test/Glfa/B_exec.h: - * tests/IDL_Test/Glfa/B_exec.cpp: - - Removed these files. - -Wed Mar 10 22:41:45 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Fix for a segmentation fault on some platforms. - -Wed Mar 10 22:36:40 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Components/Progressive_exec.h: - * DAnCE/tests/CIAO/Components/Progressive_exec.cpp: - - Missing from my previous commit. - -Wed Mar 10 20:34:07 UTC 2010 Abdul Sowayan - - * tests/Minimum/Receiver/Receiver_exec.h: - * tests/Minimum/Receiver/Receiver_exec.cpp: - * tests/Minimum/Sender/Sender_exec.h: - * tests/Minimum/Sender/Sender_exec.cpp: - - Minor code cleanup. - -Wed Mar 10 14:33:00 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/tests/CIAO/CommandlinePassage/Component.cdp: - - Adding logic allowing explicitly deployed components. As a - consequence, properties attached to components will no longer be - passed into their associated component servers. These - properties must now be associated with a component server that - is in a same process locality constraint the component. - -Wed Mar 10 13:24:23 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Components/Progressive.idl: - * DAnCE/tests/CIAO/Components/Progressive.mpc: - * DAnCE/tests/CIAO/Progressive_Deployments: - * DAnCE/tests/CIAO/Progressive_Deployments/NodeManagerMap.dat: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_A.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_B.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/Plan_C.cdp: - * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl: - - Progressive deployment example. - -Wed Mar 10 14:26:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl: - Moved all templated connectors to the VTopics module. - -Wed Mar 10 14:12:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - Added an Union connector. - -Wed Mar 10 13:51:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Resolved linker issues on Windows. - -Wed Mar 10 13:39:45 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - Remove ConnectorStatusListeners from Receivers and cdp's, clean code Sender. - -Wed Mar 10 12:07:45 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Print duration of total runs. - -Wed Mar 10 11:54:08 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/AMI.idl: - Removed, generated by TAO_IDL - - * connectors/ami4ccm/examples/Hello/Base/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Base/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/Base/AMI4CCM_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/Base/AMI4CCM_MyFoo_i.h: - moved myfoo_i into the exec and removed this file - - * connectors/ami4ccm/examples/Hello/Base/AMI.mpc: - Updated because of removed files - -Wed Mar 10 11:39:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Resolved compile error when DDS4CCM_USES_QUERY_CONDITION - is not set. - -Wed Mar 10 11:21:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Check whether DDS4CCM_USES_QUERY_CONDITION is defined and one. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Disabled getter test when DDS4CCM_USES_QUERY_CONDITION is - not defined. - -Wed Mar 10 10:28:55 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Set QueryFilter to !FIXED. - - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - Using lookup_description instead of find_topic. When using - find_topic one should use delete_topic. No need for that when - using lookup_description. - Refactored lookup_description method. Check whether TopicDescription - is a Topic or a ContentFilteredTopic. - - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - Also share domainparticipant between default QOS. - - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Calling delete_readcondition when QueryCondition is set. - - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Refactored. This test now uses the Getter port. Added a getter in order to test - the QueryCondition on the Getter. - -Wed Mar 10 08:47:43 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/*: - Moved to the base directory - -Wed Mar 10 08:36:45 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Change order of variables. - -Tue Mar 9 17:22:43 UTC 2010 Johnny Willemsen - - * connector/dds4ccm/impl/dds/DataReaderListener_T.cpp - * connector/dds4ccm/impl/dds/DataReaderStateListener_T.cpp - * connector/dds4ccm/impl/dds/DomainParticipantFactory.cpp - * connector/dds4ccm/impl/dds/Getter_T.cpp - * connector/dds4ccm/impl/dds/ReadCondition.h - * connector/dds4ccm/impl/dds/Reader_T.cpp - Layout and doxygen changes - -Tue Mar 9 16:17:25 UTC 2010 William R. Otte - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * bin/ciao_tests.lst: - - Extended test to excercise sharing when no qos is specified. - This test currently fails. - -Tue Mar 9 14:40:45 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - Add test to ciao_tests.lst and start from run_test.pl two different cdp's. - -Tue Mar 9 14:14:43 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated CIF - -Tue Mar 9 13:16:38 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Added dynamicflags omitted from previous commit on file. - -Tue Mar 9 13:10:45 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Change attribute datalen of sample in 10 runs of increasing datalen's. Change layout output. - -Tue Mar 9 13:08:09 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - - Address ordering problems with builds. - -Tue Mar 9 13:04:53 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl: - - fuzz. - -Tue Mar 9 06:45:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - Resolved issues regarding QueryCondition. - -Tue Mar 9 00:46:09 UTC 2010 Abdul Sowayan - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h: - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp: - - Cleaned up the example. - -Mon Mar 8 23:54:02 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py: - - Added script used to generate large plans. - -Mon Mar 8 23:52:06 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - - Improved error reporting. - - * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: - - bugfix, requested node names weren't inserted properly. - - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Increased log level needed for trace-level split plan messages. - -Mon Mar 8 23:50:38 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/NodeManagerMap.dat: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - - Various fixes. - -Mon Mar 8 22:11:40 UTC 2010 Abdul Sowayan - - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component_Glfa/Null_Component_exec.h: - * examples/Null_Component_Glfa/Null_Component_exec.cpp: - - Updated generated code. - -Mon Mar 8 21:02:39 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Stab at a warning fix. - -Mon Mar 8 20:56:43 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Large_Deployment: - * connectors/dds4ccm/examples/Large_Deployment/Common: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Connector: - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl: - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp: - * connectors/dds4ccm/examples/Large_Deployment/descriptors: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp: - * connectors/dds4ccm/examples/Large_Deployment/lib: - - Large deployment example. - -Mon Mar 8 20:01:50 UTC 2010 William R. Otte - - * tests/IDL_Test/Glfa: - * tests/IDL_Test/Glfa/A.idl: - * tests/IDL_Test/Glfa/A.mpc: - * tests/IDL_Test/Glfa/B.idl: - * tests/IDL_Test/Glfa/B.mpc: - * tests/IDL_Test/Glfa/B_exec.h: - * tests/IDL_Test/Glfa/B_exec.cpp: - - Test to verify Glfa compiles. - -Mon Mar 8 19:22:43 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated CIF - -Mon Mar 8 19:03:51 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_plan_launcher.mpb: - * DAnCE/Plan_Launcher/EM_Launcher.h: - * DAnCE/Plan_Launcher/NM_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Export.h: - - Reverted the substance of Mon Mar 8 10:04:43 UTC 2010, - fixing the problem in a better way. - -Mon Mar 8 16:26:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h: - Moved type traits outside of NDDS namespace - -Mon Mar 8 16:02:05 UTC 2010 Abdul Sowayan - - * tests/Bug_3834_Regression/CompB_exec.h: - * tests/Bug_3834_Regression/CompB_exec.cpp: - - Fixed a typo that caused issues on Windows based platforms. - -Mon Mar 8 15:20:43 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - List AMI4CCM pragma's - -Mon Mar 8 15:15:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp: - Created nested modules for Connector and Sender as well. Placed them in - totally different namespaces. - -Mon Mar 8 14:40:43 UTC 2010 Johnny Willemsen - - * dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc: - enabled exec - - * dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp: - Fixed compile problem - -Mon Mar 8 13:58:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DoubleNestedModule: - * connectors/dds4ccm/tests/DoubleNestedModule/Base: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp: - Compilation test for double nested modules. The sender_exec project has a - dummy_label since it doesn't seem to compile. - -Mon Mar 8 12:33:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - Added valuetype as base project. - -Mon Mar 8 11:49:27 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Removed unused ConnectorStatusListener from Receiver. - -Mon Mar 8 11:30:27 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - Using 'ndds' instead of 'rtidds' for IDL compiler flag - 'dds_impl'. - -Mon Mar 8 11:20:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h: - * connectors/dds4ccm/impl/dds/ndds/DDS4CCM_Traits.h: - Renamed. - - * connectors/dds4ccm/tests/Policies/policies.mpc: - Added requires += dds4ccm_ndds. - -Mon Mar 8 11:09:43 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - Added new pragma's which the end user can use to indicate for which - interface and receptacles he wants to enable ami4ccm - -Mon Mar 8 10:52:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl: - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - Added key declarations for openDDS. - Thanks to Jesus Martinez. - -Mon Mar 8 10:04:43 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: - * DAnCE/MPC/config/dance_plan_launcher.mpb: - Removed seperate plan launcher dll, it isn't used except - by the plan launcher executable and also didn't work - at all on windows - -Sat Mar 6 19:07:43 UTC 2010 Abdul Sowayan - - * connectors/dds4ccm/tests/NoModule/NoModule.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * tests/Bug_3834_Regression/CompA.idl: - * tests/Bug_3834_Regression/CompB.idl: - * tests/Bug_3834_Regression/Moo.idl: - - Added Id token to fix fuzz error. - -Sat Mar 6 18:21:21 UTC 2010 Abdul Sowayan - - * bin/ciao_tests.lst: - - Add Bug_3834_Regression to the test list. - -Sat Mar 6 18:11:47 UTC 2010 Abdul Sowayan - - * tests/Bug_3834_Regression: - * tests/Bug_3834_Regression/CompA.idl: - * tests/Bug_3834_Regression/CompA.mpc: - * tests/Bug_3834_Regression/CompA_exec.h: - * tests/Bug_3834_Regression/CompA_exec.cpp: - * tests/Bug_3834_Regression/CompB.idl: - * tests/Bug_3834_Regression/CompB.mpc: - * tests/Bug_3834_Regression/CompB_exec.h: - * tests/Bug_3834_Regression/CompB_exec.cpp: - * tests/Bug_3834_Regression/Moo.idl: - * tests/Bug_3834_Regression/Moo.mpc: - * tests/Bug_3834_Regression/descriptors: - * tests/Bug_3834_Regression/descriptors/NodeMap.dat: - * tests/Bug_3834_Regression/descriptors/PlanLocality_DifferentProcesses.cdp: - * tests/Bug_3834_Regression/descriptors/PlanLocality_SameProcess.cdp: - * tests/Bug_3834_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - * tests/Bug_3834_Regression/model: - * tests/Bug_3834_Regression/model/Bug_3834_Regression.xme: - - Added regression test. - -Sat Mar 6 16:16:36 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Layout changes. - -Sat Mar 6 15:54:47 UTC 2010 William R. Otte - - * NEWS: - - Updated for dance_plan_launcher. - -Sat Mar 6 15:49:25 UTC 2010 William R. Otte - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - - Further updates for the plan launcher command line option - changes. - -Sat Mar 6 15:45:32 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Base.h: - - Warning fix for PS3Cell. - -Sat Mar 6 15:43:35 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - - Error/warning fixes for Windows. - -Sat Mar 6 15:40:38 UTC 2010 William R. Otte - - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - - Enabled the connector build to excercise Jeff's fix. - -Sat Mar 6 07:04:09 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Disable for the moment now Jeff is working on TAO_IDL - -Sat Mar 6 06:47:09 UTC 2010 Johnny Willemsen - - * dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - Only generate the export file with one idl file - -Fri Mar 5 22:06:59 UTC 2010 Jeff Parsons - - * MPC/config/dds4ccm_lem_stub.mpb: - * MPC/config/dds4ccm_stub.mpb: - - New files, reflecting the recent refactoring of CIAO/ccm - and CIAO/connectors/dds4ccm projects. - - * MPC/config/dds4ccm_skel.mpb: - - Modified to make use of dds4ccm_stub.mpb, described above. - - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - - Changes corresponding to the above new base projects. - -Fri Mar 5 21:21:03 UTC 2010 William R. Otte - - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - - Another windows fix. - -Fri Mar 5 21:11:28 UTC 2010 William R. Otte - - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - - Some attempted fixes for windows. - -Fri Mar 5 20:14:38 UTC 2010 William R. Otte - - * connectors/dds4ccm/tests/NoModule: - * connectors/dds4ccm/tests/NoModule/NoModule.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl: - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - - Demonstrates broken compilation when types aren't contained in a - module. - -Fri Mar 5 16:35:58 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - - improved error reporting, fixes for compile errors/warnings. - -Fri Mar 5 15:18:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: - Resolved fuzz errors. - -Fri Mar 5 14:41:09 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Fixed invalid path - -Fri Mar 5 13:18:09 UTC 2010 Johnny Willemsen - - * cmm/CCM_lem_stub.mpc: - Only generate the stub export with one idl file - -Fri Mar 5 13:04:09 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/RTIDDS_DDS4CCM_CIAO.mwc: - * connectors/dds4ccm/NDDS_DDS4CCM_CIAO.mwc: - Renamed - -Fri Mar 5 12:27:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/dds/dds_impl.mpc: - Renamed. - - * connectors/dds4ccm/impl/dds/ndds/DDS4CCM_Traits.h: - Renamed RTI namespace to NDDS namespace. - -Fri Mar 5 12:16:58 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReaderListener.h: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/StatusCondition.h: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicListener.h: - * connectors/dds4ccm/impl/dds/Utils.h: - * connectors/dds4ccm/impl/dds/dds4ccm_dds_impl_export.h: - * connectors/dds4ccm/impl/dds/dds_impl.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * connectors/dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h: - * connectors/dds4ccm/impl/dds/ndds_impl.mpc: - Renamed project CIAO_DDS4CCM_NDDS_Impl to CIAO_DDS4CCM_DDS_Impl. - Also renamed internal macros to DDS (instead of NDDS). - -Fri Mar 5 11:46:00 UTC 2010 Marcel Smit - - * DAnCE/Plan_Launcher/EM_Launcher.cpp: - Resolved compile issue. - - * connectors/dds4ccm/tests/CoherentUpdater/*: - Added test to test is_coherent_write on the - updater port. - -Fri Mar 5 07:55:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ndds/DDS4CCM_Traits.h: - * connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h: - Moved. - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - Added test for Value types. - -Thu Mar 4 19:24:17 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: - - Fuzz. - -Thu Mar 4 19:03:08 UTC 2010 Jeff Parsons - - * MPC/config/ccm_lem_stub.mpb: - - New base project for projects depending on the - executor stub. - -Thu Mar 4 17:55:24 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_plan_launcher.mpb: - - Missing file from previous commit. - -Thu Mar 4 16:56:09 UTC 2010 Jeff Parsons - - * ccm/CCM.mpc: - * connectors/dds4ccm/idl/dds4ccm.mpc: - - Removed these files, replace by the added ones below. - - * ccm/CCM_svnt.mpc: - * ccm/CCM_lem_stub.mpc: - * ccm/CCM_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/RTIDDS_DDS4CCM_CIAO.mwc: - - New files, split up MPC files in CIAO/ccm and - connectors/dds4ccm/idl with separate ones for - stub, lem_stub and skel builds. This change - makes it easier for the added .mwc file to - select only the builds it needs. - - * MPC/config/ccm_svnt.mpb: - * MPC/config/ccm_executor.mpb: - * MPC/config/dds4ccm.mpb: - - Changes corresponding to the MPC file changes above. - - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - - Removed dependency on skel builds. - -Thu Mar 4 16:32:49 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Fixed some type warnings. - -Thu Mar 4 14:27:16 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Additional logging fixes. - -Thu Mar 4 14:13:36 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Proper ORB destruction in case of error. - -Thu Mar 4 13:57:48 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/EM_Launcher.h: - * DAnCE/Plan_Launcher/NM_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Fixed comments from Johnny. - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - - Renamed these files to have _T suffix. - -Thu Mar 4 13:30:45 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Fixed an error-checking problem whereby an invalid filename - didn't result in function exit properly. Thanks to Johnny - Willemsen for pointing this out. - -Thu Mar 4 13:27:35 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/EM_Launcher.h: - - Fuzz fix. - -Thu Mar 4 13:11:25 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - * bin/ciao_tests.lst: - - Added a test which 1) converts XML plans to CDR with - dance_convert_plan, and 2) deploys that plan. - -Thu Mar 4 13:08:02 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - - Ported to use dance_plan_launcher directly. - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - - Ported tests to use new teardown option. - - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - - Removed these files, as they are made obsolete by - direct-to-nodemanager deployment. - -Thu Mar 4 13:04:14 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Deployment_Failure.h: - * DAnCE/Plan_Launcher/EM_Launcher.h: - * DAnCE/Plan_Launcher/EM_Launcher.cpp: - * DAnCE/Plan_Launcher/NM_Launcher.h: - * DAnCE/Plan_Launcher/NM_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - - Plan launcher re-factoring. Improves ability to handle CDR - encoded deployment plans, adds ability to perform - direct-to-NodeManager deployments, some command line options - cleaned up. Main user visible change in behavior is the change - of the teardown option from -q to -s. - -Thu Mar 4 13:02:04 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: - - Improved reporting of error conditions. - -Thu Mar 4 12:57:52 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Re-implemented CDR logic to not use FILE_Connector. - -Thu Mar 4 12:54:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Resolved compile issues. - -Thu Mar 4 10:39:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Make sure we only generate the export file once - -Thu Mar 4 10:30:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/TimeUtilities.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - Moved TimeUtilities.h from impl/dds/ndds to impl/dds/. - -Thu Mar 4 10:22:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Policies/pub_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/sub_qos_test.cpp: - Resolved fuzz errors. - -Thu Mar 4 10:18:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - Removed all >>= operators. - - * connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp: - Resolved compile warnings on Windows. - -Thu Mar 4 09:37:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Changed path to TimeUtilities.h. - -Thu Mar 4 09:31:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - Set is_coherent_write to true. - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - Resolve compile issue. - -Thu Mar 4 09:21:49 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Add statistics, use only fixed size elements in topic and clean up code. - - -Thu Mar 4 09:06:49 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CoherentWriter: - Added coherent writer test. - -Thu Mar 4 08:55:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - Added. - -Thu Mar 4 08:53:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Resolved compile issue. - -Thu Mar 4 08:30:43 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/Policies/*: - Added a policy test. This tests all the ndds - streaming operators. - -Thu Mar 4 07:51:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - Renamed ifdef according to file name. - - * connectors/dds4ccm/impl/dds/: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataListenerControl_T.h: - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.h: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/StateListenerControl_T.h: - * connectors/dds4ccm/impl/dds/StatusCondition.h: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.h: - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.h: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.h: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - - * connectors/dds4ccm/impl/dds/ndds: - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/StringSeq.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds_impl.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp: - * connectors/dds4ccm/impl/dds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/Duration_t.h: - * connectors/dds4ccm/impl/dds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/StringSeq.h: - * connectors/dds4ccm/impl/dds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/TimeUtilities.h: - * connectors/dds4ccm/impl/dds/Time_t.h: - * connectors/dds4ccm/impl/dds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/TopicQos.h: - * connectors/dds4ccm/impl/dds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/*: - - Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all - NDDS specific header files. - - Replaced last C++ new's with ACE_NEW* marcros. - - Implemented latest sreaming operators for NDDS specific - conversions. - - Renamed rti_xxx variable names to ccm_dds_xxx. - - Renamed namespace RTI to DDS_CCM. - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all - NDDS specific header files. - Added a value_type-test for these tests. - -Thu Mar 4 07:50:54 UTC 2010 Johnny Willemsen - - * NEWS: - Updated for next micro - - * DAnCE/MPC/config/dance_split_plan.mpb: - Layout changes - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended this test - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2011a b/CIAO/ChangeLogs/ChangeLog-2011a deleted file mode 100644 index ed049dd5b6b..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2011a +++ /dev/null @@ -1,11910 +0,0 @@ -Wed Apr 20 09:52:52 CEST 2011 Johnny Willemsen - - * CIAO version 1.0.2 released. - -Mon Apr 18 08:07:48 UTC 2011 William R. Otte - - * NEWS: - - NEWS updates. - -Thu Apr 14 23:20:03 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc: - - Link fix for windows. - -Thu Apr 14 17:04:17 UTC 2011 Johnny Willemsen - - * MPC/config/ndds_idltocpp.mpb: - Added needed include flags - -Thu Apr 14 13:39:08 UTC 2011 Johnny Willemsen - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README: - Disabled these tests for the moment, they are using ndds without - the cck which causes a lot of warnings on the scoreboard, making - it impossible to see if there are other issues - -Thu Apr 14 11:56:09 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - Extended portability - -Thu Apr 14 10:01:01 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/ndds_idltocpp.mpb: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb: - Improved portability - -Thu Apr 14 09:29:54 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Added needed base projects - - * bin/ciao_tests.lst: - All tests should now run - -Wed Apr 13 19:13:43 UTC 2011 William R. Otte - - * ciao/Containers/Session/Session_Container.cpp: - Additional error reporting. - -Wed Apr 13 19:12:44 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - * tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp: - * tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp: - * tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp: - * tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp: - * tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp: - * tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp: - * tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp: - Additional failure testing. - -Wed Apr 13 07:48:22 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Added missing base project for windows - -Tue Apr 12 11:42:21 UTC 2011 Johnny Willemsen - - * tests/DAnCE/Threading/Component1/Component1_exec.cpp: - * tests/DAnCE/Threading/Component2/Component2.mpc: - * tests/DAnCE/Threading/Component2/Component2_exec.cpp: - Use a timeout to detect the deadlock instead of causing a real - deadlock, that is much harder to handle in our test framework - -Tue Apr 12 10:39:09 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_stub.mpb: - Attempt to fix windows link errors - -Tue Apr 12 08:26:58 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README: - New test with two different queries and an empty one, uses get_many. - -Tue Apr 12 07:20:58 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - Made some timing changes to make it more likely that DDS will call the on_requested_deadline_missed - callback of the PortStatusListener in the Receiver. - Also improved logging slightly. - -Mon Apr 11 15:36:46 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: - Added this file. SLOneByOne should work now. - -Mon Apr 11 12:28:21 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - * MPC/config/ndds_idltocpp.mpb: - * MPC/config/ndds_idltocpp_impl.mpb: - * MPC/config/ndds_idltocpp_lem_stub.mpb: - * MPC/config/ndds_idltocpp_skel.mpb: - * MPC/config/ndds_idltocpp_stub.mpb: - * MPC/config/ndds_idltocpp_ts_defaults.mpb: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc: - Renamed base projects to make a difference between plain RTI DDS (the - ndds* base projects) and our IDL to CPP wrapper around RTI DDS (the - ndds_idltocpp_* base projects) - - * MPC/config/ndds.mpb: - * MPC/config/ndds_impl.mpb: - * MPC/config/ndds_lem_stub.mpb: - * MPC/config/ndds_skel.mpb: - * MPC/config/ndds_stub.mpb: - * MPC/config/ndds_ts_default.mpb: - * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Removed these files. - -Mon Apr 11 10:11:47 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - Resolved warning. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Resolved test errors. - -Mon Apr 11 03:08:04 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - - Attempt at a compile fix for Windows. - -Mon Apr 11 03:02:24 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc: - - Fuzz. - -Sun Apr 10 19:41:34 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - * tests/DAnCE/Launch-Failures/Interceptors: - * tests/DAnCE/Launch-Failures/Interceptors/Interceptors.mpc: - * tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.h: - * tests/DAnCE/Launch-Failures/Interceptors/Selective_Error.cpp: - * tests/DAnCE/Launch-Failures/Interceptors/Selective_Error_Export.h: - * tests/DAnCE/Launch-Failures/descriptors/LocalDestEndpointFailure.cdp: - * tests/DAnCE/Launch-Failures/descriptors/LocalFacetConnectionDifferentLMs.cdp: - * tests/DAnCE/Launch-Failures/descriptors/LocalNilFacetConnection.cdp: - * tests/DAnCE/Launch-Failures/descriptors/LocalSourceEndpointFailure.cdp: - * tests/DAnCE/Launch-Failures/descriptors/besteffort.localityconfig: - - Expanded testing. - -Sun Apr 10 17:51:42 UTC 2011 William R. Otte - - * ciao/Base/CIAO_Exceptions.idl: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Improved error handling. - -Sun Apr 10 12:04:57 UTC 2011 Johnny Willemsen - - * MPC/config/ndds_ts_default.mpb: - Derive from the new ndds_cck_ts_defaults, we always use the CCK for - dds4ccm - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - No need for the CCK and TAO, we just use ACE to get a portable - main - -Sun Apr 10 03:40:52 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - - Compile error. - -Sat Apr 9 17:47:00 UTC 2011 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Fri Apr 8 13:57:42 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - Alignment. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp: - Added check on received sample during on_deletion. on_deletion should be invoked - with a valid key. Therefor changed the QOS settings. - - Thu Apr 7 15:55:20 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SLManyByMany/README: - Changed timing in test. Added extra check on key content in on_deletion. Therefore also added QoS file. - - - - Thu Apr 7 12:26:20 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - Using the getter as well to read samples from DDS. - - * connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: - Rewritten in order to use the state and event connectors properly. - - * tests/DAnCE/Progressive_Deployments/run_test.pl: - Optimized logging. - - Thu Apr 7 12:15:19 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.h: - Fixed doxygen warning - - === end changelog === - -Sat Apr 9 11:39:26 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc: - - Link fix. - -Sat Apr 9 08:16:19 UTC 2011 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Disabled a little bit more IDL in case of no event - -Sat Apr 9 01:42:54 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - * tests/DAnCE/Launch-Failures/descriptors/DestEndpointFailure.cdp: - * tests/DAnCE/Launch-Failures/descriptors/SourceEndpointFailure.cdp: - * tests/DAnCE/Launch-Failures/descriptors/besteffort.localityconfig: - * tests/DAnCE/Launch-Failures/descriptors/run_tests_besteffort.pl: - - Expanded tested failure cases. - -Fri Apr 8 09:22:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved issue. - -Fri Apr 8 00:39:42 UTC 2011 William R. Otte - - * connectors/dds4ccm/impl/logger/Logger_Service.cpp: - - Fuzz. - -Thu Apr 7 21:43:42 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures/descriptors/SuccessfulDeployment.cdp: - * tests/DAnCE/Launch-Failures/descriptors/run_test.pl: - - Successfull deployment baseline for the Launch-Failures test. - -Thu Apr 7 21:04:51 UTC 2011 William R. Otte - - * ciao/Base/CIAO_Base.mpc: - * ciao/Base/CIAO_Exceptions.idl: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - - Vastly improved error reporting for component loading problems. - Plain CCM exceptions are no longer reported to DAnCE, and - additional meta-data is now included that will report the exact - source of library loading problems. - -Thu Apr 7 21:03:27 UTC 2011 William R. Otte - - * ciao/Logger/Logger_Service.h: - * ciao/Logger/Logger_Service.cpp: - * connectors/dds4ccm/impl/logger/Logger_Service.h: - * connectors/dds4ccm/impl/logger/Logger_Service.cpp: - - Add backend support from DAnCE. - -Thu Apr 7 18:48:55 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Fixed valgrind memory leaks - -Thu Apr 7 18:01:47 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Depend on cck because the ndds_ts_defaults base project assumes that - we always use it - -Thu Apr 7 11:40:00 UTC 2011 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Thu Apr 7 07:26:03 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Simplified these plain RTI DDS tests, don't use the CCK and TAO - - Wed Apr 6 17:56:08 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Updated to 4.5d - - * tests/DAnCE/Threading/descriptors/Plan.cdp: - No ORB logging - - Wed Apr 6 14:14:31 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - Resolved test error. get_many should return at least one sample (instead of exactly one - sample). - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - Optimized logging. - - Wed Apr 6 13:59:07 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Simplified some code - - Wed Apr 6 13:14:54 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Added a comment why we shouldn't throw an exception when - return_loan fails. - - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Reviewed return_loan methods. When return_loan fails, we should - throw an exception to the user in case the data retrievel from - DDS succeeds. When the data retrieval from DDS fails, the user - want to see that exception (instead of the return_loan exception). - Still, there's always a return_loan invoked, regardless of the - outcome of the DDS retrieval. - - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - When an error occurs during return_loan, this error will be returned - to the user when the data retrieval from DDS succeeds. If the data - retrieval from DDS fails, this failure will be returned to the users. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Expanded test. When data was not read during the invocation of get_many, - the sample state of this (unread) data should be "FRESH_INFO"; otherwise - it should be "ALREADY_SEEN". - - Wed Apr 6 10:13:35 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Optimized procedure for write_many/get_many. - - Wed Apr 6 09:51:08 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - Expanded test in order to log more info about the samples available in DDS. - - * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: - Using ENV to read the environment variagle. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - Improved logging. - - Wed Apr 6 10:44:39 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - Decreased number of samples, added extra debug info. - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl: - Decreased sleep time. - - - - Wed Apr 6 08:16:39 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: - Passing the Domain ID to the Sender and Receiver to the command line. It now uses - 'DDS4CCM_DEFAULT_DOMAIN_ID'. This way the tests on the build systems won't mix. - - Wed Apr 6 07:54:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Test now reads the environment variable "DEFAULT_DOMAIN_ID" and uses this to - create the domain participant. - - Tue Apr 5 18:18:23 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - We only need ndds_ts_defaults as base project, not full dds4ccm - - Tue Apr 5 14:16:26 UTC 2011 Marcel Smit - - * ChangeLog.BRANCH: - Removed some svn statements - - * connectors/dds4ccm/impl/Getter_T.cpp: - Removed call to get_trigger_value. This call is not neccessary. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/README: - Added a description for this test. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp: - Added a Reader which tests whether all samples are available in DDS. - - Tue Apr 05 15:03:14 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: - new test read one by one variant of dds test. - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/Receiver.cpp: - add extra checks. - - Tue Apr 05 09:32:14 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/test/Getter/Sender/Getter_Test_Sender_exec.cpp: - Changed initializing of array for writing many samplesd - - Mon Apr 4 12:07:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/Getter/README: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Added comments/documentation. - - Mon Apr 4 11:03:05 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - Added some more comments/doxygen. - - Mon Apr 4 09:35:06 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Optimized doxygen documentation. - - Mon Apr 4 08:38:25 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - Added some documentation to this class. - - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Alignment. - - Mon Apr 4 07:52:19 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/Getter_T.cpp: - Code layout - - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Added some documentation to this class. - - Fri Apr 1 15:02:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/README: - Added some more information regarding this tests. - - Thu Mar 31 14:03:40 UTC 2011 Marcel Smit - - * tests/DAnCE/Threading/README: - Added. - - Thu Mar 31 13:51:24 UTC 2011 Marcel Smit - - * tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp: - Renamed deployment plan. - - * tests/DAnCE/Threading/Component1/Component1_exec.cpp: - * tests/DAnCE/Threading/Component2/Component2_exec.cpp: - Added some extra debug information. - - * tests/DAnCE/Threading/descriptors/Plan.cdp: - Locality manager now accepts the command lines given in this - deployment plan. - - Thu Mar 31 13:03:30 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Layout changes - - * tests/DAnCE/Threading/*: - * bin/ciao_tests.lst: - Added test which with one is able to tune the threading behaviour of - CORBA. - - Tue Mar 29 12:249:14 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/impl/Getter_T.cpp: - Changed number of samples in get_many from 1 to max_samples . - - Wed Mar 23 17:49:14 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: - Make the color of the shape controllable from the deployment plan - - Sun Mar 6 09:35:03 UTC 2011 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - Enable with noevent, just disable some IDL constructs - - Sun Feb 27 19:33:07 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - Removed comment, sequence can now be independent of the topic, but - to our idea it should be in the same namespace - - === end changelog === - -Thu Apr 7 11:35:36 UTC 2011 William R. Otte - - * tests/DAnCE/Launch-Failures: - * tests/DAnCE/Launch-Failures/Component: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.idl: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.h: - * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: - * tests/DAnCE/Launch-Failures/descriptors: - * tests/DAnCE/Launch-Failures/lib: - * tests/DAnCE/Launch-Failures/lib_stub: - - Testing framework for launch failures. - -Wed Apr 6 12:55:04 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - - Trailing whitespace. - -Wed Apr 6 01:24:02 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - - Removed ACE_TEXT from logging messages. - -Fri Apr 1 17:39:00 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - - Fixes. - -Thu Mar 31 22:12:23 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - - Fuzz. - -Wed Mar 30 09:27:14 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/impl/Getter_T.cpp: - Changed number of samples in get_many from 1 to max_samples . - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Solved error initilizing array for get_many test. - - -Tue Mar 29 12:14:02 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_helper.h: - * tools/IDL3_to_IDL2/identifier_helper.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - * tools/IDL3_to_IDL2/idl3p_checking_visitor.h: - * tools/IDL3_to_XMI/be_global.h: - * tools/IDL3_to_XMI/be_helper.h: - * tools/IDL3_to_XMI/identifier_helper.h: - Doxygen changes - -Tue Mar 29 09:34:03 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Removed try/catch in ccm_activate which isn't needed anymore after - we removed caching of the receptacles - -Mon Mar 28 07:25:26 UTC 2011 Johnny Willemsen - - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h: - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/be_global.h: - * tools/IDL3_to_IDL2/be_global.cpp: - * tools/IDL3_to_IDL2/be_helper.h: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_IDL2/be_sunsoft.h: - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/identifier_helper.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - * tools/IDL3_to_IDL2/idl3p_checking_visitor.h: - * tools/IDL3_to_XMI/be_global.h: - * tools/IDL3_to_XMI/be_global.cpp: - * tools/IDL3_to_XMI/be_helper.cpp: - * tools/IDL3_to_XMI/be_sunsoft.h: - * tools/IDL3_to_XMI/identifier_helper.h: - Converted to doxygen style - -Wed Mar 23 19:45:48 UTC 2011 William R. Otte - - * bin/generate_component_mpc.pl: - - Fix bug that suppressed help message. - -Wed Mar 16 00:39:40 UTC 2011 William R. Otte - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - Extended the test to include a sequence of zero length. - -Tue Mar 15 14:12:35 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: - Fixed typo - - * docs/releasenotes/index.html: - * docs/releasenotes/switch.html: - * examples/Display/README.html: - * examples/Hello/step-by-step.html: - Updated email address - -Fri Mar 11 10:10:20 UTC 2011 Johnny Willemsen - - * docs/Connectors.graffle: - Added AMI4CCM diagram - -Thu Mar 10 11:23:32 UTC 2011 Vladimir Zykov - - * tools/IDL3_to_IDL2/be_sunsoft.cpp: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - * tools/IDL3_to_XMI/be_helper.cpp: - Fixed warnings in the use of printf format. - -Wed Mar 9 11:06:52 UTC 2011 Vladimir Zykov - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp: - Fixed use of types in printf format. - -Sat Mar 5 12:27:55 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Override all topic_name methods to resolve Intel C++ warnings - -Sat Mar 5 09:31:57 UTC 2011 Johnny Willemsen - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - Generate space after sequence< to silence Intel C++ warnings - -Thu Mar 3 14:26:13 UTC 2011 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Ignore DDS_ as prefix - -Thu Mar 3 05:03:44 UTC 2011 William R. Otte - - * tests/DAnCE/LocalityManager/UnexpectedShutdown/nodemanager-besteffort.lconfig: - * tests/DAnCE/LocalityManager/UnexpectedShutdown/run_test.pl: - - Convert from --best-effort. - -Wed Mar 2 14:56:28 UTC 2011 Vladimir Zykov - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - Made use of transfer_scope_elements() defined in ast_home. - -Tue Feb 15 10:11:12 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Added quotes. - -Tue Feb 15 10:07:30 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Resolved issues related to include paths. - -Tue Feb 15 09:20:07 UTC 2011 Johnny Willemsen - - * bin/ciao_tests.lst: - One dds test should now run again - -Mon Feb 14 08:35:26 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Resolved warnings in case lw ccm. - -Fri Feb 11 11:16:00 UTC 2011 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Thu Feb 10 09:59:48 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Fixed the afters for the servants. - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - Regenerated using the latest generate_component_mpc - - Wed Feb 9 12:27:18 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Fixed some layout issues in the generated MPC code. - - * tutorials/Quoter/Simple/01.html: - Added additional information regarding generate_component_mpc. - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Regenerated. - - Wed Feb 9 09:43:20 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - Resolved unresolved externals on windows when the generated mpc - files are run on windows. - - Wed Feb 9 09:18:28 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Optimized. - - * tutorials/Quoter/Simple/01.html: - Extra remarks regarding generate_component_mpc. - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Fully generated by the generate_componet_mpc script. - - * tutorials/Quoter/Simple/descriptors/run_test.pl: - Added a forgotten new line character. - - Wed Feb 9 07:12:33 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Optimized reading command line parameters. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Improved disconnect_emitter. - - Tue Feb 8 14:15:09 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolve issues regarding lw ccm. - - Tue Feb 8 13:35:35 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Optimized reading the command line options. - Added -e option, meaning that events are uses within the - components. - - * tutorials/Quoter/Simple/01.html: - Changed regarding generate_component script. - - Tue Feb 8 13:32:53 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/PublisherListener.cpp: - Layout changes - - * bin/valgrind_nodedaemon.py: - Removed this file, not used and very old - - Tue Feb 8 10:25:20 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized disconnect_consumer. - - Tue Feb 8 10:08:39 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized logging. - - Tue Feb 8 09:27:58 UTC 2011 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Listening on the right entity. - - Tue Feb 8 09:14:17 UTC 2011 Marcel Smit - - * CIAO_TAO_DAnCE.mwc: - Reverted last changes. - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - Checking the number of unexpected_status callbacks. In order to get the - same results on dds4ccm and plain dds, a publisher listener has been added - to the plain dds test. - - Mon Feb 7 18:14:19 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved compile error on windows. - - Mon Feb 7 13:54:44 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - No ACE_Reactor as input parameter for ccm_activate in TopicBase_Connector. - ccm_activate in TopicBase_Connector now determines his own - reactor. Therefor changed the reactor method to throw an exception - when the returned reactor seems nil (while it shouldn't). - Optimized logging regarding late binding. - - Mon Feb 7 12:07:13 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized logging. Optimized disconnect_consumer. Need to distinguish - between an emitter and a publisher here. - - Mon Feb 7 09:34:18 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Rewritten deployment kind as string method. Optimized disconnect - consumer method. - - Mon Feb 7 09:07:07 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Commandline option -o and -l should work again. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized logging. - - * tutorials/Quoter/Simple/01.html: - Mentioned the -o and -l command line parameters. - - * tutorials/Quoter/Simple/descriptors/run_test.pl: - Added a forgotten \n - - Fri Feb 4 12:18:06 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Removed some unnecessary checks. - - Fri Feb 4 12:15:28 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Refactored in order to prevent double code. - - Fri Feb 4 10:42:01 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimizing. Passing the connection instead of the connectionRef - to the underlying methods. - - Fri Feb 4 10:02:10 UTC 2011 Johnny Willemsen - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Base/Server_init.h: - Doxygen changes - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - Changed the_POA and the_port_POA to follow the IDL to C++ refcounting - rules - - Fri Feb 4 09:38:59 UTC 2011 Marcel Smit - - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - * tests/DAnCE/Components/SimplePublisher_exec.cpp: - Resolved valgrind errors. - - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp: - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_SP.cdp: - Added some more tests. Also added locality constraints. - - Fri Feb 4 09:01:03 UTC 2011 Marcel Smit - - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp: - Provide a new test for connect_consumer. - - Fri Feb 4 08:55:34 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Determine whether provided reference is an emitter or a publisher. - Call subscribe in case a publisher is provided, connect_consumer when - an emitter is provided. - - Fri Feb 4 07:37:59 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - The connect_publisher is able to handle external consumers. - - Thu Feb 3 15:07:22 UTC 2011 Marcel Smit - - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: - Added more test cases. - - Thu Feb 3 13:23:41 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized disconnect_non_local. Portname should be provided. - - Thu Feb 3 12:44:38 UTC 2011 Johnny Willemsen - - * ciao/Base/CIAO_Properties.idl: - Removed not used property - - Thu Feb 3 11:09:49 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implemented (dis)connect_consumer. This was needed in case an external - Reference was available in the deployment plan. - - * tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: - Added in onder to test connect_consumer. - - Wed Feb 2 09:08:26 UTC 2011 Martin Corino - - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp: - Fixed compile problem. - - Wed Feb 2 09:03:24 UTC 2011 Martin Corino - - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc: - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc: - Fixed fuzz errors. - - Tue Feb 1 15:00:49 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Removed connect and disconnect consumer methods since these are - implemented in the servant code. - - Tue Feb 1 13:44:52 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - In case no exception is caught, disconnect the correct consumer - - Tue Feb 1 12:52:58 UTC 2011 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Fixed default implementations - - Tue Feb 1 10:04:07 UTC 2011 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - Updated describe_multiplex - - Mon Jan 31 09:13:12 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Need to enable the datareader/datawriter since this is removed from - the create_datareader/create_datawriter methods in the C++ wrapper - - * tests/CIF/Receptacle/client.cpp: - Always run test_multiple_facets. - - Fri Jan 28 17:41:28 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Refactored a few parts of this class. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Checking the return value of the enable method of the DDS entities. - When not DDS_RETCODE_OK, a internal exception is thrown. - - * tests/CIF/Common/CIF_Common.cpp: - Using the in method of _var variables. - - Fri Jan 28 16:29:59 UTC 2011 Martin Corino - - * bin/ciao_tests.lst: - * connectors/ami4ccm/examples/Quoter: - * connectors/ami4ccm/examples/Quoter/Base: - * connectors/ami4ccm/examples/Quoter/Base/Quoter.idl: - * connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc: - * connectors/ami4ccm/examples/Quoter/Client: - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl: - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc: - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h: - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp: - * connectors/ami4ccm/examples/Quoter/Producer: - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl: - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc: - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h: - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp: - * connectors/ami4ccm/examples/Quoter/descriptors: - * connectors/ami4ccm/examples/Quoter/descriptors/Plan.cdp: - * connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl: - Added Quoter example based on the latest AMI4CCM spec. - - Fri Jan 28 14:33:42 UTC 2011 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - Updated because of changes in generated code - - * tests/CIF/Events/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Fixed memory leaks in test code - - Thu Jan 27 14:13:36 UTC 2011 Johnny Willemsen - - * examples/Hello/descriptors/svc_em.conf: - * performance-tests/Benchmark/RoundTrip/svc.conf: - * performance-tests/Benchmark/svc.conf: - Removed some -ORB options - - Thu Jan 27 10:41:25 UTC 2011 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - Doxygen fix - - * examples/Hello/descriptors/svc_em.conf: - * performance-tests/Benchmark/RoundTrip/svc.conf: - * performance-tests/Benchmark/svc.conf: - Removed -ORBPOALock, it is risky and is removed from TAO - - Thu Jan 27 09:13:17 UTC 2011 Marcel Smit - - * tests/CIF/Receptacle/client.cpp: - Explicitly test multiple. - - Wed Jan 26 16:23:17 UTC 2011 Martin Corino - - * bin/ciao_tests.lst: - Added new AMI4CCM test. - - Wed Jan 26 15:23:29 UTC 2011 Martin Corino - - * connectors/ami4ccm/tests/NoConnection: - * connectors/ami4ccm/tests/NoConnection/Base: - * connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl: - * connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc: - * connectors/ami4ccm/tests/NoConnection/Receiver: - * connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl: - * connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc: - * connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h: - * connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/NoConnection/Sender: - * connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl: - * connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc: - * connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h: - * connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoConnection/descriptors: - * connectors/ami4ccm/tests/NoConnection/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl: - Added new test to verify required exception when AMI facet - not connected. - - Wed Jan 26 13:28:18 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Resolved some issues regarding LW CCM. - - Wed Jan 26 13:12:27 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Resolve some compile issues on windows. - - Wed Jan 26 13:00:31 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Added some more additional tests. - - Wed Jan 26 12:23:15 UTC 2011 Marcel Smit - - * ciao/Servants/Servant_Impl_Base.cpp: - Finished implementation of lookup_publish_description. - - * tests/CIF/Events/client.cpp: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Optimized test output. - - Wed Jan 26 11:29:44 UTC 2011 Marcel Smit - - * tests/DAnCE/Components/SimpleConsumer_exec.h: - * tests/DAnCE/Components/SimpleConsumer_exec.cpp: - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - Due to renaming of some ports. - - Wed Jan 26 11:21:00 UTC 2011 Marcel Smit - - * ciao/Servants/Servant_Impl_Base.cpp: - Implemented lookup_publisher_description - - * tests/CIF/Component/CIF_Component.idl: - Layout changes. - - * tests/CIF/Events/client.cpp: - implemented publisher tests. - - Wed Jan 26 07:57:05 UTC 2011 Marcel Smit - - * ciao/Servants/Servant_Impl_Base.cpp: - * tests/CIF/Events/client.cpp: - Implemented and test get_named_emitters. - - Tue Jan 25 14:31:26 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Added some more tests. - - * tests/CIF/Receptacle/client.cpp: - Changed the order of the names in the get_named_xxx tests. - - Tue Jan 25 14:06:16 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Expanded tests (get_all_consumers, get_named_consumers and - get_all_emitters). - - Tue Jan 25 13:06:03 UTC 2011 Marcel Smit - - * tests/CIF/Events/client.cpp: - Optimized logging. - - Tue Jan 25 12:42:45 UTC 2011 Marcel Smit - - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Component/CIF_Component_exec.h: - * tests/CIF/Component/CIF_Component_exec.cpp: - Added a consumer in order to run some more tests. - - * tests/CIF/Events/client.cpp: - Added get_all_consumers test. - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Changed the number of expected consumers. - - * tests/CIF/descriptors/run_test.pl: - Sleep message didn't log the correct client. - - * tests/DAnCE/Components/SimpleConsumer.idl: - * tests/DAnCE/Components/SimpleConsumer_exec.h: - * tests/DAnCE/Components/SimpleConsumer_exec.cpp: - * tests/DAnCE/Components/SimpleEmitter.idl: - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - * tests/DAnCE/Components/SimpleLocalProvider.idl: - * tests/DAnCE/Components/SimpleLocalProvider_exec.h: - * tests/DAnCE/Components/SimpleLocalProvider_exec.cpp: - * tests/DAnCE/Components/SimpleLocalUser.idl: - * tests/DAnCE/Components/SimpleLocalUser_exec.cpp: - * tests/DAnCE/Components/SimpleMultipleUser.idl: - * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetProvider.idl: - * tests/DAnCE/Components/SimpleNilFacetProvider_exec.h: - * tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetUser.idl: - * tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp: - * tests/DAnCE/Components/SimpleProvider.idl: - * tests/DAnCE/Components/SimpleProvider_exec.h: - * tests/DAnCE/Components/SimpleProvider_exec.cpp: - * tests/DAnCE/Components/SimplePublisher.idl: - * tests/DAnCE/Components/SimplePublisher_exec.cpp: - * tests/DAnCE/Components/SimpleUser.idl: - * tests/DAnCE/Components/SimpleUser_exec.cpp: - * tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: - * tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: - * tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: - * tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: - * tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: - * tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: - * tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: - * tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp: - * tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp: - * tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp: - * tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp: - * tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - * tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp: - * tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp: - * tests/DAnCE/Progressive_Deployments/Plan_C.cdp: - Renamed portnames of facets, receptacle, event sources and event sinks in order to get - a more realistic test. - - Mon Jan 24 08:00:12 UTC 2011 Marcel Smit - - * ccm/CCM_Events.idl: - Fixed compile errors on windows. - - Sun Jan 23 19:49:15 UTC 2011 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Fixed problem in disconnect, nil facet executor is allowd - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Const changes - - Fri Jan 21 15:42:58 UTC 2011 Marcel Smit - - * NEWS: - Reverted. - - Fri Jan 21 15:39:04 UTC 2011 Marcel Smit - - * NEWS: - Updated for the upcoming release. - - Fri Jan 21 14:03:15 UTC 2011 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - changed the number of emitters. - - Thu Jan 20 15:00:12 UTC 2011 Marcel Smit - - * tests/CIF/Component/CIF_Component.idl: - Added new emitter. - - * tests/CIF/Events/client.cpp: - Expanded tests. - - Thu Jan 20 13:48:44 UTC 2011 Marcel Smit - - * ccm/CCM_Events.idl: - Code alignment. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implemented disconnect_emitter. - - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Events: - * tests/CIF/Events/Events.mpc: - * tests/CIF/Events/client.cpp: - * tests/CIF/descriptors/run_test.pl: - Added new test to the CIF test framework. - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Optimized logging. - - * tests/DAnCE/EM-Redeployment/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/Executor-Destructor/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/Progressive_Deployments/run_test.pl: - Added CIAO_LOG_LEVEL in order to an insight on the errors. - - === end changelog === - -Fri Jan 28 11:21:05 CET 2011 Johnny Willemsen - - * CIAO version 1.0.1 released. - -Tue Jan 25 11:01:57 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Use the proper endpoint to disconnect a non local connection. - Also catch a transient exception because of the fact that dance shuts - down the locality managers simultaniously. - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - Removed after and lib declarations. - -Tue Jan 25 10:27:31 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Catch extra exceptions since dance shuts down the locality managers - simultaniously. - -Mon Jan 24 14:51:43 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - * connectors/ami4ccm/docs/RFP.odt: - Removed these files, RFP is formally published by the OMG and a - draft initial submission is now available which replaces our - draft specifications - -Mon Jan 24 14:13:36 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base_T.cpp: - Don't need to throw an exception when the executor seems nil. - Optimized logging. - -Sun Jan 23 18:08:59 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: - Attempt to fix install warnings in windows - -Fri Jan 21 15:47:13 UTC 2011 Marcel Smit - - * NEWS: - Updated for the upcoming release. - -Fri Jan 21 14:09:13 UTC 2011 Marcel Smit - - * MPC/config/ndds_stub.mpb: - Typcode instead of anytypecode was sufficient. - - * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc: - reverted last change. - -Fri Jan 21 13:40:56 UTC 2011 Marcel Smit - - * MPC/config/ndds_stub.mpb: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: - * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc: - Resolved link issues on static builds. - -Fri Jan 21 10:33:20 UTC 2011 Marcel Smit - - * tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc: - No use to not to build Partial_lem_gen because of ccm_noevents - -Fri Jan 21 09:26:08 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: - Resolved issues regarding to non-dds builds. - -Thu Jan 20 15:20:04 UTC 2011 Marcel Smit - - * MPC/config/ndds.mpb: - Resolves compile issues related to non-dds builds - -Thu Jan 20 11:42:53 UTC 2010 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Wed Jan 19 13:03:24 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved some issues regarding disconnecting event ports. - - Wed Jan 19 12:11:00 UTC 2011 Martin Corino - - * bin/ciao_tests.lst: - Exclude DAnCE/LocalityManager/CommandlinePassage/run_test_cmd - test from running on Windows. - - Tue Jan 18 18:30:39 UTC 2011 Johnny Willemsen - - * examples/BasicSP/README.html: - Removed references cidl - - Tue Jan 18 18:25:03 UTC 2011 Johnny Willemsen - - * docs/Porting_Hints.txt: - * docs/releasenotes/switch.html: - * examples/BasicSP/README.html: - * examples/BasicSP/RepoMan_Usage.html: - * examples/Display/README.html: - * examples/Display/descriptors/basicNodeDaemon.pl: - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_NodeDaemons.pl: - * examples/Hello/step-by-step.html: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tutorials/Quoter/Simple/04.html: - * tutorials/Quoter/Simple/README.html: - Updated executable names and locations - - Tue Jan 18 14:50:14 UTC 2011 Johnny Willemsen - - * docs/com-impl.html: - * docs/new_components.html: - Small change, needs more updates - - * docs/RT-Extension.html: - * docs/XML/ciao_rt_cad_ext.dtd: - Removed these files, obsolete - - Tue Jan 18 14:11:53 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implement disconnect_publisher. - - Tue Jan 18 11:33:18 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved runtime test errors. Also optimized logging - and code layout. - - Mon Jan 17 15:13:22 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved runtime issues related to cookies. - - Mon Jan 17 14:18:33 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Storing cookies in a _var first. - Optimized logging. - - Mon Jan 17 13:05:58 UTC 2011 Marcel Smit - - * ciao/Containers/Servant_Activator.cpp: - Resolved valgrind errors. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved valgrind errors. Optimized logging. - - Mon Jan 17 11:02:27 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved runtime issues related to disconnect non local - connections. - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Resolved valgrind errors. - - Fri Jan 14 15:41:23 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implemented disconnect_consumer - - * tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: - Added extra connection in order to check cookie mechanism. - - Fri Jan 14 10:24:23 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved issues regarding disconnect non local connections. - - Thu Jan 13 18:16:14 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Changed method header of prepare_installation - - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - Optimized logging. - - Thu Jan 13 17:33:38 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Merged double code into one method. - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Reorganized code. Added a method to disconnect - non local connections. - - Wed Jan 12 15:15:09 UTC 2011 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Resolved link/compile issues on windows. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved runtime errors regarding cookie registration. - - Wed Jan 12 14:43:37 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Containers/Extension/Extension_Container.inl: - * ciao/Containers/Session/Session_Container.inl: - Reorganized code. Moved as much as possible code to the base class. - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Check whether the Cookie was succesfully inserted into the internal - map. If not, throw an InvalidConnection exception since disconnect - will certainly fail. Also remove the cookie and CCMObject again. - - Wed Jan 12 09:56:24 UTC 2011 Marcel Smit - - * tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp: - * tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp: - * tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp: - Shutting down tickers of component 3 on ccm_passivate. - Resolved valgrind issues. - - Mon Jan 10 11:26:19 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Fixed doxygen warnings - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Fixed fuzz - - Mon Jan 10 09:19:06 UTC 2011 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Removed deprecated macros - - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - * tests/IDL_Test/Cornucopia/run_test.pl: - Run doxygen on the generated executor file and see if no errors - or warnings are triggered as part of our test. - - * bin/ciao_tests.lst: - Added new test only when DOXYGEN is deifned - - Mon Jan 10 08:24:37 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h: - * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h: - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h: - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h: - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h: - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * examples/Hello/Sender/Sender_exec.h: - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component_Glfa/Null_Component_exec.h: - * tests/Bug_3834_Regression/CompA_exec.h: - * tests/CIF/Component/CIF_Component_exec.h: - * tests/DAnCE/Components/Progressive_exec.h: - * tests/DAnCE/PartialShutdown/Component1/Component1_exec.h: - * tests/DAnCE/PartialShutdown/Component2/Component2_exec.h: - * tests/DAnCE/PartialShutdown/Component3/Component3_exec.h: - * tests/Thread/Sender/Sender_exec.h: - * tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: - Fixed doxygen warnings - - Fri Jan 7 16:05:10 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Resolved disconnect issues. - - Fri Jan 7 14:49:14 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - Added oneway method - - Fri Jan 7 12:52:54 UTC 2011 Marcel Smit - - * MPC/config/ndds_stub.mpb: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - Optimized MPC-file's. - - Fri Jan 7 12:06:51 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - Created a profile and using the _with_profile methods in this example. - - Fri Jan 7 11:51:27 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: - Layout changes. - - Fri Jan 7 09:24:16 UTC 2011 Marcel Smit - - * tests/Cookies/Cookie.cpp: - Removed unnecessary debug statements. - - Fri Jan 7 09:04:25 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * tests/Cookies: - * tests/Cookies/Cookie.h: - * tests/Cookies/Cookie.cpp: - * tests/Cookies/Cookies.mpc: - * tests/Cookies/Test.idl: - * tests/Cookies/client.cpp: - * tests/Cookies/run_test.pl: - * tests/Cookies/server.cpp: - Added test which explicitly tests the cookie implementation. - - * ciao/Containers/Container_Base_T.cpp: - No need to catch the CookieRequired exception anymore. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Remove cookie from the map on disconnect. - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Resolved compile issues related to qos_profile name. - - Thu Jan 6 10:33:41 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Moved (dis)connect methods to the base. Making use of the cookie - functionality when (dis)connecting local connections. - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed typo. - - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Added. - - Wed Jan 5 14:18:54 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/Utils.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Replaced all libary_name/profile_name combination with one - string (qos_profile). Substract the library_name and profile_name in - the NDDS library (instead of the core). - - Wed Jan 5 11:42:01 UTC 2011 Johnny Willemsen - - * bin/ciao_tests.lst: - Added 3944 - - * tests/Bug_3944_Regression: - * tests/Bug_3944_Regression/base_connector_conn.idl: - * tests/Bug_3944_Regression/connector_conn.idl: - * tests/Bug_3944_Regression/connector_inst_conn.idl: - * tests/Bug_3944_Regression/run_test.pl: - New test for bugzilla 3944 - - Wed Jan 5 11:01:04 UTC 2011 Marcel Smit - - * tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc: - Resolved link issues on windows. - - Wed Jan 5 10:56:02 UTC 2011 Marcel Smit - - * tests/DAnCE/PartialShutdown/Component1/Component1.mpc: - * tests/DAnCE/PartialShutdown/Component2/Component2.mpc: - * tests/DAnCE/PartialShutdown/Component3/Component3.mpc: - Resolved compile issues on windows. - - Wed Jan 5 09:15:01 UTC 2011 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - Resolved runtime issues. - - Sun Jan 2 13:28:25 UTC 2011 Johnny Willemsen - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp: - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: - - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc: - - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc: - - Tue Dec 28 14:42:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - Resolved test errors. - - Tue Dec 28 07:56:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - Resolved compile issues on linux. - - Mon Dec 27 15:10:50 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - - * tests/DAnCE/PartialShutdown/*: - Test which tests whether all connections are correctly shutdown - when one component is shutdown using a deploymentplan. - For now it tests whether all connections were shutdown properly. - - Mon Dec 27 12:47:16 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_ts_default.mpb: - * MPC/config/ndds_ts_default.mpb: - Ability for users to create their ndds-only projects. - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: - Changed mpc files to only use ndds base projects. - - Mon Dec 27 10:42:34 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - Corrected base projects. - - Mon Dec 27 10:30:27 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - Resolved linker errors on windows. - - Mon Dec 27 10:15:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h: - * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_i_handle.idl: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handle.idl: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.h: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.cpp: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleEC.h: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleS.h: - Renamed dds_rtf2_dcps to ndds_dcps. - - Mon Dec 27 09:34:09 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/ndds.mpb: - * MPC/config/ndds_lem_stub.mpb: - * MPC/config/ndds_skel.mpb: - * MPC/config/ndds_stub.mpb: - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/idl/ndds: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_i_handle.idl: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handle.idl: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.h: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.cpp: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleEC.h: - * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleS.h: - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/TopicListener.cpp: - * connectors/dds4ccm/impl/Utils.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/Condition.h: - * connectors/dds4ccm/impl/ndds/Condition.cpp: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/TopicDescription.h: - * connectors/dds4ccm/impl/ndds/TopicListener.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h: - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h: - Splitted dds_rtf2_dcps.idl into two parts, given ndds it's own idl file with its own. - stub and skeleton projects. The NDDS wrapper library now inherits from these stub and - skeleton projects - - Fri Dec 24 09:13:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - Fuzz. - - * connectors/dds4ccm/impl/Getter_T.cpp: - ::DDS::xxx instead of DDS_xxx. - - Thu Dec 23 10:28:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: - Implemented unregister_type since this one is pure virtual in the - base class. - - Thu Dec 23 09:02:00 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - Derive from DDS_Base instead of DDS_TopicBase. - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: - Removed unnecessary template parameters. - Fuzz. - - Thu Dec 23 08:11:40 UTC 2010 Marcel Smit - - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp: - Removed template parameters due to changes in the IDL compiler. - - Wed Dec 22 15:44:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Removed fith template parameter due to changes in the IDL compiler. - - Wed Dec 22 14:43:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Removed fith template parameter due to changes in the IDL compiler. - - Wed Dec 22 14:03:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - Resolved valgrind warnings/errors. - - Wed Dec 22 13:29:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Resolved memory leaks. - - Wed Dec 22 13:08:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - Resolved memory leak. - - Wed Dec 22 12:59:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - Resolved memory leaks. - - Wed Dec 22 12:34:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Layout changes - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - Removed unused class variables. - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved memory leaks. - - Wed Dec 22 11:42:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: - Rewritten, using the generated executor code. - - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: - Given the application some extra time to run - - Tue Dec 21 14:52:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Removed implementation of register_type and unregister_type - since they're pure virtual. - - Tue Dec 21 14:21:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: - Using the IDL defined type specific datareader/datawriter. - - Tue Dec 21 13:43:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - register_type and unregister_type are now pure virtual. - - Tue Dec 21 13:33:27 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - Resolve compile error on windows. - - Tue Dec 21 13:29:51 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - Resolved compile error. - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.idl: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.mpc: - Renamed xxx_Connector.* files since these files do not contain connector stuff. - - Tue Dec 21 13:11:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h: - Removed these files. - - Tue Dec 21 13:09:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.idl: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.mpc: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: - Moved Connector/* files to Base. - - Tue Dec 21 10:44:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Optimized logging for with_profile methods. - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Removed unused class variable. - - === end changelog === - -Mon Dec 20 19:10:15 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Requires ndds - -Mon Dec 20 12:17:48 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - Resolved compile error on windows. - -Mon Dec 20 10:29:55 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - Resolved compile error. - - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - Inserted extra log message. - -Fri Dec 17 15:01:53 UTC 2010 Martin Corino - - * */*.*: - Merged RemedyWork branch. - -Fri Dec 17 10:35:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - Resolved linker error on windows builds - -Wed Dec 15 11:49:02 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Simplified base projects and correct header directory - -Wed Dec 15 11:25:42 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Enable typecodes with opendds - - * bin/ciao_tests.lst: - Enabled new tests - -Wed Dec 15 14:43:48 UTC 2010 Marijke Hengstmengel - - * tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl: - Changed sever args. - -Wed Dec 15 14:02:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: - Removed DDS_TYPE and SEQ_TYPE template parameters from the Base Connector - -Wed Dec 15 13:15:48 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Generate ReplyHandler in exec with -Gex option. - -Wed Dec 15 13:10:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: - Don't let the IDL compiler generate the executor code. - -Wed Dec 15 12:46:48 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnTA_conn_i.h: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnTA_conn_i.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsTA_conn_i.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsTA_conn_i.h: - Removed. - -Wed Dec 15 12:23:48 UTC 2010 Marijke Hengstmengel - - *connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - *connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h: - *connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc: - *connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc: - *connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc: - *connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - *connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h: - *connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h: - *connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc: - *connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h: - *connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc: - *connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl: - *connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: - *connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc: - *connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - *connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc: - *connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - *connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h: - *connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - *connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc: - *connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h: - *connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc: - *connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - *connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - *connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - *connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc: - *connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h: - *connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc: - *connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - *connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h: - *connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc: - *connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - *connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h: - *connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc: - *connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - *connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h: - *connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc: - *connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h: - *connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc: - *connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc: - *connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - *connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h: - *connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl: - Remove ReplyHandler from separate conn_i file to Sender_exec, according new - output -Gex option. - - *connectors/ami4ccm/tests/OneProcess/Sender/OneProcessA_conn_i.cpp: - *connectors/ami4ccm/tests/OneProcess/Sender/OneProcessA_conn_i.h: - *connectors/ami4ccm/tests/Exceptions/Sender/ExceptionTA_conn_i.cpp: - *connectors/ami4ccm/tests/Exceptions/Sender/ExceptionTA_conn_i.h: - *connectors/ami4ccm/tests/ThreeComp/Base/ThreeCompA_conn_i.h: - *connectors/ami4ccm/tests/ThreeComp/Base/ThreeCompA_conn_i.cpp: - *connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsTA_conn_i.cpp: - *connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsTA_conn_i.h : - *connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyHA_conn_i.cpp : - *connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyHA_conn_i.h: - *connectors/ami4ccm/tests/UsesMulti/Sender/UsesMultiA_conn_i.cpp: - *connectors/ami4ccm/tests/UsesMulti/Sender/UsesMultiA_conn_i.h: - *connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.cpp: - *connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.h: - *connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSMA_conn_i.cpp: - *connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSMA_conn_i.h: - *connectors/ami4ccm/tests/GetComp/Sender/GetCompA_conn_i.cpp: - *connectors/ami4ccm/tests/GetComp/Sender/GetCompA_conn_i.h: - *connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyHA_conn_i.cpp: - *connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyHA_conn_i.h: - *connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyHA_conn_i.h: - *connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyHA_conn_i.cpp: - *connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutTA_conn_i.h: - *connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutTA_conn_i.cpp: - Remove files. - -Wed Dec 15 11:45:48 UTC 2010 Martin Corino - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - Added missing include. - -Wed Dec 15 10:26:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: - Removed unnecessary class members. - - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Wed Dec 15 09:15:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp: - - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 14 15:24:26 UTC 2010 Johnny Willemsen - - * NEWS: - Prepared for next release - -Tue Dec 14 14:46:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 14 13:29:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 14 13:13:17 CET 2010 Johnny Willemsen - - * CIAO version 1.0.0 released. - -Tue Dec 14 11:43:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Fixed memory leaks. - -Tue Dec 14 11:23:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - Added a base class in which ref counting is enabled in the - constructor. All other dds eventhandler classes are derived - from this base class. - This'll resolve some valgrind errors in the PortStatusListener. - - * connectors/dds4ccm/impl/PortStatusListener.cpp: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - Layout changes - -Tue Dec 14 09:05:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Rewritten, using the generated executor code. This was the last test - for now. All tests using the reactor are now rewritten. - -Tue Dec 14 08:35:22 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: - Fuzz. - -Mon Dec 13 16:45:53 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 13 15:21:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 13 14:59:22 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h: - Changed tutorial and code for changed generated ReplyHandler with -Gex. - -Mon Dec 13 14:01:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 13 13:02:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 13 12:49:22 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl: - * connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: - Implementation multiple templates. Still needed a TAO_IDL change for Typed::DataWriter/Reader. - - -Mon Dec 13 11:00:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - Minor code layout changes - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 13 08:18:22 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - Made (un)register_type virtual in Base and add implementation in TopicBase. - -Mon Dec 13 07:56:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl: - Fuzz. - -Mon Dec 13 07:44:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc: - Removed duplicate names in Reader_Starter projects. - -Fri Dec 10 16:01:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Fri Dec 10 14:28:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Rewritter, using the generated executor code. - Added a check on the number of samples received. - -Fri Dec 10 13:50:18 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Added .in () to a _var. - - * connectors/dds4ccm/impl/Updater_T.cpp: - Resolved some memory leaks. - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - Rewritter, using the generated executor code. - -Fri Dec 10 12:03:52 UTC 2010 Vladimir Zykov - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - Resolved linker error on windows builds - -Fri Dec 10 10:50:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Removed unneccasary include. - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - Rewritten, using the generated executor code. - -Fri Dec 10 09:54:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: - Fuzz fixes. - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.h: - Removed this file. - -Fri Dec 10 09:48:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Fri Dec 10 09:17:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp: - Rewritten, using the generated executor code. - -Thu Dec 9 13:25:55 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/examples/IDL2CPPWrapper/*: - Added test/example which tests the IDL to c++ wrapper. This is a - small shapes sender/receiver application. - -Thu Dec 9 13:26:48 UTC 2010 Martin Corino - - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Added code to ignore the CookieRequired exception at shutdown and log - only at a higher log level. - This will be reverted after the disconnect behaviour has been properly - fixed. - -Thu Dec 9 10:02:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc: - Added since they belong the the LateBinding test. - -Thu Dec 9 09:54:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp: - Resolved test errors by checking whether the last sample is available on the - receiver side. - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - Resolved unresolved externals on windows builds. - -Thu Dec 9 08:19:14 UTC 2010 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Attempt to fix a path to tao_idl3_to_xmi on installed builds. - -Wed Dec 8 17:03:29 UTC 2010 Martin Corino - - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - Fuzz fix. - -Wed Dec 8 17:34:33 UTC 2010 Johnny Willemsen - - * tests/Bug_3936_Regression: - * tests/Bug_3937_Regression: - Two new idl tests, will enable them in the test suite after - the release - -Wed Dec 8 14:28:53 UTC 2010 Martin Corino - - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchTA_conn_i.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchTA_conn_i.cpp: - Removed these files. - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - Updated to use the new AMI reply handler executor implementation - skeleton generated in de _exec.* files instead of separate - _conn_i.* files. - -Wed Dec 8 12:16:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc: - Resolved linker issues on windows. - -Wed Dec 8 10:59:48 UTC 2010 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Added dance_xml_utils parent to CIAO_IDL3_TO_XMI_EXE. It's needed - on static builds. - -Tue Dec 7 15:16:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - Moved the conversion from ::DDS::SampleInfo to CCM_DDS::ReadInfo to - the impl directory. - -Tue Dec 7 15:09:23 UTC 2010 Marijke Hengstmengel - - * tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl: - * tests/DAnCE/LocalityManager/CommandlinePassage/Component_cmd.cdp: - * bin/ciao_tests.lst: - Added --server-args nodemanager test. - -Tue Dec 7 15:03:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 7 14:11:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 7 13:44:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 7 13:07:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Tue Dec 7 11:49:27 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/Proxies/*: - Added test which tests the IDL DataWriter/DataReader. - -Tue Dec 7 10:39:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - Resolved compiler warning. - - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - -Mon Dec 6 15:40:12 UTC 2010 Marijke Hengstmengel - - *connectors/tests/AMIDDS/Base/AmiDds_Base.mpc: - *connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Removed -Gex option and includes of conn_i files. - -Mon Dec 6 14:25:12 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - Solve memory leak. - -Mon Dec 6 14:03:12 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - Activate sendc functions. - -Mon Dec 6 12:15:12 UTC 2010 Marijke Hengstmengel - - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h: - * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Resolve some memory leaks, reported by valgrind built. - -Mon Dec 6 11:24:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Resolved link errors/warnings on windows. - -Mon Dec 6 11:14:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - Resolved link errors/warnings on windows. - -Mon Dec 6 10:17:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - Resolved linker errors on windows. - -Mon Dec 6 00:27:20 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Updated some comments - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Fixed compile problems when no dds implementation is enabled - -Sat Dec 4 10:37:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Replace DDS4CCM logging macros with ACE macros, since this is user code - and doesn't belong to the DDS4CCM core. This'll probably solve unresolved - externals on windows builds. - -Fri Dec 3 14:20:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - Replace some DDS_xxx defines with ::DDS::xxx defines. DDS_xxx defines - are not allowed in the DDS4CCM core. - -Fri Dec 3 13:01:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Resolve compile issue related to the number of template variables. - -Fri Dec 3 09:59:02 UTC 2010 Martin Corino - - * bin/ciao_tests.lst: - Fixed typo in pathname. - -Fri Dec 3 10:33:37 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: - All idl in this file is for NDDS - -Fri Dec 3 10:21:40 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - Added flags for OpenDDS - -Fri Dec 3 09:36:43 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl: - Added another test component - -Fri Dec 3 06:14:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - Updated template parameters since seq_type has been removed - from the DDS traits. - - * connectors/dds4ccm/impl/Reader_T.cpp: - Fixed some memory leaks - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - Fixed some memory leaks - - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Code layout - - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - Rewritten, using the generated executor code. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Layout changes. - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Fixed memory leaks. - -Wed Dec 1 11:55:39 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - Remove trailing spaces and tabs. - - -Wed Dec 1 10:18:26 UTC 2010 Johnny Willemsen - - * MPC/config/ciao_extension_container.mpb: - * MPC/config/ciao_extension_container_stub.mpb: - * MPC/config/ciao_session_container.mpb: - * MPC/config/ciao_session_container_stub.mpb: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * docs/releasenotes/switch.html: - * MPC/config/ccm_componentserver_stub.mpb: - * ccm/ComponentServer: - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - Removed ccm_component_server_stub, the exceptions listed there are - only used in the container. That part has to be rewritten because - the exceptions are not in idl - -Wed Dec 1 10:24:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - Rewritten, using the generated executor files. - -Wed Dec 1 09:20:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Rewritten, using the generated executor files. - -Tue Nov 30 15:29:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Rewritten, using the generated executor files. - Also fixed some bugs in this test. Besides this all there's a check on - exit in order to check the correct number of samples received. - -Tue Nov 30 09:55:39 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - Implementation test. - -Tue Nov 30 12:50:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Rewritten, using the generated executor files. - -Tue Nov 30 09:55:39 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h: - Implemente get_methods and generated exec's . - -Tue Nov 30 09:56:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Removed unnecessary checks for nil pointers. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Rewritten, using the generated executor files. - -Mon Nov 29 13:17:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Added doxygen comments. - -Mon Nov 29 12:31:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Resolved memory leaks regarding QueryFilter. - -Mon Nov 29 11:09:39 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - Delete pointers without checking not o. - -Mon Nov 29 10:51:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Shutting down the dds4ccm connector in a thread safe and memory leak free - manner. - -Mon Nov 29 10:31:39 UTC 2010 Marijke Hengstmengel - - *bin/ciao_tests.lst: - Add test IDL_Test/NonTopic_Connector - -Mon Nov 29 10:15:39 UTC 2010 Marijke Hengstmengel - - * tests/IDL_Test/NonTopic_Connector/descriptors: - * tests/IDL_Test/NonTopic_Connector/descriptors/DeploymentPlan.cdp: - * tests/IDL_Test/NonTopic_Connector/descriptors/run_test.pl: - Add deployment and run script. - -Fri Nov 26 22:35:09 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Base/Hello.idl: - - Changes to the #pragma directives necessary to reflect the - recent changes in AMI4CCM reply handler generation. - -Fri Nov 26 19:04:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Resolved memory leaks. - - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - Made constructor private since this is a singleton class. - -Fri Nov 26 14:10:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Changed forward declaration (struct instead of class). - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Set listener to 0 explicitely (to be consistent with subscriber). - - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - Added set_rti_entity method. To be consistent with other classes. - - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Resolved typos. - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Layout changes. - -Fri Nov 26 13:11:39 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeCompA_conn_i.h: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeCompA_conn_i.cpp: - Generated executors with -Gex. Solve Valgrind warning. - - - -Fri Nov 26 10:39:30 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Removed dummy label when no dds vendor is enabled - - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp: - Removed not needed include - -Fri Nov 26 10:10:39 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc: - * connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc: - * connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc: - * connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc: - * connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMultiA_conn_i.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMultiA_conn_i.h: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSMA_conn_i.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSMA_conn_i.h: - Generated executors with -Gex. Solve Valgrind warning. - -Fri Nov 26 09:09:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - Every trait, needed from DDS_TYPE, has got his own template argument. - -Fri Nov 26 08:37:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Optimized logging/tracing - - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - Every trait, needed from DDS_TYPE, has got his own template argument. - -Fri Nov 26 07:42:34 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - Added typesupport pragma's - - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc: - _T must be a template file - - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: - Include cpp file here - -Thu Nov 25 19:57:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Rewritten initialization and removal of the domain participant. When - derived from (Topic)Base one can use these methods in order to use - ones own domain participant. - -Thu Nov 25 14:42:39 UTC 2010 Marijke Hengstmengel - - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: - Add extra include. Remove empty lines. - - -Thu Nov 25 14:03:39 UTC 2010 Marijke Hengstmengel - - * tests/IDL_Test/NonTopic_Connector/nontopic_test.idl: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp: - Changed after TAO_IDL change . - - -Thu Nov 25 13:52:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.h: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - Removed DDS_TYPE from templated parameters. Replaced this with more - appropriate parameters (if neccessary). - -Thu Nov 25 10:48:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - Changed template arguments of DDS_Write_T. Removed DDS_TYPE and added - TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE. - -Thu Nov 25 10:12:40 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: - Removed unneeded pragma's, fixed problems - -Thu Nov 25 08:59:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h: - Removed unneccasary streaming operators. - -Thu Nov 25 08:19:39 UTC 2010 Marcel Smit - - * NEWS: - Removed unnecessary text. - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Moved all helper methods from TopicBase to Base. That way, an user - can also derive his/her classes from Base. - -Wed Nov 24 15:17:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Rewritter init, activate, passivate and remove methods. They should - be re-usable in the derived classes. - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - Re-used the init, activate, passivate and remove methods from TopicBase. - -Wed Nov 24 15:04:18 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/idl/dds4ccm_Entity.idl: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Moved DDS_Entity to its own file - -Wed Nov 24 14:50:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Compile ccm_dds.idl as part of the build - - * connectors/dds4ccm/idl/ccm_ddsC.h: - * connectors/dds4ccm/idl/ccm_ddsS.h: - Removed these files, now generated as part of the build - -Wed Nov 24 13:59:33 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Added fixed argument for the sequence - -Wed Nov 24 13:15:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc: - Removed some dummy labels - -Wed Nov 24 09:06:35 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc: - * connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc: - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp: - * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h: - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc: - * connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcessA_conn_i.cpp: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcessA_conn_i.h: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyHA_conn_i.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyHA_conn_i.h: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyHA_conn_i.h: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyHA_conn_i.cpp: - Generated executors with -Gex. Solve Valgrind warning. - - - -Wed Nov 24 12:51:05 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - Extended test idl construct - -Wed Nov 24 11:59:21 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/NonTopic_Connector/nontopic_test.idl: - Updated connectors - -Wed Nov 24 12:00:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/ndds_impl.mpb: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Resolved unresolved externals on Windows. - -Wed Nov 24 11:04:46 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc: - - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc: - - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc: - - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - - * tests/IDL_Test/NonTopic_Connector/nontopic_test.idl: - - * tutorials/Quoter/Simple/README.html: - -Wed Nov 24 10:23:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - Resolved unresolved external errors on windows. - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Re-arranging code. Separeted the registration of the type from the - creation of the topic. Derived classes are now able to register a type - without creating a topic. - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - Implemented different topics (on for each shape). - -Wed Nov 24 09:14:35 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - Add include for sleep function. - -Wed Nov 24 09:06:35 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnTA_conn_i.h: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnTA_conn_i.cpp: - Generated executors with -Gex. Solve Valgrind warning. - - - -Tue Nov 23 14:20:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - Circle listener is working now. - -Tue Nov 23 14:09:35 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsTA_conn_i.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsTA_conn_i.h: - Generated executors with -Gex. Solve Valgrind warnings. - - -Tue Nov 23 12:15:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - The getter functionality works now. Listeners to be implemented next. - -Tue Nov 23 11:23:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - Work in progress. Enabled both components again. - Still some issues left regarding the Receiver component. - -Tue Nov 23 07:14:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Layout changes - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - Updated. Added MultiTopicConnector_T.cpp. - - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - Reorganized connections. - -Mon Nov 22 15:13:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - Prefend compilation after invoking 'make' a second time. - - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - Rewritten some parts. Removed portstatuslistener implemetation since it - wasn't used. - -Mon Nov 22 14:38:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - Split common.idl into two pieces: One which contains the type declaration, - the other one contains the interface definition. - -Mon Nov 22 12:52:02 UTC 2010 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/descriptors/*: - Some more work to get this example running again - -Mon Nov 22 11:04:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - Layout changes - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - Moved the reading of the DDS verbose logging environment variable to - the DomainParticipantManager. - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - Layout changes - - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - Added includes. - - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - Implemented the writer part of the Connector. - -Mon Nov 22 10:10:50 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Layout changes - - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - Added typedefs for DataReader/DataWriter - - * tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp: - Const change - -Fri Nov 19 19:13:13 UTC 2010 Johnny Willemsen - - Reverted introduction of TypeSupport.idl, it breaks the current modeling - tool support, we will try to reintroduce this later in the future - - * MPC/config/dds4ccm_ts_default.mpb: - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc: - * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Derived/Derived.mpc: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc: - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc: - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl: - * MPC/config/dds4ccm_ndds_ts_defaults.mpb: - -Fri Nov 19 19:59:42 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc: - Changed for new dds4ccm development. - -Fri Nov 19 19:47:42 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.cpp: - Fixed typo. - -Fri Nov 19 09:54:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Typos in logging. - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - Made set_dds_entity private. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Properly set dds entity on the listener. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp: - Fully implemented DomainParticipantListener. - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Passed domain pariticipant to StatusCondition. - - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Passing nil as a datareader should be fine. - -Thu Nov 18 19:58:29 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - Fixed compile errors, this test is plain rti dds, no need for dds4ccm - typesupport - -Thu Nov 18 19:44:26 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc: - Fixed compile errors - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - ShapesSeq must be with the Shapes struct - -Thu Nov 18 19:30:13 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Fix problems when dds4ccm_ndds is disabled - -Thu Nov 18 15:53:42 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc: - * connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.cpp: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.h: - Updated test by using -Gex option and _conn_i.h/cpp file for ReplyHandler. - -Thu Nov 18 14:32:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Removed unnecessary IDL command line options. - -Thu Nov 18 14:22:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Resolved unresolved externals on windows. - -Thu Nov 18 14:17:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - Splitted type and connector declaration into to separate files. - -Thu Nov 18 13:17:42 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultipleTemp: - * connectors/dds4ccm/tests/MultipleTemp/Sender: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/descriptors: - * connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl: - * connectors/dds4ccm/tests/MultipleTemp/Receiver: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl: - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc: - * connectors/dds4ccm/tests/MultipleTemp/Base: - * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl: - * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc: - Test for multiple templates. - -Thu Nov 18 12:55:39 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ndds_ts_defaults.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc: - * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Derived/Derived.mpc: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc: - * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc: - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc: - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Generate TypeSupport.idl and use that - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl: - Use global namespace for everything - -Thu Nov 18 12:46:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - Re-implemented test using the -Gexr option on the TAO IDL compiler. - -Thu Nov 18 09:11:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - Re-implemented test using the -Gexr option on the TAO IDL compiler - -Thu Nov 18 08:50:42 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl: - Add no ami4ccm interface in separate idl file. - -Thu Nov 18 08:15:42 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - Fixed typo. - -Thu Nov 18 07:42:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.h: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Swapped template arguments. First CCM_TYPE and than DDS_TYPE. - -Wed Nov 17 13:35:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - Resolved some valgrind errors. - -Wed Nov 17 13:04:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Store the publisher and subscriber as class members in the DataWriter - and DataReader. - -Wed Nov 17 12:48:18 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Disable all projects derived from this when no dds vendor is enabled - -Wed Nov 17 11:15:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Resolved runtime casting errors. - -Wed Nov 17 11:04:42 UTC 2010 Marijke Hengstmengel - - * connectors/tests/AMIDDS/Base/AmiDds_Base.idl: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionTA_conn_i.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionTA_conn_ih: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsTA_conn_icpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsTA_conn_ih: - * connectors/ami4ccm/tests/DelRplyH/Sender/DelRplyHA_conn_i.cpp: - * connectors/ami4ccm/tests/DelRplyH/Sender/DelRplyHA_conn_i.h: - * connectors/ami4ccm/tests/GetComp/Sender/GetCompA_conn_i.cpp: - * connectors/ami4ccm/tests/GetComp/Sender/GetCompA_conn_i.h: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutTA_conn_i.h: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutTA_conn_i.cpp: - * connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h: - * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl: - * connectors/ami4ccm/tests/DelRplyH/Sender/DelRplyH_Sender_exec.h: - * connectors/ami4ccm/tests/DelRplyH/Sender/DelRplyH_Sender.mpc: - * connectors/ami4ccm/tests/DelRplyH/Sender/DelRplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/DelRplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/DelRplyH/Receiver/DelRplyH_Receiver_exec.cpp: - * connectors/ami4ccm/tests/DelRplyH/Receiver/DelRplyH_Receiver_exec.h: - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h: - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc: - * connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp: - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h: - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h: - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl: - Updated tests by using -Gex option and _conn_i.h/cpp file for ReplyHandler. - Solved valgrind errors. - -Wed Nov 17 11:05:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Getter_T.cpp: - Enabled return_loan again. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Resolved runtime memory problems. - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Layout change. - -Wed Nov 17 10:23:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Resolved compile error. - -Wed Nov 17 10:14:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Writer_T.cpp: - Throwing an internal error when the publisher on the - DataWriter seems to be NIL. If nil, write_many will block and no info - is returned to the user. - - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - Implemented 'get_publisher' method. - Added DDS4CCM_TRACE info to every method. - -Wed Nov 17 09:26:42 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl: - Add no ami4ccm interface. - -Wed Nov 17 09:24:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Resolved test errors regarding read_w_condition. - -Wed Nov 17 09:12:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Improved logging - - * connectors/dds4ccm/impl/Reader_T.cpp: - Layout change. - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Resolved test errors regarding take_w_condition. - -Wed Nov 17 08:23:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - Resolved test errors. - -Wed Nov 17 08:14:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Optimized logging parameters. - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved test errors. - -Tue Nov 16 15:28:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved some memory leaks.Therefor created the executor code by - using -Gexr on the TAO IDL compiler. - -Tue Nov 16 14:26:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Resolved shutdown issues in some of the tests. - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved memory leak. - -Tue Nov 16 11:21:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl: - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - Layout changes. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - Resolved compile error. - -Mon Nov 15 18:27:05 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - Fixes to get head compiling without errors - -Mon Nov 15 18:13:47 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Updater_T.cpp: - Use ::DDS:: instead of DDS_. - -Mon Nov 15 15:39:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Updater_T.cpp: - Use ::DDS:: instead of DDS_. - - * connectors/dds4ccm/tests/Policies/main.cpp: - * connectors/dds4ccm/tests/Policies/policies.mpc: - * connectors/dds4ccm/tests/Policies/states_test.h: - * connectors/dds4ccm/tests/Policies/states_test.cpp: - Added test which explicitely tests whether all DDS4CCM states - (view, sample, and, instance states) are equal to the RTI states. - -Mon Nov 15 14:59:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Reader_T.cpp: - Typo. - -Mon Nov 15 14:09:24 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - Fixed incorrect logging - -Mon Nov 15 13:40:09 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/PortStatusListener.cpp: - Fixed incorrect log format specifiers - -Mon Nov 15 13:12:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Moved implementation of check_handle. - -Mon Nov 15 12:45:07 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fixed memory leak and shutdown crashes - -Mon Nov 15 12:08:19 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/PublisherListener.cpp: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - * connectors/dds4ccm/impl/Utils.h: - Print QoSPolicyId_t as readable string - -Mon Nov 15 11:36:18 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - Removed ndds include - - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Added missing virtual destructor - -Mon Nov 15 11:33:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Listening was based on whether the user had a PortStatusListener - configured (and implemented). Now listening is based on the internal - listener. - -Mon Nov 15 11:11:58 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/PublisherListener.h: - * connectors/dds4ccm/impl/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - PublisherListener is now a C++ class instead of a template - - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - Removed these files. - -Mon Nov 15 11:12:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Initialize listening mask to 0. - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - No need to re-assign instance state mask, view state mask and - sample mask since they're all unsigned longs. - - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - don't close down typesupport for now. - -Mon Nov 15 11:00:15 UTC 2010 Marijke Hengstmengel - - * tests/IDL_Test/NonTopic_Connector: - * tests/IDL_Test/NonTopic_Connector/nontopic_test.idl: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Base.idl: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.idl: - * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: - Added test. - -Mon Nov 15 10:41:39 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - * connectors/dds4ccm/impl/TopicListener.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - No need to initialize a cstring - -Mon Nov 15 08:45:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Use ::DDS::xxx instead of DDS_xxx for the states. - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Don't use the convertors when converting states. Just use '='. - -Sat Nov 13 14:24:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Updated for ccm trait changes - -Sat Nov 13 14:04:37 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.h: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Updated for ccm trait changes - -Sat Nov 13 09:18:33 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/LocalObject.h: - * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: - Fixed compile errors - -Fri Nov 12 19:47:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - Resolved BAD_INV_ORDER problem. - -Fri Nov 12 19:28:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Removed debug statement. - -Fri Nov 12 19:06:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - Removed ACE_DEBUG statement. - -Fri Nov 12 18:45:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Made implementation of the DataReader about the same as the - DataWriter. - -Fri Nov 12 15:39:51 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener.h: - * connectors/dds4ccm/impl/PortStatusListener.cpp: - * connectors/dds4ccm/impl/StateListenerControl_T.h: - * connectors/dds4ccm/impl/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener.h: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - * connectors/dds4ccm/impl/TopicListener.h: - * connectors/dds4ccm/impl/TopicListener.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/PortStatusListener_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - Converted several C++ templates to regular classes - -Fri Nov 12 14:42:20 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed topy - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Log return value of take and only have one exit point - - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - Fixed logging - - * connectors/dds4ccm/impl/StateListenerControl_T.cpp: - Just set the bool - -Fri Nov 12 13:46:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Reader_T.cpp: - Layout changes and member initialization. - -Fri Nov 12 13:28:01 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Removed DataWriterListener and DomainParticipantListener, they - where not doing anything, but where initially added in case we really - needed them - - * connectors/dds4ccm/impl/DataWriterListener_T.h: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp: - Removed these files. - -Fri Nov 12 13:11:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - Replaced rti specific checks - -Fri Nov 12 12:55:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Typos. - - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - Using the typed IDL datareader as entity - -Fri Nov 12 12:46:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Removed unused template from ConditionManager. - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - Bailing out when unexpected samples were received. - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Removed these files. - -Fri Nov 12 12:37:02 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Simplified set_component - -Fri Nov 12 12:22:40 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/LocalObject.h: - * connectors/dds4ccm/impl/LocalObject.cpp: - * connectors/dds4ccm/impl/LocalObject_T.h: - * connectors/dds4ccm/impl/LocalObject_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Simplified dds4ccm localobject and give updater/writer templates on - the things they need, not the full dds/ccm traits - -Fri Nov 12 11:47:00 UTC 2010 Vladimir Zykov - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Fixed missing xerces dependency. - - * tools/IDL3_to_XMI/identifier_helper.cpp: - Fixed formatting. - -Fri Nov 12 10:58:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.h: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.h: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Removed unnecessary template parameter. - -Fri Nov 12 09:41:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Got rid of (almost) all usage of DDS_xxx. Using - ::DDS::xx instead. - - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Removed all non-idl methods and moved them to the appropriate - classes. - - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - Converting ::DDS::SampleInfo instead of DDS_SampleInfo. - -Fri Nov 12 08:29:09 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Added new test case with multiple templated modules with alias and - typedefs. Jeff Parsons fixed a problem in the idl compiler when using - this kind of constructs yesterday, added now an explicit test - -Thu Nov 11 19:25:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - Fixed export macro - -Thu Nov 11 19:17:20 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - Implemented this file - -Thu Nov 11 18:33:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/Condition.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Removed ccm knowledge from ndds wrapper - -Thu Nov 11 15:58:44 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Added own typesupport and use that through the code - -Thu Nov 11 14:42:03 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp: - Add include for sleep function . - -Thu Nov 11 10:56:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Resolved runtime issues in Getter functionality. - -Thu Nov 11 10:34:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Getter_T.cpp: - Resolved compile issues. - -Thu Nov 11 10:28:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Initialize pointer to nil. Added log message when - BAD_INV_ORDER is thrown. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Bailing out when key name is empty - -Thu Nov 11 10:23:06 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - Add missing project. - -Thu Nov 11 10:22:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Bailing out rather sooner than later. Output of this test was very large. - -Thu Nov 11 09:54:07 UTC 2010 Vladimir Zykov - - * MPC/config/taoidl3toxmidefaults.mpb: - Make this base project to inherit from xerces. So that projects - that need tao_idl3_to_xmi will not build if xerces is not present - since tao_idl3_to_xmi is dependent on xerces. - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - * tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc: - Cleaned a bit these files. - -Thu Nov 11 09:52:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - Fuzz. - - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Implemented the IDL representation of the ::DDS::DataReader. - First step in cleaning this DataReader. - - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h: - Converting DDS::SampleInfoSeq to DDS_SampleInfoSeq and - DDS::SampleInfo to DDS_SampleInfo. - -Wed Nov 10 19:52:53 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - Use some typedefs to hide the internal templated module for our - users - -Wed Nov 10 19:10:59 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - Changed templated module for dds entities - -Wed Nov 10 14:45:14 UTC 2010 Vladimir Zykov - - * MPC/config/taoidl3toxmidefaults.mpb: - Fixed MPC problem from my previos commit. - -Wed Nov 10 14:17:36 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - Introduced a dds4ccm type specific datareader/datawriter. This will - be used within dds4ccm instead of the vendor specific type specific - reader/writer. The writer works, but the reader has to be finished, - several no_implement methods are added. - -Wed Nov 10 14:14:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Renamed get_impl to get_dds_entity and set_impl to set_dds_entity. - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Resolved test issues - -Wed Nov 10 12:40:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Utils.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - Portability changes - -Wed Nov 10 11:46:39 UTC 2010 Vladimir Zykov - - * tests/IDL3/ImpliedIDL/All/raw_include.idl: - Corrected use of deprecated bounded wide string. - -Wed Nov 10 11:21:03 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h: - * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp: - - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchTA_conn_i.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchTA_conn_i.cpp: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - - * connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: - Updated test by using -Gex option and _conn_i.h/cpp file for ReplyHandler. - Solved valgrind errors. - -Wed Nov 10 11:07:18 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Changed interfaces of get_readcondition and get_querycondition_xxx. - Now a ::DDS::Read/QueryCondition is returned. - - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Because of interface changes in ConditionManager. - -Wed Nov 10 10:26:40 UTC 2010 Vladimir Zykov - - * rules.ciao.GNU: - * MPC/config/taoidl3toxmidefaults.mpb: - Added a base project that will make it easier to use tao_idl3_to_xmi - tool in MPC. - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - tao_idl3_to_xmi has nothing to do with DAnCE. So corrected its MPC - to output binary to $CIAO_ROOT/bin and renamed other things to make - it part of CIAO. - - * tests/IDL3_to_XMI/Forward_Declared/c_nok.idl: - * tests/IDL3_to_XMI/Forward_Declared/Forward_Declared.mpc: - * tests/IDL3_to_XMI/Forward_Declared/c_ok.idl: - * tests/IDL3_to_XMI/Forward_Declared/a.idl: - * tests/IDL3_to_XMI/Forward_Declared/b.idl: - * tests/IDL3_to_XMI/Forward_Declared/README: - Added a new test. - - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - Corrected path to tao_idl3_to_xmi binary. - -Wed Nov 10 09:57:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Moved check_handle method to DataReader_T.cpp/h. - -Wed Nov 10 09:49:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Changed interfaces of several methods to use ::DDS::xxx instead of - DDS_xxx. - - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Improved exception handling during "check_last". - -Wed Nov 10 08:28:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Improved logging. - - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Resolved issue regarding detach_condition. - -Tue Nov 9 19:40:21 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Resolved bugs in listener callbacks. - - * connectors/dds4ccm/impl/logger/Logger_Service.cpp: - Enable trace when environment variable is set. - -Tue Nov 9 15:07:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ndds/Condition.h: - * connectors/dds4ccm/impl/ndds/Condition.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Layout changes. - -Tue Nov 9 14:16:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/Condition.h: - * connectors/dds4ccm/impl/ndds/Condition.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Created Waitset and Condition proxies. The underlying code - (ConditionManager_T and Getter_T) was therefor changed. - -Tue Nov 9 13:33:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Fixed runtime problem with the datareader listener - -Tue Nov 9 12:49:11 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - Fixed compile errors due to rename actions - -Tue Nov 9 09:12:28 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - Removed DDS_Typed templated module alias, shouldn't been committed - yesterday - -Mon Nov 8 19:25:53 UTC 2010 Johnny Willemsen - - Major refactoring of the dds4ccm library and the rti wrapping code - - * connectors/dds4ccm/idl/ccm_dds.idl: - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.h: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.h: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.h: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.h: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.h: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.h: - * connectors/dds4ccm/impl/ndds/Topic_T.cpp: - -Mon Nov 8 16:11:06 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - Fuzz errors. - -Mon Nov 8 14:40:06 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/MultiTopic: - * connectors/dds4ccm/tests/MultiTopic/Sender: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/descriptors: - * connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/MultiTopic/Receiver: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultiTopic/Base: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - First frame for Multi Topic test. - -Fri Nov 5 19:09:06 UTC 2010 Martin Corino - - * ciao/Containers/Session/Session_Container.cpp: - Fixed some incorrect logging messages. - -Fri Nov 5 15:42:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Getter_T.cpp: - Removed usage of ACE_ERROR macro. - -Fri Nov 5 13:56:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Rewritten interface of conditionmanager. - -Fri Nov 5 11:25:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - First step in adding a type factory with methods for creating the - type specific reader/writer - -Thu Nov 4 16:14:25 UTC 2010 Jeff Parsons - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - - Added IDL from [BUGID:3924], now fixed. - -Thu Nov 4 15:43:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Fixed runtime errors - -Thu Nov 4 15:30:03 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp: - Refactoring of dds4ccm writer/updater - -Wed Nov 3 19:07:32 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.h: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.h: - Includes cleanup - -Wed Nov 3 13:26:34 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Added type specific datareader/datawriter interfaces using IDL3+ - -Wed Nov 3 12:52:51 UTC 2010 Johnny Willemsen - - * ccm/ComponentServer/CCM_ComponentServer.mpc: - * ccm/ComponentServer/CCM_ComponentServer_Base.idl: - * MPC/config/ccm_componentserver_svnt.mpb: - * ccm/ComponentServer/CCM_ComponentServer.idl: - * ccm/ComponentServer/CCM_ComponentServer_Client.idl: - Cleanup of old stuff - -Wed Nov 3 12:10:28 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - Implemented several methods - - * connectors/dds4ccm/impl/opendds: - * connectors/dds4ccm/impl/splice: - Removed these files. - -Wed Nov 3 11:02:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - Fixed fuzz - -Wed Nov 3 09:24:05 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Fixed compile errors - -Tue Nov 2 19:55:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - Reorganized code. - -Tue Nov 2 15:13:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - Resolved link issues on Windows. - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Implemented an extra CCM proxy. - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - Due to extra proxy. - -Tue Nov 2 13:37:44 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - Fixed memory leak - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - Fixed misuage of tokenizer - - * examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - Started to fix this example - -Tue Nov 2 09:24:16 UTC 2010 Marijke Hengstmengel - - * tutorials/Quoter/Simple/03.html: - * tutorials/Quoter/Simple/04.html: - * examples/Hello/step-by-step.html: - Changed documentation about NodeManager.dat files into NodeManager.cdd files. - -Tue Nov 2 07:46:38 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_logger.mpb: - Added base projects - - * connectors/dds4ccm/impl/logger/Logger_Service.h: - Layout changes - - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - Removed unnecessary defines. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - Resolved runtime issues. - -Mon Nov 1 14:09:29 UTC 2010 Johnny Willemsen - - * examples/Hello/descriptors/Aliased_Map.cdd: - * examples/Hello/descriptors/run_test_alias.pl: - Removed these files, don't work at all - -Mon Nov 1 13:25:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/logger/Logger_Service.h: - * connectors/dds4ccm/impl/logger/Logger_Service.cpp: - Resolved compile issues on windows. - -Mon Nov 1 13:11:54 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_logger.mpb: - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - - * connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - * connectors/dds4ccm/impl/logger/Logger_Service.h: - * connectors/dds4ccm/impl/logger/Logger_Service.cpp: - * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc: - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - - * connectors/dds4ccm/impl/Log_Macros.h: - * connectors/dds4ccm/impl/Log_Macros.cpp: - Added a logger library for the DDS4CCM connector. - -Mon Nov 1 11:58:16 UTC 2010 Marijke Hengstmengel - - * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.cdd: - * tests/Bug_3834_Regression/descriptors/NodeMap.cdd: - * tests/DAnCE/Progressive_Deployments/NodeManagerMap.cdd: - * examples/Hello/descriptors/Aliased_Map.cdd: - * examples/Hello/descriptors/NodeManagerMap.cdd: - * examples/Hello/descriptors/NodeMap.cdd: - * examples/BasicSP/descriptors/BasicSP.cdd: - * examples/Display/descriptors/NodeManagerMap.cdd: - * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd: - * examples/Null_Component/descriptors/NodeMap.cdd: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: - * tests/DAnCE/Progressive_Deployments/run_test.pl: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_shs.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - Use of *.cdd files i.o. *.dat files. - - * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat: - * tests/Bug_3834_Regression/descriptors/NodeMap.dat: - * tests/Bug_3769_Regression/descriptors/NodeMap.dat: - * tests/DAnCE/Progressive_Deployments/NodeManagerMap.dat: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/NodeManagerMap.dat: - * examples/Hello/descriptors/NodeManagerMap.dat: - * examples/Hello/descriptors/NodeMap.dat: - * examples/Hello/descriptors/Aliased_Map.dat: - * examples/Display/descriptors/NodeManagerMap.dat: - * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat: - * examples/Null_Component/descriptors/NodeMap.dat: - Remove datfile NodeManager - - - -Mon Nov 1 11:48:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ndds.mpc: - Temporary added Log_Macros. This will be changed into a separate - logging library for dds4ccm. - -Mon Nov 1 11:45:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - Corrected export and singleton macros. - -Mon Nov 1 11:40:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - Corrected include file. - -Mon Nov 1 11:15:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h: - * connectors/dds4ccm/impl/ndds/ndds.mpc: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc: - Continued with the rename and move actions. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - Create two handlers in order to handle read and get separately. - -Sun Oct 31 08:49:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - Fixed compile errors due to rename and move actions. - -Sat Oct 30 07:13:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Fixed compile errors due to rename and move actions. - -Sat Oct 30 07:07:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Policies/deadline_qos_test.h: - * connectors/dds4ccm/tests/Policies/dest_order_qos_test.h: - * connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h: - * connectors/dds4ccm/tests/Policies/dp_qos_test.h: - * connectors/dds4ccm/tests/Policies/dr_qos_test.h: - * connectors/dds4ccm/tests/Policies/dur_qos_test.h: - * connectors/dds4ccm/tests/Policies/dur_service_qos_test.h: - * connectors/dds4ccm/tests/Policies/duration.h: - * connectors/dds4ccm/tests/Policies/dw_qos_test.h: - * connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h: - * connectors/dds4ccm/tests/Policies/group_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/hist_qos_test.h: - * connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h: - * connectors/dds4ccm/tests/Policies/lifespan_qos_test.h: - * connectors/dds4ccm/tests/Policies/liveliness_qos_test.h: - * connectors/dds4ccm/tests/Policies/octet_seq.h: - * connectors/dds4ccm/tests/Policies/ownership_qos_test.h: - * connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h: - * connectors/dds4ccm/tests/Policies/partition_qos_test.h: - * connectors/dds4ccm/tests/Policies/presentation_qos_test.h: - * connectors/dds4ccm/tests/Policies/pub_qos_test.h: - * connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h: - * connectors/dds4ccm/tests/Policies/reliability_qos_test.h: - * connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h: - * connectors/dds4ccm/tests/Policies/sub_qos_test.h: - * connectors/dds4ccm/tests/Policies/tbf_qos_test.h: - * connectors/dds4ccm/tests/Policies/tp_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/tp_qos_test.h: - * connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h: - * connectors/dds4ccm/tests/Policies/user_data_qos_test.h: - * connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h: - Fixed compile errors due to directory change. - -Fri Oct 29 17:21:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc: - Fuzz. - -Fri Oct 29 14:01:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.h: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.h: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.h: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.h: - * connectors/dds4ccm/impl/ndds/Topic_T.cpp: - Next action in a chain of remove and rename actions. - -Fri Oct 29 13:42:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - Rename actions. - -Fri Oct 29 13:28:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - Continued with rename and move actions. - -Fri Oct 29 13:18:59 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Add script to run Thread test with cdd file. - -Fri Oct 29 12:55:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.h: - * connectors/dds4ccm/impl/ndds/Topic_T.cpp: - * connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - Continued with rename and move actions. - -Fri Oct 29 12:34:14 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Continued rename and move actions. - -Fri Oct 29 12:14:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - Rename and move action in order to provide re-useable code. - Missed these during the last commit. - -Fri Oct 29 11:57:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - - * connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/Duration_t.h: - * connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/StringSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/Time_t.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicQos.h: - * connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h: - - * connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc: - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/DataReader.h: - * connectors/dds4ccm/impl/DataReader.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/DataWriter.cpp: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener.h: - * connectors/dds4ccm/impl/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/StatusCondition.h: - * connectors/dds4ccm/impl/StatusCondition.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/Topic_T.h: - * connectors/dds4ccm/impl/Topic_T.cpp: - - * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/ndds/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/impl/ndds/TopicBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/TopicQos.h: - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h: - Rename and move action in order to provide re-useable code. - -Fri Oct 29 11:33:06 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/*: - Reverted previous commit. - -Fri Oct 29 10:33:50 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.h: - * connectors/dds4ccm/impl/DDSDomainParticipantListener.cpp: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher_T.h: - * connectors/dds4ccm/impl/ndds/Publisher_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.h: - * connectors/dds4ccm/impl/ndds/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.h: - * connectors/dds4ccm/impl/ndds/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber_T.h: - * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.h: - * connectors/dds4ccm/impl/ndds/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic_T.h: - * connectors/dds4ccm/impl/ndds/Topic_T.cpp: - * connectors/dds4ccm/impl/ndds/convertors: - * connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/Duration_t.h: - * connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/StringSeq.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/Time_t.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/TopicQos.h: - * connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h: - * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc: - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/DataReader.h: - * connectors/dds4ccm/impl/DataReader.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/DataWriter.cpp: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener.h: - * connectors/dds4ccm/impl/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/StatusCondition.h: - * connectors/dds4ccm/impl/StatusCondition.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/Topic_T.h: - * connectors/dds4ccm/impl/Topic_T.cpp: - * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ParticipantBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h: - * connectors/dds4ccm/impl/ndds/ReliableWriterCacheChangedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/impl/ndds/TopicBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/TopicQos.h: - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h: - Rename and move action in order to separate RTI specific stuff from the DDS4CCM core - functionality. Still some work to be done. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - Creation and deletion of class pointers in constructor/destructor. - -Thu Oct 28 12:45:19 UTC 2010 Marijke Hengstmengel - - * tests/Thread/descriptors/NodeManagerMap.dat: - * tests/Thread/descriptors/run_test.pl: - * tests/Thread/descriptors/run_test_dat.pl: - * tests/Thread/descriptors/NodeManagerMap.cdd: - * tests/Thread/descriptors/run_test_cdd.pl: - * tests/Thread/descriptors/DeploymentPlanDat.cdp: - Change test to run with cdd file, dat file or naming service. - - -Thu Oct 28 10:47:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - Expanded test with NonChangeableAttribute test. - -Thu Oct 28 10:28:24 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Prevented double code by introducing a new method. - -Thu Oct 28 10:04:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Resolved issue regarding LateBinding. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - Expanded test. - -Thu Oct 28 09:51:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - Fixed test issues related to set_component/_get_component. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - Added non-changeable exception test. - -Thu Oct 28 08:30:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - Optimized logging. - -Thu Oct 28 08:16:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp: - Added an additional test. - -Thu Oct 28 07:53:41 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - Fixed typo - -Thu Oct 28 07:09:09 UTC 2010 Marcel Smit - - * NEWS: - Mentioned 'LateBinding' - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - Disabled executor generation projects. - -Thu Oct 28 07:00:47 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Enabled DDS4CCM_TRACE_ENABLED enviroment variable. - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - Implemented 'LateBinding'. This means that the DDS entities will NOT - be created and initialized when the topic name is empty at - deployment time (e.g. the topic_name is empty in the deployment plan). - The DDS entities will be created and initilized once the topic name is - set at run time. - - * connectors/dds4ccm/tests/LateBinding: - * connectors/dds4ccm/tests/LateBinding/ReadGet: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl: - Added tests which tests the latebinding implementation. Both event and state - connectors are tested. - - * bin/ciao_tests.lst: - Added previous mentioned tests. - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Fixed typos. - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - Disabled projects. - -Wed Oct 27 17:43:36 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - Regenerated with -Gexr and reimplemented - -Wed Oct 27 10:38:47 UTC 2010 Johnny Willemsen - - * ChangeLog: - * NEWS: - Updated for next release - -Wed Oct 27 12:01:05 CEST 2010 Johnny Willemsen - - * CIAO version 0.8.3 released. - -Mon Oct 25 14:47:22 UTC 2010 Jeff Parsons - - * tests/CIDL/CodeGen/Basic.idl: - - Added a method to the base interface of an interface used - in a facet. Method was supplied by Johnny Willemsen - and uncovered a bug in - executor code generation. - -Sun Oct 24 12:44:24 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Disabled a little bit more code with noevent - -Sun Oct 24 11:33:00 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - COPI tests need an extension container which can't be deployed - out of the box yet - -Sat Oct 23 07:27:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - Regenerated using -Gexr and reimplemented - -Fri Oct 22 11:44:40 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - Removed export macro not needed - -Fri Oct 22 11:36:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - Regenerated with -Gex -Gexr and added user code again - -Fri Oct 22 11:39:15 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_MyFoo_objA_conn_i.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_MyFoo_objA_conn_i.cpp: - Added generated implementation of the Reply Handler - -Fri Oct 22 11:20:59 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Publisher_T.cpp: - Layout - - * tests/Bug_3769_Regression/Bug_3769_Regression.mpc: - * tests/Bug_3890_Regression: - * tests/Bug_3890_Regression/Bug_3890_Regression.mpc: - * tests/Bug_3769_Regression/Foo.mpc: - * tests/Bug_3890_Regression/Foo.mpc: - Make mpc filenames similar to the test - -Fri Oct 22 10:35:07 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp: - Regenerated, using the latest version of the IDL compiler. - -Fri Oct 22 10:28:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - Resolved runtime issues ("ACE_OS::rand () % 0" crashes) - -Fri Oct 22 09:09:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - Rewritten, based on the generated code. - -Fri Oct 22 07:54:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated. - -Fri Oct 22 07:12:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated with the latest version of the IDL compiler. - -Fri Oct 22 06:25:27 UTC 2010 Marcel Smit - - * tests/Bug_3890_Regression/Foo.idl: - Fuzz. Trailing whitespaces. - -Thu Oct 21 15:25:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated these files using the latest version of the idl compiler. - -Thu Oct 21 12:21:33 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - Regenerated using -Gex and -Gexr and added the test code again - -Thu Oct 21 11:54:15 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - Regenerated using -Gex and -Gexr and added the test code again - -Thu Oct 21 10:25:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated with the new IDL compiler. - -Thu Oct 21 08:47:56 UTC 2010 Marcel Smit - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo.mpc: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - Reverted changes made by Jeff. Created a new test for - explicit testing valuetypes. - - * tests/Bug_3890_Regression: - * tests/Bug_3890_Regression/Foo.idl: - * tests/Bug_3890_Regression/Foo.mpc: - New test. - -Thu Oct 21 08:19:03 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Corrector path to COPI tests. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated using the TAO IDL compiler which also generates getters and setters for the attributes. - -Wed Oct 20 20:00:24 UTC 2010 Jeff Parsons - - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Removed these files from the repository, since they - are now generated. - - * tests/Bug_3769_Regression/Foo.mpc: - Added -Gex option to IDL compiler command line, to - generate the executor impl classes. - - * tests/Bug_3769_Regression/Foo.idl: - - Added interface and valuetype attributes, to test - code generation of member declaration, initialization, - and accessors. - -Wed Oct 20 13:18:45 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - * tests/COPI/Registration/Client/Component/Component_exec.cpp: - Fuzz. - -Wed Oct 20 13:14:32 UTC 2010 Marcel Smit - - * MPC/config/ccm_svnt.mpb: - * MPC/config/ciao_deployment_handlers.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_session_container.mpb: - Reverted last changes. - - * bin/ciao_tests.lst: - Added more registration tests. - - * ciao/Containers/Extension/Interceptor_Registration_T.h: - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - Resolved runtime errors. - - * tests/COPI/Registration/Client/Component/Component.mpc: - * tests/COPI/Registration/Client/descriptors/Plan.cdp: - * tests/COPI/Registration/Servant: - * tests/COPI/Registration/Servant/Component: - * tests/COPI/Registration/Servant/Component/Component.idl: - * tests/COPI/Registration/Servant/Component/Component.mpc: - * tests/COPI/Registration/Servant/Component/Component_exec.h: - * tests/COPI/Registration/Servant/Component/Component_exec.cpp: - * tests/COPI/Registration/Servant/descriptors: - * tests/COPI/Registration/Servant/descriptors/Plan.cdp: - * tests/COPI/Registration/Servant/descriptors/run_test.pl: - * tests/COPI/Registration/Server: - * tests/COPI/Registration/Server/Component: - * tests/COPI/Registration/Server/Component/Component.idl: - * tests/COPI/Registration/Server/Component/Component.mpc: - * tests/COPI/Registration/Server/Component/Component_exec.h: - * tests/COPI/Registration/Server/Component/Component_exec.cpp: - * tests/COPI/Registration/Server/descriptors: - * tests/COPI/Registration/Server/descriptors/Plan.cdp: - * tests/COPI/Registration/Server/descriptors/run_test.pl: - * tests/COPI/Registration/Stub: - * tests/COPI/Registration/Stub/Component: - * tests/COPI/Registration/Stub/Component/Component.idl: - * tests/COPI/Registration/Stub/Component/Component.mpc: - * tests/COPI/Registration/Stub/Component/Component_exec.h: - * tests/COPI/Registration/Stub/Component/Component_exec.cpp: - * tests/COPI/Registration/Stub/descriptors: - * tests/COPI/Registration/Stub/descriptors/Plan.cdp: - * tests/COPI/Registration/Stub/descriptors/run_test.pl: - Added new Interceptor registration tests. - -Wed Oct 20 10:34:42 UTC 2010 Marcel Smit - - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_session_container.mpb: - Resolved errors. - -Wed Oct 20 10:25:41 UTC 2010 Marcel Smit - - * MPC/config/ccm_svnt.mpb: - * MPC/config/ciao_deployment_handlers.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_session_container.mpb: - Resolved link errors on windows. - - * tests/COPI/Registration/Client/Component/Component.mpc: - * tests/COPI/Registration/Client/Component/Component_exec.h: - * tests/COPI/Registration/Client/Component/Component_exec.cpp: - Code clean up. - -Wed Oct 20 09:23:35 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_base.mpb: - Add nddsmonitor as base project. If nddsmonitor=1 is added to the - default.features file we will link the rtimonitor library with the - connector, see the RTI monitor manual which QoS has to be set to - enable the monitor library at runtime - -Wed Oct 20 08:43:03 UTC 2010 Marcel Smit - - * NEWS: - Mentioned the implementation of the Extension Container. - -Wed Oct 20 08:11:43 UTC 2010 Marcel Smit - - * MPC/config/ciao_extension_container.mpb: - Layout changes. - - * bin/ciao_tests.lst: - Added first COPI tests: Client Interceptor Registration. - - * ciao/Containers/Extension/Interceptor_Registration_T.h: - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - Reworked the internal list of registered interceptors. - - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * ciao/Deployment/Handlers/Container_Handler.cpp: - Added a define with which one can deploy an extension container. - When set, DAnCE deploys a extension container in stead of a - session container. This is temporary. In the future, DAnCE should - be able to deploy an extension container via a deployment plan. - - * tests/COPI: - * tests/COPI/Registration: - * tests/COPI/Registration/Client: - * tests/COPI/Registration/Client/Component: - * tests/COPI/Registration/Client/Component/Component.idl: - * tests/COPI/Registration/Client/Component/Component.mpc: - * tests/COPI/Registration/Client/Component/Component_exec.h: - * tests/COPI/Registration/Client/Component/Component_exec.cpp: - * tests/COPI/Registration/Client/descriptors: - * tests/COPI/Registration/Client/descriptors/Plan.cdp: - * tests/COPI/Registration/Client/descriptors/run_test.pl: - Added first COPI test: Registration of client interceptors. - -Wed Oct 20 07:15:51 UTC 2010 Johnny Willemsen - - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - Fixed compile errors - -Tue Oct 19 18:54:37 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Fixed memory leaks, *always* when you get a reference from the - context, first assign it to a _var before using it, else you get - a memory leak - -Tue Oct 19 18:33:35 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - Tracing fixes and memory leak fixes - -Tue Oct 19 17:58:37 UTC 2010 Johnny Willemsen - - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - Fixed memory leaks - - * ciao/Servants/Session/Servant_Impl_T.h: - Layout changes - -Tue Oct 19 13:46:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp: - Resolved errors in deployment plan. - -Tue Oct 19 13:18:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp: - Added to explicitly test memory leaks in a listener. - -Tue Oct 19 12:37:37 UTC 2010 Johnny Willemsen - - * *.pl: - Fixed typo - -Tue Oct 19 12:40:36 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/MemLeakDetection/*: - Added two test which are especially there to test for - memory leaks. - -Tue Oct 19 11:52:41 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Fixed incorrect number of deamons - -Tue Oct 19 06:35:31 UTC 2010 Marcel Smit - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - Resolved memory leaks. - -Mon Oct 18 18:39:11 UTC 2010 Johnny Willemsen - - * tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp: - Fixed memory leak in this test - -Mon Oct 18 13:49:56 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Session/Session_Context_T.h: - * ciao/Contexts/Session/Session_Context_T.cpp: - Don't cache the component - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Fixed some leaks - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Added a debug statement to show when we are finalizing dds - -Mon Oct 18 13:49:28 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - Added Log_Macros.cpp - - * NEWS: - Mentioned DDS4CCM_LOG_LEVEL environment variable. - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Reading the DDS4CCM_LOG_LEVEL environment variable and assigning it - to DDS4CCM_log_level. - - * connectors/dds4ccm/impl/Log_Macros.h: - Renamed CLINFO define to DDS4CCM_INFO. - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Renamed CLINFO define to DDS4CCM_INFO. - -Mon Oct 18 13:00:43 UTC 2010 Johnny Willemsen - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - Cleanup and don't activate the poamanger, that is for the locality - manager todo - -Mon Oct 18 11:56:15 UTC 2010 Johnny Willemsen - - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - Use an explicit init/fini call to the container to initialize itself - and to cleanup, due to reference counting the destructors are not - called at this moment. - -Mon Oct 18 08:53:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSSubscriberListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.h: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.h: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.h: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.h: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - Removed CCM_TYPE as template argument to several templates - -Mon Oct 18 07:09:22 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/Navigation.mpc: - * tests/CIF/Receptacle/Receptacle.mpc: - Prevent MPC from using left over idl files. - -Sat Oct 16 11:04:16 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp: - Fuzz. Removed trailing whitespaces. - -Sat Oct 16 10:59:42 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Fuzz. Removed trailing whitespaces. - -Sat Oct 16 07:25:54 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - Fuzz. Removed whitespaces. - -Fri Oct 15 14:34:44 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc: - Added dummy projects which generate the empty executors. - - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp: - Regenerated these executor files. - -Fri Oct 15 13:48:10 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated executor files. - -Fri Oct 15 13:39:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html: - Also referring to the generated executor header files. - -Fri Oct 15 13:21:43 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Don't run CIF test when static is applied. - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - Add projects which generated empty executor files. Added dummy_label since these only needs to - be generated when needed. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated executor files. - -Fri Oct 15 10:01:24 UTC 2010 Marijke Hengstmengel - - * connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc: - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc: - Add missing afters. - -Fri Oct 15 07:11:24 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Resolved memory leak issues. - -Thu Oct 14 10:06:01 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Resolved runtime issues on Full CCM builds. - -Wed Oct 13 12:07:24 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Do not run the CIF test when DAnCE isn't build - -Wed Oct 13 06:42:36 UTC 2010 Marcel Smit - - * NEWS: - Mentioned the fact that a new option has been added to the - TAO IDL compiler. - -Sun Oct 10 08:06:38 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Disable tests in case of CCM_NOEVENT. - -Sat Oct 9 15:59:23 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - Fuzz. - -Fri Oct 8 14:42:38 UTC 2010 Marijke Hengstmengel - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Change test for no_event feature. - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL2.mpc: - * examples/DevGuideExamples/Messenger/Administrator_Client_IDL3.mpc: - Add avoids_ccm_noevent. - -Fri Oct 8 14:01:07 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Some small fixes for disconnect - -Fri Oct 8 13:53:48 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Simplified disconnect_local_facet logic - -Fri Oct 8 11:45:26 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Layout changes - -Fri Oct 8 10:00:19 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Regenerated these executors and readded their original implementation - - * ciao/Containers/Session/Session_Container.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp: - * tests/DAnCE/Components/ProcessColocation_exec.cpp: - * tests/DAnCE/Components/Progressive_exec.cpp: - * tests/DAnCE/Components/SimpleAttribute_exec.cpp: - * tests/DAnCE/Components/SimpleConsumer_exec.cpp: - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - * tests/DAnCE/Components/SimpleFailure_exec.cpp: - * tests/DAnCE/Components/SimpleLocalProvider_exec.cpp: - * tests/DAnCE/Components/SimpleLocalUser_exec.cpp: - * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp: - * tests/DAnCE/Components/SimpleNull_exec.cpp: - * tests/DAnCE/Components/SimpleProvider_exec.cpp: - * tests/DAnCE/Components/SimplePublisher_exec.cpp: - * tests/DAnCE/Components/SimpleUser_exec.cpp: - * tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - * tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp: - * tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp: - Include and cleanup changes - -Fri Oct 8 09:57:38 UTC 2010 Marijke Hengstmengel - - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/RateGen/RateGen.mpc: - * examples/Display/GPS/GPS.mpc: - * examples/Display/NavDisplay/NavDisplay.mpc: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - * examples/DevGuideExamples/Messenger/Administrator.mpc: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - Add avoids_ccm_noevent in projects using events. - -Fri Oct 8 09:50:09 UTC 2010 Vladimir Zykov - - * rules.ciao.GNU: - Corrected the path to tao_idl3_to_idl2. - - * connectors/dds4ccm/impl/Getter_T.h: - Removed non-ASCII characters. - -Fri Oct 8 09:10:05 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - Used _var to create a cookie. - - * tests/CIF/Navigation/client.cpp: - Resolved compile issue. - -Fri Oct 8 07:55:47 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - Using _var to create a cookie. - -Fri Oct 8 07:47:48 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Resolved compile issues. - -Thu Oct 7 12:50:38 UTC 2010 Marijke Hengstmengel - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * ChangeLog: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/BasicSP/EC/EC.mpc: - * examples/BasicSP/BMDevice/BMDevice.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/DevGuideExamples/Messenger/Receiver.mpc: - Add avoids_ccm_noevent tp MPC and if !defined(CCM_NOEVENT) tp cpp files. - -Thu Oct 7 11:39:15 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Regenerated these files with -Gex and pasted the original - implementation back into the generated files, the destructors of - the facets aren't called anymore with the methods as generated - by tao_idl - -Thu Oct 7 11:05:45 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implemented disconnect for local facets, but found that DAnCE doesn't - do any disconnect for connections at this moment so this code is never - called - - * tests/IDL3/Events/Abstract/Abstract.idl: - Fixed typo - -Thu Oct 7 09:10:23 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Changed the way we get access to the ACE Reactor, we had some leaks - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Only set a listener to RTI DDS when it really is needed, doing - a set_listener with a mask of 0 seems to result in a memory leak - -Wed Oct 6 14:16:38 UTC 2010 Marijke Hengstmengel - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - * bin/ciao_tests.lst: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/BasicSP/BasicSP.mpc: - * examples/Display/Display_Base/Display_Base.mpc: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - Add !defined(CCM_NOEVENT) in case of ccm builds with events disabled. - -Wed Oct 6 13:15:38 UTC 2010 Marijke Hengstmengel - - * tests/CIF/Component/CIF_Component_exec.cpp: - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Component/CIF_Component_exec.h: - * tests/Bug_2130_Regression/interfaces/ENW.mpc: - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - * tests/IDL_Test/Keywords/Keyword_Clash.idl: - * tests/IDL_Test/Reused_Facet_Interface/Basic.idl: - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl: - * tests/IDL_Test/Extension/Cornucopia.idl: - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - * tests/Thread/Sender/Sender_exec.cpp: - * tests/Thread/Sender/Sender.idl: - * tests/Thread/Sender/Sender_exec.h: - * tests/Thread/Thread_Base/Thread_Base.idl: - * tests/Thread/Receiver/Receiver_exec.cpp: - * tests/Thread/Receiver/Receiver.idl: - * tests/Thread/Receiver/Receiver_exec.h: - * tests/DAnCE/Components/SimpleConsumer_exec.cpp: - * tests/DAnCE/Components/SimpleCommon.idl: - * tests/DAnCE/Components/SimplePublisher.idl: - * tests/DAnCE/Components/SimpleEmitter.idl: - * tests/DAnCE/Components/SimplePublisher_exec.cpp: - * tests/DAnCE/Components/SimpleConsumer_exec.h: - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - * tests/DAnCE/Components/SimpleConsumer.idl: - * tests/CIDL/CodeGen/Basic.idl: - * tests/CIDL/CodeGen/CodeGen.idl: - * tests/IDL3/Events/Regular/Regular.mpc: - * tests/IDL3/Events/Abstract/Abstract.mpc: - * tests/IDL3/Events/Any/Any.mpc: - * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc: - * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc: - * tests/IDL3/Homes/Factory/Factory.idl: - * tests/IDL3/ImpliedIDL/Events/Events.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc: - * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl: - * tests/IDL3/ImpliedIDL/All/all.mpc: - Add !defined(CCM_NOEVENT) in case of ccm builds with events disabled. - -Wed Oct 6 08:31:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - layout changes - - * performance-tests/mico: - * performance-tests/mico/mico-thrput-st: - * performance-tests/mico/mico-thrput-st/README: - * performance-tests/mico/mico-thrput-st/RoundTrip: - * performance-tests/mico/mico-thrput-st/RoundTrip.idl: - * performance-tests/mico/mico-thrput-st/RoundTrip_impl.cc: - * performance-tests/mico/mico-thrput-st/RoundTrip_impl.h: - * performance-tests/mico/mico-thrput-st/client.cc: - * performance-tests/mico/mico-thrput-st/mico-env: - * performance-tests/mico/mico-thrput-st/server.cc: - Removed these files, no idea why we have a mico performance test - in CIAO - -Wed Oct 6 07:49:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Don't cache the writer and simplified some code - -Tue Oct 5 13:51:02 UTC 2010 Johnny Willemsen - - * ciao/Valuetype_Factories/Cookies.h: - Make this refcounted - -Tue Oct 5 13:44:32 UTC 2010 Marcel Smit - - * ccm/Extension/CCM_ContainerInterceptor.idl: - Added priority - - * ciao/Containers/Extension/Extension_Container.mpc: - Added PortableServer as base project. - - * ciao/Containers/Extension/Interceptor_Registration_T.h: - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - Rename action. - - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Resolved valgrind errors. - -Tue Oct 5 13:13:42 UTC 2010 Marijke Hengstmengel - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Fixed typo's - -Tue Oct 5 12:22:41 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Added disconnect_local_facet - - * tests/Minimum/Sender/Sender.mpc: - Cleanup - -Tue Oct 5 11:27:42 UTC 2010 Marijke Hengstmengel - - * ciao/Deployment/Handlers/Connection_Handler.h: - Fixed typo's - - -Tue Oct 5 10:48:34 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Implement disconnect, this now delegates to the separate disconnect - methods which are still a noop - -Tue Oct 5 09:20:42 UTC 2010 Marijke Hengstmengel - - * MPC/config/avoids_ccm_noevent.mpb: - Add base project to avoids compiling if ccm_noevent is set. - -Tue Oct 5 08:57:42 UTC 2010 Marijke Hengstmengel - - * ccm/CCM_Events.idl: - * ccm/CCM_Object.idl: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Base/Client_init.cpp: - Add removed Events interface and some ifdefs ccm_noevent - -Tue Oct 5 08:28:14 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Fixed a few memory leaks - -Mon Oct 4 18:15:41 UTC 2010 Johnny Willemsen - - * CIAO-INSTALL.html: - Minor updates - - * COPYING: - Small update - - * ciao/Base/Client_init.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Contexts/Session/Session_Context_T.cpp: - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - Layout changes - - * ciao/Servants/Servant_Impl_Base.h: - Fixed merge problem - -Mon Oct 4 14:29:42 UTC 2010 Marijke Hengstmengel - - * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc: - Add missing after. - -Mon Oct 4 13:42:42 UTC 2010 Marijke Hengstmengel - - * ccm/CCM_Events.idl: - * ccm/CCM_EventConsumerBase.idl: - * ccm/CCM_Object.idl: - * ccm/CCM_EventBase.idl: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - Step 2 to remove events from ccm if ccm_noevents =1 - -Mon Oct 4 10:35:42 UTC 2010 Johnny Willemsen - - * ciao/Servants/Port_Activator.h: - Fixed typo - -Mon Oct 4 07:38:15 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/Navigation.mpc: - * tests/CIF/Receptacle/Receptacle.mpc: - Resolved linking error on static builds. - -Mon Oct 4 07:14:18 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.mpc: - Removed unnecessary after. - -Mon Oct 4 06:12:53 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.mpc: - Making use of an existing base project. - -Sun Oct 3 09:01:28 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.mpc: - Resolved link errors on windows. - -Sat Oct 2 12:14:50 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.h: - Added missing export macros - -Fri Oct 1 16:00:51 UTC 2010 William Otte - - * COPYING: - - Updated to include DAnCE. - -Fri Oct 1 14:35:01 UTC 2010 William R. Otte - - * tests/DAnCE/EM-Launch-Failures/run_test.pl: - * tests/DAnCE/EM-Redeployment/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: - - Fuzz. - -Fri Oct 1 14:30:15 UTC 2010 William R. Otte - - * CIAO-INSTALL.html: - - Updated. - -Fri Oct 1 13:11:29 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.mpc: - Added template files. - -Fri Oct 1 12:59:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/Updater_T.cpp: - Typo fix - -Fri Oct 1 13:03:01 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Extension/Extension_Container.idl: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Extension/Interceptor_Registration_T.h: - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - * ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.cpp: - * ciao/Contexts/Extension/Extension_Context_T.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - Implemented the registration of Container Portable Interceptors - within CIAO. This is part of the Extension Container. - -Fri Oct 1 12:03:45 UTC 2010 William R. Otte - - * tests/DAnCE/EM-Launch-Failures/run_test.pl: - * tests/DAnCE/EM-Redeployment/run_test.pl: - * tests/DAnCE/EM-Shutdown-Failures/run_test.pl: - - Add 5 second sleep. - -Fri Oct 1 12:00:04 UTC 2010 William R. Otte - - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/NodeManager-Deployments/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: - - Added a 5 second sleep after each execution to give everything a chance - to shut down and clean up. - -Fri Oct 1 11:34:42 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Fixed unicode compile error - -Fri Oct 1 11:10:42 UTC 2010 Johnny Willemsen - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - Reduced amount of projects - -Fri Oct 1 09:49:33 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc: - Added empty IDL_Files section - -Fri Oct 1 09:24:35 UTC 2010 Johnny Willemsen - - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - Reduced files generated - -Thu Sep 30 14:17:18 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - Removed id generation, we have an empty id or get an id from the cdp - -Thu Sep 30 11:33:07 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - Another missing base project - -Thu Sep 30 11:01:45 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_lem_stub.mpb: - Added missing base project - -Thu Sep 30 06:36:23 UTC 2010 Marcel Smit - - * ccm/Extension/CCM_ServerContainerInterceptorRegistration.idl: - Fixed typo. - -Thu Sep 30 05:58:41 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.cpp: - Making use of make_pair to initialize a pair. - -Wed Sep 29 21:05:24 UTC 2010 William R. Otte - - * MPC/config/ami4ccm_lem_stub.mpb: - * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc: - - Compile fixes. - -Wed Sep 29 18:38:17 UTC 2010 Adam Mitz - - * ccm/Extension/CCM_extension.mpc: - * ciao/Base/CIAO_Base.mpc: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/install_ciao_headers.mpc: - - "make install" fixes. - - * ciao/install_versionh.mpc: - - Renamed this file to install_ciao_headers.mpc. - -Wed Sep 29 14:25:51 UTC 2010 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - Fuzz - -Wed Sep 29 12:22:26 UTC 2010 Johnny Willemsen - - * ccm/Extension/CCM_extension.mpc: - Added inline file - -Wed Sep 29 12:22:37 UTC 2010 Marijke Hengstmengel - - * MPC/config/ciaoidldefaults.mpb: - * MPC/config/ccm_noevent.mpb: - Add option to disable events in ccm. Default enabled. - -Wed Sep 29 12:03:37 UTC 2010 Marcel Smit - - * ciao/Containers/Container_Base_T.cpp: - Reverted my last change. - - * ciao/Containers/Extension/Extension_Container.cpp: - First check internal list of services. If not found, - invoke resolve_service_reference on base. - -Wed Sep 29 10:23:38 UTC 2010 Marcel Smit - - * ccm/CCM_CCMException.idl: - Removed LW CCM flag for enumarations. - - * ciao/Containers/Container_Base_T.cpp: - return NIL when POA service cannot be found. - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.idl: - * ciao/Containers/Extension/Extension_Container.cpp: - Added and implemented install_service_reference, - uninstall_service_reference, and, resolve_service_reference. - - * ciao/Containers/Servant_Activator.h: - - * ciao/Contexts/Extension/Extension_Context_T.cpp: - Calling new implemented methods (install_service_refence and - uninstall_service_reference). - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Utils_T.cpp: - Replaced ACE_Array_Map with a std::map. - -Wed Sep 29 02:22:43 UTC 2010 William R. Otte - - * MPC/config/ccm_lem_stub.mpb: - * MPC/config/ccm_session_stub.mpb: - * MPC/config/ccm_svnt.mpb: - * ccm/Extension/CCM_extension.mpc: - * ccm/Session/CCM_session.mpc: - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - - Some compilation fixes. - -Tue Sep 28 15:46:07 UTC 2010 Adam Mitz - - * ccm/Session/CCM_session.mpc: - - Set install_dir. - - * ciao/Containers/Session/Session_Container.mpc: - - Install the export headers. - -Mon Sep 27 14:21:37 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Also log dll name in case of no error - - * bin/PerlCIAO: - * bin/PerlCIAO/TestUtils.base: - * bin/PerlCIAO/TestUtils.pm: - * bin/PerlCIAO/TestUtils_Base.pm: - * bin/PerlCIAO/generate_container.pl: - * bin/PerlCIAO/perlciao.mpc: - Removed these files, ancient and not used - -Mon Sep 27 09:39:07 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h: - * ciao/Servants/CIAO_Servant_Impl_export.h: - * tests/DAnCE/Executor-Destructor/Exec_Dest_export.h: - Removed generated by line - -Mon Sep 27 08:57:46 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Extension/Cornucopia.mpc: - Removed dummy label - -Mon Sep 27 08:56:46 UTC 2010 Johnny Willemsen - - * ciao/Base/CIAO_Properties.idl: - Removed properties that aren't used - - * ciao/Servants/StandardConfigurator_Impl.h: - Layout changes - -Mon Sep 27 08:51:04 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/details.txt: - Removed a lot of contents, outdated - - * connectors/dds4ccm/docs/10-05-06.pdf: - * connectors/dds4ccm/docs/10-05-07.pdf: - * connectors/dds4ccm/docs/10-05-08.pdf: - * connectors/dds4ccm/docs/DDS_DefaultQoS.xml: - * connectors/dds4ccm/docs/DDS_QoSProfile.xsd: - * connectors/dds4ccm/docs/DDSforCCM-meta.uml: - * connectors/dds4ccm/docs/_DDS for CCM Readable Files README.pdf: - * connectors/dds4ccm/docs/ccm_dds.idl: - * connectors/dds4ccm/docs/ccm_dds_dlrl.idl: - Removed these files, can be obtained from the OMG website - -Mon Sep 27 08:04:21 UTC 2010 Johnny Willemsen - - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - Reduced amount of files generated - -Mon Sep 27 07:30:13 UTC 2010 Johnny Willemsen - - * ciao/Base/CIAO_Base.mpc: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - Several cleanup and layout changes - - * ciao/Base/CIAO_FailureReasons.idl: - Removed this file, not needed anymore - -Mon Sep 27 07:09:14 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Contexts/Session/Session_Context_T.cpp: - Fixed compile problems - -Sun Sep 26 18:35:33 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Extension/Servant_Impl_T.h: - * ciao/Servants/Extension/Servant_Impl_T.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Session/Servant_Impl_T.h: - * ciao/Servants/Session/Servant_Impl_T.cpp: - More refactoring for extension components - -Fri Sep 24 18:08:37 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.idl: - * ciao/Contexts/Extension/Extension_Context_T.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Servants/Extension/Servant_Impl_T.h: - * ciao/Servants/Extension/Servant_Impl_T.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - Another set of changes for extension components, more will follow - next week together with some changes to all mpc files - -Fri Sep 24 14:14:45 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Extension/Extension_Context_T.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Contexts/Session/Session_Context_T.h: - * ciao/Contexts/Session/Session_Context_T.cpp: - * ciao/Contexts/Extension/ExtensionContext_T.h: - * ciao/Contexts/Extension/ExtensionContext_T.cpp: - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - Renamed files and started with extension context and container - -Fri Sep 24 13:40:16 UTC 2010 Marcel Smit - - * examples/BasicSP/RepoMan_Usage.html: - Update regarding ORB services rename action - -Fri Sep 24 12:49:15 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Component/CIF_Component.mpc: - * tests/CIF/Component/CIF_Component_exec.h: - * tests/CIF/Component/CIF_Component_exec.cpp: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Added explicit tests for _get_component. - -Fri Sep 24 11:51:59 UTC 2010 Johnny Willemsen - - * MPC/config/ami4ccm_lem_stub.mpb: - * MPC/config/ciao_servant.mpb: - * ciao/Containers/Containers.mpc: - * ciao/Contexts/Context.mpc: - * ciao/Contexts/Context_Impl_Base_T.h: - * ciao/Contexts/Context_Impl_Base_T.cpp: - * ciao/Contexts/Extension/ExtensionContext_T.h: - * ciao/Contexts/Extension/ExtensionContext_T.cpp: - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * MPC/config/ciao_context_impl.mpb: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_export.h: - CIAO context base is now a C++ template so that we can store a - typed container object reference - -Fri Sep 24 10:21:24 UTC 2010 Marcel Smit - - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - Delete generated xmi files - -Fri Sep 24 10:20:24 UTC 2010 Marcel Smit - - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - Corrected test errors. - -Thu Sep 23 20:41:07 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/CIAO_Handler_Common.h: - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp: - * tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h: - * tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp: - * tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl: - - Fixes for re-arranged dance. - -Thu Sep 23 20:40:02 UTC 2010 William R. Otte - - * MPC/config/ciao_container_base_stub.mpb: - - Slight compile fix. - - * ciao/Containers/Containers.mpc: - - Formatting. - -Thu Sep 23 16:39:04 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - Fuzz - -Thu Sep 23 16:17:19 UTC 2010 Adam Mitz - - * rules.ciao.GNU: - - Updated setting the shared library version numbers to match the - recent change to gnu.mpd and rules.lib.GNU. - -Thu Sep 23 13:57:37 UTC 2010 Marcel Smit - - * connectors/tests/AMIDDS/descriptors/run_test.pl: - Adapted to the new naming convention. - -Thu Sep 23 12:28:23 UTC 2010 Marcel Smit - - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * tests/CIF/Navigation/client.cpp: - Implemented get_named_emitters - -Thu Sep 23 12:13:26 UTC 2010 Marcel Smit - - * ciao/Servants/Servant_Impl_Base.h: - * ciao/Servants/Servant_Impl_Base.cpp: - * tests/CIF/Navigation/client.cpp: - Implemented get_named_publishers. - -Thu Sep 23 11:43:38 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Improved logging. - Added tests for get_all_publishers, get_named_publishers, - get_all_emitters and get_named_emitters. - -Thu Sep 23 10:40:37 UTC 2010 Johnny Willemsen - - * MPC/config/ciao_container_base_stub.mpb: - * MPC/config/ciao_context_impl.mpb: - * MPC/config/ciao_executor.mpb: - * MPC/config/ciao_extension_container.mpb: - * MPC/config/ciao_extension_container_stub.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_servant_activator.mpb: - * MPC/config/ciao_session_container.mpb: - * MPC/config/ciao_session_container_stub.mpb: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Session/Session_Container.mpc: - * ciao/Contexts/Context.mpc: - * ciao/Servants/Servants.mpc: - * MPC/config/ciao_container_base.mpb: - More refactoring of base projects, put the generated stubs in their - own shared library, that breaks a lot of dependencies - -Thu Sep 23 10:19:19 UTC 2010 Marcel Smit - - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Extended test with publishers, emitters and consumers. Extended - receptacle test with get_all_consumers and get_named_consumers. - -Thu Sep 23 10:08:04 UTC 2010 Johnny Willemsen - - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_session_container_stub.mpb: - * ciao/Containers/Session/Session_Container.mpc: - Moved session container stub to their own shared library - -Thu Sep 23 07:55:57 UTC 2010 Marijke Hengstmengelt - - * connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h: - * connectors/tests/AMIDDS/descriptors/Plan.cdp: - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h: - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - * connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl: - * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl: - Fuzz errors. - -Thu Sep 23 07:55:57 UTC 2010 Marcel Smit - - * tests/IDL3_to_XMI/XMI_For_Array/test.idl: - * tests/IDL3_to_XMI/XMI_For_Sequence/test.idl: - Fixed errors related to anonymous types. - -Thu Sep 23 07:49:32 UTC 2010 Marcel Smit - - * tests/IDL3_to_XMI/Bug_3607_Regression/test.idl: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - Fixed errors related to anonymous types. - -Thu Sep 23 06:47:01 UTC 2010 Johnny Willemsen - - * ccm/CCM_stub.mpc: - * ccm/CCM_svnt.mpc: - Fixed export macros - -Wed Sep 22 14:50:49 UTC 2010 Johnny Willemsen - - * ccm: - * ccm/CCM_svnt.mpc: - * ccm/Session/CCM_SessionSynchronization.idl: - * ccm/CCM_SessionSynchronization.idl: - Moved another file to Session - -Wed Sep 22 13:48:37 UTC 2010 Johnny Willemsen - - * MPC/config/ccm_session_stub.mpb: - * MPC/config/ciao_servant.mpb: - * ccm/CCM_lem_stub.mpc: - * ccm/Extension/CCM_extension.mpc: - * ccm/Session/CCM_SessionComponent.idl: - * ccm/Session/CCM_SessionContext.idl: - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Servants.mpc: - * ccm/CCM_SessionComponent.idl: - * ccm/CCM_SessionContext.idl: - * ccm/Extension/CCM_extension_stub.mpc: - More work in seperating the Session container from the CCM core - -Wed Sep 22 12:53:36 UTC 2010 Johnny Willemsen - - * ccm/CCM_svnt.mpc: - * ccm/Entity/CCM_ComponentId.idl: - * ccm/Entity/CCM_Entity2Context.idl: - * ccm/Entity/CCM_EntityComponent.idl: - * ccm/Entity/CCM_EntityContext.idl: - * ccm/Entity/CCM_StateIdFactory.idl: - * ccm/Entity/CCM_entity_svnt.mpc: - * ccm/Extended: - * ccm/Extended/CCM_CCM2Context.idl: - * ccm/Extended/CCM_HomeRegistration.idl: - * ccm/Extended/CCM_ProxyHomeRegistration.idl: - * ccm/Session: - * ccm/Session/CCM_Session2Context.idl: - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_T.h: - * ccm/CCM_CCM2Context.idl: - * ccm/CCM_ComponentId.idl: - * ccm/CCM_Entity2Context.idl: - * ccm/CCM_EntityComponent.idl: - * ccm/CCM_EntityContext.idl: - * ccm/CCM_HomeRegistration.idl: - * ccm/CCM_ProxyHomeRegistration.idl: - * ccm/CCM_Session2Context.idl: - * ccm/CCM_StateIdFactory.idl: - Refactoring our ccm idl, each container type will have its own - subdirectory with the idl needed for that. IDL currently not used - is not compiled and doesn't result in footprint - -Wed Sep 22 12:30:33 UTC 2010 Marijke Hengstmengel - - * tests: - * tests/AMIDDS: - * tests/AMIDDS/Sender: - * tests/AMIDDS/Sender/AmiDds_Sender.mpc: - * tests/AMIDDS/Sender/AmiDds_Sender_exec.h: - * tests/AMIDDS/Sender/AmiDds_Sender.idl: - * tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - * tests/AMIDDS/Connector: - * tests/AMIDDS/Connector/AmiDds_Connector.mpc: - * tests/AMIDDS/Connector/AmiDds_Connector.idl: - * tests/AMIDDS/README.txt: - * tests/AMIDDS/Base: - * tests/AMIDDS/Base/AmiDds_Base.mpc: - * tests/AMIDDS/Base/AmiDds_Base.idl: - * tests/AMIDDS/Base/AmiDds_DDS.idl: - * tests/AMIDDS/descriptors: - * tests/AMIDDS/descriptors/Plan.cdp: - * tests/AMIDDS/descriptors/run_test.pl: - * tests/AMIDDS/Receiver: - * tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h: - * tests/AMIDDS/Receiver/AmiDds_Receiver.idl: - * tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - * tests/AMIDDS/Receiver/AmiDds_Receiver.mpc: - * bin/ciao_tests.lst: - Add test with combination of AMI4CCM and DDS4CCM. - -Wed Sep 22 10:34:33 UTC 2010 Johnny Willemsen - - * ccm/Extension/CCM_ContainerClientRequestInfo.idl: - * ccm/Extension/CCM_ContainerRequestInfo.idl: - * ccm/Extension/CCM_ServantContainerInterceptor.idl: - * ccm/Extension/CCM_ServantContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_StubContainerInterceptor.idl: - * ccm/Extension/CCM_extension_stub.mpc: - Added MPC file and got all files to compile - -Wed Sep 22 10:07:13 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Extension/ExtensionContext_T.h: - * ciao/Contexts/Extension/ExtensionContext_T.cpp: - * ciao/Servants/Extension/Servant_Impl_T.h: - * ciao/Servants/Extension/Servant_Impl_T.cpp: - Some more extension infrastructure - -Wed Sep 22 09:53:27 UTC 2010 Johnny Willemsen - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.idl: - * ciao/Containers/Extension/Extension_Container.inl: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Session/Session_Container.h: - Added ExtensionContainer which is a copy of Session_Container, first - we need to get all infrastructure and templates in place, after that - we need to move code to base classes or to derived, than we can - start adding the real additional code to the Extension_Container - -Wed Sep 22 09:20:33 UTC 2010 Johnny Willemsen - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Session/Session_Container.h: - * ciao/Contexts/Extension/ExtensionContext_T.h: - * ciao/Contexts/Extension/ExtensionContext_T.cpp: - * ciao/Servants/Home_Servant_Impl_Base.h: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - Changes for Session_Container - -Wed Sep 22 08:52:54 UTC 2010 Johnny Willemsen - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Servants/Session/Servant_Impl_T.h: - * ciao/Servants/Session/Servant_Impl_T.cpp: - Use Session_Container for entry points - -Wed Sep 22 08:52:25 UTC 2010 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl: - * connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_shs.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3834_Regression/descriptors/run_test.pl: - * tests/CIF/descriptors/run_test.pl: - * tests/DAnCE/EM-Launch-Failures/run_test.pl: - * tests/DAnCE/EM-Redeployment/run_test.pl: - * tests/DAnCE/EM-Shutdown-Failures/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/Executor-Destructor/run_test.pl: - * tests/DAnCE/LocalityManager/CPUAffinity/run_test.pl: - * tests/DAnCE/LocalityManager/CommandlinePassage/run_test.pl: - * tests/DAnCE/LocalityManager/UnexpectedShutdown/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/Progressive_Deployments/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - * tests/Thread/descriptors/run_test.pl: - * tutorials/Quoter/Simple/descriptors/run_test.pl: - Renamed 'Naming_Service' to 'tao_cosnaming'. - -Tue Sep 21 14:01:22 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Start 2 instead of 3 node managers - -Tue Sep 21 12:40:55 UTC 2010 Johnny Willemsen - - * MPC/config/ccm_componentserver_stub.mpb: - * MPC/config/ciao.mpb: - Break dependency on dance - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.inl: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.inl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Servants/Home_Servant_Impl_Base.cpp: - Changed Container_Base to a template - -Tue Sep 21 11:41:25 UTC 2010 Johnny Willemsen - - * ciao/Base/Server_init.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Valuetype_Factories/ConfigValue.h: - More cleanup - -Tue Sep 21 11:34:57 UTC 2010 Johnny Willemsen - - * ciao/Base/Client_init.h: - * ciao/Base/Client_init.cpp: - Removed not used methods and includes - -Tue Sep 21 11:26:47 UTC 2010 Johnny Willemsen - - * ciao/Base/Server_init.h: - * ciao/Base/Server_init.cpp: - Removed write_ior function, not used - - * ciao/Containers/Session/Session_Container.h: - Layout changes - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Use different write_ior method - -Tue Sep 21 10:22:45 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Extension/ExtensionContext_T.h: - * ciao/Contexts/Extension/ExtensionContext_T.cpp: - * ciao/Contexts/Extension/ExtensionContext.h: - * ciao/Contexts/Extension/ExtensionContext.cpp: - Renamed to _T and converted to a C++ template - -Tue Sep 21 07:06:44 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - * ciao/Servants/Session/Servant_Impl_T.cpp: - For the moment readded the instance id as ciao specific method, but - this will go away at some moment again, resolve_service_reference - is a much better way to get access to some new idl interface that - delivers more meta data to a component - - * performance-tests/Protocols/Receiver/Receiver_exec.h: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.h: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - Updated because of the removed ciao specific context - -Mon Sep 20 15:28:39 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc: - Add missing lib. - -Mon Sep 20 14:36:39 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Session/Context_Impl_T.h: - Cleanup - - * ciao/Servants/Servants.mpc: - Removed files - - * ciao/Valuetype_Factories/ConfigValue.h: - * ciao/Valuetype_Factories/ConfigValue.cpp: - * ciao/Valuetype_Factories/Cookies.h: - Layout changes - -Mon Sep 20 13:53:19 UTC 2010 Johnny Willemsen - - * ciao/Servants/Session/Servant_Impl_T.h: - * ciao/Servants/Session/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - Moved to Session directory and removed EntityContext code - -Mon Sep 20 13:38:09 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - Cleanup - -Mon Sep 20 13:21:33 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context.mpc: - * ciao/Contexts/Extension/ExtensionContext.h: - * ciao/Contexts/Session: - * ciao/Contexts/Session/Context_Impl_T.h: - * ciao/Contexts/Session/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Contexts/Context_Impl_T.cpp: - Moved the SessionContext to its own directory so that we can - add the ExtensionContext more easily - -Mon Sep 20 09:32:28 UTC 2010 Johnny Willemsen - - * ccm/Extension: - * ccm/Extension/CCM_ClientContainerInterceptor.idl: - * ccm/Extension/CCM_ClientContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_ContainerClientRequestInfo.idl: - * ccm/Extension/CCM_ContainerRequestInfo.idl: - * ccm/Extension/CCM_ContainerServantRequestInfo.idl: - * ccm/Extension/CCM_ContainerServerRequestInfo.idl: - * ccm/Extension/CCM_ContainerStubRequestInfo.idl: - * ccm/Extension/CCM_ExtensionComponent.idl: - * ccm/Extension/CCM_ExtensionContext.idl: - * ccm/Extension/CCM_QoS.idl: - * ccm/Extension/CCM_ServantContainerInterceptor.idl: - * ccm/Extension/CCM_ServantContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_ServerContainerInterceptor.idl: - * ccm/Extension/CCM_ServerContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_StubContainerInterceptor.idl: - * ccm/Extension/CCM_StubContainerInterceptorRegistration.idl: - * ciao/Extension/ExtensionContext.h: - * ciao/Extension/ExtensionContext.cpp: - Got these files from svn history, IDL for QoS4CCM - - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Layout changes - -Mon Sep 20 08:55:09 UTC 2010 Johnny Willemsen - - * ccm/CCM_Context.idl: - resolve_service_reference is now available with fullccm and lwccm - - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Container_Base.idl: - Implemented resolve_service_reference for "POA" to get access to the - POA of the container. - - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.cpp: - Implemented resolve_service_reference which delegates to the - container. Removed _ciao_the_Container as CIAO specific hack - - * ciao/Servants/Port_Activator.h: - Fixed typo - - * ciao/Contexts/Context_Impl_Base.inl: - Removed this file. - -Mon Sep 20 07:56:22 UTC 2010 Marcel Smit - - * tests/CIDL/CodeGen/Basic.idl: - * tests/IDL3/ImpliedIDL/All/include.idl: - Removed anonymous types. - -Fri Sep 17 18:47:05 UTC 2010 Adam Mitz - - * ciao/Base/CIAO_Base.mpc: - - Removed DAnCE-specific rule for "make install". - -Fri Sep 17 17:55:19 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context.mpc: - No need to list all files - - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_Base.inl: - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Servants/Servant_Impl_T.cpp: - Removed ciao_instance_id, not used - -Fri Sep 17 13:37:53 UTC 2010 Marcel Smit - - * NEWS: - Mentioned the implementation of the CIF tests. - -Fri Sep 17 13:14:40 UTC 2010 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp: - * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp: - * examples/DevGuideExamples/Messenger/descriptors/Application-flattened.cdp: - * examples/DevGuideExamples/Messenger/descriptors/Application.cdp: - * examples/Display/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp: - * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp: - * tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - * tests/Bug_3834_Regression/descriptors/PlanLocality_DifferentProcesses.cdp: - * tests/Bug_3834_Regression/descriptors/PlanLocality_SameProcess.cdp: - * tutorials/Quoter/Simple/descriptors/Plan.cdp: - - - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - Removed constructor argument not used at all - -Fri Sep 17 08:46:57 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Navigation/client.cpp: - Resolved compile errors/warnings. - -Fri Sep 17 07:51:44 UTC 2010 Marcel Smit - - * *.cdp: - Added Id string to all cdp files. - -Fri Sep 17 07:11:39 UTC 2010 Marcel Smit - - * tests/CIF/descriptors/Plan.cdp: - Added ID string - -Thu Sep 16 13:57:26 UTC 2010 Marcel Smit - - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Renamed some interfaces. - -Thu Sep 16 12:18:01 UTC 2010 Marcel Smit - - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/descriptors/Plan.cdp: - Implemented a Home for the CIF_User component. The test error should - be gone. - - * tests/CIF/Receptacle/client.cpp: - Improved logging. - -Thu Sep 16 11:06:09 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * bin/ciao_tests.lst: - Add ThreeComp test to test suite. - -Thu Sep 16 10:03:09 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/ThreeComp: - * connectors/ami4ccm/tests/ThreeComp/Sender: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl: - * connectors/ami4ccm/tests/ThreeComp/descriptors: - * connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl: - * connectors/ami4ccm/tests/ThreeComp/Receiver: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h: - * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc: - * connectors/ami4ccm/tests/ThreeComp/Base: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl: - * connectors/ami4ccm/tests/ThreeComp/README.txt: - * connectors/ami4ccm/tests/ThreeComp/Master: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h: - AMI4CCM test with 3 components, with 'uses multiple' and 'provides' in one component. - -Thu Sep 16 10:09:09 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Removed ParseError test since this one has been moved to the DAnCE - tests. - - * tests/DAnCE/ParseError: - * tests/DAnCE/ParseError/Component: - * tests/DAnCE/ParseError/Component/ParseError_Test_Component.idl: - * tests/DAnCE/ParseError/Component/ParseError_Test_Component.mpc: - * tests/DAnCE/ParseError/Component/ParseError_Test_Component_exec.h: - * tests/DAnCE/ParseError/Component/ParseError_Test_Component_exec.cpp: - * tests/DAnCE/ParseError/descriptors: - * tests/DAnCE/ParseError/descriptors/run_test.pl: - * tests/DAnCE/ParseError/descriptors/run_test_msm.pl: - Removed these files. - -Thu Sep 16 09:17:09 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - Added get_component interface methods. - - * tests/CIF/Common/CIF_Common.mpc: - Resolved static compile issue. - - * tests/CIF/Component/CIF_Component.idl: - Extended by adding a home. - - * tests/CIF/Component/CIF_Component.mpc: - Auto generate executor files. - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Extended with get_all_ports method. - - * tests/CIF/Component/CIF_Component_exec.h: - * tests/CIF/Component/CIF_Component_exec.cpp: - - Removed these files. - -Wed Sep 15 18:10:43 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - * connectors/ami4ccm/tests/IDL_Test/run_test.pl: - Added perl script that just checks that the generated Hello_Component_exec.cpp - doesn't contain sendc - -Wed Sep 15 15:48:56 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc: - - Added missing link lib to the component servant's list. - -Wed Sep 15 10:38:27 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.cpp: - No need to use ACE_TEXT_ALWAYS_CHAR. - - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Component/CIF_Component_exec.h: - Added multiple receptacle. - - * tests/CIF/Receptacle/client.cpp: - Don't test ExceedConnectionLimit exception for now. - - * tests/CIF/descriptors/run_test.pl: - No STDERR for information message. - -Wed Sep 15 09:20:11 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/IDL_Test/Hello.idl: - * connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl: - Extended this test to show that the generated _exec.h/cpp files - do get too much code generated - -Wed Sep 15 08:12:50 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/models/ami4ccm.xme: - * connectors/ami4ccm/models/CoSMIC/ami4ccm.xme: - Moved to CoSMIC directory - - * connectors/ami4ccm/tutorials/Hello/Hello_asm: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM.emx: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM_Hello.jpg: - Added Zeligsoft CX models - -Wed Sep 15 07:45:33 UTC 2010 Marcel Smit - - * tests/CIF/Receptacle/client.cpp: - Test InvalidConnection exception. - -Wed Sep 15 07:18:22 UTC 2010 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Extended logging. - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Implemented get_connections - - * tests/CIF/Component/CIF_Component_exec.h: - * tests/CIF/Component/CIF_Component_exec.cpp: - Re-generated executor files - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Expanded tests. - -Tue Sep 14 12:13:34 UTC 2010 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - Updated exclude path - -Tue Sep 14 11:48:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Utils.h: - Status mask will be printed as text (instead of hex). - -Tue Sep 14 11:33:21 UTC 2010 Johnny Willemsen - - * etc/ciao_config_handlers.doxygen: - Removed this file. - -Tue Sep 14 09:42:26 UTC 2010 Marcel Smit - - * ciao/Servants/Connector_Servant_Impl_Base.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Implemented get_named_receptacles. - - * tests/CIF/Receptacle/client.cpp: - Enabled get_named_receptacles test. - - * tests/CIF/descriptors/run_test.pl: - Sleep 2 seconds. - -Mon Sep 13 09:57:33 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Common/CIF_Common.mpc: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - Added Client_init in order to rid of the MARSHAL exceptions. - -Sun Sep 12 19:20:28 UTC 2010 William R. Otte - - * tests/DAnCE/Components/ProcessColocation_exec.cpp: - * tests/DAnCE/Components/Progressive_exec.cpp: - * tests/DAnCE/Components/SimpleAttribute_exec.cpp: - * tests/DAnCE/Components/SimpleConsumer_exec.cpp: - * tests/DAnCE/Components/SimpleEmitter_exec.cpp: - * tests/DAnCE/Components/SimpleFailure_exec.cpp: - * tests/DAnCE/Components/SimpleLocalProvider_exec.cpp: - * tests/DAnCE/Components/SimpleLocalUser_exec.cpp: - * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetProvider_exec.cpp: - * tests/DAnCE/Components/SimpleNilFacetUser_exec.cpp: - * tests/DAnCE/Components/SimpleNull_exec.cpp: - * tests/DAnCE/Components/SimpleProvider_exec.cpp: - * tests/DAnCE/Components/SimplePublisher_exec.cpp: - * tests/DAnCE/Components/SimpleUser_exec.cpp: - * tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - * tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.cpp: - - Compile fixes. - -Fri Sep 10 17:20:04 UTC 2010 William R. Otte - - * bin/ciao_tests.lst: - - Updates. - -Fri Sep 10 17:06:53 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Compile fixes for separated DAnCE. - -Fri Sep 10 15:48:45 UTC 2010 William R. Otte - - * MPC/config/xscdefaults.mpb: - - Moved to MPC repository. - -Fri Sep 10 15:48:20 UTC 2010 William R. Otte - - * tests/IDL3_to_XMI: - * tools/IDL3_to_XMI: - - Re-import from DAnCE. - -Fri Sep 10 15:47:32 UTC 2010 William R. Otte - - * tests/DAnCE/LocalityManager: - * tests/DAnCE/LocalityManager/CPUAffinity: - * tests/DAnCE/LocalityManager/CommandlinePassage: - * tests/DAnCE/LocalityManager/UnexpectedShutdown: - * tests/DAnCE/ParseError: - - Import tests from DAnCE. - -Fri Sep 10 15:47:03 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Container_Handler.cpp: - - Initialize CIAO logger service. - -Fri Sep 10 15:46:30 UTC 2010 William R. Otte - - * CIAO_DAnCE.mwc: - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - - Refer to DAnCE using an environment variable. - -Fri Sep 10 14:44:35 UTC 2010 William Otte - - * DAnCE: - - Moved DAnCE to root of DOC repository. - -Fri Sep 10 10:54:09 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.mpc: - Resolved linker issues on Windows. - - * tests/CIF/Navigation/client.cpp: - Implemented the correct names in get_named_facets. - -Fri Sep 10 08:25:43 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/client.cpp: - * tests/CIF/descriptors/run_test.pl: - Extended tests. Improved logging. Added TODO list te keep track of - which tests fail. - -Thu Sep 9 02:47:19 UTC 2010 William R. Otte - - * CIAO_DAnCE.mwc: - * CIAO_TAO_DAnCE.mwc: - - Remove tools/XML. - -Wed Sep 8 15:30:34 UTC 2010 William R. Otte - - * bin/ciao_tests.lst: - * tests/DAnCE: - - Moved CIAO specific tests from DAnCE. - -Wed Sep 8 15:11:44 UTC 2010 William R. Otte - - * examples/Hello/descriptors/shs.ciao.localityconfig: - - Add a locality config apparently missing from a previous commit. - -Wed Sep 8 15:11:01 UTC 2010 William R. Otte - - * NEWS: - - Updated to reflect planned DAnCE move. - -Wed Sep 8 15:10:24 UTC 2010 William R. Otte - - * MPC/config/ciao_xml_utils.mpb: - * tools/XML: - * tools/XML/CIAO_XML_Utils_Export.h: - * tools/XML/XML.mpc: - * tools/XML/XML_Error_Handler.h: - * tools/XML/XML_Error_Handler.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - * tools/XML/XML_Schema_Resolver.h: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XML_Schema_Resolver.cpp: - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - - Moved XML utils to DAnCE. - -Wed Sep 8 15:09:06 UTC 2010 William R. Otte - - * bin/ciao_tests.lst: - * tests/IDL3_to_XMI: - * tests/IDL3_to_XMI/Bug_3607_Regression: - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - * tests/IDL3_to_XMI/Bug_3607_Regression/test.idl: - * tests/IDL3_to_XMI/IDL2XMI_Test: - * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp: - * tests/IDL3_to_XMI/XMI.dtd: - * tests/IDL3_to_XMI/XMI_For_Array: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Array/test.idl: - * tests/IDL3_to_XMI/XMI_For_Included_File: - * tests/IDL3_to_XMI/XMI_For_Included_File/File1.idl: - * tests/IDL3_to_XMI/XMI_For_Included_File/File2.idl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/test.idl: - * tests/IDL3_to_XMI/XMI_For_Native: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Native/test.idl: - * tests/IDL3_to_XMI/XMI_For_Sequence: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/test.idl: - * tools/IDL3_to_XMI: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/Literals.h: - * tools/IDL3_to_XMI/Literals.cpp: - * tools/IDL3_to_XMI/be_extern.h: - * tools/IDL3_to_XMI/be_global.h: - * tools/IDL3_to_XMI/be_global.cpp: - * tools/IDL3_to_XMI/be_helper.h: - * tools/IDL3_to_XMI/be_helper.cpp: - * tools/IDL3_to_XMI/be_init.cpp: - * tools/IDL3_to_XMI/be_produce.cpp: - * tools/IDL3_to_XMI/be_sunsoft.h: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - * tools/IDL3_to_XMI/be_util.h: - * tools/IDL3_to_XMI/be_util.cpp: - * tools/IDL3_to_XMI/identifier_helper.h: - * tools/IDL3_to_XMI/identifier_helper.cpp: - - Moved IDL3_to_XMI to DAnCE. - -Wed Sep 8 15:07:31 UTC 2010 William R. Otte - - * Release: - - Removed obsolete Release makefile. - -Wed Sep 8 14:41:52 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst: - *tests/Thread: - *tests/Thread/Sender: - *tests/Thread/Sender/Sender_exec.cpp: - *tests/Thread/Sender/starter.cpp: - *tests/Thread/Sender/Sender.idl: - *tests/Thread/Sender/Sender_exec.h: - *tests/Thread/Sender/Sender.mpc: - *tests/Thread/descriptors: - *tests/Thread/descriptors/DeploymentPlan.cdp: - *tests/Thread/descriptors/NodeManagerMap.dat: - *tests/Thread/descriptors/run_test.pl: - *tests/Thread/Thread_Base: - *tests/Thread/Thread_Base/Thread_Base.mpc: - *tests/Thread/Thread_Base/Thread_Base.idl: - *tests/Thread/Receiver: - *tests/Thread/Receiver/Receiver.mpc: - *tests/Thread/Receiver/Receiver_exec.cpp: - *tests/Thread/Receiver/Receiver.idl: - *tests/Thread/Receiver/Receiver_exec.h: - *tests/Thread/README.txt: - Test use of same thread by ccm component. - -Wed Sep 8 10:13:52 UTC 2010 Marcel Smit - - * tests/CIF/Navigation/client.cpp: - Optimized logging - - * tests/CIF/Receptacle/client.cpp: - Resolved compile error on full ccm. - - * tests/CIF/descriptors/run_test.pl: - Enabled Navigation test. - -Wed Sep 8 09:06:08 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - DDS4CCM TopicName test shouldn't be !FIXED_BUGS_ONLY. - -Wed Sep 8 08:13:32 UTC 2010 Marcel Smit - - * tests/CIF/Receptacle/client.cpp: - Commented out unnecessary code. - -Wed Sep 8 06:34:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl: - Hiding output since plan_launcher should return expected errors. - - * connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp: - Removed this file. - -Tue Sep 7 17:38:22 UTC 2010 Marcel Smit - - * tests/CIF/Common/CIF_Common.mpc: - Resolved compile issue (added after). - -Tue Sep 7 12:06:30 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added CIF and TopicName tests. - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - Removed initialization for _var variables. - The create_* methods in DomainParticipant_T won't throw an exception but - will return a _nil when the DDS vendor returns nil on the creation of - a DDS entity. In DDS_TopicBase_Connector_T, the return value is checked - and an exception is thrown when the return value is nil. - - * connectors/dds4ccm/tests/TopicName: - * connectors/dds4ccm/tests/TopicName/Base: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc: - * connectors/dds4ccm/tests/TopicName/Component: - * connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl: - * connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc: - * connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h: - * connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/TopicName/Connector: - * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl: - * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc: - * connectors/dds4ccm/tests/TopicName/descriptors: - * connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp: - * connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp: - * connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl: - Added test which tests a empty and very long topic name. - - * tests/CIF/Common/CIF_Common.h: - * tests/CIF/Common/CIF_Common.cpp: - * tests/CIF/Common/CIF_Common.mpc: - * tests/CIF/Component: - * tests/CIF/Component/CIF_Component.idl: - * tests/CIF/Component/CIF_Component.mpc: - * tests/CIF/Component/CIF_Component_exec.h: - * tests/CIF/Component/CIF_Component_exec.cpp: - * tests/CIF/Navigation/Navigation.mpc: - * tests/CIF/Navigation/client.cpp: - * tests/CIF/Receptacle/Receptacle.mpc: - * tests/CIF/Receptacle/client.cpp: - * tests/CIF/descriptors: - * tests/CIF/descriptors/Plan.cdp: - * tests/CIF/descriptors/run_test.pl: - * tests/CIF/Navigation/Navigation.idl: - * tests/CIF/Navigation/Navigation_exec.h: - * tests/CIF/Navigation/Navigation_exec.cpp: - * tests/CIF/Navigation/run_test.pl: - * tests/CIF/Receptacle/Receptacle.idl: - * tests/CIF/Receptacle/Receptacle_exec.h: - * tests/CIF/Receptacle/Receptacle_exec.cpp: - * tests/CIF/Receptacle/run_test.pl: - Rewritten CIF test. Using a deployment plan and a component to test - the Component Implementation Framework. - -Tue Sep 7 10:52:59 UTC 2010 Johnny Willemsen - - * DAnCE/ChangeLog: - * DAnCE/ChangeLogs: - Give DAnCE its own changelog - - * PROBLEM-REPORT-FORM: - * VERSION: - Updated email addresses for obtaining support - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Layout changes - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Removed return statements that are never reached - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Use ACE_OS::printf - - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/Publisher_T.h: - Layout changes - - * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - Use ACE_OS - -Sat Sep 04 11:30:18 CEST 2010 Johnny Willemsen - - * CIAO version 0.8.2 released. - -Thu Sep 2 21:17:35 UTC 2010 William R. Otte - - * DAnCE/docs/LocalityManager-Plugins.txt: - * NEWS: - - Added documentation on how LocalityManager plugins are - created and loaded. - -Thu Sep 2 16:28:56 UTC 2010 William R. Otte - - * NEWS: - - Updated. - -Wed Sep 1 15:59:55 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - - Add installed based project. - -Wed Sep 1 08:31:38 UTC 2010 Marcel Smit - - * DAnCE/LocalityManager/Configuration/Process_Priority.cpp: - Fuzz. - -Tue Aug 31 19:54:21 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Process_Priority.cpp: - - Fix for windows compilation. - -Tue Aug 31 15:06:49 UTC 2010 Adam Mitz - - * DAnCE/DAnCE/DAnCE_Core.mpc: - - Small modification to Will's commit (directly below this): the - verbatim sections for post-install steps are not needed here. - -Tue Aug 31 14:16:26 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Core.mpc: - - Fixes for installed build. - -Tue Aug 31 12:57:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - Improved logging. - - * connectors/dds4ccm/impl/LocalObject_T.cpp: - * connectors/dds4ccm/impl/LocalObject_T.h: - Added constructor in which one can pass the object. - -Mon Aug 30 22:26:16 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - - Fuzz, and some additional meta-data for the interceptor. - -Mon Aug 30 11:28:13 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Process_Priority.cpp: - - Compile fix for windows. - -Mon Aug 30 04:16:06 UTC 2010 William R. Otte - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Fix for segmentation fault. - -Sun Aug 29 18:37:35 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.h: - - Fix compile error. - -Sun Aug 29 18:16:20 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Configuration.mpc: - * DAnCE/LocalityManager/Configuration/Process_Priority.h: - * DAnCE/LocalityManager/Configuration/Process_Priority.cpp: - * DAnCE/LocalityManager/Configuration/Process_Priority_export.h: - - Process_Priority configuration plugin. - -Sun Aug 29 15:34:43 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Bugfixes for localityconfiguration command line option. - - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc: - - Bugfixes. - - * examples/Hello/descriptors/run_test_shs.pl: - * examples/Hello/descriptors/shs.localityconfig: - - Modified test to load SHS interceptor from localityconfig file. - -Sat Aug 28 21:03:06 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - - Added command line option to pass a localityconfiguration file to - any locality managers spawned by the node manager. - -Sat Aug 28 20:38:42 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/Plugin_Conf.cpp: - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h: - - Fuzz. - -Sat Aug 28 09:56:52 UTC 2010 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/History_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp: - Fixed compile errors - -Fri Aug 27 18:38:37 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Fixed gcc warnings and use new ACE_Thread_Id assignment operator - -Fri Aug 27 16:51:52 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/CIAO_State.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - - Fixed container removal. - -Fri Aug 27 14:50:24 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.h: - - compile fix. - -Fri Aug 27 13:58:34 UTC 2010 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/History_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp: - Use ACE_GUARD macro - -Fri Aug 27 12:03:26 UTC 2010 William R. Otte - - * tests/Bug_3832_Regression/run_test.pl: - - change LM_ERROR to LM_DEBUG. There's no reason an error should ever be produced - from just starting up a locality manager. - -Fri Aug 27 11:35:09 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Initialize ACE_Thread_ID as part of the constructor initializers - -Fri Aug 27 08:10:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added trace and added a debug message in the destructor so that - we easily can verify in the log that the connector has been deleted - -Fri Aug 27 07:57:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - Fixed problem in this file - - * connectors/dds4ccm/NDDS_DDS4CCM_CIAO.mwc: - Removed this file. - -Fri Aug 27 06:40:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - Fixed compile error - -Fri Aug 27 03:03:43 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/Executor-Destructor: - * DAnCE/tests/CIAO/Executor-Destructor/Component.cdp: - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.h: - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp: - * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_export.h: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor.idl: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor.mpc: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.cpp: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_exec.h: - * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_exec.cpp: - * DAnCE/tests/CIAO/Executor-Destructor/exec-dest.localityconfig: - * DAnCE/tests/CIAO/Executor-Destructor/run_test.pl: - * DAnCE/bin/dance_tests.lst: - - A test that verifies that the executor destructors are called for - CIAO components. - -Fri Aug 27 03:02:56 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - - Bugfix for command line parsing. - -Fri Aug 27 03:02:24 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Enable plan pre-processing point. - -Fri Aug 27 03:01:41 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Remove spurious log message. - -Thu Aug 26 18:46:22 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - Added missing return_loan call - -Thu Aug 26 15:17:05 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Move the _duplicate into the plugin manager. - -Thu Aug 26 14:55:26 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Updated for changed and new traits - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Use DDS traits from generated connector to reduce amount of vendor - specific code in this user component - -Thu Aug 26 14:40:32 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Made use of platform independent ACE_Thread_ID class for testing thread switch. - -Thu Aug 26 14:21:28 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/Plugin_Conf.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Attempt to address valgrind errors. - -Thu Aug 26 13:01:32 UTC 2010 Johnny Willemsen - - * DAnCE/etc/DAnCE.doxygen: - * etc/ciao.doxygen: - * etc/ciao_config_handlers.doxygen: - * etc/ciao_dds4ccm.doxygen: - Changed documentation subdirectories to make debian packaging easier - -Thu Aug 26 11:53:23 UTC 2010 Johnny Willemsen - - * DAnCE/bin/dance_tests.lst: - * bin/ciao_tests.lst: - Moved DAnCE tests to their own lst file - -Thu Aug 26 11:41:48 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Dependency_Sorter.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - - Fuzz. - -Thu Aug 26 11:39:22 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/Config_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/Inst_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.cpp: - - Warnings. - -Thu Aug 26 11:01:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSWriterEntity: - * connectors/dds4ccm/tests/DDSEntity: - Renamed to DDSEntity, we show now reader and writer - - * bin/ciao_tests.lst: - Updated test - -Thu Aug 26 10:59:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/Plan.cdp: - Added example code how to do a direct RTI DDS take from an user - component - -Thu Aug 26 10:22:23 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReader.h: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - Small tweaks to get access to RTI DataReader - -Thu Aug 26 10:11:37 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc: - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - More cleanup - -Thu Aug 26 09:54:53 UTC 2010 Johnny Willemsen - - * DAnCE/etc/DAnCE.doxygen: - Fixed directories - - * connectors/dds4ccm/impl/DataReader.h: - * connectors/dds4ccm/impl/DataReader.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - Added additional regular base class to be able to get access to the - RTI DDS entity as part of the reader on all platforms - - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - Added code to get RTI DDS reader, need to do a final test with this - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: - * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc: - * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc: - * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc: - * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc: - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc: - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc: - * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc: - * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc: - * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc: - * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc: - * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc: - * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - Major cleanup, use base projects as much as we can - -Thu Aug 26 09:01:31 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Made use of platform independant ACE_Thread_ID class for testing thread switch. - -Thu Aug 26 03:18:31 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/Plugin_Conf.h: - - Add missing export macro. - -Thu Aug 26 00:28:12 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - * DAnCE/DAnCE/DAnCE_Properties.idl: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp: - * DAnCE/LocalityManager/Handler/Config_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Config_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Inst_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/LocalityManager/Handler/Plugin_Conf.h: - * DAnCE/LocalityManager/Handler/Plugin_Conf.cpp: - * DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h: - * DAnCE/LocalityManager/Scheduler/Dependency_Sorter.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - * DAnCE/MPC/config/dance_locality_manager.mpb: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/bin/ciao.localityconfig: - - Textfile-based deployment of installation handlers, plug-ins, - and interceptors. - -Wed Aug 25 23:07:19 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Add code to dependencies attribute. - -Wed Aug 25 23:06:22 UTC 2010 William Otte - - * ciao/Base/CIAO_Properties.idl: - - Added CCM instance type strings. - -Wed Aug 25 23:05:42 UTC 2010 William Otte - - * ciao/Containers/Session/Session_Container.cpp: - - logging change. - -Tue Aug 24 19:01:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Fixed memory leak and explicit close the domainparticipantfactory, - that way RTI DDS cleans up before process exit and valgrind errors - are than reduced heavily - -Tue Aug 24 18:39:15 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed memory leaks - - * connectors/dds4ccm/impl/DomainParticipantManager.h: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Layout changes - -Tue Aug 24 18:03:20 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added helper method reactor to get the reactor - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Use the new reactor helper and throw an exception when we can't - get a reactor when we require one - -Tue Aug 24 15:31:19 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp: - * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - Fixed memory leaks - -Tue Aug 24 15:10:36 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Fixed memory leak - -Tue Aug 24 11:30:48 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DataWriter.cpp: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - Delete the DDS listeners when they are set - -Tue Aug 24 09:28:55 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - Fixed memory leaks - -Mon Aug 23 14:11:46 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Layout changes to comments - - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - Send 5000 samples instead of 10000 so that we don't get all kind - of test failures on slower systems - -Sat Aug 21 16:47:05 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - - Compile errors. - -Sat Aug 21 16:40:35 UTC 2010 William R. Otte - - * DAnCE/tests/Parsing/ArtGallery3Nodes.cdd: - - File missing from a previous commit. - -Sat Aug 21 16:39:51 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp: - - Warnings. - -Sat Aug 21 16:32:46 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/SHS_DataModel.idl: - - Corrected spelling of 'vanderbit'. - -Sat Aug 21 11:53:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DDSTopicListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - Logging improvements - -Fri Aug 20 20:13:44 UTC 2010 William R. Otte - - * DAnCE/tests/Parsing/Parsing.mpc: - * DAnCE/tests/Parsing/domain.cpp: - * DAnCE/tests/Parsing/run_test.pl: - - Test to verify that domain cdd file parsing works. - -Fri Aug 20 20:13:07 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp: - - Fixed bad handing of SatisfierProperties. - -Fri Aug 20 20:06:15 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - * DAnCE/tools/System_Health/SHS_DataModel.idl: - - Expanded meta-data vocabulary and additional items captured as part - of H&S updates. - -Fri Aug 20 20:03:52 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/UnexpectedShutdown: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/Component.cdp: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp: - * DAnCE/tests/LocalityManager/UnexpectedShutdown/run_test.pl: - - Test excercising the detection of early shutdown locality manager. This - test is currently intentionally not part of the test list as there is still - an outstanding (benign) error message. - -Fri Aug 20 20:03:03 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - - If a locality is terminated unexpectedly, don't try to call shutdown - during a scheduled teardown on that instance. - -Fri Aug 20 20:01:55 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - - If externalReferenceEndpoints have a zero-length port name, attempt - to connect as a CORBA 2.x reference. - -Fri Aug 20 15:30:11 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - * DAnCE/LocalityManager/Handler/LocalityHandler.mpc: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - - Add additional interception point that is invoked on unexpected - events, beginning with the crash of a locality server. - -Fri Aug 20 14:11:53 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/NoQuery.cdp: - Removed this file, no query is now valid - -Thu Aug 19 13:40:42 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Reduced log priority of configuration handler message. - -Thu Aug 19 11:38:37 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/docs/RFP.odt: - Small improvements - -Thu Aug 19 09:44:48 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Fixed typo - - * DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: - * DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl: - * DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl: - * DAnCE/tests/LocalityManager/ProcessName/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: - * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: - * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: - * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: - * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: - * connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl: - * connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * performance-tests/Benchmark/Multi_Threaded/run_test.pl: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tutorials/Quoter/Simple/descriptors/run_test.pl: - Updated message which we print, -q isn't used anymore. Also check - the return value of the plan launcher at shutdown - -Wed Aug 18 19:26:51 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Fixed incorrect logging macro - - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - Use error instead of debug - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - Don't use log level 6 - -Wed Aug 18 09:49:25 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/docs/RFP.odt: - Minor updates. - -Wed Aug 18 00:20:33 UTC 2010 William R. Otte - - * connectors/ami4ccm/docs/RFP.odt: - - Minor updates. - -Tue Aug 17 23:41:47 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.mpc: - - Windows linker fixes. - -Tue Aug 17 18:30:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/LocalObject_T.h: - * connectors/dds4ccm/impl/LocalObject_T.cpp: - Splitted lifecycle of the connector from its facets using the new - LocalObject_Auto_Ptr_T which allocates the local facet and makes sure - we call release on it when the connector gets destructed. It can be - that the user component is destructed after the connector and than - we just can't destructs the facets at that moment, because they are - still in the user component context. They will get destructed at the - moment the user component context gets destructed - -Tue Aug 17 18:29:41 UTC 2010 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/LocalObject_T.h: - * connectors/dds4ccm/impl/LocalObject_T.cpp: - - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - -Tue Aug 17 07:56:45 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/docs/RFP.odt: - Draft RFP, now multiple people can update it - -Mon Aug 16 15:51:15 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - - additional fixes for improper reference counting. - -Mon Aug 16 14:09:19 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - Layout changes - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - Setting a filter with empty string is valid, this is handled as - no filter - -Mon Aug 16 12:44:35 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - - Add close () method to explictly release resources on shutdown to - installation handlers. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Cosmetic. - - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h: - * DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - * ciao/Deployment/Handlers/CIAO_State.h: - * ciao/Deployment/Handlers/CIAO_State.cpp: - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Implement close method. - -Mon Aug 16 11:47:21 UTC 2010 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Servant_Impl_T.cpp: - Updated the Port Activator to make correct use - -Mon Aug 16 10:19:52 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Home_Handler.cpp: - Initialise pointers to 0 - - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - Fixed crash when ciao logging was enabled - -Mon Aug 16 09:47:50 UTC 2010 Marijke Hengstmengel - - * docs/OMG-CCM-Tutorial.pptx - Add uses multiple sheets to AMI4CCM. - -Mon Aug 16 09:35:50 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/CIAO_State.cpp: - Use _nil() instead of 0 - - * ciao/Deployment/Handlers/Component_Handler.cpp: - Reduced scope of a _var and check if it is not nill - -Sun Aug 15 18:14:00 UTC 2010 Johnny Willemsen - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Fixed invalid check for nil object reference - - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - Added log line just before we call delete_participant on DDS - -Sun Aug 15 10:27:17 UTC 2010 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed some refcount problems - -Sat Aug 14 18:15:53 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - Corrected error levels and use some DEBUG macros instead of ERROR - -Fri Aug 13 15:47:22 UTC 2010 James H. Hill - - * connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme: - - Example illustrating delegation. - -Fri Aug 13 06:07:23 UTC 2010 James H. Hill - - * connectors/dds4ccm/models/dds4ccm.xme: - - Re-generated dds4ccm library since some of the elements - were missing. - -Thu Aug 12 19:35:41 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h: - * DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.cpp: - - Removed the superfluous 'instance_' prefix on most operations. - - * DAnCE/LocalityManager/Interceptors/Best_Effort.h: - * DAnCE/LocalityManager/Interceptors/Best_Effort.cpp: - * DAnCE/LocalityManager/Interceptors/Standard_Error.h: - * DAnCE/LocalityManager/Interceptors/Standard_Error.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Configured.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Connect.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Passivate.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Remove.cpp: - * DAnCE/LocalityManager/Scheduler/Events/Start.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Updated to reflect the above change. - -Thu Aug 12 19:19:00 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/DD_Handler.h: - * DAnCE/Config_Handlers/DD_Handler.cpp: - * DAnCE/Config_Handlers/XML_File_Intf.h: - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - - Added domain parsing to the XML_File_Intf. - - * DAnCE/TargetManager/DomainDataManager.cpp: - - Transition to XML_File_Intf instead of using DD_Handler - directly. - -Thu Aug 12 14:04:30 UTC 2010 Adam Mitz - - * docs/fm/CIAO.htm: - - Added dollar-Id-dollar in HTML comment. - -Wed Aug 11 20:47:38 UTC 2010 Adam Mitz - - * DAnCE/DAnCE/DAnCE_Core.mpc: - - DAnCE_{DeploymentInterceptors,Properties}C.inl aren't generated. - -Wed Aug 11 20:03:48 UTC 2010 Adam Mitz - - * docs/fm/CIAO-*.gif: - * docs/fm/CIAO.css: - * docs/fm/CIAO.htm: - - Adding HTML document exported from Adobe FrameMaker, based on the - source file docs/fm/CIAO.fm, which came from the OCI TAO Developer's - Guide. - -Tue Aug 10 18:59:29 UTC 2010 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Updated paths to tao documentation - -Tue Aug 10 08:10:08 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.h: - Throw an internal exception if setting the listener fails. Also - configuration_complete is now void, in case of a problem we throw - an exception - -Tue Aug 10 07:00:56 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - Check return values of set_listener - -Mon Aug 9 19:09:26 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Updated some comments - -Mon Aug 9 14:50:25 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/LocalObject_T.h: - * connectors/dds4ccm/impl/LocalObject_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - Renamed DDS4CCM_LocalObject to LocalObject, no need for DDS4CCM - prefix, it is already in that namespace. Added more logging in all - handle_exception methods - - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h: - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp: - Removed these files. - -Mon Aug 9 06:42:10 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h: - Removed not needed semi colons - -Sun Aug 8 12:46:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Pass the control and conditionmanager by reference to the listeners, - they are always there and no need to check them for nill - - * etc/ciao_dds4ccm.doxygen: - Updated links to TAO doxygen documentation - -Thu Aug 5 15:46:04 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_config_handlers_base.mpb: - * MPC/config/ciao_xml_utils.mpb: - Removed exceptions as base projects - -Thu Aug 5 14:09:20 UTC 2010 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Corrected links to other documentations - -Thu Aug 5 07:58:42 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/DP_Handler.cpp: - Fixed compile errors - -Wed Aug 4 18:05:42 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/ADD_Handler.cpp: - * DAnCE/Config_Handlers/DP_Handler.cpp: - * DAnCE/Config_Handlers/DnC_Dump_T.cpp: - * DAnCE/Config_Handlers/Dump_Obj.cpp: - * DAnCE/Config_Handlers/IDREF_Base.cpp: - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/tools/Completion/Completion_Counter_Base.cpp: - * ciao/Servants/Port_Activator.cpp: - * ciao/Valuetype_Factories/ConfigValue.cpp: - * ciao/Valuetype_Factories/Cookies.cpp: - * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp: - * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp: - * tools/IDL3_to_IDL2/be_helper.cpp: - * tools/IDL3_to_XMI/be_helper.cpp: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - Removed ACE_RCSID - -Wed Aug 4 18:01:14 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - Log the dds status masks with %x and added the logging to some more - methods - -Tue Aug 3 18:24:17 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - - Better error messages when parsing fails. - - * DAnCE/Config_Handlers/XSCRT/Traversal.hpp: - - Compile error in clang. - -Tue Aug 3 12:12:36 UTC 2010 Johnny Willemsen - - * DAnCE/etc/DAnCE.doxygen: - Doxygen config file for dance - - * etc/ciao.doxygen: - * etc/ciao_config_handlers.doxygen: - * etc/ciao_dds4ccm.doxygen: - Changed location of generated ciao documentation - - * etc/ciao_DAnCE.doxygen: - Removed this file. - -Tue Aug 3 04:29:02 UTC 2010 James H. Hill - - * connectors/ami4ccm/examples/Hello/models: - * connectors/ami4ccm/examples/Hello/models/Hello-complete.xme: - * connectors/ami4ccm/examples/Hello/models/Hello.xme: - - PICML models for the example. - - * connectors/ami4ccm/models/ami4ccm.xme: - - Updated the ami4ccm model to latest version of PICML. - - * connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme: - * connectors/dds4ccm/examples/Shapes/models/Shapes.xme: - - Updated models for example to latest version of PICML. - - * tutorials/Quoter/Simple/Model/Quoter.xme: - - Update exampe to latest vers - -Sun Aug 1 18:16:59 UTC 2010 Johnny Willemsen - - * NEWS: - Updated for next release - -Sun Aug 01 11:30:54 CEST 2010 Johnny Willemsen - - * CIAO version 0.8.1 released. - -Sat Jul 31 15:03:40 UTC 2010 William R. Otte - - * NEWS: - - Updated. - -Sat Jul 31 14:53:05 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Core.mpc: - * DAnCE/Deployment/Deployment_Core.mpc: - - Installed fixes. - -Fri Jul 30 11:22:50 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc: - - removed the avoids += test_installed. - -Thu Jul 29 18:15:53 UTC 2010 William R. Otte - - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - - Installed fix. - -Thu Jul 29 17:53:05 UTC 2010 Marcel Smit - - * NEWS: - Updated - -Thu Jul 29 17:47:16 UTC 2010 William R. Otte - - * DAnCE/Deployment/Deployment_Core.mpc: - - Installed fix. - -Thu Jul 29 15:25:54 UTC 2010 William R. Otte - - * DAnCE/Deployment/Deployment_Core.mpc: - - Installed fix. - -Thu Jul 29 14:06:53 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc: - - avoids += test_installed, so we can disable on installed builds. - -Thu Jul 29 13:44:34 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Core.mpc: - * DAnCE/DAnCE/DAnCE_Utility.h: - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - * DAnCE/LocalityManager/Scheduler/Scheduler.mpc: - - Attempt at some install fixes. - -Thu Jul 29 12:33:37 UTC 2010 Marcel Smit - - * CIAO-INSTALL.html: - Removed unneeded phrase regarding ssl. - -Thu Jul 29 02:27:05 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Explicitly close the plugin manager in the shutdown operation instead of - the destructor so it is called before the ORB is destroyed. - -Wed Jul 28 12:29:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - Fuzz - -Wed Jul 28 07:30:33 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - LocalityManager/run_test.pl doesn't exist and - LocalityManager/CommandlinePassage/run_test.pl wasn't listed. - Corrected this. - -Wed Jul 28 07:17:02 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - Fuzz - -Tue Jul 27 23:19:55 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - - Further tweak of previous fix. - -Tue Jul 27 22:45:12 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: - - Attempt at a fix for the installed build. - -Tue Jul 27 16:00:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - Resolved compile issue on Windows. - -Tue Jul 27 15:52:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - Resolve compile issue on Windows. - -Tue Jul 27 07:23:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Log_Macros.h: - Added ace/Log_Msg.h include. - -Tue Jul 27 06:29:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf: - Replaced. - -Mon Jul 26 23:16:54 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Configuration.mpc: - - Windows linker issue. - -Mon Jul 26 17:50:42 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - - Use ACE_OS::num_processors to detect if #cpus is greater than 1. - - * bin/ciao_tests.lst: - - remove MULTICORE from restrictions. - -Mon Jul 26 13:40:13 UTC 2010 William R. Otte - - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - - Tweak a preprocessor check for MSVC and unicode. - -Mon Jul 26 13:01:16 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - - Added property for CPU Affinity. - - * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: - - Bugfix. - - * DAnCE/tests/LocalityManager/CPUAffinity: - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl: - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc: - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h: - * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - * DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp: - * DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: - * bin/ciao_tests.lst: - - Added test for CPUAffinity. Must have MULTICORE set for test - script. This test requires at least 2 processors/cores. - -Mon Jul 26 12:29:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Update - -Mon Jul 26 11:57:45 UTC 2010 Marcel Smit - - * CIAO-INSTALL.html: - Extended with a link to DDS4CCM install. Also - extended the CIAO build section a bit. - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - How to build and install DDS4CCM - - * connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf: - Summary of how the DDS4CCM connector is designed. - - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - Added Copy_disabled as base class. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - Corrected number of samples to be received - - * docs/OMG-CCM-Tutorial.pptx: - Extended the DDS4CCM section. - -Mon Jul 26 01:57:17 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/CommandlinePassage: - * DAnCE/tests/CIAO/CommandlinePassage: - * bin/ciao_tests.lst: - - Moved CommandLinePassage test to a more appropriate location. - -Mon Jul 26 01:53:38 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: - * DAnCE/LocalityManager/Configuration/Process_Name.cpp: - - Address exception warning on Windows. - -Mon Jul 26 01:51:16 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h: - * DAnCE/tools/System_Health/Interceptors/SHS_Transport.h: - - Add virtual destructor. - -Mon Jul 26 01:48:33 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc: - - Prevent a possible race condition during parallel builds. - -Mon Jul 26 01:14:21 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/CPU_Affinity.h: - * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: - * DAnCE/LocalityManager/Configuration/CPU_Affinity_export.h: - * DAnCE/LocalityManager/Configuration/Configuration.mpc: - * DAnCE/LocalityManager/Configuration/Process_Name.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - CPU Affinity configuration plugin. Currently works on Linux - kernel 2.5.8 or later. - -Sat Jul 24 07:04:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl: - Added. - -Fri Jul 23 17:41:04 UTC 2010 William R. Otte - - * bin/ciao_tests.lst: - - Add in the Hello SHS test. - -Fri Jul 23 17:37:45 UTC 2010 William R. Otte - - * DAnCE/tests/LocalityManager/ExplicitExec: - * DAnCE/tests/LocalityManager/ExplicitExec/Deployment.cdp: - * DAnCE/tests/LocalityManager/ExplicitExec/ExplicitExec.mpc: - * bin/ciao_tests.lst - - Test for explicitly using a locality executable name other than - dance_locality_manager. - -Fri Jul 23 16:06:57 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Process_Name.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Bugfixes. - - * DAnCE/tests/LocalityManager/ProcessName: - * DAnCE/tests/LocalityManager/ProcessName/Deployment.cdp: - * DAnCE/tests/LocalityManager/ProcessName/run_test.pl: - - Test for process name changing. - - * bin/ciao_tests.lst: - - Added tests to daily build. - -Fri Jul 23 15:05:19 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Configuration/Process_Name.cpp: - - Compile fixes. - -Fri Jul 23 14:26:53 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_LocalityManager.idl: - - Added local interface for configuration plugins. - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - - Added logic to invoke configuration plugins if present. - - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.h: - * DAnCE/LocalityManager/Scheduler/Plugin_Manager.cpp: - - Loading logic for configuration plugins. - - * DAnCE/LocalityManager/Configuration: - * DAnCE/LocalityManager/Configuration/Configuration.mpc: - * DAnCE/LocalityManager/Configuration/Process_Name.h: - * DAnCE/LocalityManager/Configuration/Process_Name.cpp: - * DAnCE/LocalityManager/Configuration/Process_Name_export.h: - - Change process name configuration plugin. Note that this only - works on Linux (kernel 2.6.9) and later. If invoked on other - platforms, it will generate a StartError exception. - -Fri Jul 23 14:24:21 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Interceptors/Error_Interceptors.mpc: - - dynamicflags should use += - -Fri Jul 23 14:21:52 UTC 2010 William R. Otte - - * DAnCE/DAnCE/DAnCE_Properties.idl: - - Added some documentation, removed a couple extraneous properties. - - * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp: - - Update to accomodate the changes in DAnCE_Properties.idl. - -Fri Jul 23 13:55:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - Replace an anonymous bounded octet sequence with a typedef. - -Fri Jul 23 13:56:23 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * tools/XML/XercesString.h: - - Fuzz. - -Fri Jul 23 13:54:46 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - - Compile fix. - -Fri Jul 23 08:25:07 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm.mpb: - Removed the -aw as IDL compiler option. We've - changed the IDL instead. - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Replace an anonymous bounded octet sequence with a typedef. - -Fri Jul 23 07:29:40 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl: - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl: - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl: - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl: - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: - Replace an anonymous bounded octet sequence with a typedef. - -Fri Jul 23 06:48:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - Added MPC file for Base.idl. - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.cxx: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BasePlugin.cxx: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BasePlugin.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BaseSupport.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BaseSupport.cxx: - - Removed these files. - -Thu Jul 22 16:00:37 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/SHS_DataModel.idl: - - Fuzz. - -Thu Jul 22 15:30:07 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp: - * DAnCE/TargetManager/DomainDataManager.cpp: - * DAnCE/TargetManager/Target_Manager_Module.cpp: - * DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_exec.cpp: - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - - Unicode fixes on Windows. - -Thu Jul 22 15:28:24 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - * DAnCE/tools/System_Health/SHS_DataModel.idl: - - Windows compile fixes. Note that the enum in the DataModel IDL - file has changed to accomodate a windows specific preprocessor - define. - -Thu Jul 22 15:24:25 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.mpc: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp: - - Windows compile fixes. - -Thu Jul 22 15:00:09 UTC 2010 Jeff Parsons - - * MPC/config/dds4ccm.mpb: - - Added -aw option to ndds feature, so it will be applied - to all current DDS4CCM builds. The DDS implementation - IDL contains anonymous constructs. - - * tests/Bug_3769_Regression/Foo.idl: - - Changed anonymous IDL constructs, substituted typedefs - for a bounded string and bounded wstring. - - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl: - - Replace an anonymous bounded octet sequence with a typedef. - -Thu Jul 22 13:12:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.cxx: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BasePlugin.cxx: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BasePlugin.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BaseSupport.h: - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/BaseSupport.cxx: - Fuzz - -Thu Jul 22 12:26:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - Resolved duplicate names. - -Thu Jul 22 11:44:24 UTC 2010 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html: - * connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html: - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html: - * connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html: - * connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html: - Minor improvements. - -Thu Jul 22 09:54:41 UTC 2010 Marcel Smit - - * docs/OMG-CCM-Tutorial.pptx: - Added some more info regarding the DDS4CCM connector. - -Thu Jul 22 09:38:30 UTC 2010 Marcel Smit - - * docs/OMG-CCM-Tutorial.pptx: - Added some more info regarding the DDS4CCM connector. - -Thu Jul 22 09:10:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - This tutorial now works in conjunction with the RTI Shapes Demo. - -Thu Jul 22 08:20:36 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/DDS/*: - Added a small reproducer which should reproduce the time out - which occurs after setting the query parameters. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - Got this one working. The reproducer will log an error about - the unexpected timeout. - -Thu Jul 22 03:55:53 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_shs_daemon.mpb: - * DAnCE/MPC/config/dance_shs_stub.mpb: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.idl: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.mpc: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h: - * DAnCE/tools/System_Health/SHS_DataModel.idl: - * DAnCE/tools/System_Health/System_Health.mpc: - - Fuzz. - -Wed Jul 21 11:44:19 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - DataControlListener is now by value (instead of by reference). - -Wed Jul 21 07:50:29 UTC 2010 Marcel Smit - - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: - Resolved compile error. - - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - Resolved compile warning. - -Tue Jul 20 23:22:50 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_shs_daemon.mpb: - * DAnCE/MPC/config/dance_shs_stub.mpb: - - Files missing from previous commit. - -Tue Jul 20 18:25:39 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Daemon: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.cpp: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.idl: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon.mpc: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h: - * DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.cpp: - - Placeholder for the Plan Launcher daemon, a process using the - DAnCE_Plan_Launcher to provide an IDL interface for deployment - execution. Right now, it only provides an interface for parsing - XML/CDR plans into IDL. - -Tue Jul 20 18:23:34 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfix whereby the NodeApplication would mistakenly believe that - the deployment scheduler had timed out. - -Tue Jul 20 18:22:02 UTC 2010 William R. Otte - - * examples/Hello/descriptors/run_test_shs.pl: - - Simple test that loads the SHS daemon. - -Tue Jul 20 18:19:34 UTC 2010 William R. Otte - - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - * DAnCE/NodeManager/NodeManager_Impl.cpp: - - Load SHS interceptors. - -Tue Jul 20 18:17:33 UTC 2010 William R. Otte - - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.idl: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon.mpc: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h: - * DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp: - * DAnCE/tools/System_Health/Interceptors: - * DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_CORBA_Transport_export.h: - * DAnCE/tools/System_Health/Interceptors/DAnCE_SHS_Interceptors_export.h: - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h: - * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp: - * DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc: - * DAnCE/tools/System_Health/Interceptors/SHS_Transport.h: - * DAnCE/tools/System_Health/SHS_DataModel.idl: - * DAnCE/tools/System_Health/System_Health.mpc: - - Initial implementation of system health & status service. - -Tue Jul 20 12:32:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: - Removed the domain_id since this tutorial doesn't work in conjunction - with the RTI shapes demo because of coding standards. - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: - Mentioned that this tutorial doesn't run in conjunction - with the RTI Shapes demo. If one would like to see this, - one should compile and run the Shapes example. - -Tue Jul 20 09:58:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Corrected number of samples expected to be received. - -Tue Jul 20 08:31:28 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: - Added union connectors to these deployment plans. - -Tue Jul 20 06:04:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h: - Fuzz - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Log_Macros.h: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - Changed misspelled define. - -Mon Jul 19 12:39:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Log_Macros.h: - * connectors/dds4ccm/impl/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicListener_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - Replaced CIAO_Log_level number with DDS4CCM_LOG_LEVEL_* - defines. - -Fri Jul 16 14:00:57 UTC 2010 Marcel Smit - - * docs/OMG-CCM-Tutorial.pptx: - Updates regarding DDS4CCM. - -Fri Jul 16 12:13:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - Don't call a dds narrow with 0 pointer, it causes an error to be - logged - -Thu Jul 15 19:11:05 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - Don't call a dds narrow with 0 pointer, it causes an error to be - logged - -Thu Jul 15 09:48:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/Topic_T.h: - Resolved compile issues. - -Thu Jul 15 09:47:04 UTC 2010 Jeff Parsons - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - - Added -Gex to command line of HelloA.idl processing, - and the resuling generated reply handler implementation - files to the connector project. - -Thu Jul 15 09:34:43 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Interceptors/Standard_Error.h: - Doxygen changes - - * etc/ciao_DAnCE.doxygen: - Use INet tag file - -Thu Jul 15 09:12:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/StatusCondition.h: - Resolved compile issues on Windows. - -Thu Jul 15 08:38:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.h: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.h: - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h: - * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.cpp: - * connectors/dds4ccm/impl/DDSDataReaderListener_T.h: - * connectors/dds4ccm/impl/DDSDataWriterListener_T.h: - * connectors/dds4ccm/impl/DDSPublisherListener_T.h: - * connectors/dds4ccm/impl/DDSTopicListener_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.h: - * connectors/dds4ccm/impl/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/DataWriter.h: - * connectors/dds4ccm/impl/DataWriter_T.h: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.h: - * connectors/dds4ccm/impl/DomainParticipantListener.h: - * connectors/dds4ccm/impl/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/DomainParticipant_T.h: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/Publisher_T.h: - * connectors/dds4ccm/impl/QueryCondition_T.h: - * connectors/dds4ccm/impl/ReadCondition_T.h: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/StateListenerControl_T.h: - * connectors/dds4ccm/impl/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/StatusCondition.h: - * connectors/dds4ccm/impl/Subscriber_T.h: - * connectors/dds4ccm/impl/TopicDescription_T.h: - * connectors/dds4ccm/impl/Topic_T.h: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - Reorganized _get/_setcomponent methods. Created a new templated - class called DDS4CCM_LocalObject_T which derives from CORBA::LocalObject. - This class contains the _get/_setcomponent methods. - Also cleanup quite a few includes of tao/LocalObject.h which weren't - neccesary. - -Thu Jul 15 08:26:16 UTC 2010 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Only generate documentation for the core directories - -Thu Jul 15 07:21:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Count the number of samples received and check whether this number is right. - Code layout. - -Wed Jul 14 12:12:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Removed unnecessary code. Using set_parameters again. - -Wed Jul 14 12:01:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - Optimized logging. - - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.h: - Created DataWriter typedef. - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - Check the outcome of the dynamic_cast. - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Implemented resetting of the querycondition. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl: - Testing resetting the QueryCondition. - -Wed Jul 14 10:02:39 UTC 2010 William R. Otte - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - - Compile fix. - -Wed Jul 14 09:55:07 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - - Memory leak fix. - -Wed Jul 14 09:47:31 UTC 2010 William R. Otte - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Memory leak fixes. - - * tools/XML/XercesString.h: - * tools/XML/XercesString.cpp: - - Added a reset method to release memory on demand. - -Wed Jul 14 09:45:59 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - Add AMI4CCM test GetComp. - -Wed Jul 14 09:17:42 UTC 2010 William R. Otte - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - - Memory leak. - -Tue Jul 13 19:38:35 UTC 2010 William R. Otte - - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: - - Possible fix for compile error on scoreboard. - - * tools/XML/XML_Helper.tpp: - - Possible fix for segfault on scoreboard, as I can't reproduce in my - workspace. - -Tue Jul 13 15:11:35 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - Removed include which we don't need anymore now the behaviour of -SS - on tao_idl doesn't break the include chain anymore - -Tue Jul 13 14:52:59 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: - Small changes in test criteria. - -Tue Jul 13 10:30:59 UTC 2010 Jeff Parsons - - * tools/IDL3_to_XMI/be_util.cpp: - * tools/IDL3_to_XMI/be_util.h: - - New files containing a utility class - with static methods. - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - - Added new files to the project. - - * tools/IDL3_to_XMI/be_global.cpp: - * tools/IDL3_to_XMI/be_global.h: - - Factored out methods unrelated to global - data storage and moved them to the new - utility class. - -Mon Jul 12 22:52:21 UTC 2010 William R. Otte - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - - Updated to match new XML_Helper interface. - -Mon Jul 12 15:04:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/Log_Macros.h: - Code layout. - - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp: - Added filter test. - -Mon Jul 12 13:07:57 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - * DAnCE/Config_Handlers/XML_Typedefs.h: - * DAnCE/Config_Handlers/XML_Typedefs.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - * tools/XML/XML_Schema_Resolver.h: - * tools/XML/XML_Schema_Resolver.tpp: - * tools/XML/XML_Schema_Resolver.cpp: - - A number of fixes to how the XML infrastructure handles memory. This - also happens to fix the segmentation fault caused by my prior commit. - -Mon Jul 12 10:15:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/Log_Macros.h: - Added macros to print CCM_DDS::InternalError and CORBA::exceptions - -Mon Jul 12 09:47:09 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DataWriter_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/DomainParticipant_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Publisher_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - * connectors/dds4ccm/impl/StatusCondition.cpp: - * connectors/dds4ccm/impl/Subscriber_T.cpp: - * connectors/dds4ccm/impl/TopicDescription_T.cpp: - * connectors/dds4ccm/impl/Topic_T.cpp: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: - Using :: for namespaces. - -Mon Jul 12 09:14:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Changed exception handling. Exceptions are caught in the - DDS_Event_Connector_T and DDS_State_Connector_T and not in - the ports itself. Also corrected some incorrect parameters - of the CCM_DDS::InternalError exception. - -Mon Jul 12 06:36:52 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Resolved compile error. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/*: - Added test which checks whether resetting the query condition - works. Need to extend this test. - -Fri Jul 9 12:00:41 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Only logging the wait time when logging is enabled. - -Fri Jul 9 11:26:30 UTC 2010 William R. Otte - - * tools/XML/XML_Schema_Resolver.cpp: - - Remove extraneous call to initialize. - -Fri Jul 9 10:24:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - Logging the wait time. - -Fri Jul 9 08:52:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - Fuzz (mismatch traces). - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Improved logging. - -Fri Jul 9 08:21:58 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h - Solved compile warnings. - -Fri Jul 9 07:32:58 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - Removed unnecessary code - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: - Added test with two listeners, each having its own querycondition. Each listener - should receive the samples he expected. - -Thu Jul 8 19:07:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Updated the comment in order to reflect the - CIAO_DDS4CCM_CONTEXT_SWITCH better. - -Thu Jul 8 18:06:47 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReader_T.cpp: - Don't initialize _var with _nil. - - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/ReadCondition_T.cpp: - Code alignment. Optimized logging. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - Extend test with an extra connector. This one tests whether all - samples are in DDS. - -Thu Jul 8 13:12:40 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/GetComp - * connectors/ami4ccm/tests/GetComp/Base - * connectors/ami4ccm/tests/GetComp/Base/GetComp.idl - * connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc - * connectors/ami4ccm/tests/GetComp/descriptors - * connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp - * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl - * connectors/ami4ccm/tests/GetComp/Receiver - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp - * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h - * connectors/ami4ccm/tests/GetComp/Sender - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp - * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h - Test to check if ami44ccm facet user component uses, does have a - get_component and returns ami4ccm connector. - -Thu Jul 8 09:06:40 UTC 2010 William R. Otte - - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Updated test to verify that all attributes are actually - tested duing cc_activate. - -Thu Jul 8 08:52:29 UTC 2010 William R. Otte - - * DAnCE/Config_Handlers/XML_File_Intf.h: - * DAnCE/Config_Handlers/XML_File_Intf.cpp: - * tools/XML/XML_Helper.h: - * tools/XML/XML_Helper.tpp: - - Explicitly invoke terminate in the destructor of - the XML_File_Intf in an attempt to clean up valgrind logs. - -Thu Jul 8 07:04:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ConditionManager_T.h: - * connectors/dds4ccm/impl/ConditionManager_T.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/QueryCondition_T.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - Added a ConditionManager. This class manages all read conditions - and query conditions. There's one conditionmanager per port. - Also code layout changes and consistent naming of typedefs. - - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Optimized debug messages. - -Wed Jul 07 08:55:30 UTC 2010 Martin Corino - - * ciao/Containers/Servant_Activator.cpp: - Fuzz fix. - -Wed Jul 07 08:41:30 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h - Pass context to threads i.o cashing connection. - -Wed Jul 07 07:41:30 UTC 2010 Martin Corino - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Fixed memory leak. - -Wed Jul 07 07:33:30 UTC 2010 Martin Corino - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - Fixed memory leak. - -Wed Jul 07 07:12:30 UTC 2010 Martin Corino - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: - Fixed memory leaks. - -Tue Jul 06 13:30:30 UTC 2010 Martin Corino - - * ciao/Containers/Servant_Activator.cpp: - Fixed memory leak. - -Tue Jul 06 13:18:30 UTC 2010 Martin Corino - - * DAnCE/DAnCE/DAnCE_Utility.cpp: - Fixed memory leak. - -Tue Jul 06 12:46:30 UTC 2010 Martin Corino - - * DAnCE/Config_Handlers/Any_Handler.cpp: - Fixed memory leak. - -Tue Jul 06 12:35:30 UTC 2010 Martin Corino - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Fixed memory leak. - -Tue Jul 6 12:08:34 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl - Add extra pragma to idl files. Pass context to threads i.o cashing connection. - -Tue Jul 06 11:33:30 UTC 2010 Martin Corino - - * DAnCE/tools/Split_Plan/Locality_Splitter.cpp: - Fixed bug in key comparison causing assertions on VC9. - -Tue Jul 6 11:13:22 UTC 2010 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_DAnCE.doxygen: - * etc/ciao_config_handlers.doxygen: - * etc/ciao_dds4ccm.doxygen: - Reduced the size of the colloboration graphs - -Tue Jul 06 09:50:30 UTC 2010 Martin Corino - - * DAnCE/tests/CIAO/EM-Shutdown-Failures: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/1NodeFailureAtPassivate.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/1NodeFailureAtRemove.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/1NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/2NodeFailureAtPassivate.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/2NodeFailureAtRemove.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/2NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/5NodeFailureAtPassivate.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/5NodeFailureAtRemove.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/5NodeNoFailure.cdp: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/README.txt: - * DAnCE/tests/CIAO/EM-Shutdown-Failures/run_test.pl: - Added new testset. - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - Fixed 'eating' of exceptions at component removal. - - * DAnCE/tests/CIAO/EM-Launch-Failures/README.txt: - Updated. - - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - Added cleanup of test results. - - * bin/ciao_tests.lst: - Added new testsets to autobuild testsuite. - -Tue Jul 6 07:52:34 UTC 2010 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc - Rename duplicate project name . - -Mon Jul 05 14:35:30 UTC 2010 Martin Corino - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: - * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - Standardized scripts. Proper use of targets. - - * DAnCE/tests/CIAO/EM-Redeployment/README.txt: - Removed outdated comment. - -Mon Jul 5 14:02:19 UTC 2010 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_DAnCE.doxygen: - * etc/ciao_config_handlers.doxygen: - * etc/ciao_dds4ccm.doxygen: - Disable include and included graphs, this should reduce the size - of the documentation a lot - -Mon Jul 5 12:58:34 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/ami4ccm/docs/TestCoverage.odt - * connectors/ami4ccm/tests/InterInOutArgs - * connectors/ami4ccm/tests/InterInOutArgs/Base - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc - * connectors/ami4ccm/tests/InterInOutArgs/descriptors - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp - * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl - * connectors/ami4ccm/tests/InterInOutArgs/Receiver - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp - * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h - * connectors/ami4ccm/tests/InterInOutArgs/Sender - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h - Add AMI4CCM test with inout arguments. - -Mon Jul 5 11:45:34 UTC 2010 Johnny Willemsen - - * DAnCE/LocalityManager/Scheduler/Deployment_Completion.cpp: - Const change - - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp: - Unicode fix - - * DAnCE/tests/Parsing/Parsing.mpc: - Layout change - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Fixed layout of some debug statements - -Mon Jul 5 09:38:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/DataReader_T.h: - * connectors/dds4ccm/impl/DataReader_T.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README: - Additional info - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - Refactored. Don't send the same iterations again. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp: - Removed report errors since it wasn't used. - - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: - Also count the received number of samples. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryCondition/Different/*: - Added test which tests whether the QueryCondition on different extended ports are different. - -Sun Jul 04 18:57:33 CEST 2010 Johnny Willemsen - - * CIAO version 0.8 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2011b b/CIAO/ChangeLogs/ChangeLog-2011b deleted file mode 100644 index 3014fb9a8db..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2011b +++ /dev/null @@ -1,2172 +0,0 @@ -Sun Dec 04 11:51:30 CET 2011 Johnny Willemsen - - * CIAO version 1.0.6 released. - -Tue Nov 29 09:55:32 UTC 2011 Johnny Willemsen - - * ciao/Servants/Servants.mpc: - List the new files so that they are getting installed - -Mon Nov 28 09:56:48 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Also generate an entry for the templated servant files. - - * tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc: - Regenerated, using the new generate_component_mpc. - -Mon Nov 28 09:17:32 UTC 2011 Johnny Willemsen - - * tests/IDL_Test/Extension/Cornucopia.mpc: - Disable one project I missed - -Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen - - Merging in our workbranch - - === start changelog === - - Thu Nov 24 12:31:23 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Servants/Derived.mpc: - Fixed afters. - - Thu Nov 24 07:40:14 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Servants/Base.idl: - * tests/IDL_Test/Inherited_Servants/Derived.idl: - Enabled all IDL code again and added an extra component - and interface without a module. - - Fri Nov 4 15:47:29 UTC 2011 Marcel Smit - - * *.mpc: - Removed all S.inl entries. - - Fri Nov 4 16:16:35 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Removed reference to S.inl - - Mon Nov 21 15:21:00 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Servants/Derived.mpc: - Fixed mpc issue - - Thu Nov 17 10:54:54 UTC 2011 Marcel Smit - - * ciao/Servants/Facet_Servant_Base_T.h: - * ciao/Servants/Facet_Servant_Base_T.cpp: - Templated base class for facet servants. - - * tests/IDL_Test/Inherited_Servants: - * tests/IDL_Test/Inherited_Servants/Base.idl: - * tests/IDL_Test/Inherited_Servants/Base.mpc: - * tests/IDL_Test/Inherited_Servants/Derived.idl: - * tests/IDL_Test/Inherited_Servants/Derived.mpc: - * tests/IDL_Test/Inherited_Servants/Tester: - * tests/IDL_Test/Inherited_Servants/Tester.cpp: - Added compilation test. - - === end changelog === - -Tue Nov 22 14:04:21 UTC 2011 Martin Corino - - * ciao/Servants/Home_Servant_Impl_T.h: - * ciao/Servants/Home_Servant_Impl_T.cpp: - - Implemented separate method for removal of all components - (moving code out of destructor). - -Sun Nov 20 19:35:18 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp: - Fixed msvc warning - -Sun Nov 20 19:34:21 UTC 2011 Martin Corino - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Fixed incorrect definition of parameters for template module - reference definition (only used with full CCM builds). - -Thu Nov 17 10:21:55 UTC 2011 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Extended this test with attributes - -Fri Nov 11 11:22:13 UTC 2011 Martin Corino - - Merged rw_block_strategy branch. - - === start changelog === - - Thu Nov 10 14:15:13 UTC 2011 Martin Corino - - * bin/ciao_tests.lst: - * connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp: - * connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl: - - Added variant of test using full blocking container servers - (LocalityManager). - - === end changelog === - -Thu Nov 03 13:25:13 UTC 2011 Marijke Hengstmengel - - * tests/Collocation/Sender/Sender_exec.cpp: - * bin/ciao_tests.lst - - Only if defined CCM_DIRECTCOLL run test. - -Thu Nov 03 08:52:13 UTC 2011 Martin Corino - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Fixed WCHAR compile problem. - -Wed Nov 02 12:09:13 UTC 2011 Marijke Hengstmengel - * tests/Collocation/Receiver/Receiver_exec.cpp: - Cancel timer and delete generators - -Wed Nov 02 08:04:13 UTC 2011 Marijke Hengstmengel - * tests/Collocation/Receiver/Receiver_exec.cpp: - * tests/Collocation/Sender/Sender_exec.cpp: - Removed unreferenced local variables - - -Wed Nov 02 08:30:13 UTC 2011 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Tue Nov 1 09:11:13 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Component/Extended/Base.mpc: - Layout changes. - - * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: - Linux link error. - - Tue Nov 1 08:48:41 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Component/Extended/Derived.idl: - Used module name to identify the supported interface. - - * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: - Fixed link issue on linux - - Mon Oct 31 13:53:36 UTC 2011 Marcel Smit - - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Session/Session_Container.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/CIAO_State.cpp: - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - Several improvements regarding thread safety. Also - some minor code layout changes. - - * ciao/Containers/Extension/README: - * ciao/Contexts/Extension/README: - * ciao/Servants/Extension/README: - Added: Extension containers are not ready to use, yet. - - Sat Oct 29 14:25:16 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc: - Fuzz. - - * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: - Fixed double project names. - - Fri Oct 28 15:55:29 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - Fixed compile and link issues on windows - - Fri Oct 28 15:04:03 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - Fixed another link issue. - - Fri Oct 28 15:00:43 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - Fixed link issue on windows. - - Fri Oct 28 14:55:18 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: - Fixed compile issues on windows. - - Fri Oct 28 14:52:38 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: - Added libpaths. - - Fri Oct 28 14:49:01 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - Fixed afters. - - Fri Oct 28 14:18:46 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/IDL_Test: - * connectors/dds4ccm/tests/IDL_Test/Base: - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl: - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc: - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl: - * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl: - * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: - * connectors/dds4ccm/tests/IDL_Test/Connector: - * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl: - * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc: - Compilation test. - - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: - Fixed link issue - - Fri Oct 28 14:17:05 UTC 2011 Marcel Smit - - * tests/IDL_Test/Inherited_Component/Extended: - - * tests/IDL_Test/Inherited_Component/Extended/Base.idl: - * tests/IDL_Test/Inherited_Component/Extended/Base.mpc: - * tests/IDL_Test/Inherited_Component/Extended/Derived.idl: - * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: - * tests/IDL_Test/Inherited_Component/Extended/Tester.cpp: - Compilation test. - - Thu Oct 27 10:10:00 UTC 2011 Martin Corino - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Changed basic CIAO_ReferenceLookup_i to attempt handling resolving - externalReference endpoints as CORBA IOR type references. - Added factory method for creating interceptor. - - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - - Change to allow overruling CIAO_LOG_LEVEL from commandline. - - === end changelog === - -Tue Nov 1 19:23:58 UTC 2011 Johnny Willemsen - - * MPC/config/ccm_svnt.mpb: - * MPC/config/ciao_container_base_stub.mpb: - Removed avoids_corba_e_compact, should work now - -Tue Nov 1 13:16:16 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - - Integrated improvements from Martin Corino . - -Thu Nov 01 10:54:13 UTC 2011 Martin Corino - - Merged changes from Remedy SA work branch. - - === start changelog === - - Tue Nov 01 08:41:15 UTC 2011 Marijke Hengstmengel - * tests/Collocation/Sender/Sender_exec.cpp: - Add define in test in case of CIAO not build with - ccm_direct_colloation. - - Mon Oct 31 13:55:15 UTC 2011 Marijke Hengstmengel - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Servants/Extension/Extension_Container.h: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servants.mpc: - Removed already disabled lines with servant- and portactivators - - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/Port_Activator_T.h: - * ciao/Servants/CIAO_Port_Activator.idl: - * ciao/Servants/Port_Activator.h: - * ciao/Servants/Port_Activator.cpp: - * MPC/config/ciao_port_activator_stub.mpb: - * MPC/config/ciao_servant_activator_stub.mpb: - * MPC/config/ciao_servant_activator.mpb: - - Deleted this files. - - - - Mon Oct 31 13:30:15 UTC 2011 Marijke Hengstmengel - * tests/Collocation/README: - Explanation of the test - - Mon Oct 31 13:19:15 UTC 2011 Marijke Hengstmengel - * tests/Collocation/Coll_Base/Base.idl: - * tests/Collocation/Coll_Base/Base.mpc: - * tests/Collocation/Receiver/Receiver.idl: - * tests/Collocation/Receiver/Receiver_exec.h: - * tests/Collocation/Receiver/Receiver_exec.cpp: - * tests/Collocation/Sender/Sender.idl: - * tests/Collocation/Sender/Sender_exec.h: - * tests/Collocation/Sender/Sender_exec.cpp: - * tests/Collocation/descriptors/PlanAllOnOne.cdp: - * tests/Collocation/descriptors/run_test.pl: - Expanded test. Use different CollocationStrategies via - attributes in deploymentplans. - - Tue Oct 27 07:16:24 UTC 2011 Marijke Hengstmengel - - * ciao/Containers/Extension/Extension_Containers.mpc: - Remove ciao_port_activator_stub and cia_servant_activator_stub - * ciao/Servants/Servant_Impl_Base.cpp: - Committed the right file now. - - Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel - - * ciao/Containers/Session/Session_Containers.mpc: - Remove ciao_port_activator_stub and cia_servant_activator_stub - - Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel - - * ciao/Containers/Containers.mpc: - Remove ciao_port_activator_stub and cia_servant_activator_stub - - - Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel - - * MPC/config/ciao_extension_container.mpb: - * MPC/config/ciao_extension_container_stub.mpb: - * MPC/config/ciao_servant.mpb: - * MPC/config/ciao_session_container.mpb: - * MPC/config/ciao_session_container_stub.mpb: - * ciao/Containers/Containers.mpc: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Session/Session_Container.mpc: - Remove ciao_port_activator_stub and cia_servant_activator_stub - - * ciao/Containers/CIAO_Servant_Activator.idl: - * ciao/Containers/CIAO_Servant_Activator.mpc: - * ciao/Containers/Servant_Activator.h: - * ciao/Containers/Servant_Activator.cpp: - * ciao/Servants/Port_Activator_T.cpp: - * ciao/Servants/CIAO_Port_Activator.idl: - Deactivate content. Later on if build successfull delete files - - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servants.mpc: - Disable Servant_Activator and Port_Activator functionality, - Later on if build successfull delete lines - - * tests/Collocation/Coll_Base/Base.mpc: - * tests/Collocation/Receiver/Receiver.mpc: - * tests/Collocation/Sender/Sender.mpc: - Remove avoids_no_events and -GD (already global defined) - - * tests/Collocation/descriptors/run_test.pl: - Disable debug logs - - * bin/ciao_tests.lst: - Add CIAO/tests/Collocation - - === end changelog === - -Sun Oct 30 22:39:45 UTC 2011 William R. Otte - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - - Moved external reference resolution to the interceptor. - -Fri Oct 21 07:24:24 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: - Fixed typo - -Fri Oct 21 07:06:59 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/README: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: - Fixed opendds compile errors. - -Tue Oct 20 09:30:13 UTC 2011 Martin Corino - - Merged changes from Remedy work branch. - - === start changelog === - - Thu Oct 20 08:56:25 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized logging - - * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: - Reverted extra test. More investigation needed. - - Wed Oct 19 14:19:49 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Fixed some typos in comments. - - * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: - Added extra tests on exit. - - Tue Oct 18 14:06:44 UTC 2011 Marcel Smit - - * ciao/Servants/Connector_Servant_Impl_Base.cpp: - * ciao/Servants/Home_Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Session/Servant_Impl_T.cpp: - Using class variables in a thread safe way. - Code alignment. - - Tue Oct 18 10:02:14 UTC 2011 Marcel Smit - - * NEWS: - Info about thread safety. - - * ciao/Containers/Servant_Activator.cpp: - Minor code updates. - - * ciao/Contexts/Context_Impl_Base_T.cpp: - * ciao/Contexts/Session/Session_Context_T.cpp: - Made the container_ variable thread safe. - - Tue Oct 18 08:57:34 UTC 2011 Marijke Hengstmengel - - * MPC/ccm_direct_collocation.mpb: - * MPC/avoids_ccm_direct_collocation.mpb: - * MPC/ciaoidldefaults.mpb: - * MPC/ccm_svnt.mpb: - * MPC/ccm.mpb: - * MPC/ciao_base.mpb: - * MPC/ciao.mpb: - * MPC/ciao_servant.mpb: - * MPC/ciao_servant_activator_stub.mpb: - Add direct_collocation to projects - - - - - Tue Oct 18 08:31:34 UTC 2011 Marcel Smit - - * ciao/Containers/Container_Base_T.cpp: - Using temporary _var variables in order to be thread safe. - - Mon Oct 17 14:01:44 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/CIAO_State.h: - * ciao/Deployment/Handlers/CIAO_State.cpp: - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Using mutexes to be threadsafe. - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Using this for class variable. - - * ciao/Servants/Extension/Servant_Impl_T.cpp: - Renamed some variables. - - Mon Oct 17 08:31:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - A subscriber must be created when just listeners are created. - - Fri Oct 14 12:18:05 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ResetTopic/TooLong: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Base: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors: - * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl: - Added a test which test whether the correct exception is thrown when a topic cannot - be created by DDS. - - Thu Oct 13 06:30:15 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/logger/Log_Macros.h: - Fixed compile errors when all logging is disabled. Seems that no space - is allowed between the declaration and the first bracket ( "XXX (Y)" should - be "XXX(Y)" ). - - Wed Oct 12 13:10:27 UTC 2011 Marcel Smit - - * ciao/Base/CIAO_Base.mpc: - * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc: - * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc: - Fixed several install issues. - - Wed Oct 12 12:37:47 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CollocatedPubSub: - * connectors/dds4ccm/tests/CollocatedPubSub/Base: - * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl: - * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc: - * connectors/dds4ccm/tests/CollocatedPubSub/Connector: - * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl: - * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc: - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent: - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl: - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc: - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h: - * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp: - * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent: - * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl: - * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc: - * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h: - * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp: - * connectors/dds4ccm/tests/CollocatedPubSub/descriptors: - * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl: - New test. Three components running on the same node. One writes the samples - to DDS and collects these sample at the same time. The other two components just - listen. All listeners have a QueryFilter applied. - - Wed Oct 12 12:25:34 UTC 2011 Marijke Hengstmengel - - * tests/Collocation: - * tests/Collocation/Sender: - * tests/Collocation/Sender/Sender.idl: - * tests/Collocation/Sender/Sender_exec.cpp: - * tests/Collocation/Sender/Sender.mpc: - * tests/Collocation/Sender/Sender_exec.h: - * tests/Collocation/.project: - * tests/Collocation/Coll_Base: - * tests/Collocation/Coll_Base/Base.mpc: - * tests/Collocation/Coll_Base/Base.idl: - * tests/Collocation/descriptors: - * tests/Collocation/descriptors/run_test.pl: - * tests/Collocation/descriptors/PlanAllOnOne.cdp: - * tests/Collocation/Receiver: - * tests/Collocation/Receiver/Receiver.mpc: - * tests/Collocation/Receiver/Receiver_exec.h: - * tests/Collocation/Receiver/Receiver_exec.cpp: - * tests/Collocation/Receiver/Receiver.idl: - Test for collocation, for playing with results change OrbStrategy in cdp plan - - Wed Oct 12 09:07:34 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - We also need to create a subscriber and publisher when the user - is using a ConnectorStatusListener; the Subscriber Listener and - Publisher Listener are involved in the ConnectorStatusListener. - - Wed Oct 12 08:58:10 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp: - Extended this test a bit more. - - Tue Oct 11 14:27:23 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - Layout changes. - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Fixed warnings. - - Tue Oct 11 09:34:02 UTC 2011 Marcel Smit - - * NEWS: - Updated. - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Improved logging: mentioning the connection which has - been pre-established. - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Prevent the creation of a subscriber or publisher when - they are not needed. - - * connectors/dds4ccm/tests/ResetTopic/README: - Updated. - - Mon Oct 10 14:11:45 UTC 2011 Marcel Smit - - * ciao/Deployment/Handlers/Connection_Handler.h: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Added validate_connection when a user want's the connections to - be connected during deployment (instead of on first usage). This can - be switched on by setting the CIAO_PRE_ESTABLISH_CONNECTIONS define - - Mon Oct 10 08:03:56 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - No need to check of the NonChangeable exception, since the topic name can be reset. - - Mon Oct 10 07:55:48 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: - No need to check of the NonChangeable exception. Since the topic name can be reset. - - Mon Oct 10 07:46:35 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: - Fixed ref count issue. Because of this, the core crashed on exit. - - Fri Oct 7 15:41:09 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: - Minor change of names. - - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: - Some extra check on whether samples were received during each run. - - Fri Oct 7 15:30:37 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: - Some extra check on whether samples were received during each run. - - Thu Oct 6 11:34:13 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - Removed unnecessary logging. - - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc: - Fixed warnings on FC15. - - Wed Oct 5 15:12:49 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp: - Enabled test for state connector. - - Wed Oct 5 14:16:49 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Start DDS when the topic name is not empty. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp: - Clearing topic name on a running DDS connector. After clearing, start writing. - The connector should throw a bad_inv_order exception. Setting the topic name again. - The sender should be able to write again. Need to expanded with an updater - (state connector). - - Wed Oct 5 12:39:54 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Components are always set when a port is obtained. This does not - depend on whether the topic name has been set. - - Wed Oct 5 12:29:41 UTC 2011 Marcel Smit - - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Reset the components in the ccm_remove method itself since this is - the only place where these components need to be reset. - - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - Applied coding conventions. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl: - A new test which tests the reset of topic names in the state connector. - - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: - Removed unnecessary logging - - Wed Oct 5 07:58:13 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/ResetTopic/WriteListen: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl: - Reset of topic name during write and listen operations. - - Mon Oct 3 14:18:35 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Setting the component to nil in the State connector and Event connector, - instead of setting it in the extended ports. - - Fri Sep 30 16:27:55 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc: - Fixed duplicate project names. - - Fri Sep 30 08:28:31 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - Added new test to the test framework - - Fri Sep 30 08:08:14 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - Layout changes - - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Get_T.h: - * connectors/dds4ccm/impl/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.h: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Ability to change the topic name. When a topic name changes, - DDS will be restarted. After restart, the connector manages the - new topic. - - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - Improved logging - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - Removed test for NonChangeable exception. - - - * connectors/dds4ccm/tests/ResetTopic: - * connectors/dds4ccm/tests/ResetTopic/README: - * connectors/dds4ccm/tests/ResetTopic/ReadGet: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl: - Added test which test the reset DDS within the connector. See readme for more information. - - === end changelog === - -Thu Oct 13 19:09:42 UTC 2011 William R. Otte - - * ciao/Deployment/Handlers/Container_Handler.cpp: - - File missing from previous commit. - -Thu Oct 13 19:04:17 UTC 2011 William R. Otte - - * ciao/Base/CIAO_Properties.idl: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: - - Changed to use constants in the CIAO_Properties file to identify - implementation type. - -Mon Oct 10 08:48:51 CEST 2011 Johnny Willemsen - - * CIAO version 1.0.5 released. - -Sat Oct 8 08:45:40 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Fixed runtime issue. XML doesn't allow comments before the tag. - -Fri Oct 7 09:46:31 UTC 2011 Marcel Smit - - * docs/CIAO_Style_Guide.txt: - * docs/Porting_Hints.txt: - * performance-tests/Benchmark/descriptors/NOTE.txt: - Fuzz. - -Fri Oct 7 09:20:40 UTC 2011 Marcel Smit - - * connectors/ami4ccm/tests/ThreeComp/README.txt: - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README: - * connectors/dds4ccm/tests/DDSEntity/README: - * connectors/dds4ccm/tests/Event_Connection_Test/README: - * connectors/dds4ccm/tests/Getter/README: - * connectors/dds4ccm/tests/InstanceHandle/README: - * connectors/dds4ccm/tests/KeyedSamples/README: - * connectors/dds4ccm/tests/LateBinding/README: - * connectors/dds4ccm/tests/ListenManyByMany/README: - * connectors/dds4ccm/tests/ListenNotEnabled/README: - * connectors/dds4ccm/tests/ListenOneByOne/README: - * connectors/dds4ccm/tests/NonChangeableAttribute/README: - * connectors/dds4ccm/tests/QueryCondition/DDS/README: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README: - * connectors/dds4ccm/tests/QueryCondition/Different/README: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/README: - * connectors/dds4ccm/tests/Reader/README: - * connectors/dds4ccm/tests/SetConnectorAttributes/README: - * connectors/dds4ccm/tests/SharedDomainParticipant/README: - * connectors/dds4ccm/tests/State_Connection_Test/README: - * connectors/dds4ccm/tests/UnkeyedSamples/README: - * connectors/tests/AMIDDS/README.txt: - * examples/BasicSP/EC/README: - * examples/DevGuideExamples/readme.txt: - * tests/CIDL/CodeGen/README: - * tests/DAnCE/EM-Launch-Failures/README.txt: - * tests/DAnCE/EM-Redeployment/README.txt: - * tests/DAnCE/EM-Shutdown-Failures/README.txt: - * tests/DAnCE/Threading/README: - * tests/IDL3/Connectors/README.txt: - * tests/IDL3/Events/Any/README: - * tests/IDL3/Lookup/README: - * tests/IDL3_to_XMI/Forward_Declared/README: - * tests/IDL_Test/IDL3_Plus/README: - * tests/IDL_Test/Reused_Facet_Interface/README: - * tests/Thread/README.txt: - Fuzz: Id-tags. - -Fri Oct 7 07:59:11 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Fuzz: Trailing whitespace - -Fri Oct 7 07:08:30 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - Changed Id tag so that it's recognized by svn. - -Fri Oct 7 07:07:19 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - Reverted last changes. - -Thu Oct 6 12:07:52 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - Fuzz. Added Id string. - - * tests/CIF/Common/CIF_Common.cpp: - Check on orb is not nil. - -Tue Aug 23 18:18:23 UTC 2011 Johnny Willemsen - - * NEWS: - Prepared for next release - -Tue Aug 23 19:01:44 CEST 2011 Johnny Willemsen - - * CIAO version 1.0.4 released. - -Sun Aug 14 10:32:36 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Improved support for creating DDS entities with a OoS directly. - Because not all vendor specific extensions are available through - the IDL to C++ wrapper we first have to retrieve the QoS and than - only change the QoS that are available through the IDL to C++ - wrapper. This way we set at least valid values for the vendor - specific extensions - -Fri Aug 12 07:24:01 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Reverted change of yesterday, breaks the dds4ccm tests that don't - have a QoS file - -Thu Aug 11 13:34:51 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Initialize all NDDS QoS variables with their default value, than - we get correct values for all non standard extensions. - -Thu Aug 11 11:04:12 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h: - Extended IDL QoS representation with several NDDS specific fields - -Thu Aug 11 07:01:53 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Fixed typo in error message - -Thu Aug 11 06:54:09 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Fixed possible race condition in the set_listener methods - -Wed Aug 10 12:43:08 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - When the thread switch feature is enabled in DDS4CCM, we do require - the user to have ACE_HAS_REACTOR_NOTIFICATION_QUEUE to be enabled. - Without this option we could overflow the ACE reactor queue leading - to blocking - -Wed Aug 10 09:27:06 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Removed OpenDDS code that is not needed anymore - -Tue Aug 9 14:56:12 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Removed OpenDDS include that no longer exists - -Mon Aug 8 14:28:31 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - Disable cdr streaming - -Mon Aug 8 10:59:50 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Improved logging - -Mon Aug 8 10:57:32 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h: - Provide access to some RTI specific QoS values - -Mon Aug 8 10:53:42 UTC 2011 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.cpp: - When we catch an exception log for which instance - -Mon Aug 8 09:04:55 UTC 2011 Johnny Willemsen - - * MPC/config/ndds_idltocpp.mpb: - Don't generate CDR streaming operations - -Mon Aug 8 08:35:38 UTC 2011 Johnny Willemsen - - * MPC/config/ndds_idltocpp.mpb: - Don't generate arg traits, not needed for datatypes that are only - are intended to go through local interfaces - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Add include open OpenSplice - -Fri Jul 29 14:17:56 UTC 2011 Phil Mesnier - - * ciao/Containers/Container_Base_T.cpp: - - unfuzz. - -Wed Jul 27 08:42:34 UTC 2011 William R. Otte - - * ciao/Containers/Container_Base_T.cpp: - - Fixed some errors in the logging messages that would cause segfaults - on some platforms. - -Wed Jun 29 19:12:21 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/Reader_T.cpp: - Extended portability and improved some error handling - -Wed Jun 29 14:03:36 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm_impl.mpb: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Extended OpenDDS support - -Thu Jun 23 15:00:01 UTC 2011 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Disable html help, seems doxygen now disables the search option - when html help is enabled - -Thu Jun 23 12:39:08 CEST 2011 Johnny Willemsen - - * etc/*.doxygen: - Disable html help, seems doxygen now disables the search option - when html help is enabled - -Thu Jun 23 13:46:08 CEST 2011 Johnny Willemsen - - * CIAO version 1.0.3 released. - -Mon Jun 20 15:38:24 UTC 2011 Johnny Willemsen - - * examples/DevGuideExamples/Messenger/Administrator_exec_i.h: - * examples/DevGuideExamples/Messenger/History_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Messenger.mpc: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - * examples/DevGuideExamples/Messenger/Receiver_exec_i.h: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - Some cleanup and simplifications but this example doesn't deploy yet - -Mon Jun 20 13:58:32 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - Fixed coverity errors - -Mon Jun 20 08:02:38 UTC 2011 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - - * connectors/dds4ccm/tests/Derived/Derived.idl: - * connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - Code alignment. Corrected some incorrect names. - - * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: - Code alignment. - -Sun Jun 19 18:00:12 UTC 2011 Johnny Willemsen - - * examples/Hello/Sender/Sender_exec.cpp: - Fixed memory leak - -Sat Jun 18 08:14:04 UTC 2011 Marcel Smit - - * examples/Hello/Receiver/Receiver_exec.cpp: - Fixed compiler error on windows. - -Fri Jun 17 13:53:44 UTC 2011 Marcel Smit - - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - Renamed "SameProcess" to "DifferentProcess" - - * examples/Hello/step-by-step.html: - Update. Fixed some typos. - -Fri Jun 17 12:47:24 UTC 2011 Marcel Smit - - * examples/Hello/step-by-step.html: - Update. Started rewriting Assemble. - - * examples/Null_Component/Null_Component.mpc: - * examples/Null_Component_Glfa/Null_Component.mpc: - Let the TAO IDL compiler generate the executor files. - - * examples/Null_Component/Null_Component_exec.h: - * examples/Null_Component/Null_Component_exec.cpp: - * examples/Null_Component/plan.h: - * examples/Null_Component_Glfa/Null_Component_exec.h: - * examples/Null_Component_Glfa/Null_Component_exec.cpp: - Removed since the TAO IDL compiler generates these files - on the fly. - - * examples/Philosophers: - * examples/Philosophers/Philosophers.idl: - * examples/Philosophers/README: - Removed these files. - -Fri Jun 17 12:21:03 UTC 2011 Marcel Smit - - * examples/Hello/step-by-step.html: - Describing ccm_noevent in default.features. Made an extra - link to the description of "starter". - - * examples/Hello/descriptors/Domain.cdd: - * examples/Hello/descriptors/Hello.pcd: - * examples/Hello/descriptors/package.tpd: - * examples/Hello/descriptors/svc_em.conf: - Removed these files since they may confuse the user. - -Fri Jun 17 11:52:57 UTC 2011 Marcel Smit - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Sender/Sender.mpc: - Regenerated, using the -e option in generate_component_mpc. - We're using events in this example. - - * examples/Hello/step-by-step.html: - Added the -e option to the description of generate_component_mpc. - -Fri Jun 17 11:33:44 UTC 2011 Marcel Smit - - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - According to latest version of the Hello example. - -Fri Jun 17 11:23:32 UTC 2011 Marcel Smit - - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp: - * examples/Hello/step-by-step.html: - Rewritten. Regenerated the mpc and executor code. Also - using unhomed components. Next step is to test and change - the other perl scripts. - -Thu Jun 16 11:05:53 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp: - Fixed memory leak in this test - -Thu Jun 16 08:36:24 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fixed runtime issues in close. - - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Expanded test with a few other tests. - -Thu Jun 16 07:19:26 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - Fixed memory leak in this test - -Wed Jun 15 13:38:57 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Optimized management of DomainParticipants and type-factory combinations. - -Wed Jun 15 07:30:00 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl: - Fixed error in openDDS. - -Tue Jun 14 13:36:00 UTC 2011 William R. Otte - - * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h: - - Fuzz. - -Tue Jun 14 12:03:17 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - Fixed compile issue on openDDS. - -Tue Jun 14 08:46:29 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: - Coverity : checked return value of register_type. - -Mon Jun 13 09:09:56 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp: - Fixed runtime issue due to renaming action. - -Sat Jun 11 08:18:19 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Fuzz: no ending new line at the end of the file. - -Sat Jun 11 08:17:03 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc: - Fixed compile issues after renaming of project names. - -Fri Jun 10 15:01:15 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/TypeSupport: - * connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc: - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - * connectors/dds4ccm/tests/TypeSupport/run_test.pl: - Added a new (regular C++) which tests the TypeSupport class and its - internal type factory administration. - -Fri Jun 10 14:54:14 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - Code alignment. - - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fuzz. Mismatched trace. - -Fri Jun 10 14:48:01 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc: - Fuzz. Shorten project names - -Fri Jun 10 11:35:16 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - Added the memory leak test to the test framework - -Fri Jun 10 11:17:36 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fixed memory leak in the register_type/unregister_type implemenation. This - memory existed because of the fact that two different topics where based - on the same datatype. - To fix this, a new map was created wich contains the DomainParticipant in - combination with the already existing type factories. Type factories - are now stored and removed per DomainParticipant. - - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl: - Added test to verify whether the memory leak is fixed. - -Wed Jun 8 12:32:48 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - Fixed problem with OpenDDS - -Wed Jun 8 07:00:55 UTC 2011 Marcel Smit - - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - Resolved compile error in case NDDS. - -Tue Jun 7 12:34:23 UTC 2011 Marcel Smit - - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - Removed unused declaration - -Tue Jun 7 11:56:36 UTC 2011 Marcel Smit - - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - Fixed warning. - -Mon Jun 6 15:08:05 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Extended support - -Wed Jun 1 12:56:35 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Don't use the invalid macros but just use != for handle comparison - -Wed Jun 1 08:27:26 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: - Fixed export macro for OpenDDS - -Wed Jun 1 01:56:05 UTC 2011 William R. Otte - - * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h: - * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp: - * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h: - * tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc: - * tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp: - - Fix for bugzilla 3963. On certain platforms (e.g., FC15), when - a library which is dlopened links another library which is - dlopened, this may cause spurious error messages upon exit - exit of the LocalityManager from ld.so. - -Tue May 31 12:27:54 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - Disable some parts for opendds - -Tue May 31 08:56:09 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - OpenDDS doesn't support a topic with a valuetype member - -Mon May 30 12:07:40 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Removed unused ACE_ARG_UNUSED. - - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - PSAT stub project was using the *.cxx, generated by the - DDS IDL compiler. Fixed this by merging two projects - (idl_gen and _stub) into one (_stub). - -Sun May 29 17:31:41 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - Specify some more opendds ts flags - -Sun May 29 17:22:08 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - These components use ndds specific features - -Fri May 27 12:44:32 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Resolved errors in builds with other DDS vendors then ndds - -Thu May 26 20:29:07 UTC 2011 Marcel Smit - - * tests/DAnCE/Progressive_Deployments/run_test.pl: - ../lib is not necessary; it doesn't even exist. - -Thu May 26 07:13:15 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed compile error - -Wed May 25 10:56:26 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Fixed argument not used warnings - -Tue May 24 18:52:31 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Improved portability - -Tue May 24 11:17:37 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - Increased portability - -Tue May 24 09:12:37 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Increased portability - -Tue May 24 08:26:15 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Increased portability - -Mon May 23 18:24:38 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - Increased portability - -Mon May 23 15:07:33 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: - Increased portability - -Mon May 23 10:49:10 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - * connectors/dds4ccm/tests/PSAT/psat_type.idl: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - Added needed pragma's for OpenDDS - -Mon May 23 09:49:50 UTC 2011 Johnny Willemsen - - * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl: - Added needed pragma's for OpenDDS - -Mon May 23 09:37:23 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - Attempt to give dds4ccm libraries the correct version number when - OpenDDS isenabled - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl: - Added needed pragma's for OpenDDS - -Mon May 23 09:00:14 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - Added needed pragma's for OpenDDS - -Mon May 23 08:36:09 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Added DDS_INSTANCE_HANDLE_VALID - -Mon May 23 07:41:20 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl: - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl: - Fixes for OpenDDS support - -Fri May 20 14:14:32 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl: - * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/Derived/Derived.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl: - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl: - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl: - Added needed pragma's for OpenDDS - -Fri May 20 09:18:56 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - Added needed pragma's for OpenDDS - -Fri May 20 07:55:44 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - Added needed pragma's for OpenDDS - -Fri May 13 18:00:06 UTC 2011 James H. Hill - - * tutorials/Quoter/Simple/03.html: - - Updated the stock quoter example. - -Tue May 11 13:21:37 UTC 2011 Marijke Hengstmengel - - * examples\Display\NavDisplayGUI_exec\DetailView.h: - * examples\Display\NavDisplayGUI_exec\RootPanel.cpp: - * examples\Display\NavDisplayGUI_exec\NodeItem.cpp: - * examples\Display\NavDisplayGUI_exec\RootPanel.h: - * examples\Display\NavDisplayGUI_exec\NodeItem.h: - * examples\Display\NavDisplayGUI_exec\Worker.cpp: - * examples\Display\NavDisplayGUI_exec\MapView.h: - * examples\Display\NavDisplayGUI_exec\Command.h: - * examples\Display\NavDisplayGUI_exec\NavDisplayGUI_exec.cpp: - * examples\Display\NavDisplayGUI_exec\NavUnit.cpp: - * examples\Display\NavDisplayGUI_exec\UpdatePositionCmd.cpp: - * examples\Display\NavDisplayGUI_exec\DetailView.cpp: - * examples\Display\GPS\GPS_exec.h: - * examples\Display\GPS\GPS_exec.cpp: - * examples\Display\README.html: - Made example running on Windows, changed deprecated Qt includes. - - -Tue May 11 08:15:37 UTC 2011 Marijke Hengstmengel - - * examples/Display/README.html: - * examples/Display/example.gif: - Add image to readme. - -Tue May 11 07:09:37 UTC 2011 Marijke Hengstmengel - - * examples/Display/descriptors/run_test_more.pl: - * examples/Display/descriptors/deploymentplanone.cdp: - * examples/Display/descriptors/deploymentplanmore.cdp: - * examples/Display/descriptors/run_test_more_contr.pl: - * examples/Display/descriptors/flattened_deploymentplannat.cdp: - * examples/Display/descriptors/run_all_in_one.pl: - * examples/Display/descriptors/run_test.pl: - * examples/Display/descriptors/run_test_one.pl: - Solved Fuzz errors. - -Wed May 11 05:32:01 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - Fixed problem with last commit - -Tue May 10 18:32:40 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - Added include paths - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Fixed Coverity errors - -Tue May 10 12:38:37 UTC 2011 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * examples/Display/Display_Base/Display_Base.idl: - * examples/Display/descriptors/flattened_deploymentplannat.cdp: - * examples/Display/descriptors/run_test.pl: - * examples/Display/NavDisplayGUI_exec/DetailView.h: - * examples/Display/NavDisplayGUI_exec/RootPanel.cpp: - * examples/Display/NavDisplayGUI_exec/NodeItem.cpp: - * examples/Display/NavDisplayGUI_exec/MapView.cpp: - * examples/Display/NavDisplayGUI_exec/RootPanel.h: - * examples/Display/NavDisplayGUI_exec/NodeItem.h: - * examples/Display/NavDisplayGUI_exec/Worker.cpp: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/Display/NavDisplayGUI_exec/MapView.h: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/Display/NavDisplayGUI_exec/NavUnit.cpp: - * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/Display/NavDisplayGUI_exec/NavUnit.h: - * examples/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/Display/RateGen/controller.cpp: - * examples/Display/RateGen/RateGen_exec.cpp: - * examples/Display/GPS/GPS.idl: - * examples/Display/GPS/GPS_exec.h: - * examples/Display/GPS/GPS_exec.cpp: - * examples/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/Display/NavDisplay/NavDisplay.idl: - * examples/Display/NavDisplay/NavDisplay_exec.h: - - Made test working again with GUI display, using one or more GPS - devices. Used only QT4, removed qt3support. Not yet tested on - Windows. - - * examples/Display/descriptors/basicNodeDaemon.pl: - * examples/Display/descriptors/flattened_deploymentplan.cdp: - * examples/Display/descriptors/DeploymentPlan.cdp: - * examples/Display/GPS/GPS_tracing_exec.cpp: - * examples/Display/GPS/GPS_tracing_exec.h: - Deleted this files. Not used anymore. - - Deleted this files. Not used anymore. - - * examples/Display/descriptors/deploymentplanmore.cdp: - * examples/Display/descriptors/run_test_one_contr.pl: - * examples/Display/descriptors/run_all_in_one.pl: - * examples/Display/descriptors/run_test_more.pl: - * examples/Display/descriptors/deploymentplanone.cdp: - * examples/Display/descriptors/run_test_more_contr.pl: - * examples/Display/descriptors/run_test_one.pl: - Added scripts for running GUI test (one and more) and test_all_in_one for testsuite. - - Added scripts for running GUI test (one and more) and - test_all_in_one for testsuite. - -Tue May 10 06:25:37 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - - Resolved coverity errors/warnings. Check pointer if nil before - using it. - -Mon May 9 10:58:16 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Don't throw an exception when a wrong QosProfile is applied. In the - end the creation of the DDS entity will fail. As a result to that, an - exception is thrown. This'll simply code and logging. - - * connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp: - Added another test. - -Mon May 9 08:56:04 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - Created a template class for the DataReaderListener and DataReaderStateListener - threadswitch. This'll reduce double code. - -Sun May 8 19:05:42 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/Updater_T.cpp: - Give local variable unique name - - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp: - Fixed possible memory leaks - -Thu May 5 08:26:59 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - Only asign status when things go wrong. - -Wed May 4 11:37:31 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Improved handling of Qos profile string. Throwing a ::CORBA::INTERAL - when the Qos profile string does not meet the requirements - (i.e. containing a '#'-sign). - - * connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp: - * connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp: - * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: - Extended this test with a malformed Qos profile string. - - * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp: - Removed this file. - -Thu Apr 28 14:00:42 UTC 2011 Marcel Smit - - * bin/generate_component_mpc.pl: - Added a -I as commandline parameter. This will set an - include directory for all projects (cpp and idl). - - * connectors/dds4ccm/impl/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - Adding and removing reference manually. This'll prevent removing the - listener while the reactor still has messages to handle. - -Tue Apr 26 13:57:23 UTC 2011 Marijke Hengstmengel - - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/Display/descriptors/NodeManagerMap.cdd: - * examples/Display/descriptors/run_NodeDaemons.pl: - Deleted unused files. - - * examples/Display/README.html: - * examples/Display/RateGen/RateGen_exec.cpp: - * examples/Display/GPS/GPS_exec.cpp: - Changed to make test working again. - - * examples/Display/ run_test_contr.pl: - * examples/Display/flattened_deploymentplannat.cdp: - * examples/Display/run_test.pl: - Added for running test in console mode. - - -Sat Apr 23 19:48:23 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - Deleting the ticker in a consistent manner. Created in the constructor, - deleting it in the destructor. - -Fri Apr 22 19:26:37 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/impl/Updater_T.cpp: - Give local variable a different name to not match argument - -Fri Apr 22 13:01:26 UTC 2011 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: - Always delete stuf which was created in the constructor. - -Fri Apr 22 08:24:41 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - Added missing breaks - -Fri Apr 22 07:35:30 UTC 2011 Marcel Smit - - * performance-tests/Protocols/descriptors/svc.conf: - Fuzz: Added $Id string. - -Thu Apr 21 09:38:23 UTC 2011 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/dds4ccm_ts_default.mpb: - Extended base projects - -Thu Apr 21 08:29:25 UTC 2011 Johnny Willemsen - - * MPC/config/ndds_idltocpp_ts_defaults.mpb: - Added taolib - -Wed Apr 20 08:11:49 UTC 2011 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - * MPC/config/dds4ccm_ts_default.mpb: - * MPC/config/ndds_idltocpp.mpb: - * MPC/config/ndds_idltocpp_stub.mpb: - * MPC/config/ndds_idltocpp_ts_defaults.mpb: - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * connectors/dds4ccm/idl/dds4ccm_Base.idl: - * connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener.cpp: - * connectors/dds4ccm/impl/PublisherListener.cpp: - * connectors/dds4ccm/impl/Reader_T.h: - * connectors/dds4ccm/impl/Reader_T.cpp: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - * connectors/dds4ccm/impl/Updater_T.h: - * connectors/dds4ccm/impl/Updater_T.cpp: - * connectors/dds4ccm/impl/Writer_T.h: - * connectors/dds4ccm/impl/Writer_T.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/dds4ccm_impl.mpc: - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl: - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl: - * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/Derived/Derived.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl: - * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl: - * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl: - * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl: - * connectors/dds4ccm/tests/NoModule/NoModule.idl: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl: - * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - * connectors/dds4ccm/tests/PSAT/psat_type.idl: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl: - * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl: - * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl: - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl: - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - Extended portability for dds4ccm - -Wed Apr 20 09:52:52 CEST 2011 Johnny Willemsen - - * CIAO version 1.0.2 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2012a b/CIAO/ChangeLogs/ChangeLog-2012a deleted file mode 100644 index 6d656fa2a90..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2012a +++ /dev/null @@ -1,5821 +0,0 @@ -Wed Aug 29 08:16:04 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.4 released. - -Tue Aug 28 13:51:23 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - Removed COPI tests, they have been removed from the repository - some time ago - -Fri Aug 24 10:35:48 UTC 2012 Johnny Willemsen - - * ciao/Servants/Connector_Servant_Impl_Base.h: - Doxygen fix - -Thu Aug 16 18:30:32 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Updated because of type support changes - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - If unregistering the type support factory fails throw an exception - - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Added bool return to unregister_type() to indicate success or failure - -Thu Aug 16 10:31:55 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm_impl.mpb: - Removed obsolete include path - - * connectors/dds4ccm/impl/DomainParticipantManager.h: - Doxygen fix - -Thu Aug 16 10:30:43 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/TypeSupport.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fixed problem when shutting down the system. The type factories - wheren't reference counted, the first connector that was - shutting down destroyed the type factory. Added a refcount to - the typesupport administration and greatly simplified the code - and improved the logging. - -Tue Aug 14 11:02:10 UTC 2012 Johnny Willemsen - - * ccm/Session/CCM_session.mpc: - Simplified this mpc file, the base project should do the trick - -Mon Aug 13 07:01:37 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc: - Fixed install location - -Sun Aug 12 19:07:08 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * connectors/dds4ccm/idl/dds: - * connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc: - * connectors/dds4ccm/idl/OpenDDS: - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Moved OpenDDS to dds and made some more changes to improve the - lem generation for OpenDDS - -Fri Aug 10 11:59:55 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Fixed debug message - -Thu Aug 9 07:15:33 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Fixed windows problems - -Tue Aug 7 12:47:24 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Fixed incorrect debug statements - -Tue Aug 7 12:37:45 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.cpp: - Fixed incorrect debug statements - - * ciao/Deployment/Interceptors/Name_Utilities.h: - Layout changes - -Tue Aug 7 08:01:29 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Added missing base to get the library installed - -Mon Aug 6 18:22:22 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Install fixes and corrected library name - -Mon Aug 6 06:43:33 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm_opendds_lem_stub.mpb: - Corrected library name for opendds lem - -Sat Aug 4 19:21:49 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Fixed install problems - -Fri Aug 3 07:42:52 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Use -Ssc instead of -SS - -Thu Aug 2 18:01:01 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Fixed mpc problems when opendds is not available - -Thu Aug 2 13:59:22 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm.mpb: - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - Updated after statements - -Thu Aug 2 12:04:57 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Explicit list output files - -Thu Aug 2 09:52:00 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm_opendds_lem_stub.mpb: - New file for dds4ccm with opendds - -Thu Aug 2 09:34:14 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Fixed duplicate project name - -Thu Aug 2 09:29:22 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/OpenDDS: - * connectors/dds4ccm/idl/OpenDDS/opendds_lem_stub.mpc: - Generate the lem for OpenDDS as part of ciao - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - Updated base projects and includes for OpenDDS - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Updated include for opendds - -Tue Jul 31 13:01:24 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Simplified make_pair usage - -Tue Jul 31 12:39:42 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Fixed typo - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataReader.cpp: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/CCM_DataWriter.cpp: - Fixed compile problems when OpenDDS is configured with less features - -Fri Jul 27 18:05:48 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Improved instructions - -Fri Jul 27 10:56:24 UTC 2012 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Generate UML diagrams, assume stl is buildin - -Fri Jul 27 08:59:40 UTC 2012 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Upgraded to latest doxygen - -Thu Jul 26 16:29:47 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - One return path - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Upgraded to latest doxygen - -Thu Jul 26 14:56:20 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Doxygen fix - -Thu Jul 26 09:31:13 UTC 2012 Johnny Willemsen - - * NEWS: - Updated for next release - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Removed deprecated tag - -Thu Jul 26 09:12:26 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.3 released. - -Mon Jul 23 19:43:30 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc: - Fixed base project - -Mon Jul 23 19:24:09 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - Init the condition manager from subscriber base instead from the - getter - -Mon Jul 23 18:47:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.h: - Doxygen improvements - - * connectors/dds4ccm/impl/ConditionManager.cpp (query): - Check if qc_reader is nil before using it - -Mon Jul 23 17:38:31 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Layout changes - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Layout changes to logging messages - -Mon Jul 23 14:01:10 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - At the moment we delete the domain participant, first delete - all contained entities. We have already deleted everything in dds4ccm - but it could be that some topic is still registered in the dp, because - we can only delete a topic on a dp when it is not used at all. When - using find_topic/delete_topic, all delete_topics can only be done when - all datareaders/datawriters have been deleted, something which will - just not work with dds4ccm - -Mon Jul 23 13:36:41 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - More logging - -Mon Jul 23 11:25:54 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - Removed incorrect duplicate - -Mon Jul 23 07:56:38 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed tracing - - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Set local variables to nil to improve shutdown behavior - -Fri Jul 20 16:13:02 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - Corrected CommandlinePassage, one perl script wasn't used, other - was called twice - -Fri Jul 20 07:47:52 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - Set datareader to nil - -Thu Jun 28 08:08:12 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl: - Optimized logging. - -Thu Jun 28 07:58:38 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl: - Extended sleeping time. - -Thu Jun 28 07:04:33 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Thu Jun 28 06:49:20 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Print message when we start - -Thu Jun 28 06:29:10 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - Layout change - - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - Removed const_casts - -Thu Jun 28 06:19:21 UTC 2012 Marcel Smit - - * tests/TTSCTest/Sender/Sender_exec.cpp: - Fixed warnings. - -Thu Jun 28 06:13:33 UTC 2012 Marcel Smit - - * tests/TTSConnContext/Sender/Sender.mpc: - Fixed after. - -Wed Jun 27 19:07:49 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 14:17:56 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 13:34:02 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 13:07:31 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 12:58:23 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - Removed a double declared forward declaration of Sender_exec_i. - - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 12:45:56 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp: - Start the writing of samples upon a publication matched event. - -Wed Jun 27 11:51:29 UTC 2012 Marcel Smit - - * tests/TTSCTest/Sender/Sender.mpc: - * tests/TTSCTest/TTSConnector/TTSConnector.mpc: - Fixed link issues on windows. This also fixes afters seen - on RedHat. - -Wed Jun 27 11:23:34 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - Start the writing upon a publication matched event. - -Tue Jun 26 09:32:12 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - Fixed inconsistencies. history depth should be - less than resources_limits.max_samples_per_instance. - -Mon Jun 25 08:00:29 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Log instance handles of any reader/writer/publisher/subscriber - we create - -Mon Jun 25 07:45:38 UTC 2012 Marijke Hengstmengel - - * tests/TTSCTest/Sender/Sender_exec.cpp: - * tests/TTSConnContext/Sender/Sender_exec.cpp: - Added missing include - -Mon Jun 25 07:21:16 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Extended logging at the moment we are going to delete entities - -Sun Jun 24 09:11:38 UTC 2012 Marijke Hengstmengel - - * tests/TTSCTest/Sender/Sender_exec.cpp: - * tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - * tests/TTSConnContext/Sender/Sender_exec.cpp: - * tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp: - Added ACE_OS::sleep - -Fri Jun 22 10:28:59 UTC 2012 Johnny Willemsen - - * tests/TTSCTest/Sender/Sender_exec.cpp: - - * tests/TTSCTest/TTSConnector/TTSConnector.idl: - * tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - -Fri Jun 22 09:14:41 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - Do not start the test until a publication matched even has been received - in the sender component. - -Thu Jun 21 17:34:54 UTC 2012 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Layout changes - - * tests/TTSConnContext/Sender/Sender_exec.cpp: - * tests/TTSConnContext/TTSCConnector/TTSCConnector.idl: - * tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp: - Fixed compile problems with msvc - -Thu Jun 21 13:43:20 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp: - Added connector status listener. The test starts upon receiving a publication matched - event from DDS. - -Thu Jun 21 10:11:38 UTC 2012 Marijke Hengstmengel - - * ciao/Deployment/Handlers/Component_Handler.cpp: - Solved msvc error. - -Thu Jun 21 09:08:38 UTC 2012 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - More logging - -Thu Jun 21 08:40:50 UTC 2012 Johnny Willemsen - - commit f169a288e51231ca120d066e143742d1432a8443 - Author: Marijke Hengstmengel - Date: Thu Jun 21 10:31:36 2012 +0200 - - * CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - * CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.h: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h: - used reference-counting policy for pulse_Generator to solve memory leaks - -Wed Jun 20 08:13:50 UTC 2012 Johnny Willemsen - - Merged service_connector branch. This adds support for so called - service components which are available through the component context - using resolve_service_reference. Service components are deployed as - regular components, but are installed by the installation handler (see - the TTSCTest test) or they install themselves into the service registry - (see TTSConnContext). These components can be seen as container plugins - which are going to be used for various extensions without causing the - container to be huge and unmaintainable - - commit a5d5158d22435059f4488e1ff96ed1862fba8ab7 - Author: Marijke Hengstmengel - Date: Tue Jun 19 10:20:23 2012 +0200 - - * CIAO/tests/TTSConnContext/README.txt: - Explain test - - commit 859f54123a96f8474cbd7f4be8e10a8cb5e4b776 - Author: Marijke Hengstmengel - Date: Mon Jun 18 17:34:33 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - * CIAO/ccm/CCM_Context.idl: - * CIAO/ciao/Contexts/Context_Impl_Base_T.cpp: - * CIAO/ciao/Contexts/Context_Impl_Base_T.h: - Made (un)install_service_component_reference available on context. - - * CIAO/tests/TTSConnContext/Sender/Sender.idl: - * CIAO/tests/TTSConnContext/Sender/Sender.mpc: - * CIAO/tests/TTSConnContext/Sender/Sender_exec.cpp: - * CIAO/tests/TTSConnContext/Sender/Sender_exec.h: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.idl: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector.mpc: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.cpp: - * CIAO/tests/TTSConnContext/TTSCConnector/TTSCConnector_conn.h: - * CIAO/tests/TTSConnContext/descriptors/DeploymentPlan.cdp: - * CIAO/tests/TTSConnContext/descriptors/run_test.pl: - New test for ServiceConnector, self installing its service_component_reference, not via cdp file. - - commit c56a6b0fb4a6d72b2b3dc94032f9ec290ebcd004 - Author: Marijke Hengstmengel - Date: Mon Jun 18 15:04:13 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - * CIAO/ciao/Containers/Container_Base.idl: - * CIAO/ciao/Containers/Container_Base_T.cpp: - * CIAO/ciao/Containers/Container_Base_T.h: - * CIAO/ciao/Containers/Session/Session_Container.cpp: - * CIAO/ciao/Containers/Session/Session_Container.h: - * CIAO/ciao/Deployment/Handlers/Component_Handler.cpp: - Remove (un)install_service_reference frm session- to base container - Renamed (un)install_service_reference_obj to (un)install_service_component_reference - Added extra checks. - - * CIAO/tests/TTSCTest/Sender/Sender_exec.cpp: - * CIAO/tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - Use ACE_time_value in handle_timeout. - - * CIAO/ciao/Base/CIAO_Properties.idl: - * CIAO/tests/TTSCTest/TimeTriggerServiceConnector.odt: - * CIAO/tests/TTSCTest/descriptors/DeploymentPlan.cdp: - Renamed ConfigPropertye FacetServiceId to ServiceReference - - commit 50b0fe093573fead1c9467b4554bbb99ca64612d - Author: Johnny Willemsen - Date: Fri Jun 15 11:38:28 2012 +0200 - - * CIAO/ChangeLog.BRANCH: - No need anymore for a branch changelog, git log will - list all changes - - commit 46251df1af9301ac288eb4b20043dd22dce5ab35 - Author: Marijke Hengstmengel - Date: Thu Jun 7 14:05:52 2012 +0200 - - Removed and added comments. - - commit d9001269233f15621aea6a10d589e9719c3cb1c1 - Author: Marijke Hengstmengel - Date: Thu Jun 7 13:47:20 2012 +0200 - - Added the use of separate configproperties for ServiceName and portname in a cdp file - - commit e3012f925994adfdcb516de79aed021814705566 - Author: Marijke Hengstmengel - Date: Tue Jun 5 12:06:33 2012 +0200 - - Tue June 5 10:02:03 UTC 2012 Marijke Hengstmengel - - * tests/TTSCTest/TimeTriggerServiceConnector.odt: - * tests/TTSCTest/Sender/Sender_exec.cpp: - * tests/TTSCTest/Sender/Sender_exec.h: - * tests/TTSCTest/TTSConnector/TTSConnector.idl: - * tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - * tests/TTSCTest/TTSConnector/TTSConnector_conn.h: - * tests/TTSCTest/descriptors/DeploymentPlan.cdp: - Changed naming and typedefs. - - * tests/TTSCTest/TimeTriggerServiceConnector.pdf: - Removed - - commit a8a163c9d8e84fdfd6aba54ff0531efca5133d1e - Author: Marijke Hengstmengel - Date: Thu May 31 16:03:35 2012 +0200 - - Thu May 31 14:03:03 UTC 2012 Marijke Hengstmengel - - * bin/ciao_tests.lst - Corrected path to TTSConnector test: TimeTrigger ServiceConnector - - commit f76a9cc488f02ed945b58782afa386fc088fdac1 - Author: Marijke Hengstmengel - Date: Thu May 31 15:43:21 2012 +0200 - - Thu May 31 13:406:03 UTC 2012 Marijke Hengstmengel - - * tests/TTSCTest/Sender/Sender.idl - * tests/TTSCTest/descriptors/DeploymentPlan.cdp - * tests/TTSCTest/TimeTriggerSeviceConnector.pdf - Add document and removed debug lines. - - commit c5aaf93075ac6370a23ca6e6d7c63ccd31efa6ff - Author: Marijke Hengstmengel - Date: Thu May 31 12:39:40 2012 +0200 - - Thu May 31 10:36:03 UTC 2012 Marijke Hengstmengel - - * bin/ciao_tests.lst - Add TTSConnector test: TimeTrigger ServiceConnector - - commit de4da760c21c86f0b50f604d0d0bb18e3b00c11b - Author: Marijke Hengstmengel - Date: Thu May 31 12:34:30 2012 +0200 - - Thu May 31 10:26:03 UTC 2012 Marijke Hengstmengel - - * ciao/Base/CIAO_Properties.idl - * ciao/Containers/Container_Base.idl - * ciao/Containers/Container_Base_T.cpp - * ciao/Containers/Container_Base_T.h - * ciao/Containers/Session/Session_Container.cpp - * ciao/Containers/Session/Session_Container.h - * ciao/Deployment/Handlers/Component_Handler.cpp - Implemented get_local_facet. Use port-name in Config property. - - * tests/TTSCTest/Base/Base.idl - * tests/TTSCTest/Base/Base.mpc - Deleted - - * tests/TTSCTest/Sender/Sender.idl - * tests/TTSCTest/Sender/Sender.mpc - * tests/TTSCTest/Sender/Sender_exec.cpp - * tests/TTSCTest/Sender/Sender_exec.h - * tests/TTSCTest/TTSConnector/TTSConnector.idl - * tests/TTSCTest/TTSConnector/TTSConnector.mpc - * tests/TTSCTest/TTSConnector/TTSConnector_conn.cpp - * tests/TTSCTest/TTSConnector/TTSConnector_conn.h - * tests/TTSCTest/descriptors/DeploymentPlan.cdp - Completed test , use local interface connector and time struct - - commit 2b4d033f94ffcd83db90c2eb1509e1cb2559d61c - Author: Marijke Hengstmengel - Date: Thu May 24 17:44:45 2012 +0200 - - Thu May 24 15:36:03 UTC 2012 Marijke Hengstmengel - - * ciao/Base/CIAO_Properties.idl: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * tests/TTSCTest/Base/Base.idl: - * tests/TTSCTest/Sender/Sender.idl: - * tests/TTSCTest/Sender/Sender_exec.cpp: - * tests/TTSCTest/Sender/Sender_exec.h: - * tests/TTSCTest/TTSConnector/TTSConnector.idl: - * tests/TTSCTest/descriptors/DeploymentPlan.cdp: - * modified: tests/TTSCTest/descriptors/run_test.pl: - install_service_ref via cdp and via resolve_service_ref in Sender, - it is now possible to get a facet from the connector. - - commit 30f5e90d95adabe0d7f39f362da37d1b3d6460e2 - Author: Marijke Hengstmengel - Date: Thu May 24 12:37:57 2012 +0200 - - Thu May 24 10:36:03 UTC 2012 Marijke Hengstmengel - - * CIAO/TTSCTest/Base/Base.idl: - * CIAO/TTSCTest/Base/Base.mpc: - * CIAO/TTSCTest/Sender/Sender.idl: - * CIAO/TTSCTest/Sender/Sender.mpc: - * CIAO/TTSCTest/Sender/Sender_exec.cpp: - * CIAO/TTSCTest/Sender/Sender_exec.h: - * CIAO/TTSCTest/TTSConnector/TTSConnector.idl: - * CIAO/TTSCTest/TTSConnector/TTSConnector.mpc: - * CIAO/TTSCTest/TTSConnector/TTSConnector_conn.cpp: - * CIAO/TTSCTest/TTSConnector/TTSConnector_conn.h: - * CIAO/TTSCTest/descriptors/DeploymentPlan.cdp: - * CIAO/TTSCTest/descriptors/run_test.pl: - Start for test TimeTrigger Service-Connector - - commit eb171f8a57639871888adef323762d232f83959e - Author: Marijke Hengstmengel - Date: Thu May 24 12:27:35 2012 +0200 - - Thud May 24 10:11:03 UTC 2012 Marijke Hengstmengel - - * CIAO/ciao/Containers/Container_Base.idl - * CIAO/ciao/Containers/Container_Base_T.cpp - * CIAO/ciao/Containers/Container_Base_T.h - * CIAO/ciao/Containers/Session/Session_Container.cpp - * CIAO/ciao/Containers/Session/Session_Container.h - * CIAO/ciao/Deployment/Handlers/Component_Handler.cpp - Changes for registering and resolving service reference on session container - -Wed Jun 20 07:48:30 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader_T.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Get the cft working again, it can only be deleted after the datareader - has been deleted. Also slightly changed the ndds wrapper, when - requested to delete a dds entity, first set our pointer to rti to zero - and than call delete, prevents possible raise conditions - -Tue Jun 19 18:30:04 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - Improved support for OpenDDS and extended logging - -Tue Jun 19 13:25:24 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Set dds entities to references on other places to nil before calling - delete on them - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Const fixes - -Tue Jun 19 08:55:04 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Give each domain participant its own unique transport config - -Mon Jun 18 15:39:18 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Moved setting of OpenDDS transport config, need to be tweaked more, - OpenDDS doesn't support sharing rtps transports between domain - participants - -Mon Jun 18 09:29:25 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp: - Fixed incorrect class name in logging - -Fri Jun 15 19:30:43 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - Fixed compile warnings - -Fri Jun 15 18:58:24 UTC 2012 Johnny Willemsen - - * ciao/install_ciao_headers.mpc: - Removed extension directories - -Fri Jun 15 10:38:39 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/Container_Handler.cpp: - Zapped some code for extension container - -Fri Jun 15 09:14:56 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc: - * MPC/config/ccm_extension_stub.mpb: - * MPC/config/ciao_extension_container.mpb: - * MPC/config/ciao_extension_container_stub.mpb: - * ccm/Extension: - * ccm/Extension/CCM_ClientContainerInterceptor.idl: - * ccm/Extension/CCM_ClientContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_ContainerClientRequestInfo.idl: - * ccm/Extension/CCM_ContainerInterceptor.idl: - * ccm/Extension/CCM_ContainerRequestInfo.idl: - * ccm/Extension/CCM_ContainerServantRequestInfo.idl: - * ccm/Extension/CCM_ContainerServerRequestInfo.idl: - * ccm/Extension/CCM_ContainerStubRequestInfo.idl: - * ccm/Extension/CCM_ExtensionComponent.idl: - * ccm/Extension/CCM_ExtensionContext.idl: - * ccm/Extension/CCM_InvalidRegistration.idl: - * ccm/Extension/CCM_QoS.idl: - * ccm/Extension/CCM_ServantContainerInterceptor.idl: - * ccm/Extension/CCM_ServantContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_ServerContainerInterceptor.idl: - * ccm/Extension/CCM_ServerContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_StubContainerInterceptor.idl: - * ccm/Extension/CCM_StubContainerInterceptorRegistration.idl: - * ccm/Extension/CCM_extension.mpc: - * ciao/Containers/Extension: - * ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Extension/Extension_Container.idl: - * ciao/Containers/Extension/Extension_Container.mpc: - * ciao/Containers/Extension/Interceptor_Registration_T.h: - * ciao/Containers/Extension/Interceptor_Registration_T.cpp: - * ciao/Containers/Extension/README: - * ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.cpp: - * ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.h: - * ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.cpp: - * ciao/Contexts/Extension: - * ciao/Contexts/Extension/Extension_Context_T.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Contexts/Extension/README: - * ciao/Servants/Extension: - * ciao/Servants/Extension/README: - * ciao/Servants/Extension/Servant_Impl_T.h: - * ciao/Servants/Extension/Servant_Impl_T.cpp: - * tests/COPI: - * tests/COPI/Registration: - * tests/COPI/Registration/Client: - * tests/COPI/Registration/Client/Component: - * tests/COPI/Registration/Client/Component/Component.idl: - * tests/COPI/Registration/Client/Component/Component.mpc: - * tests/COPI/Registration/Client/Component/Component_exec.h: - * tests/COPI/Registration/Client/Component/Component_exec.cpp: - * tests/COPI/Registration/Client/descriptors: - * tests/COPI/Registration/Client/descriptors/Plan.cdp: - * tests/COPI/Registration/Client/descriptors/run_test.pl: - * tests/COPI/Registration/Servant: - * tests/COPI/Registration/Servant/Component: - * tests/COPI/Registration/Servant/Component/Component.idl: - * tests/COPI/Registration/Servant/Component/Component.mpc: - * tests/COPI/Registration/Servant/Component/Component_exec.h: - * tests/COPI/Registration/Servant/Component/Component_exec.cpp: - * tests/COPI/Registration/Servant/descriptors: - * tests/COPI/Registration/Servant/descriptors/Plan.cdp: - * tests/COPI/Registration/Servant/descriptors/run_test.pl: - * tests/COPI/Registration/Server: - * tests/COPI/Registration/Server/Component: - * tests/COPI/Registration/Server/Component/Component.idl: - * tests/COPI/Registration/Server/Component/Component.mpc: - * tests/COPI/Registration/Server/Component/Component_exec.h: - * tests/COPI/Registration/Server/Component/Component_exec.cpp: - * tests/COPI/Registration/Server/descriptors: - * tests/COPI/Registration/Server/descriptors/Plan.cdp: - * tests/COPI/Registration/Server/descriptors/run_test.pl: - * tests/COPI/Registration/Stub: - * tests/COPI/Registration/Stub/Component: - * tests/COPI/Registration/Stub/Component/Component.idl: - * tests/COPI/Registration/Stub/Component/Component.mpc: - * tests/COPI/Registration/Stub/Component/Component_exec.h: - * tests/COPI/Registration/Stub/Component/Component_exec.cpp: - * tests/COPI/Registration/Stub/descriptors: - * tests/COPI/Registration/Stub/descriptors/Plan.cdp: - * tests/COPI/Registration/Stub/descriptors/run_test.pl: - * tests/IDL_Test/Extension: - * tests/IDL_Test/Extension/Cornucopia.idl: - * tests/IDL_Test/Extension/Cornucopia.mpc: - Removed the disabled extension container from CIAO. We started with - this container as part of QoS4CCM some time ago, but never finished - it. The extension container is really CORBA specific and doesn't - fit into our plans for CIAO to make it a Common Component Model - implementation. - -Fri Jun 15 08:25:58 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Don't use the participant after it has been deleted - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Improved logging - - * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl: - Extended timeout - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Fixed problem in versioned namespace builds - -Thu Jun 14 13:26:15 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - With RTI DDS any unkeyed sample gets handle nil, but with OpenDDS - we get always the same handle for all samples of the same type, but - not nil. Extended this test to handle both vendors - -Wed Jun 13 18:41:10 UTC 2012 Johnny Willemsen - - Updated email address in various files - -Wed Jun 13 18:38:55 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Use publication_matched callback to start writing, solves missing - samples with OpenDDS - -Wed Jun 13 18:23:56 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - With RTI DDS any unkeyed sample gets handle nil, but with OpenDDS - we get always the same handle for all samples of the same type, but - not nil. Extended this test to handle both vendors - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl: - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl: - * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl: - * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl: - * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl: - * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl: - Removed left over comments from the time that we manually had to - expend IDL3+ to IDL3 - -Wed Jun 13 17:42:32 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - Don't use the word proxy in logging, that is only the case with - RTI DDS - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: - Layout change - -Wed Jun 13 10:42:23 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Fixed compile error - -Wed Jun 13 07:52:44 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp: - Simplified logging of timestamps - -Wed Jun 13 05:52:55 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl: - Layout change - - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - Compare with correct nil value - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - We don't support comparing rti and dds4ccm instance handles anymore, - removed this from the test - - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - Set point to zero - -Tue Jun 12 18:27:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - These files where defining OpenDDS keys which shouldn't have been done - -Tue Jun 12 17:24:50 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h: - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - Changed the operators to compare instance handles. With RTI DDS - it seems there are multiple values that are considered nil, so - handle nil values by using DDS_InstanceHandle_is_nil and if both - handles are not nil, use DDS_InstanceHandle_equals - - * connectors/dds4ccm/impl/Updater_T.cpp: - Added logging when we get an instance back - - * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp: - Initialize variable with handl nil - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp: - Log instance handle - - * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Cleaned base projects - -Tue Jun 12 13:45:28 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp: - Corrected definition of a nil handle, has a length of zero - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Dump the full rti dds handle - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Log file handle - -Mon Jun 11 19:09:41 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - Layout changes - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Exception with large data only happens with RTI DDS - -Mon Jun 11 18:51:10 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Extended dp checks for OpenDDS, there the instancehandle itself - is only unique within a dp - -Mon Jun 11 18:34:16 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - Extended dp checks for OpenDDS, there the instancehandle itself - isn't unique between dp - -Mon Jun 11 17:54:39 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Fixed typo - -Mon Jun 11 12:37:55 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - The concept of invalid instance handles is RTI NDDS specific. Removed - the macros for that, but just compare the instance handles with nil - instead of checking the isValid - -Sun Jun 10 18:39:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Shutdown DDS in the destructor of the connector, doing it as part - of ccm_remove causes the reset of the topic to fail in case we only - have one connector in the process - -Sun Jun 10 18:01:21 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Added explicit close method to the dpm, at the moment there are - no domain participants registered this method will shutdown DDS - interaction completely. This should improve shutdown with OpenDDS - -Sun Jun 10 10:41:08 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Reverted removal of include, needed to compare the instance handle - -Fri Jun 8 18:01:51 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Removed not needed include - -Fri Jun 8 18:00:02 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Count on deletion events - -Fri Jun 8 17:42:59 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Set default discovery to rtps - -Fri Jun 8 17:26:02 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Shutdown dds vendor when we don't have any dp's anymore - -Fri Jun 8 13:01:47 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.h: - * connectors/dds4ccm/impl/ConditionManager.cpp: - * connectors/dds4ccm/impl/Getter_T.cpp: - Simplified the condition manager and getter by using the - get_trigger_status call on the condition. The condition manager - wait method now only returns true when one of the conditions has - triggered, which means we don't have to check the conditions anymore - in the getter - - * connectors/dds4ccm/impl/ndds/WaitSet.h: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Removed check_condition, this isn't a spec defined method but - was only here for the condition manager - -Fri Jun 8 11:52:44 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Make generic dds entity log macros - -Fri Jun 8 11:33:11 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Shutdown OpenDDS, it will cause more crashes at this moment but - without a graceful shutdown we will have a lot of memory leaks - -Fri Jun 8 10:59:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_conf.h: - Introduced new log macros for the domain participant. With OpenDDS - the instance handle is unique for all instance handles contained - within a dp, but not for the dp itself. - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Don't administrate which topics we are using within dds4ccm. We - are now using find_topic and let DDS handle this administration. At - the moment we delete a topic which is still used we get a DDS:: - RETCODE_PRECONDITION_NOT_MET which we than log but don't see as - error anymore. Also extended logging to use the new macros above - so that we can in more detail what is happening - -Fri Jun 8 07:29:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DomainParticipantManager.h: - Layout change - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - OpenDDS doesn't support an union as topic type, use another type - to get these tests deployed - -Fri Jun 8 06:37:06 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_utils.h: - Fuzz fixes - -Thu Jun 7 19:44:44 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Extended logging, implemented check_condition - - * connectors/dds4ccm/impl/TimeUtilities.h: - Added conversion DDS::Duration_t to ACE_Time_Value - - * connectors/dds4ccm/impl/ndds/WaitSet.h: - Doxygen changes - - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - Comment change - -Thu Jun 7 19:10:15 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/dds4ccm_utils.h: - New file to print access_status as string - - * connectors/dds4ccm/impl/Getter_T.cpp: - Only return true from get_one/get_many when we have valid samples - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Log dds return code after wait - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp: - Attempt to reduce logging when the test fails, log access_status as string - -Thu Jun 7 08:21:07 UTC 2012 Marcel Smit - - * NEWS: - Added refactoring of domain participant re-use. - -Thu Jun 7 08:13:52 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/Utils.cpp: - Fixed msvc warnings - -Thu Jun 7 07:48:27 UTC 2012 Marcel Smit - - * MPC/config/ciaoidldefaults.mpb: - Fixed compile issue related to GEN_OSTREAM. - - - Merged DDS4CCM_QOS_Handler branch into trunk. - Made the DomainParticipantManager more generic. - This manager manages the re-use of the DomainParticipants and - Topics and was implemented for RTI DDS. After the move, it's - available for other vendors (openDDS). - - commit 8a0b18b8170de5e17b809c4ac66e9bf12f721598 - Merge: ed688a4 c4917dd - Author: Marcel Smit - Date: Thu Jun 7 08:48:42 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit ed688a4c9dda6280686e8f8e2782d8e5266d7014 - Author: Marcel Smit - Date: Thu Jun 7 08:39:03 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Optimized logging. - - commit 3f272fbdc84e3e4983d6e15bcdb8fa7b43637f02 - Merge: 9c0d8ab 0e4ff1a - Author: Marcel Smit - Date: Thu Jun 7 08:32:03 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit 9c0d8abb9d3d9814dce1877aa3ed357468e0c632 - Author: Marcel Smit - Date: Thu Jun 7 08:31:49 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h: - Renamed add_xxx and remove_xxx methods to register_xxx and - unregister_xxx respectively. - Also guard the list when a topic is registered or - unregistered. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Due to rename action. Also check the return value of the - register methods. If a participant or topic cannot be - registered log an error and throw in Internal exception. - - commit 0e4ff1aa6eed5ab1c5454ff66020a3f36b8fc9c7 - Author: Johnny Willemsen - Date: Thu Jun 7 08:16:46 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - Fixed logging, really bail out when we have a problem - - commit c94b19372a805a33248a409aabd0b11f5fb6ac33 - Author: Johnny Willemsen - Date: Wed Jun 6 21:06:43 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Shutdown opendds when no dp's are registered anymore - - commit 878e648328179ceaa0b1b69e8feb4a0cd8d3b4bb - Author: Johnny Willemsen - Date: Wed Jun 6 20:56:30 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Check done_ in ccm_remove - - commit 755de847ca5258281e8ffb570c23d646d136713a - Author: Johnny Willemsen - Date: Wed Jun 6 20:42:46 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Documentation fix - - commit 6c0e018a313be100d79b545e556fa6d95ba884ed - Author: Johnny Willemsen - Date: Wed Jun 6 20:41:32 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Handle that qos_profile pointer can be zero - - * CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - Increased timeout - - commit dad7f336d79e24b1897f446355453383738cc277 - Author: Johnny Willemsen - Date: Wed Jun 6 20:21:48 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added some commented out code - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - When we don't have any dp left, we could shutdown opendds, but - kept that commented out, it leads to all kind of shutdown - crashes - - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - Removed export - - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp: - Use publication_matched status - - commit 423cc156dc943b94eac55676d8566102d9d8afaa - Author: Marcel Smit - Date: Wed Jun 6 16:17:52 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added the domain participant handle to the logging. - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Fixed runtime issue. - - commit 737b8684e03e4ef575b9acafe7c75d85d3eaad80 - Author: Marcel Smit - Date: Wed Jun 6 16:03:52 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Added the domain participant instance to the logging. - - commit 8712ac32bee2d5b63e6f2c3e349b19e4fb280f36 - Merge: 8f3614e 645e935 - Author: Marcel Smit - Date: Wed Jun 6 15:33:07 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit 8f3614e7bdd325e89b497ba1c80ded8277a3223d - Author: Marcel Smit - Date: Wed Jun 6 15:25:37 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added the use of the DPMANAGER. - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Added missing duplicate. - Refactored some of the reference counting on topics. - - * CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h: - Added some documentation. - - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Removed the use of the DPMANAGER. - - -Wed Jun 6 11:25:57 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: - After we get one unexpected sample are bailing out - -Wed Jun 6 09:17:49 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/TimeUtilities.h: - Use truncate_cast - -Wed Jun 6 06:46:14 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - OpenDDS doesn't support valuetype as topic. Added a string connector - to the idl as replacement for valuetype, that way the msvc linker - does generate the library and this test will than deploy - -Wed Jun 6 06:03:29 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - When a different domain id is set, also set the rtps discovery - for that domain - -Wed Jun 6 05:37:36 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Removed hand_shake_timeout_ setting, use the OpenDDS default. Added - DDS4CCM_OPENDDS_LOG_LEVEL and DDS4CCM_OPENDDS_TRANSPORT_LOG_LEVEL to - control OpenDDS logging through environment variables - -Tue Jun 5 19:15:52 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/Utils.h: - Added export macro - -Tue Jun 5 10:22:38 UTC 2012 Marcel Smit - - Merged branch DDS4CCM_QOS_Handler to trunk. - Making the DDS4CCM independant of the DDS vendor. - - commit a096657b276c719b3d9b29f61431f7f16b2774f7 - Merge: 6f6e689 f1bc8fc - Author: Marcel Smit - Date: Tue Jun 5 12:12:24 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit 6f6e6893ae6571abe5239ffa7c0d867dac938378 - Author: Marcel Smit - Date: Tue Jun 5 12:00:41 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - Fixed compilation issues in case RTI DDS. - - * CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h: - Added include to XML_Noop. - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Fixed compilation issues in case RTI DDS. - - commit a4d8e8b951b96ae8dbc6f03497a3d8d8db9c44ae - Author: Johnny Willemsen - Date: Tue Jun 5 11:23:29 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Fixed error in debug statement - - commit 63e48ca6a34e6a974b6e60e369b733f3f159e58d - Author: Johnny Willemsen - Date: Tue Jun 5 10:24:50 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - * CIAO/connectors/dds4ccm/impl/Utils.cpp: - * CIAO/connectors/dds4ccm/impl/Utils.h: - * CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h: - Added noop xml class that can be used for vendors not - supporting the specification defined xml files - - commit a1c689f37217af23bd22b8c573dc1c70841205d4 - Author: Johnny Willemsen - Date: Tue Jun 5 09:56:49 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/ConditionManager.h: - Zapped empty lines - - commit 5755380b50670bd276cfc5d8734628788d719060 - Author: Johnny Willemsen - Date: Tue Jun 5 09:54:19 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Reduced vendor dependent code - - commit 877b27d1b5d11705480e4c952d791664685593b5 - Author: Johnny Willemsen - Date: Tue Jun 5 09:28:57 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - * CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Simplified file headers, made qos_xml a pointer type - and always pass this, independent of the vendor - - commit d0c04168a9180135846443949517ca62ead5b95e - Author: Marcel Smit - Date: Tue Jun 5 08:52:08 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp: - Removed an unused typedef which caused compilation issues. - - commit 4a31c8c089858128581365ef39c7dcd8eb61a327 - Author: Johnny Willemsen - Date: Mon Jun 4 21:40:51 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Only check the name of the key when we have data back - - commit 179e9356023dbd5a6abfe0dc6b6e6f3a8486d3ba - Author: Johnny Willemsen - Date: Mon Jun 4 20:52:58 2012 +0200 - - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: - Removed double comment - - commit a7a128ba4d0ffbd41198e083b2b446ac5b4ebed4 - Author: Marcel Smit - Date: Mon Jun 4 17:11:32 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/Reader_T.cpp: - Also logging the value of the instance in 'read_w_instance' - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Also check whether a valid sample is received in 'check_last'. If not, no reason to check the - value of 'iteration'; just return false. - - commit 52c32fff8668b22de93d18efdec1884fc311a215 - Author: Marcel Smit - Date: Mon Jun 4 15:56:47 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Fixed runtime errors. No need to lookup topic 4 when perform_test is on. - - commit 2bed5a4429ca6be6030821d07d879c335ae35987 - Merge: af0f5b7 64c7ed3 - Author: Marcel Smit - Date: Mon Jun 4 15:34:55 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit af0f5b7eb0e4621a0913afdad49f2e0536af7d83 - Author: Marcel Smit - Date: Mon Jun 4 15:34:33 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - Made these independant of the DDS vendor. All checks are based on the instance handles of the - domain participants/topics. The test used to test if the pointers of the domain participants/topics - were equal. - - commit 64c7ed3419244d541d647bd8cca99aabe109c6eb - Merge: 12469cc 2ab1f7c - Author: Marcel Smit - Date: Mon Jun 4 12:48:44 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - -Mon Jun 4 10:40:21 UTC 2012 Marcel Smit - - - Merged branch DDS4CCM_QOS_Handler to trunk. - - commit 12469cc7ad40ae7134ff7d258779c39d0c9f63d9 - Merge: 4a0c74b dfcdbf3 - Author: Marcel Smit - Date: Mon Jun 4 11:47:28 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit 4a0c74b4b0af35f908d731f8462983be6de77a16 - Merge: 8bc9829 3e77af8 - Author: Marcel Smit - Date: Mon Jun 4 11:35:55 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit 8bc9829f4a1f99ca2522581af95d2bd842f3fd57 - Author: Marcel Smit - Date: Mon Jun 4 11:33:07 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - Specified a DDS vendor for certain tests. These tests - are not suitable to run in combination with other DDS vendors. - - commit 3e77af813b19f99d5ff02c5e09531840845f4d06 - Author: Johnny Willemsen - Date: Mon Jun 4 11:30:57 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - Tagged some tests as opendds tests - - commit 4e9c586f31c9c60337dff4a1939fe0779a4b6e59 - Merge: 30f36e6 1221f86 - Author: Johnny Willemsen - Date: Mon Jun 4 11:23:27 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit 30f36e60e49bfbd5f0757ec073dfbb52177234e0 - Merge: bb9b94d f666762 - Author: Marcel Smit - Date: Mon Jun 4 11:14:01 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit bb9b94ddbea7ec36aa32209aafa19c88b71a0aa5 - Author: Marcel Smit - Date: Mon Jun 4 11:13:33 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - Fixed runtime issues. The Receiver was twice while the sender wasn't started - at all. - - commit f6667627ef8e6cc9d900959b5124cd32f4b84ca2 - Author: Johnny Willemsen - Date: Mon Jun 4 11:12:48 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - DDS4CCM policies test is specific for NDDS - - commit be7dd97e09b67777fdac09207da6d9807f939924 - Merge: 39c4b41 ecf9e44 - Author: Johnny Willemsen - Date: Mon Jun 4 10:26:49 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit 39c4b41ff4a43fe7ad8cf92464acd33589594a62 - Merge: c4fe935 093b245 - Author: Marcel Smit - Date: Mon Jun 4 10:07:47 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit c4fe9351ddaac05547cc1511914fd3cab1edd465 - Author: Marcel Smit - Date: Mon Jun 4 10:07:30 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - The sender should start writing on the first publication matched event; not on subsequent publication - matched event. This should fix runtime errors. - - commit 093b24540dd4b92213416e12cbc6b0a6e58df2fd - Merge: 0e58d66 7f271a6 - Author: Johnny Willemsen - Date: Mon Jun 4 10:06:39 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit 0e58d661707e374a8698a4d63b2ccbfac254debb - Merge: 3974590 a25cfbf - Author: Johnny Willemsen - Date: Mon Jun 4 09:43:04 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - -Mon Jun 4 09:21:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc: - Fixed requires - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Made this test compiling with opendds, but than it is just a noop test - -Mon Jun 4 08:19:57 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - Make this test compiling with opendds, in that case it doesn't really - test a thing. Removed qos_profile string from cdp, was not used - -Mon Jun 4 08:04:30 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc: - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Compile this test with opendds, but than it is just doing nothing - -Mon Jun 4 07:39:50 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - Removed a lot of flags we don't use at all. Also changed the dds4ccm - test checks, all DDS4CCM tests are now having DDS4CCM as required - test config. Vendor specific tests can use DDS4CCM_OPENDDS and - DDS4CCM_NDDS as test configs - -Mon Jun 4 06:50:39 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Added missing newline - - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml: - Updated location of the xsd - -Sun Jun 3 19:23:26 UTC 2012 Johnny Willemsen - - * NEWS: - DDS4CCM updates - -Sun Jun 3 19:09:34 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - Removed qos dump test - -Sun Jun 3 19:02:08 UTC 2012 Johnny Willemsen - - Use the new OpenDDS QOS_XML library, removed the ciao version - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Write_T.h: - Updated includes - - * CIAO_TAO_DAnCE.mwc: - * CIAO_TAO_DAnCE_OpenDDS.mwc: - dds4ccm doesn't have a tools directory anymore - - * MPC/config/dds4ccm.mpb: - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - Use OpenDDS base projects - - * MPC/config/dds4ccm_qos_xml_handler.mpb: - * MPC/config/dds4ccm_qos_xml_handler_base.mpb: - * connectors/dds4ccm/docs/schema: - * connectors/dds4ccm/docs/schema/dds_qos.xsd: - * connectors/dds4ccm/docs/schema/xsc-banner.h: - * connectors/dds4ccm/docs/schema/xsc-banner.cpp: - * connectors/dds4ccm/tests/QoS: - * connectors/dds4ccm/tests/QoS/dump: - * connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - * connectors/dds4ccm/tests/QoS/dump/qos.xml: - * connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * connectors/dds4ccm/tests/QoS/dump/run_test.pl: - * connectors/dds4ccm/tools: - * connectors/dds4ccm/tools/QOS_XML_Handler: - * connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_Handler_Export.h: - * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Removed these files. - -Sun Jun 3 19:14:02 UTC 2012 Johnny Willemsen - - Merged branch DDS4CCM_QOS_Handler again to trunk - - commit 194fb1fe7b7b6c8c302eb9fdbe8bb52706350991 - Merge: fd87f4f 203fa8d - Author: Johnny Willemsen - Date: Sun Jun 3 19:14:11 2012 +0200 - - Merge branch 'master' into DDS4CCM_QOS_Handler - - commit fd87f4fcb14eb246c8644983ed55458511e5686a - Author: Johnny Willemsen - Date: Fri Jun 1 20:00:11 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added commented out code to control opendds logging - - commit 98cc0b67f57a5fa3284b1f88240683666a5c71e0 - Author: Marcel Smit - Date: Fri Jun 1 16:41:03 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp: - Added a connector status listener. The sender starts writing once a - publication matched event comes in. - - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - Layout changes. - - commit 2a227e39896ea3ae785cbae71a402a3223e49141 - Author: Marcel Smit - Date: Fri Jun 1 16:14:01 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - Code alignment. - - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - Added a connector status listener. The sender starts writing sample once a - publication matched event is received. - - commit 18476e2bd4f2ea7f7a0a3f7240b3db84883cea72 - Merge: 9b432e0 c748d37 - Author: Marcel Smit - Date: Fri Jun 1 15:51:24 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - Conflicts: - CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h - - commit 9b432e0c9582be3d0e175b24c760d6503c00c5b4 - Author: Marcel Smit - Date: Fri Jun 1 15:47:37 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - No need to export this class. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Optimized comments. - - commit c748d379dceb796fad1ef35781b298d57469ccc1 - Merge: 0661ef7 45f7800 - Author: Johnny Willemsen - Date: Fri Jun 1 14:54:57 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit 0661ef7b9987148dd4c620cd855a86e40f9fd9d9 - Author: Johnny Willemsen - Date: Fri Jun 1 14:54:52 2012 +0200 - - * CIAO/ciao/Containers/Extension/ClientContainerInterceptorRegistration_Impl.h: - * CIAO/ciao/Containers/Extension/Interceptor_Registration_T.h: - * CIAO/ciao/Containers/Extension/ServantContainerInterceptorRegistration_Impl.h: - * CIAO/ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.h: - * CIAO/ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.h: - * CIAO/ciao/Servants/Facet_Servant_Base_T.h: - * CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - * CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * CIAO/connectors/dds4ccm/impl/CCM_DataReader.h: - * CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h: - * CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h: - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Read_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - * CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h: - * CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h: - * CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * CIAO/connectors/dds4ccm/impl/Getter_T.h: - * CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h: - * CIAO/connectors/dds4ccm/impl/PortStatusListener.h: - * CIAO/connectors/dds4ccm/impl/PublisherListener.h: - * CIAO/connectors/dds4ccm/impl/Reader_T.h: - * CIAO/connectors/dds4ccm/impl/SampleInfo.h: - * CIAO/connectors/dds4ccm/impl/SubscriberListener.h: - * CIAO/connectors/dds4ccm/impl/TimeUtilities.h: - * CIAO/connectors/dds4ccm/impl/TopicListener.h: - * CIAO/connectors/dds4ccm/impl/Updater_T.h: - * CIAO/connectors/dds4ccm/impl/Writer_T.h: - * CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h: - * CIAO/connectors/dds4ccm/impl/ndds/Condition.h: - * CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataReader.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h: - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * CIAO/connectors/dds4ccm/impl/ndds/Publisher.h: - * CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h: - * CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h: - * CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h: - * CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h: - * CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/Topic.h: - * CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h: - * CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h: - * CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h: - * CIAO/connectors/dds4ccm/impl/ndds/Utils.h: - * CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h: - * CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - * CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.idl: - * CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.idl: - * CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.idl: - * CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl: - * CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl: - * CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl: - * CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl: - * CIAO/tests/DAnCE/Threading/Base/Threading.idl: - * CIAO/tests/DAnCE/Threading/Component1/Component1.idl: - * CIAO/tests/DAnCE/Threading/Component2/Component2.idl: - * CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl: - File header update - - commit 45f7800d0ad7fdfea0b55d2a3fcc2bc3270b8cc9 - Author: Marcel Smit - Date: Fri Jun 1 14:54:10 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Resticted the number of early returns; just making use of a return - value. - - commit 5421f639fdb38c7e10d7216580d9f343ce33c802 - Author: Marcel Smit - Date: Fri Jun 1 14:42:20 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Catching exceptions as const. - - commit 945beeedfb53829dd6e26d8fe3fd405678c592f9 - Author: Marcel Smit - Date: Fri Jun 1 14:38:01 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - Added uniform file header comments. Also added some documentation to - methods. - In some files, DCPS_debug_level needed to be in the OpenDDS::DCPS namespace - since the class wasnt' in that namespace. - - commit a42f923be5b9b7c796a968035dbadf740235fcfb - Author: Marcel Smit - Date: Fri Jun 1 13:54:43 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - No need to use namespace for DCPS_debug_level since the QOS XML is now - in the same namespace. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - No need to use namespace for DCPS_debug_level since the QOS XML is now - in the same namespace. - No need to log an error when no qos_profile is provided; a debug message - will do in this case. - - commit bce2efaad735151e050780dac3115c3d07b92f25 - Author: Marcel Smit - Date: Fri Jun 1 13:49:38 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - Providing an empty qos_profile is not necessarily an error. The library - generates a debug statement and returns RETCODE_OK. - - commit 2aaf1f763ffe9cd196105cf9a8fd9865e847309f - Author: Marcel Smit - Date: Fri Jun 1 13:30:15 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - No need to export these classes. - - commit 18e73f57852311d7226bff0b2746888ccb0051d8 - Author: Marcel Smit - Date: Fri Jun 1 13:27:02 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - Removed forward declarations of DDS entities. - - commit cbcbf1598c6f13d853ef22e646910426b9f4e47c - Author: Marcel Smit - Date: Fri Jun 1 13:21:42 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - No need for qos_profile to be const ACE_TCHAR *; just const char * - is ok. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - No need to export this class. - No need for profile_name to be const ACE_TCHAR *; just const char * - is ok. - - commit 6c18e96bacf9481f30f8ff70a8dfa506a9f363cf - Author: Marcel Smit - Date: Fri Jun 1 13:03:50 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Removed everything from the DDS4CCM namespace and put it in the - OpenDDS::DCPS namespace. - - commit 16718f6989331a9e38edeb6089b8b261d9832472 - Author: Marcel Smit - Date: Fri Jun 1 12:10:42 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Made ACE_DEBUG depend on the DCPS_debug_level flag. - - commit c903c44523987d03af9f6cf2f8f7271187d40be9 - Author: Marcel Smit - Date: Fri Jun 1 11:46:14 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Replaced DDS4CCM_DEBUG and DDS4CCM_ERROR with ACE_DEBUG and ACE_ERROR - in order to get this library to move to openDDS. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Due to removal of Utils.* - - commit fdd68d3deb26f18d302b876cd6bc1eb9afb6706e - Author: Marcel Smit - Date: Fri Jun 1 11:36:14 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Fixed compile issue related to the removal of - tools/QOS_XML_Handler/Utils.* - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - Fixed compile issue related to the removal of - tools/QOS_XML_Handler/Utils.* - Also created a return value in the get_xxx_qos methods. - - commit d9f1ff34951fcc154068f56b4c11ebfc97572f4f - Author: Marcel Smit - Date: Fri Jun 1 11:19:01 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - Moved get_profile_name and get_xml_file_name to QOS_XML_Loader. - Therefor these files can be removed. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - Added get_profile_name and get_xml_file_name - - commit 71c3a6511db487a1aabeb3f91079c3cf02c690b8 - Author: Marcel Smit - Date: Fri Jun 1 11:09:32 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Removed DDS4CCM_TRACE command from these files. Not necessary anymore. - - commit 34d598e7c981c6a3b252c6f71e8fc0378d37c56b - Merge: e8a2587 dd50f82 - Author: Johnny Willemsen - Date: Fri Jun 1 09:57:35 2012 +0200 - - Merge branch 'DDS4CCM_QOS_Handler' of http://git.remedy.nl/git/atcd into DDS4CCM_QOS_Handler - - commit e8a258743980edcbe852c3c2b4fcc62f41bb0196 - Author: Johnny Willemsen - Date: Thu May 31 21:03:29 2012 +0200 - - * CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html: - Document OpenDDS support instructions - - commit 9c4fc8d727e3fadddf7f6b8765a234402d25f3e7 - Author: Johnny Willemsen - Date: Thu May 31 20:45:28 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp: - Fixed profile name - - commit b5e032b8b49bcc9117b37f922902cc121d0188fa - Author: Johnny Willemsen - Date: Thu May 31 20:43:44 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl: - Increased sleep time - - commit 9c2432cf82209217a99e1397a852f7830b8bdc23 - Author: Johnny Willemsen - Date: Thu May 31 20:39:59 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - Increased sleep time, OpenDDS discovery seems to be a little bit - slower at this moment - - commit 3b2df1dc5a445b8656e0914eaf6a12f4c92ff423 - Author: Johnny Willemsen - Date: Thu May 31 20:38:07 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml: - Updated location xsd - - * CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl: - Zapped file extension here - - commit 556a7e35ba195c7457e3c0b3a918812c8c5071cc - Author: Johnny Willemsen - Date: Thu May 31 20:27:04 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml: - Fixed profile name - - commit 8771c8ad48d3bb2fc98d63811574187b10ad2930 - Author: Johnny Willemsen - Date: Thu May 31 20:22:26 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Log an error when we didn't got the start, also only set the flag - when we get a publication matches - - commit 2e392a04b7f4ec8680f6a50de8a4b0b976916006 - Author: Johnny Willemsen - Date: Thu May 31 15:41:33 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Removed not needed include - - commit 74242fbe18f245b55c2d8ed91ead1d78940fe87b - Author: Marcel Smit - Date: Thu May 31 15:19:45 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml: - Created QOS XML for openDDS. - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml: - Renamed HelloTest_Library into KeyedTest_Library. - - commit d340e508f9af65a9049758f270f0042f6b35c89b - Author: Marcel Smit - Date: Thu May 31 14:57:56 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Removed DDS forward declarations. Therefor moved the include of - DdsDcpsInfrastructureC.h to the header - - commit 0b0f611b8867f77a7347187f04223ab6b7f21052 - Author: Marcel Smit - Date: Thu May 31 13:24:01 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - Layout change. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Now the user need to pass the complete profile string to the QOS XML library. - The library is responsible for parsing this string. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Due to interface changes regarding QOS profile string. Also - check whether the string is available. If not, don't invoke the - the get_xxx_methods. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - No need to export get_profile_name and get_xml_file_name anymore. - - commit 34b11314baa646a8fcf687a0bc810d18cd790589 - Author: Marcel Smit - Date: Thu May 31 11:03:46 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Check whether the return value of XML loader init is OK. If not, - throw an internal exception. - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: - Optimized logging. Fixed some errors in logging. - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp: - Waiting on a Publication matched event before starting the actual test. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Check the return values of the init and get_xxx_qos methods invocations. - Logging an error when a return value is not RETCODE_OK. - - commit 9b0dd58e24ada501473fc43d1a66af491cf6bc16 - Author: Marcel Smit - Date: Thu May 31 10:11:19 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - Fixed runtime errors. These methods need an export macro. - - commit 6b0f3a857165e455f1ce04c095257044181e556c - Author: Marcel Smit - Date: Thu May 31 09:51:47 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Changed the return value of the get_xxx_qos methods. These methods - now return a DDS error code. This way we can be more specific about - what is wrong. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Due to changing the return value of the get_xxx_qos methods. - Throwing an internal exception when a get_xxx_qos method returns - another value than RETCODE_OK. - - commit cea623030f3db69d53f823918c70d5e16d1607e4 - Author: Johnny Willemsen - Date: Thu May 31 08:07:57 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml: - Corrected location of the xsd file - - commit b6ea10422ca83aef55fcb412c0962690b3381781 - Author: Johnny Willemsen - Date: Wed May 30 21:29:41 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml: - * CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml: - * CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml: - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml: - Removed path from dds_qos.xsd - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Set search path correctly - - commit be819f6c1956eba8dea9549d7981145d466201af - Author: Marcel Smit - Date: Wed May 30 16:11:24 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - No need to print "No profile specified" as an error. - - commit dd50f8216306d98d4305dbfb800e50aa39df38fc - Author: Johnny Willemsen - Date: Thu May 31 21:03:29 2012 +0200 - - * CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html: - Document OpenDDS support instructions - - commit a25c2a95ff7a6a1b01ccbeea7da1b65c07930550 - Author: Johnny Willemsen - Date: Thu May 31 20:45:28 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp: - Fixed profile name - - commit c51edadfb7133de860df366722c6ea84c93015cb - Author: Johnny Willemsen - Date: Thu May 31 20:43:44 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl: - Increased sleep time - - commit 921d6d3d39634d74f54db8bc9124f2f3baa5467f - Author: Johnny Willemsen - Date: Thu May 31 20:39:59 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: - Increased sleep time, OpenDDS discovery seems to be a little bit - slower at this moment - - commit 4f73e9c77987ca5a868c0a93fb9edbac8f3efadb - Author: Johnny Willemsen - Date: Thu May 31 20:38:07 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml: - Updated location xsd - - * CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl: - Zapped file extension here - - commit c0b5233a4a7b3aa6f879108fa25d9d133f6f1961 - Author: Johnny Willemsen - Date: Thu May 31 20:27:04 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml: - Fixed profile name - - commit 5554094ed0c1c6b1dabb52c17ea0eccf2e160268 - Author: Johnny Willemsen - Date: Thu May 31 20:22:26 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Log an error when we didn't got the start, also only set the flag - when we get a publication matches - - commit 509769c6371624d9f49081ff038b6537960ed671 - Author: Johnny Willemsen - Date: Thu May 31 15:41:33 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Removed not needed include - - commit a28c7fc0c93dee3cc688ed3634fd437e948df8dc - Author: Marcel Smit - Date: Thu May 31 15:19:45 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml: - Created QOS XML for openDDS. - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml: - Renamed HelloTest_Library into KeyedTest_Library. - - commit 84365a719fc21193f61f4219218757c9a6435dc4 - Author: Marcel Smit - Date: Thu May 31 14:57:56 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Removed DDS forward declarations. Therefor moved the include of - DdsDcpsInfrastructureC.h to the header - - commit d258d8885d3cc2019fb7d84b6febfb5a9df620f8 - Author: Marcel Smit - Date: Thu May 31 13:24:01 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - Layout change. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Now the user need to pass the complete profile string to the QOS XML library. - The library is responsible for parsing this string. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Due to interface changes regarding QOS profile string. Also - check whether the string is available. If not, don't invoke the - the get_xxx_methods. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - No need to export get_profile_name and get_xml_file_name anymore. - -Thu May 31 17:59:02 UTC 2012 Johnny Willemsen - - * MPC/config/ciaoidldefaults.mpb: - Added gen_ostream - -Thu May 31 12:31:31 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Updated for XSC move from DAnCe to ACE - -Thu May 31 09:12:50 UTC 2012 Johnny Willemsen - - * MPC/config/dds4ccm_qos_xml_handler.mpb: - * MPC/config/dds4ccm_qos_xml_handler_base.mpb: - * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h: - * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - Updated because DAnCE XML_Utils has been moved to ACE as ACE_XML_Utils - -Thu May 31 08:12:08 UTC 2012 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Fixed input location - -Thu May 31 06:32:23 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/QoS/dump: - * connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - * connectors/dds4ccm/tests/QoS/dump/qos.xml: - * connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * connectors/dds4ccm/tests/QoS/dump/run_test.pl: - Added basic QOS XML test. This test just dumps the - IDL QOS structure after parsing. - -Wed May 30 13:24:42 UTC 2012 Marcel Smit - - * connectors/dds4ccm/docs/schema: - - * connectors/dds4ccm/docs/schema/dds_qos.xsd: - * connectors/dds4ccm/docs/schema/xsc-banner.h: - * connectors/dds4ccm/docs/schema/xsc-banner.cpp: - Added schema for all DDS4CCM QOS files. - -Wed May 30 11:26:24 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml: - Fuzz: Added missing id-string. - -Wed May 30 11:28:57 CEST 2012 Johnny Willemsen - - Merged git branch DDS4CCM_QOS_Handler which adds support for - configuring DDS4CCM QOS through xml files with OpenDDS - - commit 2196ead1f39f5ba8351ead32418d8b5318e4bb55 - Author: Marcel Smit - Date: Wed May 30 11:08:55 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - Corrected file name in file header. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - Removed unnecessary comment. - - commit 165994f23185cb70e969affe4efcee0f60ab0f14 - Author: Marcel Smit - Date: Wed May 30 10:44:56 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - Added the parsing of user_data as comment - - commit 354e196184266f36f8097d848b779654b3417500 - Author: Marcel Smit - Date: Wed May 30 10:36:44 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/ParticipantQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added ParticipantQos handler to the QOS XML parsing library. - - commit 53c7b49ea5bec0200c55a0f56b85409e26c7dd4f - Author: Marcel Smit - Date: Wed May 30 09:40:32 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml: - Added for openDDS support. - - * CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: - Quit script when the plan launcher returns an error. This prevent sleeping - when not necessary. - - commit 94d45ee0604090c1ec316f41ff3e7fc707fa8449 - Author: Marcel Smit - Date: Wed May 30 09:11:21 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: - Renamed HelloTest_Library to Throughput_Library. - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml: - Added for openDDs support. - - commit 34b58e3e83bef8e5ee27c4c1370813bce6f4f7ef - Author: Marcel Smit - Date: Wed May 30 08:55:13 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml: - Added for openDDS support - - commit 41a741b0fc38c82d12a8359023bfde0a97ef24a3 - Author: Johnny Willemsen - Date: Wed May 30 08:50:49 2012 +0200 - - * DAnCE/MPC/config/dance_config_handlers.mpb: - * DAnCE/MPC/config/dance_config_handlers_base.mpb: - * DAnCE/tools/Config_Handlers/Config_Handlers.mpc: - Removed visibility override, shouldn't be needed - - commit 36a00caafa85939db4b45ef7faf27acfad605acb - Author: Johnny Willemsen - Date: Wed May 30 08:44:55 2012 +0200 - - * CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb: - * CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Removed all visibility overrides - - commit 266692b66adf4250928ae04c483250df314988a0 - Author: Marcel Smit - Date: Wed May 30 08:40:11 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml: - Added for openDDS support - - commit 4864845d8fdba020df526c24ea15311c433d6317 - Author: Marcel Smit - Date: Wed May 30 08:32:15 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml: - Added correct XML. - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml: - Added for openDDS support. - - commit 028b7e82e57842a3271ae782342c5e0d711f7637 - Author: Johnny Willemsen - Date: Tue May 29 21:14:07 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - Layout change - - * DAnCE/tools/Config_Handlers/Utils/Functors.h: - Removed borland workaround - - commit a81ea59447d5af5fda614d548d9667b5b9aa68bb - Author: Johnny Willemsen - Date: Tue May 29 19:44:32 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - Removed not needed export macros - - commit fcf7c65010675d8660cb7a8f610dfe6e8a321fb6 - Author: Johnny Willemsen - Date: Tue May 29 16:30:53 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Added commented out code to enable opendds logging - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/HelloTest_Library.xml: - new file - - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - layout change - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_XSC_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - only use 1 export file - - commit 7c2c1b238bfb3115b718c589005986ac28c06e5a - Author: Marcel Smit - Date: Tue May 29 16:13:47 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp: - Optimized logging. - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml: - Added for openDDS support. - - commit 928aa26205f4df1b5fb77a0e991bfd2fe01e794f - Author: Marcel Smit - Date: Tue May 29 14:27:02 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml: - Created for openDDS support. - - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - QOS Profile name shouldn't contain an underscore. - - commit bac443928ada09fb26948427d0e69025ad794518 - Author: Marcel Smit - Date: Tue May 29 14:16:18 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml: - Added QOS xml for openDDS. - - commit 3958e589a64b93b701b38b72cb704a4b30a405fa - Author: Marcel Smit - Date: Tue May 29 13:37:57 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml: - Added and corrected path to dds_qos.xsd - - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml: - Added for openDDS support. - - commit 41a122c6a3736dfd7c1fe9802e2b34cae884af3f - Author: Marcel Smit - Date: Tue May 29 13:13:57 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml: - Added for openDDS support. - - * CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Error message when publication_matched was not received. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Added DDS4CCM_INFO define to log message - - commit e25c4785a913b62ffe306178388c2c31b915d62d - Author: Johnny Willemsen - Date: Tue May 29 12:37:51 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml: - Corrected profile name - - commit 779f3c5864dc3b9b2a51e6e8e1a52fae14ec3732 - Author: Johnny Willemsen - Date: Tue May 29 12:32:32 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - Only check ndds values when ndds is enabled - - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml: - Added new qos file - - commit 6fa0ca5280992a9f366a3b4a938a3a7b127c999b - Author: Johnny Willemsen - Date: Tue May 29 11:58:52 2012 +0200 - - * CIAO/MPC/config/dds4ccm_impl.mpb: - Added gen_ostream as base in order to dump qos - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Use gen_ostream feature when it is enable to log the - qos as we pass it to dds - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Removed dumping of qos xml, moved to dds4ccm - - * TAO/tao/ORB.h: - Typo - - commit 6fbccfee00f805f0bd1228e4eea2d3c56fd6adb4 - Author: Marcel Smit - Date: Tue May 29 11:45:40 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml: - Added QOS XML file openDDS usage. - - commit 1bdc20ab30b2be587336f50d0bd2cec5a8f5350f - Author: Marcel Smit - Date: Tue May 29 11:44:46 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml: - Added QOS XML file for openDDS usage. - - commit 9278d35882f2c11f235f4c004f58a29c4d523c8a - Author: Marcel Smit - Date: Tue May 29 11:43:00 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Added endline characters after QOS dump messages. - - commit 4fb8cd683a4b948c4fb71f7d76d0041330033b09 - Author: Marcel Smit - Date: Tue May 29 11:34:55 2012 +0200 - - * CIAO/MPC/config/dds4ccm.mpb: - Fixed an after. The QOS-dump test didn't build - due to a non-existing header file. - - commit a60950b2e0e8bb7377539a7b7925435e373ba365 - Author: Marcel Smit - Date: Tue May 29 09:29:54 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: - Fixed runtime issues regarding renaming QOS profile - - commit e2a5b89d288931ede26f9a1b349a75c1fa0ad95d - Author: Marcel Smit - Date: Tue May 29 08:45:25 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Fixed runtime issues regarding renaming QOS profile. - - commit 986f98484df29ee36bf032050b094be3d8c2267d - Author: Johnny Willemsen - Date: Fri May 25 21:29:40 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Disabled shutdown, could resolve crash at shutdown - - commit ab374ede0c4fb0b1ef49991ee36ad0ac63e87046 - Author: Johnny Willemsen - Date: Fri May 25 21:28:03 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - Fixed compile error - - commit 49e847d930cf8326d30ed880307a65fad1ca7645 - Author: Johnny Willemsen - Date: Fri May 25 15:23:22 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml: - Added QoS XML file for this example - - commit 678fe5718d848fdb771cb4bc4ba1e1e4c5746533 - Author: Johnny Willemsen - Date: Fri May 25 13:37:00 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Layout change - - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml: - Created qos xml file for this test - - commit bac9723c978f3a8b68b3b67d27878ff6164d2108 - Author: Johnny Willemsen - Date: Fri May 25 13:26:02 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml: - QoS XML file for this test. The test does run, but crashes at - shutdown in OpenDDS - - commit cc24a1ae343ab9e23bd264bab0d8e1bc7274c8c7 - Author: Johnny Willemsen - Date: Fri May 25 12:48:13 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/PublisherListener.cpp: - * CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp: - Improved logging - - commit 365df2f1901afa2bf9c56d41e4cd684812a8afb6 - Author: Johnny Willemsen - Date: Fri May 25 12:42:42 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Dump QoS when we have detailed logging. Corrected signature - of read_qos, fixed durability conversion - - commit 3dee3b2ecf2492da0bbb63f42230d2a721b3959f - Author: Johnny Willemsen - Date: Fri May 25 10:18:41 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Fixed incorrect method name in logging - - commit 28f8a8f3edcadb6074238a55d3f3a912098ac2fe - Author: Johnny Willemsen - Date: Fri May 25 09:54:22 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp: - * CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp: - Added error logging to callbacks which we don't expect - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - Logging changes - - commit accc5b6398067a04d7134b8ab471443206fe37d8 - Author: Marcel Smit - Date: Fri May 25 09:30:05 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Due to some RTI specific QOS settings, the data of a deleted sample is passed to the - on_deletion handler. Since this is non-standard behaviour, the on_deletion handler has - rewritten. We now just log an message when an on_deletion event comes in. - - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml: - Added standard QOS XML - - commit c01508954ca3b86fd3f7cd06fb4af466379080a5 - Author: Marcel Smit - Date: Fri May 25 09:20:56 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - Due to some RTI specific QOS settings, the data of a deleted sample is passed to the - on_deletion handler. Since this is non-standard behaviour, the on_deletion handler has - rewritten. We now just log an message when an on_deletion event comes in. - - commit 77bc43f4019e99f977df20f292394d336261089d - Author: Johnny Willemsen - Date: Fri May 25 09:13:55 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Create topics when we have matched - - * CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Layout change - - * CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml: - New qos file for this test, still fails, works with plain OpenDDS, - need to analyze this test further - - commit c832d3628a2159e26a8f9b42593e24aabd1d8acd - Author: Marcel Smit - Date: Fri May 25 08:58:39 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml: - Added QOS for openDDS. - - commit ff8bf9ffdc581dc1e17dce106e403484e2f1b336 - Author: Johnny Willemsen - Date: Thu May 24 21:09:20 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Shutdown OpenDDS at the end, have to check what happens - if we have multiple connectors in the same process - - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Fixed memory leaks - - commit 838c9b631aba86ae0607a7e6393f09ce6d33edf4 - Author: Johnny Willemsen - Date: Thu May 24 16:09:34 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - OpenDDS discovery is slower, so don't start the test on ccm_activate but wait - on publication matched status - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml: - New qos file for this test - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - Removed empty line - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml: - Added id tag - - commit 36d9b2da54171e829e72c8394eff67f37ef16387 - Author: Marcel Smit - Date: Thu May 24 15:08:07 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - Do not build this test when RTI DDS is used. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - Optimized logging. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - Fixed loggin issue. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Check for an empty profile string. Optimized logging for that. - - commit 4649a89638765c22e2450f23805099b77d9b0b21 - Author: Johnny Willemsen - Date: Thu May 24 15:07:34 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml: - Added qos xml file for OpenDDS. After rerunning this test it still - doesn't work. Quick code review showed that OpenDDS doesn't support - the on_sample_rejected callback, reported publicly as bugzilla - 4028 - - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - Removed empty line - - commit d997f2f1ab316efa7961d1f89a63f71ffa5e8090 - Author: Johnny Willemsen - Date: Thu May 24 14:38:09 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Layout changes - - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - Reordered qos so that we more easily can compare it with the rti file - - commit 49b5568d98819745a385626ad48498c7cf00b387 - Author: Johnny Willemsen - Date: Thu May 24 13:40:07 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - Guard zero pointers to strdup - - commit 5b6e2a6b8f9e5f4753ae9c6d6d60e6e4da100ac9 - Author: Marcel Smit - Date: Thu May 24 13:23:51 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - Finished the conversion of the Publisher QOS and Subscriber QOS. - - commit a2c83c1290de06b049f6aa2fd44ecd0e96812c66 - Author: Marcel Smit - Date: Thu May 24 12:44:31 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml: - Extended partion tag for Subscribers and Publishers for testing. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - Parse partition and entity_factory QOS settings. Presentation still - need to be parsed. - - commit 3f84a2cf5c648b6b55fe602d619032c972394162 - Author: Marcel Smit - Date: Thu May 24 11:57:01 2012 +0200 - - * CIAO/connectors/dds4ccm/docs/schema/dds_qos.xsd: - According to the spec the Publisher QOS, the Subscriber QOS, and - the Participant QOS haven't got the topic_filter attribute. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/PublisherQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_PubSub_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/SubscriberQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added the Publisher and Subscriber QOSs to the parsing framework. - - commit 2813ef125b1c8682ef4bcac2030490a3219fb633 - Author: Marcel Smit - Date: Thu May 24 11:13:27 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - Prevent reading the QOS while it's not available. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Removed some unnecessary logging. - - commit 557dd624806d1d090b6375e36d31782c89253737 - Author: Johnny Willemsen - Date: Thu May 24 11:06:53 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - Fixed coverity error - - commit 0567c8a5a006fa037fb8fc7ab664ff4a652e61f2 - Author: Marcel Smit - Date: Thu May 24 10:51:35 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - Optimized logging. Some method name were not logged correct. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Topic_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/TopicQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added support for Topic QoSs. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Invoking get_topic_qos. - - commit 81cb02e3a1c54b25c4c6cf9e86a5d178aae82314 - Author: Johnny Willemsen - Date: Thu May 24 10:44:15 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp: - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - * CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp: - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp: - * CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - The usage of an underscore is not legal in the DDS profile string, removed it - in all existing deployment plans and QoS XML files - - commit 81434c3d2a5c7893d79f179c0d1b1074717198e4 - Author: Johnny Willemsen - Date: Thu May 24 10:39:24 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: - Make the profile name a legal name, spec doesn't allow _ - - commit 741410c799ac678353911b632a4aa23411480a7d - Author: Johnny Willemsen - Date: Thu May 24 10:30:16 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl: - Set execute bit - - commit 2313138bb1365693ff212810ba8487963d9c9f68 - Author: Johnny Willemsen - Date: Thu May 24 10:28:55 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml: - Added new spec compliant QoS XML file for this test - - commit b843062b65831336559d6383efee494d386cad7b - Author: Marcel Smit - Date: Thu May 24 10:02:17 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dw_qos.xml: - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml: - * CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl: - Rename action. qos.xml contains all xml code. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Added DataReaderQos. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - Check whether init succeeds. If not, return false. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Added support for DataReaderQos. - - commit 95dcc54fe0c1e398e4e74d9484ffae2595efab8a - Author: Marcel Smit - Date: Thu May 24 09:22:14 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataReaderQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataReader_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added support for DataReader QOS. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - Removed unnecessary include. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - Optimized logging. - - commit aee7ed1215ee28d13f621c40543843daf450b7f7 - Author: Johnny Willemsen - Date: Thu May 24 08:47:20 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed install location - - commit a94d2e871e0ba73e19e6df32e7b1a22e94f8e553 - Author: Marcel Smit - Date: Thu May 24 08:32:10 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - Removed comments. Optimized logging - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - Fixed runtime issue regarding logging. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Optimized logging. - - commit b3ddbd8634f7894d068fbaa550d1444404cab459 - Author: Marcel Smit - Date: Thu May 24 08:17:22 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: - Fixed compile issues due to interface changes in configuration_complete - - commit 013d5054cec9b31eb57289fcf9a4f8cc141c6870 - Author: Marcel Smit - Date: Thu May 24 08:04:31 2012 +0200 - - * CIAO/MPC/config/dds4ccm_dcps.mpb: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed MPC issues regarding RTI DDS - - commit 337c946da317ff3ea2c6552db6df23e66cf5c960 - Author: Marcel Smit - Date: Wed May 23 21:21:17 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - Optimized logging. Logging the real QOS IDL value instead of what the - value should be (the QOS XML value). - - commit 356516954b7a253bb52cb3caaa4b0e839d314ce3 - Author: Marcel Smit - Date: Wed May 23 21:04:19 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - Enabled more QOS setting for DataWriters and Topics. - - commit 819277a41a39704e85c8d69ca10abad25710f151 - Author: Marcel Smit - Date: Wed May 23 20:57:15 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - Rewritten common QOS setting for DataWriter, DataReaders and Topics. - - commit 8ad139ff96ba6a80d29a5e8bd08923532a85459c - Author: Marcel Smit - Date: Wed May 23 15:26:06 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - Added support for DomainParticipant QOS. - - commit f2b91ec491af6e056690134c4020f734e1258ae1 - Author: Marcel Smit - Date: Wed May 23 15:10:42 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - PublisherQos now is filled by the QOS XML Handler - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - Prepared the PublisherQos and SubscriberQos - - commit 58f4edfc05e2ff3209075e92295a187cb4b37d0d - Author: Marcel Smit - Date: Wed May 23 14:52:55 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Get_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - Passing the QOS XML structure to the reader side in order to - create a DataReaderQos. - - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - Passing QOS XML structure by reference. - - commit e2148e64ce9f0b1b49e9c34ed81985c156d3c292 - Author: Marcel Smit - Date: Wed May 23 14:39:01 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Passing the topic name to the QOS XML Handler - - commit 9c9921f90817ff04bd4a806cf7ca1b9a4c3b1868 - Author: Marcel Smit - Date: Wed May 23 14:05:39 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - Making difference between RTI DDS and openDDS when passing - arguments. - - * CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Update_T.h: - Passing the QOS instance to the updater so that is able to - create a datawriter with the supplied DataWriterQos. - - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Renamed Reader_Profile to ReaderProfile since the DDS XSD doesn't - accept underscores in the name. - - commit e832c62456e825cd5aaedb4083b8698463d5b037 - Author: Marcel Smit - Date: Wed May 23 11:55:44 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - Fixed runtime issues regarding determining the file name. - - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml: - Fixed location of the xsd. Parsing now succeeds. - - commit 4514c259e6079ff817bfd76488a07f50f4ec3dbd - Author: Johnny Willemsen - Date: Wed May 23 11:37:25 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Check OpenDDS config before creating them - - commit 7a3fc436330a0c8f7ee9b023a4b59e2c830c5cf1 - Author: Marcel Smit - Date: Wed May 23 11:20:41 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Using the openDDS IDL QOS structure instead of the DDS4CCM IDL - QOS structure. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Layout changes. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - Made get_xml_file_name and get_profile_name const. Fixed - runtime issues due to used sprintf - - commit d2f4a5e59fb5db0f3d5e14b512894d36e630bd0b - Author: Marcel Smit - Date: Wed May 23 10:34:21 2012 +0200 - - * CIAO/MPC/config/dds4ccm.mpb: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - Fixed link issues on windows. - - commit d5573ac64ef4ddd20e178272f3a31de02be7dbc6 - Author: Marcel Smit - Date: Wed May 23 09:53:57 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed link issues on windows. - - commit e7f3c01a7f82e44080860939751a64214e2eeec7 - Author: Marcel Smit - Date: Wed May 23 09:45:55 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - Fixed compile issues on windows: include correct header. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_XSC_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed compile issues on windows: BUILD_DLL define was not set properly, - therefor the export macros was not correctly defined. - - commit 958e79633b5d32dac7332aa4b39df4f796430a44 - Author: Johnny Willemsen - Date: Wed May 23 09:26:31 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - Fixed casing of the callback method name - - commit cc9abbed90097fbf837187edbeb0f4b5742d6921 - Author: Marcel Smit - Date: Wed May 23 09:20:41 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed compile issues regarding paths. - - commit 1e98f6d489dd8b41633931abfb47a0fa8a3de513 - Author: Marcel Smit - Date: Wed May 23 07:25:13 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_XSC_Handler_Export.h: - Added. - - commit 3e3ad5e5dc965c3caeb0b1b2b767788d7f7375e8 - Author: Marcel Smit - Date: Tue May 22 15:52:29 2012 +0200 - - * CIAO/MPC/config/dds4ccm_impl.mpb: - Added QOS XML handler as base project. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Write_T.h: - Passing the XML library to the writer in case openDDS. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Passing QOS by reference. - - * CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml: - Added qos for openDDS for testing purposes. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/Utils.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added support for parsing QOS profile string - - commit 5501b03128b7d74a0c29ef055e8e0b30c0760a96 - Author: Marcel Smit - Date: Tue May 22 14:43:01 2012 +0200 - - * CIAO/bin/ciao_tests.lst: - Added QoS/dump to the test framework. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Pass qos by reference. - - commit 990b1ce1c02730adbba92e3ed14452e6d2fbb125 - Author: Marcel Smit - Date: Tue May 22 14:25:37 2012 +0200 - - * CIAO/MPC/config/dds4ccm_base.mpb: - In case of openDDS, DDS4CCM needs the QOS XML handler - library. - - * CIAO/MPC/config/dds4ccm_config_handlers.mpb: - * CIAO/MPC/config/dds4ccm_config_handlers_base.mpb: - * CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb: - * CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb: - Rename action. - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Work in progress : Initialization of the QOS XML library - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - Due to rename action. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Due to initialization change. - - * CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl: - To support test framework. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Reworked method headers and initialization. One should pass the - qos in the get_xxx_qos methods. The callee is therefor responsible - for clean up. - - commit d766c172a83211aa48fc404992b3b55df54d8dd5 - Author: Marcel Smit - Date: Tue May 22 11:40:59 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dw_qos.xml: - Changed value for testing purposes. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - Keeping the profiles in memory (instead of one profile). - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - Removed tracing - - commit fa345aa750c7522ed0ea0a60255fadb8b4062c8b - Author: Marcel Smit - Date: Tue May 22 11:03:33 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dw_qos.xml: - Added to test with - - commit 5e49df59c2b98963a2a0a6ec874330d29c8cb7ae - Author: Marcel Smit - Date: Tue May 22 11:02:22 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - Work in progress. Disabled code in order to get it compiled and running. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_Common.h: - Added helper methods. Some integer value may contain tekst - (nanosec for instance). This class converts them in the right way. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DataWriter_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwDrTp_Base_T.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_DwTp_Base_T.h: - Hierarchy of Qos's in templated C++ classes. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - Added dds4ccm/docs/schema to the search path. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - Added some tracing. - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added QosCommon. - - commit 13d2bebd279ece2760081a26130daf326ceb8b1e - Author: Marcel Smit - Date: Tue May 22 08:50:22 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/DataWriterQos_Handler.h: - Converting the XML DataWriterQos to an IDL DataWriterQos - - commit bbf94d9c1018e3abfb67c8eba66fa9d0ca49e0e8 - Author: Marcel Smit - Date: Tue May 22 08:48:40 2012 +0200 - - * CIAO/MPC/config/dds4ccm_config_handlers_base.mpb: - * CIAO/connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Work in progress: First steps of the QOS XML handler using XSC. - - commit 6dc4be2b0cb7e23aa24a68b65e21ec97bc6532b3 - Author: Johnny Willemsen - Date: Fri May 18 20:06:46 2012 +0200 - - * CIAO/MPC/config/dds4ccm_config_handlers.mpb: - * CIAO/MPC/config/dds4ccm_config_handlers_base.mpb: - New base projects for dds4ccm config handlers - - * CIAO/connectors/dds4ccm/tests/QoS/dump/dds4ccm_qos_dump.mpc: - * CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp: - Starter for new qos xml tests - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Added more code - - * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc: - Removed not needed base project - - * DAnCE/tools/Config_Handlers/DnC_Dump.h: - Layout changes - - commit e383bec8fadbf726ac6684779210ee619f376faf - Author: Johnny Willemsen - Date: Fri May 18 19:07:33 2012 +0200 - - * CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc: - * CIAO/CIAO_TAO_OpenDDS.mwc: - Reuse the OpenDDS workspace files instead - of duplicating them here - - commit a0971838efcac9b1967cad1612cd055917c1ea5d - Author: Johnny Willemsen - Date: Fri May 18 15:43:50 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - Enabled parsing - - commit bceaf0f92476bca8163dbba68d7dfcb8893f8bd0 - Author: Johnny Willemsen - Date: Fri May 18 15:19:32 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Fixed compile errors, just get it to compile - - commit b95b7e4318a9125eac10ef87e22c991691d191f2 - Author: Johnny Willemsen - Date: Fri May 18 15:16:18 2012 +0200 - - * CIAO/CIAO_TAO_DAnCE.mwc: - * CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc: - Also compile connectors/dds4ccm/tools by - default - - commit fb26c7868fc9a515075aa909bea8b2f12f57856b - Author: Johnny Willemsen - Date: Fri May 18 14:58:01 2012 +0200 - - * CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc: - * CIAO/CIAO_TAO_OpenDDS.mwc: - New workspaces that compile ACE/TAO/CIAO/DAnCE with - OpenDDS - - commit d69b8370c30a6a204d7fee98efe5c23852c58aaa - Author: Johnny Willemsen - Date: Thu May 17 15:56:27 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Some starting files, need more work - - commit f9e6292cbc3b37da214edee3386185c651d17ad8 - Author: Johnny Willemsen - Date: Thu May 17 15:43:25 2012 +0200 - - * CIAO/connectors/dds4ccm/docs/schema/dds_qos.xsd: - Simplified xsd, all restrictive qos are not used - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp: - Regenerated and slightly handcrafted - - commit c9f9fb8210a8696d4cece32a3e99f40b2bedddaa - Author: Johnny Willemsen - Date: Wed May 16 20:34:48 2012 +0200 - - * CIAO/connectors/dds4ccm/docs/schema/dds_qos.xsd: - Updated with modified file by Will Otte that gets better - handled by XSC - - commit 4d92a57a9e4e695cf38e4291203dbc44814285c9 - Author: Johnny Willemsen - Date: Wed May 16 20:32:52 2012 +0200 - - * CIAO/connectors/dds4ccm/docs/schema/dds_qos.xsd: - Some fixes - - commit 2b28f0224a2581fc3d176a0d63def384c591d577 - Author: Johnny Willemsen - Date: Wed May 16 14:14:56 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_XSC_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Generated dds_qos with some manual handcrafting to get it to compile - - commit 315a80179069abe422a3aba87b997fe1bf718552 - Author: Johnny Willemsen - Date: Wed May 16 13:46:02 2012 +0200 - - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_XSC_Handler_Export.h: - Renamed to get the correct name - - commit 817e02aa595eca4c77f643ab38ec8f6e3c12018d - Author: Marcel Smit - Date: Wed May 16 13:39:58 2012 +0200 - - * CIAO/connectors/dds4ccm/docs/schema/dds_qos.xsd: - * CIAO/connectors/dds4ccm/docs/schema/xsc-banner.cpp: - * CIAO/connectors/dds4ccm/docs/schema/xsc-banner.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.cpp: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/QOS_XML_Loader.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_QOS_Handler_Export.h: - * CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: - Work in progress: starting up a DDS QOS Handler for DDS4CCM - -Sat May 19 14:28:57 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.2 released. - -Thu May 17 08:19:42 UTC 2012 Johnny Willemsen - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - Fixed conversion warnings - -Wed May 16 14:183:12 UTC 2012 Marijke Hengstmengel - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - Changes in DOxygen documentation . - -Tue May 15 18:17:45 UTC 2012 Johnny Willemsen - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_XMI/be_sunsoft.cpp: - Removed support for Tandem NSK. That was the last platform that - needed the emulated versions of ACE_INT64 and ACE_UINT64, that - emulation has now been removed - -Tue May 15 13:35:32 UTC 2012 Marcel Smit - - Merged DDS4CCM_OpenDDS branch - - commit 4470f90d57735e51dc7d38e1d22ecf3b7ff34a92 - Author: Marcel Smit - Date: Tue May 15 14:05:24 2012 +0200 - - * CIAO/MPC/config/dds4ccm_base.mpb: - * CIAO/MPC/config/dds4ccm_impl.mpb: - Added base projects in order to fix unresolved - externals on windows. - - commit 69fdc95b7e5ed5f2a79b4ae7cd4e285839f65f23 - Author: Johnny Willemsen - Date: Mon May 14 20:25:37 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - Use correct requires - - commit 767ef7334d305c4ca189a51805329afc93ca39d8 - Author: Johnny Willemsen - Date: Mon May 14 07:46:40 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc: - Added missing after statements - - commit 847866aae0f053bfbb1ffd4edaf7274b6e2e9bab - Author: Johnny Willemsen - Date: Sun May 13 19:36:20 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc: - Added missing after - - commit 05da116efe0de5b68abfecb07b48aa59a93ec946 - Author: Marcel Smit - Date: Fri May 11 16:28:46 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: - CIAO_DDS4CCM_NDDS was not set correctly. Changed base project for that. - - commit 0931cdcf6642d963880d54c51b966d4c10d5da89 - Author: Marcel Smit - Date: Fri May 11 14:33:51 2012 +0200 - - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - Added sequence definition - - commit 9331312287c935480baf8f3ac0f84762b2243482 - Author: Marcel Smit - Date: Fri May 11 14:17:40 2012 +0200 - - * CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp: - * CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h: - * CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp: - * CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - Fixed compile errors due to XML utils renaming - - commit 5efbb98bed19986fe31c661e649c88f2324fbc0e - Author: Marcel Smit - Date: Fri May 11 08:54:30 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc: - Added after. - - * DAnCE/tools/XML/XML_Typedefs.cpp: - * DAnCE/tools/XML/XML_Typedefs.h: - * DAnCE/tools/XML/XML_Utils_Export.h: - Added due to rename actions - - commit 6dab97ffb04eb583d5f0dc876b38ae4034e0b066 - Author: Marcel Smit - Date: Thu May 10 07:56:10 2012 +0200 - - * CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc: - * CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Renamed dance_xml_utils into xml_utils - - commit 081664cae99505b17cd31e6774b08bd5f05a998c - Author: Marcel Smit - Date: Wed May 9 13:18:52 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc: - Fixed compile issues due to a missing after - - commit 6d23412946c4af026d07eee8fa12ae4ddb076056 - Author: Marcel Smit - Date: Tue May 8 20:16:19 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: - Disabled for open DDS - - commit 8add902213001fb14a67bfea22fc0d8008348df5 - Author: Marcel Smit - Date: Mon May 7 09:24:20 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: - The executor projects require dds4ccm_ndds - - commit 21fd72b48afd93d99b2d03c7d184efc9265a6b25 - Author: Marcel Smit - Date: Mon May 7 08:59:09 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - * CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: - Fixed compile issues due to a lacking after - - commit 5a9425df311d7f805e6933d074d791498b81d072 - Author: Marcel Smit - Date: Tue May 1 18:32:44 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc: - Disabled executor project since RTI DDS is used in these tests. - - commit 3016a41bbd84a8f2fd6e41ce8f4c4d50ad1c0240 - Author: Marcel Smit - Date: Tue May 1 18:28:51 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: - Fixed an after - - commit 4ea8bea0051379385a6761ca320fca2d961e129a - Author: Marcel Smit - Date: Tue May 1 10:31:19 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl: - Reverted the last changes since the openDDS idl compiler now generates an - include guard. - - commit c86fedea982747310fa4a7dd2329f1674dafd12c - Author: Marcel Smit - Date: Tue May 1 09:37:14 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: - Do not build for openDDS - - commit 396f2e3891f0df6e9258ce99c3eb5062fafce8f6 - Author: Marcel Smit - Date: Tue May 1 09:35:33 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl: - Prevent the inclusion of the TypeSupport.idl twice. - - commit 88ab89cb93654070ebc6f1a0a14e7b88e642a2b2 - Author: Marcel Smit - Date: Tue May 1 08:55:02 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - Prevent including BaseTypeSupport twice. Also disabled Component executors to be compiled on - opendds - - commit 29d038436fe7e79156b8e5cc4ef6f93f58a5dc04 - Author: Marcel Smit - Date: Fri Apr 27 18:11:59 2012 +0200 - - * CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl: - Added support for openDDS - - commit 5cae521c342abb234e65342c98923f6fe4d48df2 - Author: Marcel Smit - Date: Fri Apr 27 18:08:02 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: - Turned off for openDDS for now - - * CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - * CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: - Added support for openDDS - - commit 2ff1b8641ea2087c45f12c87b326e46daf1d5b1f - Author: Marcel Smit - Date: Fri Apr 27 17:50:05 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc: - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: - * CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc: - * CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc: - * CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc: - Disable these projects for now. - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl: - Added support for openDDS - - commit 6fefa31cf3b6d85c16989272375181db07314668 - Author: Marcel Smit - Date: Fri Apr 27 16:51:37 2012 +0200 - - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl: - * CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl: - * CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc: - Updated in order to support openDDS. - - commit 9e02fb8bf4fd99b815a13b2aa26819a3837aad8b - Author: Marcel Smit - Date: Fri Apr 27 14:11:33 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - Prototyped the idl changes for openDDS. - - commit 6ce8768572a8340ee59521fc910f6b5023fe0cbf - Author: Marcel Smit - Date: Fri Apr 27 11:15:33 2012 +0200 - - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - Fixed compile issues. - - * TAO/TAO_IDL/be/be_global.cpp: - * TAO/TAO_IDL/be/be_util.cpp: - * TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - * TAO/TAO_IDL/be_include/be_global.h: - Removed opendds_suffix from the code. In openDDS, suffix of - the sequence is defined as 'Seq'. - - commit d1c45d256337574e7779c088c5d0634be7d024d5 - Author: Marcel Smit - Date: Thu Apr 26 20:06:13 2012 +0200 - - * CIAO/MPC/config/ndds_idltocpp.mpb: - * CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb: - Added -DDDS4CCM_NEEDS_SEQUENCES_DEFINED again. - - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - Fixed compile issues for both openDDS and RTI DDS. - - * CIAO/connectors/dds4ccm/idl/ccm_dds.idl: - Removed comment. - - * TAO/TAO_IDL/be/be_visitor_arg_traits.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: - Don't check for which DDS vendor is used. Just check for the - availability of the pragma. - - commit eabcfd1ec51f753d925c3e224c853a598f69c7db - Author: Marcel Smit - Date: Thu Apr 26 11:22:35 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * CIAO/connectors/dds4ccm/idl/ccm_dds.idl: - * CIAO/connectors/dds4ccm/impl/Updater_T.cpp: - * CIAO/connectors/dds4ccm/impl/Updater_T.h: - * CIAO/connectors/dds4ccm/impl/Writer_T.cpp: - * CIAO/connectors/dds4ccm/impl/Writer_T.h: - * TAO/TAO_IDL/be/be_visitor_arg_traits.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - * TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: - * TAO/TAO_IDL/fe/lex.yy.cpp: - * TAO/TAO_IDL/include/idl_global.h: - * TAO/TAO_IDL/util/utl_global.cpp: - Using a pragma to define the sequences for openDDS. If that pragma is - set, the sequence is generated as it was declared as a native - - * CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - - * CIAO/connectors/dds4ccm/impl/ConditionManager.cpp: - Check whether read condition is there before detaching - it from the waitset. Optimized logging in this case. - - commit ca001a58956fd09ce0aee1ab614ed178c54cbe0a - Author: Marcel Smit - Date: Wed Apr 25 12:39:30 2012 +0200 - - * CIAO/MPC/config/dds4ccm_ts_default.mpb: - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * CIAO/connectors/dds4ccm/idl/ccm_dds.idl: - * CIAO/connectors/dds4ccm/impl/Updater_T.cpp: - * CIAO/connectors/dds4ccm/impl/Updater_T.h: - * CIAO/connectors/dds4ccm/impl/Writer_T.cpp: - * CIAO/connectors/dds4ccm/impl/Writer_T.h: - * CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - Work in progress: Refactoring of typedef sequence declarations. Seems that 'native' - declaration does not work. Need to change openDDS, using a typedef declaration with - a pragma. - - commit 9002aa673f147c470cf6bc8a4c5de101dc01429f - Author: Marcel Smit - Date: Wed Apr 25 09:11:46 2012 +0200 - - * CIAO/MPC/config/dds4ccm.mpb: - * CIAO/MPC/config/dds4ccm_base.mpb: - * CIAO/MPC/config/dds4ccm_impl.mpb: - * CIAO/MPC/config/dds4ccm_ts_default.mpb: - * CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb: - * CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: - REmoved splice support since that didn't work out until now. - - * CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Define the DDS4CCM_NEEDS_SEQUENCES_DEFINED in case RTI dds. - - * CIAO/connectors/dds4ccm/impl/Updater_T.cpp: - Need to pass a valid handle to openDDS. Therefor looking up the - handle first. - - commit 53edc627ec77beca80f51ab5fd000dd17567c55f - Author: Marcel Smit - Date: Tue Apr 24 15:51:18 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/ConditionManager.cpp: - Implemented check_handle for openDDS. - - * CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: - Removed splice support. - - * CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl: - Fixed compile errors regarding sequences in openDDS - - commit 8622b7527aaa6185fcd8c1196f41fadefc50a025 - Author: Marcel Smit - Date: Mon Apr 23 15:38:42 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - * CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl: - * CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - Fixed compile issues for openDDS. Using the DDS4CCM_NEEDS_SEQUENCES_DEFINED - define around typedef sequence declarations. - - commit 03b781dddd707522891d3c4a153ba3a15a5566f3 - Author: Marcel Smit - Date: Mon Apr 23 15:32:32 2012 +0200 - - * CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl: - * CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl: - Removed ciao related, commented out code. - - * CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl: - * CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl: - Fixed compile issues for openDDS - - commit ddb71b5d1c9cef74d6e39d4204437841a0539045 - Author: Marcel Smit - Date: Mon Apr 23 14:43:30 2012 +0200 - - * CIAO/connectors/dds4ccm/impl/ConditionManager.cpp: - Fixed OpenDDS runtime error regarding initialization - of return value. - - * CIAO/connectors/dds4ccm/impl/Updater_T.cpp: - Fixed runtime error. Passing the lookup instance handle - instead of the given instance handle. - - commit 99091377ad5bbc4246faf234ceba4e6e19229843 - Author: Marcel Smit - Date: Mon Apr 23 12:15:39 2012 +0200 - - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/idl/ccm_dds.idl: - * CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: - * CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl: - * CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/Derived/Derived.idl: - * CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl: - * CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl: - * CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl: - * CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl: - * CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl: - * CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl: - * CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl: - * CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl: - * CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl: - * CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl: - * CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl: - * CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - * CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl: - * CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl: - * CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - * CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - Fixed compile issues on OpenDDS. Making use of a define which prevents sequences to be compiled. - - commit 11933d30e07fa7dacf35bc3e523b3be2eb2e8220 - Author: Marcel Smit - Date: Fri Apr 13 16:11:38 2012 +0200 - - * CIAO/MPC/config/dds4ccm_ts_default.mpb: - Use dcps_rtps instead of dcps as base project. - - * CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - Removed the usage of a openDDS repository - - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - Configuring openDDS to use RTPS discovery. Also configure openDDS - to use the correct domain ID. - - commit 1c7c7c0af71e7908ad02c24f7a0f9cc71f6b71da - Author: Marcel Smit - Date: Wed Apr 11 11:54:28 2012 +0200 - - * CIAO/MPC/config/dds4ccm.mpb: - * CIAO/MPC/config/dds4ccm_ts_default.mpb: - * CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * CIAO/connectors/dds4ccm/idl/ccm_dds.idl: - * TAO/TAO_IDL/be/be_codegen.cpp: - * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - Preparation in order to support OpenDDS in DDS4CCM - -Mon May 14 05:42:00 UTC 2012 Johnny Willemsen - - * performance-tests/Protocols/Sender/Sender_exec.cpp: - Use ACE_High_Res_Timer::global_scale_factor_type - -Sun May 13 12:50:03 UTC 2012 Johnny Willemsen - - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Protocols/Receiver/Receiver_exec.cpp: - * performance-tests/Protocols/Sender/Sender_exec.cpp: - Use ACE_High_Res_Timer::global_scale_factor_type - -Tue May 8 12:43:12 UTC 2012 Marijke Hengstmengel - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - Generated executors again after adding new documentation in TAO_IDL . - -Tue May 8 12:10:12 UTC 2012 Marcel Smit - - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Fixed runtime errors (double deletes) in main. - -Wed Apr 25 12:02:03 UTC 2012 Marijke Hengstmengel - - * connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html: - Fixed typo. - * connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html: - Added include of dds4ccm/idl dir with -Gex command - - -Thu Apr 19 07:48:03 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/TypeSupport.cpp: - Fixed incorrect loop - -Sun Apr 15 12:35:12 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h: - * connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp: - Fixed coverity error - -Thu Apr 12 08:17:57 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - Compile fix - -Wed Apr 11 10:41:14 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h: - * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h: - * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp: - Coverity fixes - -Fri Apr 06 09:03:19 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.1 released. - -Mon Mar 26 10:46:30 UTC 2012 Johnny Willemsen - - * tests/Bug_4009_Regression/Bug_4009_Bar.mpc: - Fixed windows link issues - -Fri Mar 23 22:04:28 UTC 2012 Johnny Willemsen - - * tests/Bug_4009_Regression/Bug_4009_Foo.idl: - Forgot to commit this last version - -Fri Mar 23 21:58:41 UTC 2012 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Parse more files - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Added some documentation to be copied by doxygen to the - executor header - -Fri Mar 23 20:34:35 UTC 2012 Johnny Willemsen - - * tests/Bug_4009_Regression/Bug_4009_Bar.idl: - * tests/Bug_4009_Regression/Bug_4009_Bar.mpc: - * tests/Bug_4009_Regression/Bug_4009_Foo.idl: - Extended this test with much more typedefs - -Fri Mar 23 20:24:42 UTC 2012 Johnny Willemsen - - * tests/Bug_4009_Regression/Bug_4009_Bar.idl: - * tests/Bug_4009_Regression/Bug_4009_Bar.mpc: - * tests/Bug_4009_Regression/Bug_4009_Foo.idl: - * tests/Bug_4009_Regression/Bug_4009_Foo.mpc: - New unit test for bugzilla 4009, uncovers a bug when generating - the CIAO executor - -Fri Mar 23 19:39:28 UTC 2012 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Added a component with a sequence type as attribute - -Wed Mar 21 01:35:00 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp: - Fixed compile error - -Wed Mar 21 01:30:33 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp: - Fixed coverity errors - -Tue Mar 20 01:30:58 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h: - * connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp: - * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: - * connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp: - * connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: - * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp: - * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp: - * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp: - * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: - Fixed coverity errors - -Wed Mar 7 13:09:45 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - Fixed coverity errors - -Wed Mar 7 10:56:00 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Fixed coverity error - -Wed Mar 7 10:03:02 UTC 2012 Johnny Willemsen - - * NEWS: - Updated for release - -Wed Mar 07 09:04:40 CET 2012 Johnny Willemsen - - * CIAO version 1.1.0 released. - -Tue Feb 28 19:26:48 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/Getter_T.cpp: - * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp: - Fixed coverity errors - -Thu Feb 23 14:16:48 UTC 2012 Johnny Willemsen - - * tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp: - Use the OpenMode as configProperty - -Thu Feb 23 12:27:54 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - * ciao/Base/CIAO_Properties.idl: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.h: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Container_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - Added support for new ciao config property "edu.vanderbilt.dre.CIAO.OpenMode" - which controls the mode that is used to load the shared libraries for - a home or component. By default we use ACE_DEFAULT_SHLIB_MODE - which can be controlled through config.h, but now it can also - be controlled using the deployment plan. This property is of type long - - * tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp: - * tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl: - Example cdp using the new open mode property - -Tue Feb 21 15:36:44 UTC 2012 Johnny Willemsen - - * ciao/Containers/Container_Base_T.h: - * ciao/Containers/Container_Base_T.cpp: - * ciao/Containers/Extension/Extension_Container.cpp: - * ciao/Containers/Session/Session_Container.cpp: - Changed open_mode as argument, more work has to be done to let the - user control this mode - -Mon Feb 20 13:12:42 UTC 2012 Johnny Willemsen - - * ccm/CCM_EventConsumerBase.idl: - Removed not needed include - -Fri Jan 27 09:02:30 UTC 2012 Johnny Willemsen - - * NEWS: - Updated for next release - -Fri Jan 27 08:58:54 CET 2012 Johnny Willemsen - - * CIAO version 1.0.8 released. - -Thu Jan 26 10:56:23 UTC 2012 Martin Corino - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - Removed duplicate function declaration. - -Tue Jan 24 19:14:53 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/CCM_DataReader.h: - * connectors/dds4ccm/impl/CCM_DataWriter.h: - * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: - * connectors/dds4ccm/impl/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/DDS_Write_T.cpp: - Make it possible to also use _get_component on the dds_entity ports - - * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp: - Test _get_component on the dds_entity ports - -Tue Jan 24 18:31:45 UTC 2012 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Extended this test for supports with attributes, thanks to - Michael Frommberger - for extending this test - -Tue Jan 24 13:33:32 UTC 2012 Johnny Willemsen - - * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: - Layout changes - - * rules.ciao.GNU: - Small simplification - -Tue Jan 24 12:05:47 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp: - * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: - Narrow the result of _get_component to the connector interface - -Mon Jan 23 20:21:32 UTC 2012 Johnny Willemsen - - * MPC/config/taobaseidl3toidl2defaults.mpb: - * MPC/config/taoidl3toxmidefaults.mpb: - Fixed again - -Mon Jan 23 20:12:06 UTC 2012 Johnny Willemsen - - * MPC/config/taobaseidl3toidl2defaults.mpb: - * MPC/config/taoidl3toxmidefaults.mpb: - Reverted change below, triggers error in normal build - -Mon Jan 23 14:35:42 UTC 2012 Johnny Willemsen - - * MPC/config/taobaseidl3toidl2defaults.mpb: - * MPC/config/taoidl3toxmidefaults.mpb: - Fixes for install builds - -Mon Jan 23 12:55:55 UTC 2012 Johnny Willemsen - - * ccm/CCM_stub.mpc: - Reverted change below, the install is needed - -Mon Jan 23 12:07:30 UTC 2012 Johnny Willemsen - - * ccm/CCM_stub.mpc: - Removed not needed post_install - -Mon Jan 23 09:45:53 UTC 2012 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - Also build tools - -Mon Jan 23 07:53:26 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Fixes for install build - -Sun Jan 22 19:03:34 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - Unicode fixes - -Sun Jan 22 18:01:27 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Install fixes - -Sat Jan 21 14:40:46 UTC 2012 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - Reduced number of files generated - -Sat Jan 21 14:40:07 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Change install - -Sat Jan 21 12:15:51 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Added missing files - -Fri Jan 20 10:31:19 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Reduced the amount of files being generated - -Fri Jan 20 10:08:02 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Reduced the amount of files being generated - -Fri Jan 20 09:58:21 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: - * connectors/dds4ccm/idl/dds4ccm_skel.mpc: - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Reduced the amount of files being generated - -Fri Jan 20 09:28:45 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Use new -Ssvcp and -Ssvtp - -Thu Dec 29 20:00:39 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp: - Fixed wchar compile error - -Tue Dec 27 11:39:58 UTC 2011 Johnny Willemsen - - * NEWS: - Updated for next release - -Tue Dec 27 10:06:28 CET 2011 Johnny Willemsen - - * CIAO version 1.0.7 released. - -Tue Dec 20 15:10:01 UTC 2011 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp: - * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: - Reset the timer queue and finalize DDS explicitly to fix a lot of - reported memory leaks - -Tue Dec 20 09:10:05 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - Solved valgrind errors. - -Mon Dec 19 11:33:05 UTC 2011 Marijke Hengstmengel - - * tests/DAnCE/NodeManager-Deployments/run_test.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_noevent.pl: - * tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/NodeManager-Deployments/run_testcdr_noevent.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test_noevent.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl: - * tests/DAnCE/ExecutionManager-Deployments/run_testcdr_noevent.pl: - * tests/DAnCE/EM-Redeployment/run_test.pl: - * tests/DAnCE/Em_Redeployment/run_test_noevent.pl: - * bin/ciao_tests.lst: - Splitted tests-runs in runs for noevent disabled and enabled. - - -Sun Dec 18 11:36:05 UTC 2011 Johnny Willemsen - - * bin/ciao_tests.lst: - Run more tests with noevent, if some of the cdp's are not fit - for noevent, than they should move to a different directory - -Fri Dec 16 12:39:56 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - Added performance-tests/Keyed to the test framework. - - * ciao/Deployment/Handlers/Connection_Handler.cpp: - Optimized logging. - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - Fixed runtime issues. Also cleaned up unused code. - -Fri Dec 16 07:37:37 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Added dds4ccm_QueryFilterC.inl to the DDS4CCM_stub project. - -Thu Dec 15 14:01:48 UTC 2011 Marijke - - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: - Solved error. - -Thu Dec 15 12:49:05 UTC 2011 Marcel Smit - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - Fuzz. Whitespaces. - -Thu Dec 15 11:00:00 UTC 2011 Martin Corino - - Merged timer_policy branch. - - === start changelog === - - Wed Dec 14 08:56:00 UTC 2011 Martin Corino - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - - Fixed compile error. - - Tue Dec 13 10:28:00 UTC 2011 Martin Corino - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp: - * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp: - - Adapted tests to new time policy support. - - === end changelog === - -Thu Dec 15 07:49:48 UTC 2011 Marijke - - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: - Solved dependency error. - - -Wed Dec 14 11:33:48 UTC 2011 Marcel Smit - - Merged changes from our work branch. - === start changelog === - Wed Dec 14 10:22:44 UTC 2011 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - Used a std::pair instead of a separate list for the domain ID. - - Mon Dec 12 15:37:43 UTC 2011 Marcel Smit - - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: - Domain partipants should be created per domain ID and QOS profile. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl: - Added test to verify this. - -Wed Dec 14 09:00:48 UTC 2011 Marijke - - * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl: - * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl: - * connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp: - * tests/IDL3/Homes/Basic/Basic.idl: - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Fuzz errors - -Tue Dec 13 13:37:25 UTC 2011 Marijke Hengstmengel - - Merged changes from our work branch. Test Home with connectors.F - === start changelog === - - Tue Dec 13 13:17:07 UTC 2011 Marijke Hengstmengel - - * bin/ciao_tests.lst - Added HomeTest - - Tue Dec 13 13:00:07 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp: - * connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp: - * connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl: - Home created now a connector instance, without activating it. - - Mon Dec 12 10:59:27 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp: - * connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp: - * connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp: - * connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl: - Add controller, acting on Home component - - * connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp: - Removed this file. - - Thu Dec 8 16:08:07 UTC 2011 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeTest: - * connectors/dds4ccm/tests/HomeTest/Base: - * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl: - * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc: - * connectors/dds4ccm/tests/HomeTest/Connector: - * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl: - * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc: - * connectors/dds4ccm/tests/HomeTest/HomeComp: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h: - * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp: - * connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp: - * connectors/dds4ccm/tests/HomeTest/descriptors: - * connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp: - * connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl: - First commit new test for Connector Homes. - === end changelog === - -Mon Dec 12 19:28:51 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - Added missing template files - -Mon Dec 12 07:33:25 UTC 2011 Johnny Willemsen - - Merged changes from our work branch. Facet servants are now generated - as C++ template at the moment the interface is declared, this reduces - the amount of code generated heavily. Component/Connector context is - now also generated as C++ template - - === start changelog === - - Fri Dec 9 16:07:48 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - Fixed compile errors. - - Fri Dec 9 15:41:59 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl: - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: - Also generate a Single_Service_Common lem. - - Fri Dec 9 14:28:24 UTC 2011 Marcel Smit - - * tests/Bug_3834_Regression/Moo.mpc: - Fixed afters and linker errors on windows. - - Fri Dec 9 14:15:16 UTC 2011 Marcel Smit - - * tests/Bug_3834_Regression/CompA.mpc: - * tests/Bug_3834_Regression/Moo.mpc: - Fixed link issues on windows. - - Fri Dec 9 13:42:40 UTC 2011 Marcel Smit - - * tests/Bug_3834_Regression/CompA.idl: - * tests/Bug_3834_Regression/CompA.mpc: - * tests/Bug_3834_Regression/Moo.idl: - * tests/Bug_3834_Regression/Moo.mpc: - Fixed compile issues on Linux. - - Fri Dec 9 13:24:31 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: - * tests/Bug_3834_Regression/CompA.mpc: - * tests/Bug_3834_Regression/CompB.mpc: - Removed the -Glfa option since it is obsolete. - - Fri Dec 9 11:48:53 UTC 2011 Marcel Smit - - * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc: - * tests/DAnCE/Components/SimpleCommon.mpc: - * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc: - Fixed compile errors related to the movement of the facet - servants. - - Fri Dec 9 10:41:34 UTC 2011 Marcel Smit - - * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: - Generate svnt code as well. - - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h: - * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp: - Removed these files since they can be generated. - - Fri Dec 9 10:17:37 UTC 2011 Marcel Smit - - * bin/ciao_tests.lst: - * examples/Null_Component_Glfa: - * examples/Null_Component_Glfa/Null_Component.idl: - * examples/Null_Component_Glfa/Null_Component.mpc: - * examples/Null_Component_Glfa/Null_Interface.idl: - * examples/Null_Component_Glfa/Null_Interface.mpc: - * examples/Null_Component_Glfa/descriptors: - * examples/Null_Component_Glfa/descriptors/NodeMap.dat: - * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp: - * examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - Removed this test. No need to test this anymore. - - Fri Dec 9 10:15:44 UTC 2011 Marcel Smit - - - * tests/IDL_Test/Glfa: - * tests/IDL_Test/Glfa/A.idl: - * tests/IDL_Test/Glfa/A.mpc: - * tests/IDL_Test/Glfa/B.idl: - * tests/IDL_Test/Glfa/B.mpc: - Removed these files. No need to test this anymore. - - Fri Dec 9 08:34:00 UTC 2011 Marcel Smit - - * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc: - Fixed compile errors related to the movement of the facet - servants. - - Fri Dec 9 08:31:15 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: - Fixed compile errors related to the movement of the facet - servants. - - Fri Dec 9 07:57:33 UTC 2011 Marcel Smit - - * connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc: - * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc: - * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc: - * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc: - * connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc: - * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc: - * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc: - * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc: - * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc: - * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc: - * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc: - * connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc: - * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc: - * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc: - * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc: - * connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc: - * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc: - * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc: - Fixed compile errors related to the movement of the facet - servants. - - Thu Dec 8 14:38:45 UTC 2011 Marcel Smit - - * ciao/Servants/Extension/Servant_Impl_T.h: - Added missing include. - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc: - Removed -Gsv IDL compiler flag. - - Wed Dec 7 07:34:23 UTC 2011 Marcel Smit - - * ciao/Servants/Facet_Servant_Base_T.h: - * ciao/Servants/Session/Servant_Impl_T.h: - Added some necessary includes. - - Mon Dec 5 19:10:07 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Removed -Glem for generation of dds4ccm_entity.idl - and ccm_dds.idl since it was not necessary to create - the local executor mapping (at least, the generated - files were not compiled) - - Mon Dec 5 18:41:32 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Removed -Glem since it was added a second time. At that point - dds4ccm_QueryFilter was generated with -Glem - (which is not necessary). - - Fri Dec 2 07:58:40 UTC 2011 Marcel Smit - - * ciao/Contexts/Extension/Extension_Context_T.h: - * ciao/Contexts/Extension/Extension_Context_T.cpp: - * ciao/Servants/Extension/Servant_Impl_T.h: - * ciao/Servants/Extension/Servant_Impl_T.cpp: - * ciao/Servants/Session/Servant_Impl_T.h: - * ciao/Servants/Session/Servant_Impl_T.cpp: - Added _T to templated classes. This fixes compile error - since the IDL compiler was already prepared for this. - - * tests/IDL_Test/Inherited_Component/Extended/Base.idl: - Let derived_interface derive from the base_interface. - - Thu Dec 1 09:05:31 UTC 2011 Marcel Smit - - * connectors/dds4ccm/idl/dds4ccm_stub.mpc: - Prevent compilation after invoking make for a second time - - Thu Dec 1 08:36:22 UTC 2011 Marcel Smit - - * ciao/Contexts/Session/Session_Context_T.h: - * ciao/Contexts/Session/Session_Context_T.cpp: - Renamed class, using _T postfix. - - * tests/IDL_Test/Inherited_Component/Extended/Base.idl: - * tests/IDL_Test/Inherited_Component/Extended/Derived.idl: - Expanded. - - === end changelog === -Wed Dec 7 19:00:59 UTC 2011 Johnny Willemsen - - * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc: - Fix problem in this mpc file - -Wed Dec 7 10:47:15 UTC 2011 Johnny Willemsen - - Merged in the changes to update AMI4CCM to match the initial revision - with the synchronous port and the new pragma's added - - === start changelog === - - Thu Dec 1 09:50:06 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - * connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - Changes for using now sync port ami connector beside Sender-Receiver connection - - Thu Dec 1 09:15:53 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp: - * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: - - * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp: - * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: - Changes for using now sync port ami connector beside Sender-Receiver connection - - Wed Nov 30 16:11:09 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp: - * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp: - * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: - Run test also with sync port on AMI connector. - - Mon Nov 21 15:10:06 UTC 2011 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/ami4ccm/tests/SyncPortConn: - * connectors/ami4ccm/tests/SyncPortConn/Base: - * connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl: - * connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc: - * connectors/ami4ccm/tests/SyncPortConn/Receiver: - * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc: - * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/tests/SyncPortConn/Sender: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/tests/SyncPortConn/descriptors: - * connectors/ami4ccm/tests/SyncPortConn/descriptors/.dance_artifacts: - * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp: - * connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl: - Test using sync port on AMI connector. - - Mon Nov 21 13:30:15 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Add sync port to connector - - Tue Nov 8 08:53:04 UTC 2011 Marijke Hengstmengel - - * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc: - Missing file. - - Mon Nov 7 13:29:04 UTC 2011 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/ami4ccm/tests/PragmaT: - * connectors/ami4ccm/tests/PragmaT/Base: - * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl: - * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc: - * connectors/ami4ccm/tests/PragmaT/README: - * connectors/ami4ccm/tests/PragmaT/Receiver: - * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl: - * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h: - * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp: - * connectors/ami4ccm/tests/PragmaT/Sender: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h: - * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp: - * connectors/ami4ccm/tests/PragmaT/descriptors: - * connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp: - * connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl: - Test use of new pragma's 'ami4ccm interface', 'ami4ccm receptacle' and 'ami4ccm idl'. - New pragma's work besides old ones 'ciao ami4ccm ...' . - - === end changelog === - -Mon Dec 5 12:32:50 UTC 2011 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Removed some commented out code and use a switch instead of an if - - * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: - Removed return statement which we never could reach - - * ciao/Servants/Session/Servant_Impl_T.cpp: - Some code restructuring - - * ciao/Valuetype_Factories/ConfigValue.cpp: - Small performance increase - - * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: - Fixed memory leak - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2013a b/CIAO/ChangeLogs/ChangeLog-2013a deleted file mode 100644 index 04245406cf2..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2013a +++ /dev/null @@ -1,1259 +0,0 @@ -Fri Aug 16 08:56:17 CEST 2013 Johnny Willemsen - - * CIAO version 1.2.1 released. - -Mon Aug 12 09:48:27 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc: - Remove dds4ccm from svnt - * connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp: - Delete ticker - -Fri Aug 9 16:57:32 UTC 2013 Johnny Willemsen - - * tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - Use ACE_HAS_SCHED_GETAFFINITY instead of checking the - linux kernel version here - -Fri Aug 9 08:28:27 UTC 2013 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Further extensions, test whether the default value of all - numeric fields works when they just use in the cdp - -Wed Aug 7 09:340:27 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml: - Qos file, needed if not using OPEN DDS . - -Tue Aug 6 08:00:27 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h: - Missing files for test. - -Mon Aug 5 10:20:27 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/examples/ShapesContr: - * connectors/dds4ccm/examples/ShapesContr/Connector: - * connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc: - * connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/examples/ShapesContr/Base: - * connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl: - * connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc: - * connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl: - * connectors/dds4ccm/examples/ShapesContr/README: - * connectors/dds4ccm/examples/ShapesContr/Sender: - * connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc: - * connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp: - * connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/examples/ShapesContr/descriptors: - * connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp: - * connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp: - * connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml: - * connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl: - * connectors/dds4ccm/examples/ShapesContr/ControllerR: - * connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc: - * connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp: - * connectors/dds4ccm/examples/ShapesContr/ontrollerR/Shapes_ControllerR.idl: - * connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h: - * connectors/dds4ccm/examples/ShapesContr/Controller: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl: - * connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h: - * connectors/dds4ccm/examples/ShapesContr/Receiver: - * connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc: - * connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl: - * connectors/dds4ccm/examples/ShapesContr/README: - Test where a controller componet starts and stops publishing of shapes and an - other controller component aggregates the received samples and makes them available for the outside world. - -Mon Aug 5 06:13:27 UTC 2013 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed coverity warning - -Mon Aug 5 06:08:56 UTC 2013 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed warning - -Sat Aug 3 19:01:31 UTC 2013 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Another fix for compile errors related to long doubles. - -Fri Aug 2 06:25:59 UTC 2013 Marcel Smit - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed compile errors related to long doubles. - -Thu Aug 1 11:49:07 UTC 2013 Marcel Smit - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - Added extended tests for array attributes. Expanded the - Bug_3769_Regression to test this. Added some more attributes - to test more cases. - Log: - commit d76669ffd4319f509fb70a23357bc625bd439394 - Author: Johnny Willemsen - Date: Thu Aug 1 13:03:49 2013 +0200 - - Removed commented out code (issue #1551) - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: - - commit c48685af6b186881a3dd5c04e3f81bebc594a3c6 - Author: Marcel Smit - Date: Thu Aug 1 11:57:18 2013 +0200 - - Changes after review - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed some faulty error logs. - - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Removed commented out code. - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - Fixed logging. - - commit 332899620e9b6eaf272f69eff58daf9d8efbd54f - Author: Marcel Smit - Date: Thu Aug 1 11:03:04 2013 +0200 - - Removed commented out code - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - - commit 9ee6750d39e778a291333c09ec5520add22ab102 - Author: Marcel Smit - Date: Thu Aug 1 10:02:20 2013 +0200 - - Fixed compile issues on windows by disabling the long double. Added - comments. - (refs #1551) - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - commit 075179c1cdf06b39d53bddba009a32285e3bf7ad - Author: Marcel Smit - Date: Thu Aug 1 09:35:20 2013 +0200 - - Documented why chars and long doubles are not supported. - Removed defaults in arguments of check_array. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - - commit 1c90d97e9afceeebad6a71fc5c879cf2d4839f28 - Author: Marcel Smit - Date: Thu Aug 1 09:20:26 2013 +0200 - - Removed TODO list. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - - commit c781f16d4730a6f5a493fc7df52786d5ffb03f14 - Author: Marcel Smit - Date: Wed Jul 31 10:16:55 2013 +0200 - - Layout changes. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - - commit 72a9515e4c3e3ee403283711eb3f01cb61299caf - Author: Marcel Smit - Date: Wed Jul 31 10:02:21 2013 +0200 - - Added a test for sequences in arrays. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit a6e12df7fe89528a5b168e820590488b053dc062 - Author: Marcel Smit - Date: Wed Jul 31 09:32:33 2013 +0200 - - Added a sequence of arrays to test. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 6422409ab6f5ec56e998b1a570aee3234a5edafd - Author: Marcel Smit - Date: Wed Jul 31 08:44:22 2013 +0200 - - Disabled long doubles since a longdouble is defined in the xsd as double. - We are then creating a long double initialized from a regular - double. This is a very tricky conversion and doesn't work in - combination with certain (versions of) compilers. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Removed long double checks - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - Don't assign the type code in case a long double. Added comments - above. - - commit d539f68dc768da7032f08a9f3ae2537bd1fabe1a - Author: Marcel Smit - Date: Tue Jul 30 20:36:49 2013 +0200 - - Updated todo list. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - - commit 4160bc932f390e837244eb800dea190f272bcb85 - Author: Marcel Smit - Date: Tue Jul 30 20:35:55 2013 +0200 - - Added a plain boolean attribute to test. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit a9b2197ca6320b481484f69f0abeb12f474acddf - Author: Marcel Smit - Date: Tue Jul 30 20:24:31 2013 +0200 - - Added an octet and a long double as attribute to the Foo component. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 2d59676cd472ab12bf14ac0ad17e75d615d46d84 - Author: Johnny Willemsen - Date: Tue Jul 30 20:09:35 2013 +0200 - - Added some more todo - * CIAO/tests/Bug_3769_Regression/Foo.idl: - - commit e8f011ebb02e44895bc158525d6aef13cec64a24 - Author: Marcel Smit - Date: Tue Jul 30 16:37:00 2013 +0200 - - Added checks on the array of octets. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - - commit 22970ae42a26d7d0df31e89bf080aa6f83853adb - Author: Marcel Smit - Date: Tue Jul 30 16:26:48 2013 +0200 - - Enabled an array of octets. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 5345db6e8dfb1acfcaf8082e1ce4b58b48ce8c7d - Author: Johnny Willemsen - Date: Tue Jul 30 16:20:42 2013 +0200 - - Cleanup octet/longdouble support and logging improvements - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - - commit 6e23dde3fa5a79a47e9d20c80bec18b56adba5a9 - Author: Johnny Willemsen - Date: Tue Jul 30 15:59:42 2013 +0200 - - Const fix - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - - commit 6769ad6d4e5adc000c84e628ff7783f9b9cf2d2d - Author: Marcel Smit - Date: Tue Jul 30 15:58:29 2013 +0200 - - References issue #1551 - - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - Fixed compile issue - - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Enabled long double test again. - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - Work in progress: Hunting the long double bug... - - commit cacb9ef80d659eb1c925517d1e4a6f5d939daa45 - Author: Marcel Smit - Date: Tue Jul 30 14:04:24 2013 +0200 - - Added an array of booleans. - Added char and wstring arrays although these are not supported. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit ba45f218640e65e3c2f6ad23e9bbb06b0ba62a8e - Author: Marcel Smit - Date: Tue Jul 30 13:47:44 2013 +0200 - - References issue #1551 - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added float and longdouble arrays. Long double arrays do appear to - have errors. - - * DAnCE/tools/Config_Handlers/Any_Handler.cpp: - Removed newline character in exception logging. - - commit 804983d47b0061dd55dec0b5d5e254c2a0d40903 - Author: Marcel Smit - Date: Tue Jul 30 12:56:34 2013 +0200 - - Added an array of doubles. Skipped an array of chars since this is - not supported. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - Also layout changes - - commit 3938d99a1a3705e99b888b192a189464f940d032 - Author: Marcel Smit - Date: Tue Jul 30 11:11:47 2013 +0200 - - Added (unsigned) short arrays - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit d563ee6d2dcb4b8b843ee11b20df21a7bf40c035 - Author: Marcel Smit - Date: Tue Jul 30 11:03:04 2013 +0200 - - Added a test for an array with unsigned long long values. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 17dfa9a0d26e48f39d9e41cce5644e05ef01da90 - Author: Marcel Smit - Date: Tue Jul 30 10:48:33 2013 +0200 - - Added a long long array test. - Also added a template class which check whether the content - of the arrays are correct. This'll prevent multiple times the - same code. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 92c6bf4f6d01c70b7b39df632312fc89133db6ef - Author: Marcel Smit - Date: Tue Jul 30 09:55:28 2013 +0200 - - Added a ulong array as test. Prepared the other basic types in arrays. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 8f76f00815805c094310085928bd2b61f4a132fa - Author: Marcel Smit - Date: Tue Jul 30 08:47:56 2013 +0200 - - Layout changes. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - - commit 756c6c355b7c89ba1b6cefcc91d7b5ee3d738748 - Author: Marcel Smit - Date: Tue Jul 30 08:37:30 2013 +0200 - - Added a sequence in sequence test. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 6831e1364639cf497f81c49b9eb33f51b0ea1c20 - Author: Marcel Smit - Date: Mon Jul 29 16:51:29 2013 +0200 - - References issue #1551 - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added an array in array tests. - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - Fixed issues regarding array in arrays and sequences in arrays. - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: - Fixed issues regarding sequences in sequences and arrays. Need to add - an extra test for this. - - commit 99c188e25d6ecaecbd4ce57a22cb457adce5c627 - Author: Marcel Smit - Date: Mon Jul 29 14:31:24 2013 +0200 - - Added test for a struct, containing one member which is an array of structs. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 8d21f4afe29e0f5d23957614ed74b959cbd3a666 - Author: Marcel Smit - Date: Mon Jul 29 13:46:34 2013 +0200 - - Enabled the check on an array of bar structs. Prepared the next - check as well. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 66b903a90ed5166633cd57729796cd2b72a8c76c - Author: Johnny Willemsen - Date: Mon Jul 29 13:22:18 2013 +0200 - - Remove commented out line - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - - commit 21432ee084eae5293a6799fe98091966ba789a14 - Author: Marcel Smit - Date: Mon Jul 29 13:15:02 2013 +0200 - - Renamed error_ postfix to success_. - (refs #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - - commit 34e1be7229a58cccea99581d7657100cea1196ba - Author: Marcel Smit - Date: Mon Jul 29 13:00:32 2013 +0200 - - References issue #1551 - - * CIAO/tests/Bug_3769_Regression/Foo.idl: - String array contains 3 instead of 5 entries. - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - Improved naming of booleans by adding 'error_'. - - commit 47985c348d9fc416c4e0406b8c259048c10e624b - Author: Marcel Smit - Date: Mon Jul 29 11:52:57 2013 +0200 - - Added test for arrays of strings. - (issue #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit c17d5178d0c5095b2476043bc5d8014e05d55bb0 - Author: Marcel Smit - Date: Mon Jul 29 11:31:54 2013 +0200 - - Improved error logging in ccm_activate. - (issue #1551) - - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - - commit 8241a2b161d6e0b5d56b08aaf3626f46f78e4f98 - Author: Johnny Willemsen - Date: Wed Jul 24 13:44:39 2013 +0200 - - Fixed problems introduced by regeneration related to string - unicode comparison and wrong namespace - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: - - commit 87b32e82230e087aae351d59e430b41aa31f86d1 - Author: Johnny Willemsen - Date: Wed Jul 24 12:21:07 2013 +0200 - - Removed comments from tao_idl - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - - commit 4898ab76fa271668e935891b5ae7bd7f7310a6cf - Author: Johnny Willemsen - Date: Wed Jul 24 11:49:41 2013 +0200 - - Test long array, commented out the other array, test needs major - extensions - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - - commit 17a8a51ff550444f7e6d1646f0e94db31265ddb5 - Author: Johnny Willemsen - Date: Wed Jul 24 11:37:41 2013 +0200 - - Added long array to the cdp - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit 26f5dccb4aec965f6b3a7bdfd3afaa004f20cd08 - Author: Johnny Willemsen - Date: Wed Jul 24 11:37:29 2013 +0200 - - Extended IDL - * CIAO/tests/Bug_3769_Regression/Foo.idl: - - commit aa8d6195c6d2359a09c855d979432d911910c4c1 - Author: Johnny Willemsen - Date: Wed Jul 24 11:37:15 2013 +0200 - - Fixed typecode handling - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - - commit 15ca519cf1bd8277e518fc846b58aec44cb5e84b - Author: Johnny Willemsen - Date: Wed Jul 24 11:21:21 2013 +0200 - - First try to add an array to the cdp - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - commit e80ae72952d7253519ccb17873de1e15da023aa0 - Author: Johnny Willemsen - Date: Tue Jul 23 21:21:43 2013 +0200 - - Added length to array definition - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - - commit 2a439e37fe257e48b6471e5c8287cd79d46c9b40 - Author: Johnny Willemsen - Date: Tue Jul 23 21:16:55 2013 +0200 - - Implemented some more array handling - * DAnCE/docs/schema/Basic_Deployment_Data.xsd: - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h: - - commit f44210381907f568d4295beb9cbf0a75743375b7 - Author: Johnny Willemsen - Date: Tue Jul 23 20:55:24 2013 +0200 - - Updated array definition - * DAnCE/docs/schema/Basic_Deployment_Data.xsd: - - commit 5309ae3c49a7507b6c626e2c1b05e5cc60bed393 - Author: Johnny Willemsen - Date: Tue Jul 23 16:10:14 2013 +0200 - - Initial copied files for DynArray support - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h: - Added. - - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc: - - commit 1313b0f422d0420208e41c5f466ff0b961180bc9 - Author: Johnny Willemsen - Date: Tue Jul 23 16:00:47 2013 +0200 - - Some initial test extensions - * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: - * CIAO/tests/Bug_3769_Regression/Foo_exec.h: - * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - * CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl: - * CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl: - - commit 2fcba7d1938c0b37fff2c94fa0e65b78bef0def8 - Author: Johnny Willemsen - Date: Tue Jul 23 15:50:30 2013 +0200 - - Extended xsd with support for arrays - * DAnCE/docs/schema/Basic_Deployment_Data.xsd: - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: - * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp: - -Thu May 30 15:31:48 UTC 2013 Johnny Willemsen - - * tests/CIF/Events/client.cpp: - Removed dead code - -Mon May 27 10:18:33 UTC 2013 Johnny Willemsen - - * NEWS: - Updates in preparation of releasing x.2.0 - -Mon May 27 10:09:24 CEST 2013 Johnny Willemsen - - * CIAO version 1.2.0 released. - -Mon May 13 07:14:04 UTC 2013 Johnny Willemsen - - * NEWS: - Make 1.1.9 public and prepare for the next minor release - -Mon May 13 08:52:11 CEST 2013 Johnny Willemsen - - * CIAO version 1.1.9 released. - -Tue Apr 23 7:34:41 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl: - Changed nr of deamons. - -Fri Apr 19 10:22:41 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc: - Added lib Connector2_stub to svnt - -Thu Apr 18 18:37:16 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/impl/CCM_DataReader.h: - Layout change - - * connectors/dds4ccm/impl/ContentFilterSetting.cpp: - Log name of CFT - -Thu Apr 18 14:37:41 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc: - Make project names unique - -Thu Apr 18 13:04:48 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp: - Don't use qos_profile, not needed for this test - - * connectors/dds4ccm/tests/HomeDerived/descriptors/USER_QOS_PROFILES.xml: - Removed this file. - -Thu Apr 18 12:42:46 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - Check if transport config exists before trying to create it, - fixes ResetTopic tests - -Thu Apr 18 10:25:57 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/06_compilation.html: - html fix - -Thu Apr 18 09:44:00 UTC 2013 Marijke Hengstmengel - - * connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl: - Fuzz error - -Thu Apr 18 08:50:34 UTC 2013 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/HomeDerived: - * connectors/dds4ccm/tests/HomeDerived/Base: - * connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl: - * connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc: - * connectors/dds4ccm/tests/HomeDerived/Connector1: - * connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl: - * connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc: - * connectors/dds4ccm/tests/HomeDerived/Connector2: - * connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl: - * connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc: - * connectors/dds4ccm/tests/HomeDerived/Sender: - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl: - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc: - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/tests/HomeDerived/descriptors: - * connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp: - * connectors/dds4ccm/tests/HomeDerived/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl: - Test with derived homes and derived home components . - -Tue Apr 16 17:54:56 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Several fixes - -Tue Apr 16 17:30:31 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Detailed step by step instructions for DDS4CCM with RTI DDS on Linux - -Mon Apr 15 18:18:18 UTC 2013 Adam Mitz - - * CIAO_DAnCE.mwc: - - Added ami4ccm and dds4ccm connectors to this workspace. - -Mon Apr 15 08:59:47 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Added exact instructions how to compile DDS4CCM with OpenDDS - on linux. These can be copied to the console and will compile - everything - - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl: - Make these running on trunk, only run_8.pl needs some more work - -Fri Apr 12 20:40:54 UTC 2013 Adam Mitz - - * ciao/Logger/Log_Macros.h: - * ciao/Logger/Log_Macros.cpp: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - - Use distinct ACE Log Categories for both CIAO and DDS4CCM. - -Thu Apr 11 06:49:15 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Listen_T.h: - Added missing includes in case an user includes this template - stand alone in his own custom connector - -Wed Apr 10 14:08:25 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Extended instructions for OpenDDS - -Thu Mar 14 12:42:30 UTC 2013 Johnny Willemsen - - * CIAO_TAO_DAnCE_OpenDDS_shapes.mwc: - New workspace for compiling just the shapes example with everything - related to it - -Thu Mar 14 08:39:03 UTC 2013 Johnny Willemsen - - * NEWS: - Updated for next release - - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - Log topic_name with each message - -Thu Mar 14 09:04:46 CET 2013 Johnny Willemsen - - * CIAO version 1.1.8 released. - -Tue Mar 12 13:49:26 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml: - Various plans for 2013 DDS interop demo - -Mon Mar 4 12:55:09 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: - Moved the ShapeType into a nested module and update the cdp - to set a fixed typename. Matches the 2013 version of the - shapes example - -Wed Feb 27 08:17:40 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm_Connector.idl: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: - Added a type_name attribute to the DDS TopicBase connector. - When the user doesn't specifiy this in the cdp we will - default to the DDS vendor specific type_name which is - not standardized. In case of interoperability problems - this type_name could be needed. This addition has been - reported to the OMG as issue 18499. Updated a few logging - statements to include type_name and don't use CORBA::is_nil - for checking whether a String_var has content - -Wed Feb 13 22:38:40 UTC 2013 Kevin Stanley - - * CIAO_TAO_OpenDDS.mwc: - Added exclude for nsgroup since it is not using the FT_Naming - service. Was causing build errors due to missing FT_NamingManager. - -Wed Feb 6 23:17:27 UTC 2013 Kevin Stanley - - * CIAO_TAO.mwc: - Added exclude for nsgroup since it is not using the FT_Naming - service. Was causing build errors due to missing FT_NamingManager. - -Mon Feb 4 08:11:50 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp (activate_topic): - Fixed logic error, when no listener is passed in we create - the default one, but always install a listener. Thanks to - Jiang Wei for - reporting this problem. This fixes bugzilla 4089 - -Sun Feb 3 18:37:32 UTC 2013 Johnny Willemsen - - * bin/ciao_tests.lst: - Added !NO_IDL3_TO_IDL2 to Bug_4087_Regression, invoking idl3_to_idl2 - means we need gcc which we don't have on all targets - -Thu Jan 31 11:33:37 UTC 2013 Johnny Willemsen - - * bin/ciao_tests.lst: - Fixed path 4087 test - -Tue Jan 29 12:20:08 UTC 2013 Johnny Willemsen - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - Fixed bugzilla 4087, thanks to - Jiang Wei for - providing this patch - -Tue Jan 29 12:17:09 UTC 2013 Johnny Willemsen - - * bin/ciao_tests.lst: - * tests/Bug_4087_Regression: - * tests/Bug_4087_Regression/run_test.pl: - * tests/Bug_4087_Regression/test.idl: - New unit test for idl3_to_idl2, currently failing. Thanks to - Jiang Wei for - creating this test. - -Mon Jan 28 10:11:13 UTC 2013 Johnny Willemsen - - * bin/ciao_tests.lst: - * tests/Bug_4086_Regression/Bug_4086_Regression.mpc: - * tests/Bug_4086_Regression/Foo.idl: - * tests/Bug_4086_Regression/Foo_exec.h: - * tests/Bug_4086_Regression/Foo_exec.cpp: - * tests/Bug_4086_Regression/descriptors/DeploymentPlan.cdp: - * tests/Bug_4086_Regression/descriptors/run_test.pl: - * tests/Bug_4086_Regression/descriptors/run_test_cdr.pl: - New test for components with attributes as part of - supported interfaces. Thanks to Jiang Wei - for reporting this and - providing the patch and unit test - -Mon Jan 21 08:16:41 UTC 2013 Johnny Willemsen - - * bin/ciao_tests.lst: - QueryCondition DDS tests are NDDS only - -Thu Dec 27 09:19:07 UTC 2012 Johnny Willemsen - - * NEWS: - Updated in preparation of next release - -Thu Dec 27 10:00:49 CET 2012 Johnny Willemsen - - * CIAO version 1.1.7 released. - -Sun Dec 23 11:44:31 UTC 2012 Johnny Willemsen - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Fixed post install - -Sat Dec 22 15:22:31 UTC 2012 Johnny Willemsen - - * ciao/Base/CIAO_Base.mpc: - Fixed location of ciao tools - -Thu Dec 20 13:55:46 UTC 2012 Johnny Willemsen - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - Fixed post install - -Thu Dec 20 07:13:50 UTC 2012 Johnny Willemsen - - * MPC/config/taoidl3toxmidefaults.mpb: - Updated location of tao_idl3_to_xmi - -Wed Dec 19 14:44:43 UTC 2012 Johnny Willemsen - - * MPC/config/taobaseidl3toidl2defaults.mpb: - * docs/fm/CIAO.htm: - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Install tao_idl3_to_idl2 and tao_idl3_to_xmi into ACE_ROOT/bin - to handle cross compilation in a flat layout more easily, this - way we can use the same approach as tao_idl does - -Wed Dec 19 08:30:15 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/Utils.h: - Extended PresentationQosPolicyAccessScopeKind and - SampleRejectedStatusKind. Both enums are extended by - RTI DDS 5.0.0 with some new enum values. - -Mon Dec 17 18:49:30 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Condition.cpp: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/WaitSet.cpp: - Don't include ndds_cpp.h as first include, fixes problems - with msvc release mode compilation - -Mon Dec 17 10:14:59 UTC 2012 Marcel Smit - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Using ACE::is_inequal to compare floating point and - double values. - -Sun Dec 16 09:49:50 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/tests/Policies/dr_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h: - * connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp: - Fixed compile error with RTI DDS < 5 - -Fri Dec 14 18:38:56 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - Fixed compile error with RTI DDS < 5 - -Thu Dec 13 08:40:18 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h: - * connectors/dds4ccm/tests/Policies/dr_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/policies.mpc: - * connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h: - * connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp: - Added support for the new DDS TypeConsistencyEnforcementQosPolicy - which is coming from the DDS X-Types specification. - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl: - Made both topics completely inconsistent, the topics - we had where seen as concistent by the DDS X-Types - specification - -Sun Dec 9 19:36:14 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Fixed coverity error - -Fri Nov 30 10:11:11 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: - * connectors/dds4ccm/impl/Utils.h: - Extended SampleRejectedStatusKind with the RTI defined extensions, - detected by Coverity - -Sat Nov 24 14:18:41 UTC 2012 Marcel Smit - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fuzz : Trailing whitespaces - -Fri Nov 23 12:53:17 UTC 2012 Marcel Smit - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Fixed fuzz and test. - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Fixed fuzz. - -Fri Nov 23 10:56:41 UTC 2012 Marcel Smit - - * tests/Bug_3769_Regression/Foo_exec.cpp: - Minor layout change. - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added new attribute. - - * bin/ciao_tests.lst: - * tests/Bug_3769_Regression/descriptors/run_test_cdr.pl: - New test: using CDR as input for the plan launcher. - -Fri Nov 23 10:28:23 UTC 2012 Marcel Smit - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - Expanded test. Added a struct within a struct which - is placed in a separate module. checking whether the - correct values are set. - -Mon Nov 19 18:15:16 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - Layout changes - - * connectors/dds4ccm/impl/DomainParticipantManager.cpp: - Check for (un)registration of nil domain participants, log - profile during unregistration - -Mon Nov 12 10:07:05 UTC 2012 Johnny Willemsen - - * NEWS: - Updated for next release - -Mon Nov 12 09:34:14 CET 2012 Johnny Willemsen - - * CIAO version 1.1.6 released. - -Fri Oct 12 11:18:03 UTC 2012 Johnny Willemsen - - * ccm/CCM_Transaction.idl: - Removed old comment - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Fixed some logging statements - -Fri Oct 12 10:53:23 UTC 2012 Johnny Willemsen - - * NEWS: - Updated for x.1.5 - -Fri Oct 12 11:20:25 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.5 released. - -Mon Oct 8 08:02:52 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.cpp: - * ciao/Deployment/Handlers/Home_Handler.cpp: - Fixed logging messages - -Fri Oct 5 06:26:38 UTC 2012 Johnny Willemsen - - * examples/Hello_Event/descriptors/run_test_shs.pl: - Fixed path - -Wed Oct 3 06:19:55 UTC 2012 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Fixed typo in error message - - * connectors/dds4ccm/impl/ndds/Topic.cpp: - layout changes - - * connectors/dds4ccm/tests/Policies/run_test.pl: - * connectors/dds4ccm/tests/TimeConversion/run_test.pl: - * connectors/dds4ccm/tests/TypeSupport/run_test.pl: - Check all return values, directly exit when the test has ended - - * examples/Hello_Event/descriptors/run_test_shs.pl: - Corrected path of sender - -Tue Oct 2 17:50:55 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/convertors/StringSeq.h: - * connectors/dds4ccm/tests/Policies/main.cpp: - * connectors/dds4ccm/tests/Policies/policies.mpc: - * connectors/dds4ccm/tests/Policies/string_seq.h: - * connectors/dds4ccm/tests/Policies/string_seq.cpp: - Test StringSeq conversion and fixed a bug in the conversion - from a tao sequence to a RTI sequence - -Tue Oct 2 17:29:33 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: - Only call the RTI narrow with a valid pointer, calling it with - null causes RTI to log an error - -Tue Oct 2 08:27:28 UTC 2012 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Simplified logging statement - -Tue Oct 2 06:48:39 UTC 2012 Johnny Willemsen - - * examples/Hello_Event/descriptors/run_test.pl: - * examples/Hello_Event/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello_Event/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello_Event/descriptors/run_test_shs.pl: - * examples/Hello_Event/descriptors/run_test_without_ns.pl: - Updated location of the starter - -Mon Oct 1 18:26:08 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/PortStatusListener.cpp: - * connectors/dds4ccm/impl/PublisherListener.cpp: - * connectors/dds4ccm/impl/SubscriberListener.cpp: - * connectors/dds4ccm/impl/TopicListener.cpp: - Catch everywhere C++ exceptions and log a CORBA::BAD_INV_ORDER - at a lower priority, because that is a signal that the system - is shutting down - -Fri Sep 28 09:39:27 UTC 2012 Johnny Willemsen - - * examples/Hello/Sender/Hello_Sender_exec.h: - Added missing file - -Thu Sep 27 09:29:38 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - * examples/Hello: - Added new Hello test that isn't dependent on CCM events - -Thu Sep 27 08:59:45 UTC 2012 Johnny Willemsen - - * bin/ciao_tests.lst: - * examples/Hello: - * examples/Hello_Event: - Renamed Hello to Hello_Event, this version of the - Hello example uses the CCM events, will add another - version that just uses facet/receptacles - - * examples/Null_Component/Null_Interface.idl: - Doxygen change - -Tue Sep 25 18:00:53 UTC 2012 Johnny Willemsen - - * ciao/Deployment/Handlers/Component_Handler.h: - * ciao/Deployment/Handlers/Container_Handler.h: - * ciao/Deployment/Handlers/Home_Handler.h: - * ciao/Deployment/Handlers/Homed_Component_Handler.h: - Only locality manager stubs are used here - -Fri Sep 21 07:52:43 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/logger/Log_Macros.h: - Added DDS4CCM_PRINT_CORBA_EXCEPTION also in case there is no - logging - -Thu Sep 20 07:08:30 UTC 2012 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Removed not needed ObjectId_to_string, the result is never - used - - * ciao/Valuetype_Factories/Cookies.h: - Removed not needed include - -Thu Sep 20 07:06:41 UTC 2012 Johnny Willemsen - - * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - During shutdown it can happen that still event handlers are - registered in the reactor and the DDS entities are already - removed. At that moment we get BAD_INV_ORDER exceptions which - is the only case we could get them, log them as warning - messages at that moment instead of real errors - -Wed Aug 29 07:36:27 UTC 2012 Johnny Willemsen - - * CIAO_TAO.mwc: - * CIAO_TAO_DAnCE.mwc: - * CIAO_TAO_DAnCE_OpenDDS.mwc: - * CIAO_TAO_OpenDDS.mwc: - Be more specific in what we build - - * tests/tests.mwc: - Removed this file. - -Wed Aug 29 07:34:37 UTC 2012 Johnny Willemsen - - * ChangeLog: - * ChangeLogs/ChangeLog-2012a: - * NEWS: - Prepared for the next release - -Wed Aug 29 08:16:04 CEST 2012 Johnny Willemsen - - * CIAO version 1.1.4 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2014a b/CIAO/ChangeLogs/ChangeLog-2014a deleted file mode 100644 index 02a420eb2d5..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2014a +++ /dev/null @@ -1,417 +0,0 @@ -Wed Sep 24 19:51:44 CEST 2014 Johnny Willemsen - - * CIAO version 1.2.8 released. - -Fri Aug 29 07:39:43 UTC 2014 Johnny Willemsen - - * tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp: - Removed not needed return - -Thu Aug 28 10:15:41 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - Committed some fixes prepared some time ago, fixed these QoS XML - files so that they work with RTI DDS 5.1.0 - -Thu Aug 28 09:18:06 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp: - * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp: - * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/TypeSupport/main.cpp: - Fixed valgrind reported memory leaks - -Sun Aug 17 18:52:15 UTC 2014 Johnny Willemsen - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - Fixed missing break as reported by Coverity - -Thu Jul 3 11:03:02 UTC 2014 Johnny Willemsen - - * examples/Display/NavDisplay/NavDisplay_exec.h: - Fixed typos, triggered by a patch from Pau Garcia i Quiles - - -Mon Jun 23 12:49:47 UTC 2014 Johnny Willemsen - - * NEWS: - Updated for next release - -Mon Jun 23 09:43:57 CEST 2014 Johnny Willemsen - - * CIAO version 1.2.7 released. - -Wed May 21 22:20:27 UTC 2014 Simon McQueen - - * tests/Bug_3890_Regression/Foo.idl: - Work around woefully broken Sun Studio compiler. - -Fri Apr 25 06:24:28 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Fixed compile error - -Thu Apr 24 06:49:53 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/impl/ConditionManager.cpp: - Not being able to create a read condition should result in - a throw of an exception - - * connectors/dds4ccm/impl/Getter_T.cpp: - Pass 0 as index as part of the exception thrown - -Tue Apr 22 08:29:33 UTC 2014 Johnny Willemsen - - * NEWS: - Make x.2.6 public - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Handle pidl files as idl files - -Tue Apr 22 08:44:41 CEST 2014 Johnny Willemsen - - * CIAO version 1.2.6 released. - -Wed Mar 26 01:39:54 UTC 2014 Johnny Willemsen - - * tests/DAnCE/StoreReferences/run_test.pl: - Fixed return value of the script itself - -Tue Mar 25 00:42:50 UTC 2014 Johnny Willemsen - - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Fixed compile errors with unicode enabled - -Sun Mar 23 13:04:16 UTC 2014 Johnny Willemsen - - * ciao/Deployment/Interceptors/Deployment_Interceptors.h: - * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: - Remove registration from the naming service in the - post remove. Thanks to Michael Frommberger - for providing this patch - - * tests/DAnCE/StoreReferences/client.cpp: - * tests/DAnCE/StoreReferences/run_test.pl: - Small changes to make sure the test runs now perfect with the - patch integrated - -Sat Mar 22 13:39:42 UTC 2014 Johnny Willemsen - - * bin/ciao_tests.lst: - * tests/DAnCE/StoreReferences/DeploymentPlan.cdp: - * tests/DAnCE/StoreReferences/StoreReferences.idl: - * tests/DAnCE/StoreReferences/StoreReferences.mpc: - * tests/DAnCE/StoreReferences/StoreReferences_exec.h: - * tests/DAnCE/StoreReferences/StoreReferences_exec.cpp: - * tests/DAnCE/StoreReferences/client.cpp: - * tests/DAnCE/StoreReferences/run_test.pl: - Integrate unit test for bugzilla 4106, thanks to - Michael Frommberger - for creating this - -Tue Mar 18 14:38:53 UTC 2014 Johnny Willemsen - - * tests/IDL_Test/Inherited_Component/Extended/Base.idl: - * tests/IDL_Test/Inherited_Component/Extended/Base.mpc: - Extended base component with a publishes, this triggers - a problem in the generated code, thanks to Sebastian Perk - for reporting this - -Mon Mar 17 11:02:00 UTC 2014 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - Removed dead code - -Mon Mar 17 10:58:45 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Fixed uninitialized warning by Coverity - -Fri Feb 28 07:59:56 UTC 2014 Johnny Willemsen - - * NEWS: - Make x.2.5 public and prepare for next release - -Fri Feb 28 08:46:21 CET 2014 Johnny Willemsen - - * CIAO version 1.2.5 released. - -Thu Feb 20 11:47:45 UTC 2014 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Updated instructions to OpenDDS 3.5 - -Thu Jan 9 13:02:45 UTC 2014 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Don't set include path - -Thu Jan 9 12:33:02 UTC 2014 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - Upgraded to doxygen 1.8.6 - -Thu Jan 9 10:26:52 UTC 2014 Johnny Willemsen - - * NEWS: - Prepare for next release - -Thu Jan 09 09:18:31 CET 2014 Johnny Willemsen - - * CIAO version 1.2.4 released. - -Wed Dec 25 00:00:00 UTC 2013 Douglas C. Schmidt - - * Merry Christmas everyone! - -Wed Dec 18 14:22:00 UTC 2013 Johnny Willemsen - - * etc/ciao.doxygen: - Upgraded to doxygen 1.8.5 - -Wed Dec 18 11:23:21 UTC 2013 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Upgraded to doxygen 1.8.5 - -Tue Dec 17 13:36:01 UTC 2013 Johnny Willemsen - - * ciao/Containers/Container_Base_T.cpp: - RETAIN is the default servant retention policy, so no need - to explicitly set it - -Sun Dec 8 18:30:24 UTC 2013 Johnny Willemsen - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - Added various attributes that use bounded strings - -Wed Nov 27 02:37:17 UTC 2013 Douglas C. Schmidt - - * VERSION: Updated the URL to point to Vandy not WUSTl. - -Sun Nov 17 19:17:50 UTC 2013 Johnny Willemsen - - * ciao/Deployment/Interceptors/Name_Utilities.cpp: - Improved logging and when we get invalid arguments directly return - after logging an error - -Wed Nov 13 18:19:07 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/03_executors.html: - Added missing commandline flags to specify the export file and macro - when generating the starter code - - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: - * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: - Added missing commandline flags to specify the export file and macro - when generating the starter code - - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: - * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: - Regenerated with the latest flags - -Mon Nov 11 09:43:10 UTC 2013 Johnny Willemsen - - * NEWS: - Prepare for next release - -Mon Nov 11 09:17:34 CET 2013 Johnny Willemsen - - * CIAO version 1.2.3 released. - -Fri Nov 8 12:15:15 UTC 2013 Marijke Hengstmengel - - * CIAO-INSTALL.html: - * NEWS: - Added information about Android port - -Mon Nov 4 14:13:28 UTC 2013 Marijke Hengstmengel - - * docs/CIAO_android_port.html: - Added environment variables - -Mon Oct 28 14:098:24 UTC 2013 Marijke Hengstmengel - - * docs/CIAO_android_port.html: - Description setup CIAO Android port. - - -Wed Oct 23 08:48:24 UTC 2013 Marijke Hengstmengel - - * examples/Hello/Receiver/Hello_Receiver_exec.cpp: - - * examples/Hello/descriptors/run_test.pl: - - * CIAO/examples/ciao_android.lst: - Changes for ANDROID port - commit 43a2b2dfd3cc68ed5c30f4d8994a36183d972202 - Author: Marijke Hengstmengel - Date: Wed Oct 16 12:40:58 2013 +0200 - - * CIAO/examples/ciao_android.lst: - List tests running on CIAO Android port. - - commit ac22da3990acafaa9e5c2e9ddf8fc08a8e86f2b0 - Author: Marijke Hengstmengel - Date: Tue Oct 15 15:22:58 2013 +0200 - - Made perl script ready for running on two different targets: - local host and remote android target - * CIAO/examples/Hello/descriptors/run_test.pl: - - commit eb9626a86511c55e5d46a65a260240af6103f8e4 - Author: Marijke Hengstmengel - Date: Thu Oct 3 10:19:06 2013 +0200 - - * CIAO/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Added extra debug info - - -Tue Oct 8 12:39:51 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Reduced number of steps for which we use cygwin - -Mon Oct 7 14:55:11 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Added note that paths in environment variables shouldn't use - double quotes - -Mon Oct 7 13:50:49 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Corrected flag for x86_64 - -Mon Oct 7 10:18:42 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Use perl explicitly when using mwc.pl on Windows - -Mon Oct 7 10:16:28 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Corrected windows slashes - -Mon Oct 7 08:15:16 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Document how with nmake we can generate Win64 projects - -Fri Oct 4 10:51:06 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Extended instructions - -Fri Oct 4 07:22:25 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Added nmake steps - -Thu Oct 3 19:33:20 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/DDS4CCM-INSTALL.html: - Added instructions how to compile DDS4CCM with RTI DDS - with Visual Studio on Windows - -Thu Oct 3 09:36:45 UTC 2013 Johnny Willemsen - - * NEWS: - Prepared for next release - -Thu Oct 03 09:47:23 CEST 2013 Johnny Willemsen - - * CIAO version 1.2.2 released. - -Mon Sep 2 15:39:58 UTC 2013 Phil Mesnier - - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: - * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: - - * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: - - explicit includes. - -Sat Aug 31 14:05:45 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Removed error from a message, we also run this component - without a receiver, than this will happen - -Thu Aug 29 11:11:22 UTC 2013 Johnny Willemsen - - * connectors/dds4ccm/impl/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.h: - * connectors/dds4ccm/impl/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.h: - * connectors/dds4ccm/impl/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/Getter_T.h: - * connectors/dds4ccm/impl/LocalObject.h: - * connectors/dds4ccm/impl/Utils.h: - Fixes for the DDS State connector. The semantics of this - connector is that the state is kept in DDS, but the listeners - where doing a take which removed the data from DDS. The basic - and extended listener ports C++ templates are extended with a - new template argument which is used to control the semantics - of the listener, DDS4CCM_READ or DDS4CCM_TAKE. The State connector - does use read, the Event connector does use take. This fixes - bugzilla 4123 - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: - * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Extended a few tests to check the state in DDS after they - have received some samples through the listener. In previous - versions this never returned data, with the updated DDS4CCM - State connector semantics this now returns data - -Fri Aug 16 08:36:26 UTC 2013 Johnny Willemsen - - * ChangeLog: - * ChangeLogs/ChangeLog-2013a: - * NEWS: - Prepared for next release - -Fri Aug 16 08:56:17 CEST 2013 Johnny Willemsen - - * CIAO version 1.2.1 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-2014b b/CIAO/ChangeLogs/ChangeLog-2014b deleted file mode 100644 index fac789e2791..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2014b +++ /dev/null @@ -1,26 +0,0 @@ -Fri Nov 14 08:14:44 UTC 2014 Johnny Willemsen - - * NEWS: - Updated for next release - -Fri Nov 14 08:38:16 CET 2014 Johnny Willemsen - - * CIAO version 1.3.0 released. - -Tue Nov 4 14:38:36 UTC 2014 Johnny Willemsen - - * etc/ciao.doxygen: - * etc/ciao_dds4ccm.doxygen: - * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: - Set UML_LOOK to NO, with UML look all members/methods are shown - in the diagrams making them unusable - -Wed Sep 24 19:51:44 CEST 2014 Johnny Willemsen - - * CIAO version 1.2.8 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/ChangeLogs/ChangeLog-pre_release b/CIAO/ChangeLogs/ChangeLog-pre_release deleted file mode 100644 index 5f7b2769f7c..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-pre_release +++ /dev/null @@ -1,6202 +0,0 @@ -Fri Apr 02 13:41:09 2004 Balachandran - - * CIAO version 0.4.1 released. - -Fri Apr 2 13:05:56 2004 Balachandran Natarajan - - * NEWS: - - Updated with the latest developments just prior to BFO. - -Wed Mar 31 23:03:59 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Added code emitter to generate includes of *S.h corresponding to - IDL files included in the CIDL file. Thanks to Gary Duzan - for pointing out the problem. - -Wed Mar 31 17:59:12 2004 Balachandran Natarajan - - * tools/static_configurator/Static_Configurator.mpc: - - Fixed fuzz warnings. - -Mon Mar 29 11:00:00 2004 Jeff Parsons - - * CIDLC/CIDLC.vcproj: - - Excluded the file RepositoryIdGenerator.cpp from the Release build, - as it has already been excluded from the Debug build. Thanks to - Marek Brudka for reporting the problem. - -Sun Mar 28 23:51:17 2004 Balachandran Natarajan - - * TAO/CIAO/tools/RTComponentServer/Makefile.RTComponentServer: - - Updated dependencies. - - * TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h: - - Removed inclusion of Functor.h. - -Mon Mar 29 05:46:58 2004 Balachandran Natarajan - - * TAO/CIAO/tools/RTComponentServer/Makefile.RTComponentServer: - - Updated dependencies. - - * TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h: - - - -Tue Mar 23 14:34:06 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Modified code generated by FacetEmitter class to generate - the _Servant class for a facet in the scope where the IDL - interface the facet employs is defined, as mandated by the - CCM spec. - - * CIDLC/ServantSourceGenerator.cpp: - - Change generation of the declaration of a local variable - which is a _var of the executor class for a facet to match the - scope of the declaration of the executor class itself, which - must be, as mentioned above, in the same scope as the declaration - of the IDL interface used by the facet. - - Thanks to Jessica Pistole for - sending the example IDL/CIDL files that demostrated the - problem. - -Tue Mar 16 11:22:44 2004 Venkita Subramonian - - * docs/static_ciao_contents.html: - * docs/static_config_example.html: - * docs/index.html: - - Fixed webpage for unnecessary whitespace characters. Fixed links - to images. Thanks to Tao Lu for pointing out. - -Tue Mar 16 10:34:41 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Added instantiation of generators for regular and readonly - attributes in interfaces supported by components. The - corresponding code generation in the servant source file - was already there. - -Tue Mar 16 10:36:21 2004 Tao Lu - - * CIAO-INSTALL.html: - - Added the support for CIDL with MPC on Linux. - -Tue Mar 16 10:52:21 2004 Venkita Subramonian - - * docs/static_config_example.html: - * docs/static_ciao_contents.html: - * docs/static_ciao_toc.html: - - Made some modifications to include an example run. - - * docs/index.html: - - Added link from the CIAO main page to the static config - documentation. - -Sun Mar 14 00:23:02 2004 Tao Lu - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - * CCF/CCF/CIDL/CodeGenerationKit.mpc: - * CCF/CCF/CIDL/CompilerElements.mpc: - - Removed the * to disable the duplicated words in the - project/makefile. - -Sun Mar 14 00:16:46 2004 Tao Lu - - * CIDLC/CIDLC.mpc: - - Removed the * to disable the duplicated words in the - project/makefile. - -Mon Mar 15 10:14:16 2004 Boris Kolpackov - - * CIDLC/cidlc.cpp: - - Temporary fix for the wrong return code in CIDL compiler. - Thanks to Gary Duzan for reporting this. - -Fri Mar 12 11:03:38 2004 Jeff Parsons - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added missing operations to generate enum type names. Thanks to - Jessica Pistole for reporting - the missing type names in generated servant glue code. - -Thu Mar 11 16:30:45 2004 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - - Added support for bounded string and wstring. - - * CCF/Documentation/TODO: - - Reflected new achievement. - - * CIDLC/cidlc.cpp: - - Cosmetic changes. - -2004-03-11 Venkita Subramonian - - * ciao/Container_Base.cpp: Removed an ACE_DEBUG statement which - got in by mistake. - -Wed Mar 10 14:59:19 2004 Venkita Subramonian - - * docs/static_ciao_toc.html: - * docs/static_ciao_contents.html: - * docs/static_ciao_index.html: Updated documentation. Renamed - static_ciao.html to static_ciao_contents.html. - -Wed Mar 10 12:36:01 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added code generator instantiations to handle multiple nested - modules. - - * CIDLC/cidlc.cpp: - - Fixed typo in usage message. - -Tue Mar 9 23:18:22 2004 Venkita Subramonian - - * tools/static_configurator/Static_Assembly_Parser.cpp: - - Made a minor fix to eliminate unnecessary command line option - processing. - - * tools/static_configurator/README: Added this file. - -Tue Mar 9 22:48:10 2004 Venkita Subramonian - - * docs/static_ciao.html: - * docs/imgs/ciao-static1.jpg: - * docs/imgs/ciao-static2.jpg: - * docs/imgs/ciao-dynamic1.jpg: - * docs/imgs/ciao-dynamic2.jpg: - * docs/imgs/ciao-static-vs-dynamic.jpg: Added documentation for - CIAO static configuration. - -Mon Mar 8 14:57:39 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Added inclusion of the source file when compiling with - --lem-force-all option. - -Mon Mar 8 13:54:16 2004 Balachandran Natarajan - - * NEWS: - - Added a NEWS file which tracks user visible changes between - every beta. Thanks to Olli Savia and Gary Duzan for motivating - this. - -Wed Mar 3 14:30:53 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added code generation for operations corresponding to - attributes in facets and supported interfaces. Thanks to - Praveen K Sharma for reporting the bug. - This closes [BUGID:1756]. - -Tue Mar 2 19:50:50 2004 Balachandran Natarajan - - * DnC/Node/NodeApplicationManager_Impl.h: - - Added @@Tao comments. - -Tue Mar 2 15:08:39 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed code generation in the body of an operation. This - body just delegates to the executor, so we have to - generate the argument list again (just the names, not - the types), but we don't have to generate the raises - list again. The front end Traversal raises() method - was getting executed, no code generated, but it was - picking up the overridden comma() method used for the - arg list. So we had to override raises() itself to - do nothing. Thanks to Boris for his help with this. - -Tue Mar 2 01:34:18 2004 Tao Lu - - * DnC/Node: - * DnC/Node/NodeApplication_Impl.h: - * DnC/Node/NodeApplication_Impl.h: - - Added the prototype definition files of - NodeApplication and NodeApplicationManager. - -Sun Feb 29 20:57:40 2004 Venkita Subramonian - - * tools/static_configurator/Static_Configurator.h: - * tools/static_configurator/Static_Configurator.cpp: - * tools/static_configurator/Static_Assembly_Parser.cpp: Fixed - compile errors in builds with native exceptions disabled. - - * tools/static_configurator/Static_Assembly_Visitors.cpp: Fixed - compile errors in gcc 3.3.2. Thanks to Bala for pointing out. - -Sat Feb 28 15:42:22 2004 Balachandran Natarajan - - * tools/static_configurator/Static_Assembly_Visitors.cpp: - - Fixed a couple of small errors. But this file still doeasn't - compile with gcc 3.3.2. Sending Venkita note. - -Fri Feb 27 11:35:41 2004 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Fixed code generation errors reported by Edward Mulholland - . - -Thu Feb 26 14:21:48 2004 Balachandran Natarajan - - * CIAOTAO.mwc: - - An mwc file for CIAO with its dependencies on ACE+TAO. Folks can - now run $ACE_ROOT/bin/mwc.pl CIAOTAO.mwc in $CIAO_ROOT and - invoke "make" from $CIAO_ROOT. Thanks to Brian Mendel and Ed - Mulholland for motivating this. - -Tue Feb 24 18:00:44 2004 Tao Lu - - * DnC/Deployment.idl: Removed - * DnC/DnC_Deployment.idl - * DnC/DnC_Element.idl - * DnC/DnC_Resource.idl - - Deployment.idl is splited into 3 parts now. - -Mon Feb 23 15:04:26 2004 Boris Kolpackov - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Added generation of a top-level namespaces with the name - derived from composition. Plus all the necessary modifications - in generated code to adopt this scheme. - -Mon Feb 23 13:54:19 2004 Tao Lu - - * CIDLC/CIDLC.vcproj: - - Added ".\Literals.cpp" into the project. - -Mon Feb 23 13:34:20 2004 Tao Lu - - * CIDLC/CIDLC.vcproj: - - Reversed the change. - -Thu Feb 19 11:07:35 2004 Tao Lu - - * docs/index.html: - - Added the parts listing area. Added a few relative links. - -Wed Feb 18 13:05:35 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - - Added missing header inclusion. - -Wed Feb 18 10:43:54 2004 Tao Lu - - * docs/index.html: - - Added the tutorial section in this file. - -Wed Feb 18 10:11:42 2004 Tao Lu - - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - - Changed these MPC files to specify the output lib path. - -Wed Feb 18 14:05:13 UTC 2004 Johnny Willemsen - - * CCF/CCF/CCF.mwc: - Removed this file, it has an error and is not needed. - -Tue Feb 17 01:18:16 2004 Balachandran Natarajan - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * examples/OEP/Display/RateGen/client.cpp: - * examples/OEP/Display/RateGen/controller.cpp: - - Fixed the code for exception safety when exceptions are - disabled. I don't claim that I have caught everything, but - should have most of the problems. Another pass is required to fix - the remaining problems. - -Mon Feb 16 20:01:19 2004 Balachandran Natarajan - - * CIDLC/CIDLC.mwc: - - Added the mpc files from CCF in there. This will make it easier - for the users. Users just need to go to $CIAO_ROOT/CIDLC and - type mwc.pl CIDLC.mwc and then a make. They need not go to go - and build CCF specifically. But this has a hitch that Tao needs - to fix. The CCF libraries should be installed in $CIAO_ROOT/lib - for this to work fine. Tao has accepted to fix this. - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Bunch of wrong environment macro usage. This should fix the - problems that Brian Mendel reported. Thanks to Brian for - reporting this. - - These fixes wouldn't have taken so long. The CIDLC linking takes - a really really long time! - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/starter.cpp: - * examples/OEP/BasicSP/EC/EC_exec.cpp: - * examples/OEP/BasicSP/EC/client.cpp: - * examples/OEP/BasicSP/EC/controller.cpp: - - Fixes to the executor code to get it compiling on platforms with - exceptions disabled. - -Mon Feb 16 16:32:11 UTC 2004 Johnny Willemsen - - * CCF/CCF/CCF.mwc: - Fixed typo in this file, this fixes the problems out VC71 build has - -Fri Feb 13 11:51:17 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Added generation of file caption to local executor mapping. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed bug in name generation when decalartions are in file - scope. - - * CIDLC/DescriptorGenerator.cpp: - - Fixed inconsistent tags. - - * CIDLC/Literals.cpp: - * CIDLC/Literals.hpp: - - Split literals into header and source. - - * CIDLC/CIDLC.mpc: - * CIDLC/CIDLC.vcproj: - * CIDLC/Makefile: - * CIDLC/Makefile.alt: - - Added Literals.cpp - -Thu Feb 12 17:40:33 2004 Tao Lu - - * CIDLC/CIDLC.mwc: - * CIDLC/CIDLC.mpc: - - Updated these two files. - Note: Only linux with boost/utility installed as package/rpm is - tested. - -Thu Feb 12 11:00:39 2004 Tao Lu - - * CIAO-INSTALL.html - * CCF/CCF/CIDL/CIDL.mpc - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc - * CCF/CCF/CompilerElements/CompilerElements.mpc - * CCF/CCF/IDL2/IDL2.mpc - * CCF/CCF/IDL3/IDL3.mpc - - Updated these files to set the static linkage. - -Thu Feb 12 10:31:23 2004 Tao Lu - - * CCF/CCF/CCF.mwc: - - Added this workspace file. - -Wed Feb 11 19:17:54 2004 Tao Lu - - * CIAO-INSTALL.html: - - Added this file for CIAO install/build instructions. - -Wed Feb 11 12:05:59 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Updated URLs to the Boost website. Fixed incorrect build - instruction for Windows. - -Wed Feb 11 11:36:08 2004 Balachandran Natarajan - - * examples/Hello/descriptors/run_test_debug.pl: - - A new script that uses -ORBdebuglevel while running the - component server. - - * examples/Hello/step-by-step.html: - - Added a pointer to the above script. - - Thanks to Gary Duzan and Praveen Sharma - for motivating this. - -Tue Feb 10 18:15:59 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Fixed bugs and updated links. - -Tue Feb 10 16:44:33 2004 Tao Lu - - * CIDLC/CIDLC.vcproj: - - Changed the include path. - -Tue Feb 10 16:28:53 2004 Jeff Parsons - - * cidlc/CIDLC.vcproj: - - Added '..' to include paths, to pick up inclusion of - ciao/Version.h. - - * cidlc/ServantHeaderGenerator.cpp: - * cidlc/ServantSourceGenerator.cpp: - - Fixed errors in generated environment variables. Thanks to - Edward Mulholland for reporting the - problems. - -Tue Feb 10 14:54:48 2004 Venkita Subramonian - - * ciao/Container_Impl.h: - * ciao/Container_Base.h: Changes to fix compile errors by adding - default arguments for static configuration related paramters in - the constructor. - - -Tue Feb 10 11:35:47 2004 Tao Lu - - * DnC/Deployment.idl: - - Added this file for the new DnC spec. - -Tue Feb 10 10:41:48 2004 Venkita Subramonian - - * tools/static_configurator/Static_Assembly_Visitors.{cpp,h}: - * tools/static_configurator/Static_Assembly_Parser.cpp: - * tools/static_configurator/Static_Assembly.h: Offline static - configuration parser to parse XML files into an intermediate C++ - header file which will be included by the online configuration - engine. - - * tools/static_configurator/Static_Configurator.mpc: - * tools/static_configurator/Static_Configurator.{h,cpp}: Online - configuration engine that reads the intermediate table created - by the offline parser. This is responsible for creating - component servers, homes, containers, components and - establishing connections between components. - - * ciao/Container_Base.{h,cpp}: Modifications for static - configuration. While installing a home, instead of loading the - entry point symbol from a DLL, the entry point function pointer - is obtained from a hashmap which is passed to the - container. This hashmap contains the name of the entry point and - the entry point function pointer. - - * ciao/Container_Impl.{h,cpp,inl}: - * ciao/ComponentServer_Impl.{h,cpp,inl}: Changed constructor - signatures to add a flag for static configuration and a hashmap - containing the static entry function pointers. These are - defaulted to 0. - -Fri Feb 6 15:54:26 2004 Jeff Parsons - - * examples/Hello/Hello_Base/Hello_Base.idl: - * examples/OEP/BasicSP/BasicSP.idl: - * examples/OEP/Display/HUDisplay.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - - Removed the 'ciao/' path prefix from inclusions of - Components.idl. - -Fri Feb 6 14:49:48 2004 Tao Lu - - * CIDLC/CIDLC.mpc: - * CCF/CCF/CIDL/CIDL.mpc - * CCF/CCF/IDL2/IDL2.mpc - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc - * CCF/CCF/CompilerElements/CompilerElements.mpc - * CCF/CCF/IDL3/IDL3.mpc - - Added reqires cidl in these mpc files. By default - cidl is not turned on, so MPC won't generate makefiles. - -Thu Feb 5 12:58:14 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - * CIDLC/README.html: - - Updated all URLs to point to the 'central location'. - -Wed Feb 4 14:58:05 2004 Tao Lu - - * ./CIDLC/CIDLC.mpc: - * ./CCF/CCF/CIDL/CIDL.mpc - * ./CCF/CCF/IDL2/IDL2.mpc - * ./CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc - * ./CCF/CCF/CompilerElements/CompilerElements.mpc - * ./CCF/CCF/IDL3/IDL3.mpc - - Added these mpc files to build CIDLC compiler. - The libpath of Boost and Utility is not fixed yet. - Need to test all the mpc files on both Linux/Windows. - -Wed Feb 4 13:58:36 2004 Jeff Parsons - - * ciao/CCM_Base.idl: - * ciao/CCM_Container.idl: - * ciao/CCM_Core.mpc: - * ciao/CCM_Deployment.idl: - * examples/Hello/Hello_Base/Hello_Base.idl: - * examples/OEP/BasicSP/BasicSP.idl: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp: - * examples/OEP/Display/HUDisplay.idl: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/server.cpp: - * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - * tests/temp/assembly/client.cpp: - * tests/temp/assembly/control.idl: - * tests/temp/assembly/control.mpc: - * tests/temp/assembly/server.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.cpp: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Impl.h: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Service.idl: - * tools/Assembly_Deployer/Assembly_Visitors.h: - * tools/Assembly_Deployer/Deployment_Configuration.h: - * tools/ComponentServer/ComponentServer.cpp: - * tools/ComponentServer/ComponentServer_test_client.cpp: - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/Daemon_Commands.cpp: - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/Daemon_Commands.cpp: - * tools/ServerActivator/ServerActivator.cpp: - * tools/ServerActivator/ServerActivator_test_client.cpp: - * tools/XML_Helpers/XMLHelpers.mpc: - * tools/XML_Helpers/XML_Utils.h: - - - Removed all include paths except TAO_ROOT and CIAO_ROOT - for C++ and IDL compilers, from MPC files. - - - Modified includes in source and header files as necessary, - per the above changes. - - - Added missing ACE_ROOT/ace includes. - - - Made other modifications as necessary to MPC files to - eliminate build errors. - -Mon Feb 2 20:07:41 2004 Balachandran Natarajan - - * tools/XML_Helpers/Makefile.XML_Helpers: - - Removed RTConfiguration_Stub.cpp and included - RTConfigurationC.cpp for compilation. - -Mon Feb 2 20:00:07 2004 Balachandran Natarajan - - * tools/XML_Helpers/RTConfiguration.idl: - - Include RTCORBA_include.pidl instead of RTCORBA.pidl. - - * tools/XML_Helpers/RTConfiguration_Stubs.cpp: - - Removed the hacks in this file since they are no longer - necessary. - - * tools/XML_Helpers/XMLHelpers.mpc: - - Changed the order of inheritance to get the libraries in the - right order. - - All these should fix a problem reported by Diego Sevilla Ruiz - and as always thanks to him for reporting it. - -Sat Jan 31 18:26:24 2004 Balachandran Natarajan - - * tools/XML_Helpers/RTConfiguration.idl: - - Appended "tao" to the path for RTCORBA.pidl. - -Thu Jan 29 14:03:42 2004 Chad Elliott - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * tools/XML_Helpers/XMLHelpers.mpc: - - Updated these mpc files to work with IDL_Files as a custom build - type instead of a built-in build type. - -Thu Jan 29 12:30:52 2004 Tao Lu - - * step-by-step.html: - * Receiver/Receiver.mpc: - * Receiver/Receiver_exec.cpp: - * Receiver/Receiver_exec.h: - * Sender/Sender.mpc: - * Sender/Sender_exec.cpp: - * Sender/Sender_exec.h: - * descriptors/default.cad: - * descriptors/multi-receivers-default.cad: - * descriptors/run_test_multirecv.pl: - - Following changes have been added to resolve the EI.idl problem. - 1. All *EI.idl are removed. - 2. All provided facets are implemented by the way of - "composition". - 3. Added one more deployment scenario which has 2 instances of - the Receiver. - -Thu Jan 29 11:00:50 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Reverted some more changes since they caused the C++ generated - code to break. - -Thu Jan 29 10:03:42 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Debian package libboost-dev apparently does not include regex. - Instead regex is provided as a separate libboost-regex-dev. - Added libboost-regex-dev as a required package to build CCF. - Thanks to Hans-Peter Bock - for reporting this. - -Wed Jan 28 17:49:06 2004 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - - Reverted back to SessionContext since it would be very hard - to fix C++ code to conform to this change. Will have to - do it later as part of C++ code refactoring. - -Wed Jan 28 13:21:00 2004 Chad Elliott - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Use the new qt and qt_moc base projects. The qt-min* base - projects have been removed and the functionality moved into qt and - qt_moc. The original qt and qt_moc base projects were dispersed - and became different base projects. - -Wed Jan 28 13:02:28 2004 Boris Kolpackov - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Implemented generation of additional interfaces that allow - separation between executor interfaces and composition type. - -Tue Jan 27 12:05:13 2004 Boris Kolpackov - - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - - New EI-less implementation. - - * CIDLC/CIDLC.sln: - * CIDLC/CIDLC.vcproj: - - Updated projects to compile with boost out-of-the-box. - -Tue Jan 27 11:33:39 2004 Tao Lu - - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/starter.cpp: - - Updated these files. - -Tue Jan 27 10:15:59 2004 Tao Lu - - * examples/Hello/step-by-step.html: - - Some format and trivial fix. - -Mon Jan 26 20:33:31 2004 Tao Lu - - * examples/Hello/step-by-step.html: - - Updated this file with new font. - -Fri Jan 23 10:36:27 2004 Boris Kolpackov - - * CCF/CCF/CCF.sln: - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CCF/CCF/CompilerElements/CompilerElements.vcproj: - * CCF/CCF/IDL2/IDL2.vcproj: - * CCF/CCF/IDL3/IDL3.vcproj: - - Updated projects to compile with boost out-of-the-box. - - * CCF/Documentation/Build.html: - - Added step-by-step instructions for building CCF on - Windows. Thanks to Tao Lu for helping me with this. - -Thu Jan 22 23:38:32 2004 Tao Lu - - * examples/OEP/Display/descriptors/DualDisplay.cad: - - Changed the name of the file. - -Wed Jan 21 11:16:31 2004 Boris Kolpackov - - * CCF/CCF/IDL2/Parsing/Recovery.hpp: - * CCF/CCF/IDL2/Traversal/ValueType.tpp: - * CCF/CCF/IDL3/Traversal/EventType.tpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Cosmetic changes. - -Wed Jan 21 10:17:22 2004 Boris Kolpackov - - * CCF/Makefile: - * CCF/CCF/Makefile: - * CCF/CCF/CIDL/Makefile: - * CCF/CCF/CIDL/Makefile.alt: - * CCF/CCF/CIDL/Makefile.archive: - * CCF/CCF/CIDL/Makefile.archive.alt: - * CCF/CCF/CIDL/SemanticAction/Makefile: - * CCF/CCF/CIDL/SemanticAction/Makefile.alt: - * CCF/CCF/CIDL/SemanticAction/Makefile.object: - * CCF/CCF/CIDL/SemanticAction/Makefile.object.alt: - * CCF/CCF/CIDL/SemanticAction/Impl/Makefile: - * CCF/CCF/CIDL/SemanticGraph/Makefile: - * CCF/CCF/CIDL/Traversal/Makefile: - * CCF/CCF/CodeGenerationKit/Makefile: - * CCF/CCF/CompilerElements/Makefile: - * CCF/CCF/IDL2/Makefile: - * CCF/CCF/IDL2/Makefile.alt: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Makefile.archive.alt: - * CCF/CCF/IDL2/SemanticAction/Makefile: - * CCF/CCF/IDL2/SemanticAction/Makefile.alt: - * CCF/CCF/IDL2/SemanticAction/Makefile.object: - * CCF/CCF/IDL2/SemanticAction/Makefile.object.alt: - * CCF/CCF/IDL2/SemanticAction/Impl/Makefile: - * CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL2/SemanticGraph/Makefile: - * CCF/CCF/IDL2/Traversal/Makefile: - * CCF/CCF/IDL2/Traversal/Makefile.alt: - * CCF/CCF/IDL3/Makefile: - * CCF/CCF/IDL3/Makefile.alt: - * CCF/CCF/IDL3/Makefile.archive: - * CCF/CCF/IDL3/Makefile.archive.alt: - * CCF/CCF/IDL3/SemanticAction/Makefile: - * CCF/CCF/IDL3/SemanticAction/Impl/Makefile: - * CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL3/SemanticGraph/Makefile: - * CCF/CCF/IDL3/Traversal/Makefile: - * CIDLC/Makefile: - - Added ACE-style makefiles. - - * CCF/CCF/CIDL/Parser.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Token.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - - Cosmetic changes. - - * CCF/Documentation/Build.html: - - Fixed a typo. - -Mon Jan 19 10:08:15 2004 Boris Kolpackov - - * CIDLC/Makefile.alt: - * CIDLC/cidlc.cpp: - - Added --version command line option to CIDL compiler. Thanks - to Craig Rodrigues for the suggestion. - -Thu Jan 15 20:17:17 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Fixed some typos. Thanks to Craig Rodrigues for reporting - them. - -Thu Jan 15 17:53:38 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Updated build instructions for Debian GNU/Linux and RedHat - OS family. - -Thu Jan 15 14:39:35 2004 Boris Kolpackov - - * CCF/Config.rules: - - Fixed incorrect initialization of UTILITY_BUILD_RULES when - UTILITY_ROOT is set. Thanks to Gary Duzan - for reporting this. - -Thu Jan 15 14:30:44 2004 Balachandran Natarajan - - * README: - - Updated the file with information about CIDLC. Thanks to Gary - Duzan for motivating this. - -Wed Jan 14 18:50:00 2004 Balachandran - - * CIAO version 0.4 released. - -Wed Jan 14 15:22:13 2004 Balachandran Natarajan - - * CIDLC/README - * CIDLC/README.html: - - HTML'ised README into a new file README.html and removed the - ascii equivalent of it. - -Wed Jan 14 11:30:58 2004 Balachandran Natarajan - - * docs/releasenotes/index.html: - * docs/index.html: - - Updated releasenotes. - -Wed Jan 14 10:59:10 2004 Balachandran Natarajan - - * docs/releasenotes: - - New directory. - - * docs/releasenotes/index.html: - - The actual document is placed here to be consistent with TAO. - - * docs/releasenotes.html: - - Removed the file since it has been moved into a new directory. - -Tue Jan 13 20:54:31 2004 Balachandran Natarajan - - * ChangeLog: - - Lots of entries had gotten removed. Fixed them. - -Tue Jan 13 11:24:55 2004 Boris Kolpackov - - * CCF/Config.rules: - - Added 'default-if-not-set' value for UTILITY_BUILD_RULES to - look into well-known location where RedHat and Debian packages - are installed. - -Sat Jan 10 11:58:05 2004 Balachandran Natarajan - - * CIAO.mwc: - - Fixed a typo in the previous checkin. - -Sat Jan 10 11:08:42 2004 Balachandran Natarajan - - * CIAO.mwc: - - We removed all the mpc files for CIDLC. Needed to remove that - from the workspace file too. - -Fri Jan 9 16:01:55 2004 Jeff Parsons - - * CIDLC/cidlc.cpp: - - Changed the error return value from -1 to 1. For some reason, - Visual Studio does not detect the -1 return value and thinks - everything is fine. - -Fri Jan 9 15:45:33 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Added some clarifications suggested by Tao Lu. - -Fri Jan 9 14:46:41 2004 Jeff Parsons - - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CCF/CCF/IDL2/IDL2.vcproj: - - Added new files for union support and updated other project - settings. - - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/izeTypeCalculator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added support for unions to the back end, and fixed a bug in - generating the servant name when the component is declared at - file scope. - -Fri Jan 9 12:25:37 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.hpp: - - Fixed a bug with union member handling in semantic - actions. - -Fri Jan 9 12:20:32 2004 Boris Kolpackov - - * CCF/Config.rules: - * CCF/Makefile.alt: - * CCF/CCF/Makefile.alt: - * CCF/CCF/CIDL/Makefile.alt: - * CCF/CCF/CIDL/Makefile.archive: - * CCF/CCF/CIDL/SemanticAction/Makefile.alt: - * CCF/CCF/CIDL/SemanticAction/Makefile.object: - * CCF/CCF/CIDL/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/CIDL/SemanticGraph/Makefile.alt: - * CCF/CCF/CIDL/Traversal/Makefile.alt: - * CCF/CCF/CodeGenerationKit/Makefile.alt: - * CCF/CCF/CompilerElements/Makefile.alt: - * CCF/CCF/IDL2/Makefile.alt: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/SemanticAction/Makefile.alt: - * CCF/CCF/IDL2/SemanticAction/Makefile.object: - * CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL2/SemanticGraph/Makefile.alt: - * CCF/CCF/IDL2/Traversal/Makefile.alt: - * CCF/CCF/IDL3/Makefile.alt: - * CCF/CCF/IDL3/Makefile.archive: - * CCF/CCF/IDL3/SemanticAction/Makefile.alt: - * CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL3/SemanticGraph/Makefile.alt: - * CCF/CCF/IDL3/Traversal/Makefile.alt: - * CCF/Documentation/Build.html: - * CCF/Example/Makefile.alt: - * CCF/Example/CIDL/Makefile.alt: - * CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt: - * CCF/Example/CodeGenerationKit/Makefile.alt: - * CCF/Example/CodeGenerationKit/Indentation/Makefile.alt: - * CCF/Example/CodeGenerationKit/Indentation/IDL/Makefile.alt: - * CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt: - * CCF/Example/ComponentDeploymentDescriptor/Makefile.alt: - * CCF/Example/IDL2/Makefile.alt: - * CCF/Example/IDL2/CxxMapping/Makefile.alt: - * CCF/Test/Makefile.alt: - * CCF/Test/CIDL/Makefile.alt: - * CCF/Test/CIDL/Compiler/Makefile.alt: - * CCF/Test/CompilerElements/Makefile.alt: - * CCF/Test/CompilerElements/CPP/Makefile.alt: - * CCF/Test/IDL2/Makefile.alt: - * CCF/Test/IDL2/Compiler/Makefile.alt: - * CCF/Test/IDL2/SemanticGraph/Makefile.alt: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/Makefile.alt: - * CCF/Test/IDL2/Traversal/Makefile.alt: - * CCF/Test/IDL2/Traversal/Recreate/Makefile.alt: - * CCF/Test/IDL3/Makefile.alt: - * CCF/Test/IDL3/Compiler/Makefile.alt: - * CIDLC/Makefile.alt: - - Added 'flexibility' variables to Config.rules and - updated makefiles to reflect this change. - -Thu Jan 8 15:33:31 2004 Tao Lu - - * CCF/CCF/CCF.mwc - * CCF/CCF/CIDL/CIDL.mpc - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc - * CCF/CCF/CompilerElements/CompilerElements.mpc - * CCF/CCF/IDL2/IDL2.mpc - * CCF/CCF/IDL3/IDL3.mpc - * CCF/CCF.mwc - * CCF/Example/CIDL/CIDL.mwc - * CCF/Example/CIDL/LocalExecutorMapping/LocalExecutorMapping.mpc - * CCF/Example/Example.mwc - * CCF/Example/CodeGenerationKit/Indentation/IDL/IDL.mpc - * CCF/Example/CodeGenerationKit/Indentation/XML/XML.mpc - * CCF/Example/CodeGenerationKit/Indentation/Indentation.mwc - * CCF/Example/CodeGenerationKit/CodeGenerationKit.mwc - * CIDLC/cidlc.mpc - - Removed all these MPC files since CIDL is not working with MPC yet. - -Thu Jan 8 15:10:24 2004 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Union.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Union.hpp: - * CCF/CCF/IDL2/SemanticGraph/Makefile.alt: - * CCF/CCF/IDL2/SemanticGraph/Union.cpp: - * CCF/CCF/IDL2/SemanticGraph/Union.hpp: - * CCF/CCF/IDL2/Traversal/Struct.hpp: - * CCF/CCF/IDL2/Traversal/Union.cpp: - * CCF/CCF/IDL2/Traversal/Union.hpp: - - Added support for union. - -Thu Jan 8 14:47:22 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Changed default suffix for generating #include of C++ header - file generated from executor mapping IDL file, similar to the - change in - - Thu Jan 8 12:00:16 2004 Jeff Parsons . - -Thu Jan 8 13:49:10 2004 Jeff Parsons - - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - - Reverted the changes in - - Wed Jan 7 11:20:13 2004 Jeff Parsons - - since these command line options (include paths) are now part of - the default command line. - -Thu Jan 8 12:00:16 2004 Jeff Parsons - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Changed default suffix for the generated executor mapping IDL file - from '_exec.idl' to 'E.idl'. - - * ciao/CCM_Core.mpc: - - Added header files that are unmatched by a corresponding .cpp file. - -Wed Jan 7 11:20:13 2004 Jeff Parsons - - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - - Added include path command line options for the CIDL compiler. - -Wed Jan 7 09:56:39 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Fixed a typo. - -Tue Jan 6 18:25:24 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - - Fixed bug in Scope::add_edge_right (Extends&). - -Tue Jan 6 17:26:33 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - - Added support for lookup in inherited/supported - scopes. - -Tue Jan 6 11:35:27 2004 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.hpp: - - Added virtual destructors to classes ServantHeaderEmitter and - ServantSourceEmitter to eliminate warnings on g++ 3.3. - -Tue Jan 6 11:23:29 2004 Jeff Parsons - - * examples/OEP/BasicSP/EC/client.cpp: - * examples/OEP/BasicSP/EC/controller.cpp: - - Replaced occurrences of cerr with ACE_ERROR_RETURN. - - * examples/OEP/Display/GPS/GPS_exec.cpp: - * examples/OEP/Display/GPS/GPS_tracing_exec.cpp: - - Added #include of ace/OS_NS_time.h. - -Tue Jan 6 10:16:51 2004 Balachandran Natarajan - - * tools/Assembly_Deployer/Assembly_Manager.cpp: - - Fixed a warning using _var. - -Mon Jan 5 21:38:53 2004 Boris Kolpackov - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Fixed uninitialized variable bug that resulted in generation - of unused modules. - - * CCF/Example/CIDL/LocalExecutorMapping/test-0.idl: - - Added unused module to the test case. - - * CIDLC/cidlc.cpp: - - Cosmetic chnages. - -Mon Jan 5 20:31:18 2004 Jeff Parsons - - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/RepositoryIdGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed typos in servant code generation. - -Mon Jan 5 19:34:44 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Updated Utility library url. - -Mon Jan 5 19:16:40 2004 Boris Kolpackov - - * CIDLC/Makefile.alt: - - Added updated generators to the build. - -Mon Jan 5 18:48:54 2004 Boris Kolpackov - - * CCF/Test/IDL2/Traversal/Recreate/Makefile.alt: - - Fixed a typo. - -Mon Jan 5 18:27:12 2004 Boris Kolpackov - - * CCF/Config.rules: - - Added default values to the paths. - -Mon Jan 5 15:47:04 2004 Boris Kolpackov - - * CIDLC/README: - - Updated build instructions. - -Mon Jan 5 14:32:17 2004 Boris Kolpackov - - * CCF/Documentation/Build.html: - - Updated build instructions. - -Mon Jan 5 01:44:13 2004 Jeff Parsons - - * CCF/CCF/CompilerElements/CompilerElements.vcproj: - * CCF/CCF/IDL2/IDL2.vcproj: - * CCF/CCF/IDL3/IDL3.vcproj: - - Added files recently checked in to projects. - - * CIDLC/CIDLC.vcproj: - * CIDLC/Collectors.hpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - * CIDLC/SizeTypeCalculator.cpp: - * CIDLC/SizeTypeCalculator.hpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - * CIDLC/cidlc.cpp: - - Overhauled the entire backend to integrate with the new - frontend traversal framework, and with recently supported - features. - -Sun Jan 4 17:48:50 2004 Balachandran Natarajan - - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/RTComponentServer/RTConfig_Manager.cpp: - - Fixed warnings with g++ builds. - -Sat Jan 3 16:34:35 2004 Boris Kolpackov - - * CCF/CCF/IDL2/Traversal/Operation.hpp: - * CCF/CCF/IDL2/Traversal/Operation.tpp: - * CCF/CCF/IDL3/Traversal/Home.cpp: - * CCF/CCF/IDL3/Traversal/Home.hpp: - - Added receives_none() member function. - -Fri Jan 2 16:09:32 2004 Balachandran Natarajan - - * ciao/Container_Base.cpp: - - Fixed a compile error in single threaded configuration. - - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/ComponentServer/ComponentServer.cpp: - * tools/XML_Helpers/RTConfig_Handlers.cpp: - - Fixed more warnings with g++, mostly from the wrong usage of - _var's. - -Fri Jan 2 15:36:07 2004 Boris Kolpackov - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.hpp: - - Changed pass-by-value to pass-by-const-ref for fs::path argument. - -Fri Jan 2 14:41:35 2004 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - - Fixed small recognition bug. - - * CCF/CCF/IDL2/Traversal/Attribute.cpp: - * CCF/CCF/IDL2/Traversal/Attribute.hpp: - - Added traversal or readonly attribute. - - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - - Added support for readonly attribute. - - * CCF/Example/CIDL/LocalExecutorMapping/test-0_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-1.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-1_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - - Updated tests and results. - - * CIDLC/ExecutorMappingGenerator.cpp: - - Added support for readonly attribute. - -Fri Jan 2 13:44:06 2004 Boris Kolpackov - - * CCF/CCF/CompilerElements/Preprocessor.cpp: - - Removed debug print. - - * CCF/Documentation/TODO: - - Updated. - -Fri Jan 2 12:59:05 2004 Chad Elliott - - * performance-tests/Benchmark/Benchmark.mpc: - - Prefixed the project name with the '*' operator to avoid project - name conflicts. - -Thu Jan 1 20:27:30 2004 Balachandran Natarajan - - * ciao/Makefile: - - Updated dependancies since we have now have the Makefiles in the - repo. - -Thu Jan 1 19:58:26 2004 Balachandran Natarajan - - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - - Fixed typo. - -Thu Jan 1 20:12:03 2004 Balachandran Natarajan - - * tools/XML_Helpers/XML_Utils.cpp: - - Fixed a unused variable warning. - -Thu Jan 1 20:05:59 2004 Balachandran Natarajan - - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/ComponentServer/ComponentServer.cpp: - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/Daemon_Impl.cpp: - * tools/Daemon/controller_i.cpp: - * tools/RTComponentServer/ComponentServer_Task.cpp: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/RTComponentServer/RTServer_Impl.cpp: - * tools/ServerActivator/ServerActivator.cpp: - * tools/Simple_Component_Server/Simple_Component_Server.cpp: - * tools/Simple_Component_Server/Simple_Server_i.cpp: - * tools/Simple_Component_Server/sample_client.cpp: - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Spec.cpp: - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - - More fixes to remove compile errors when exceptions are set - to 0. - -Thu Jan 1 19:32:23 2004 Balachandran Natarajan - - * ciao/ComponentServer_Impl.cpp: - - Fixed typo in the last checkin. - -Thu Jan 1 19:28:58 2004 Balachandran Natarajan - - * ciao/ComponentInstallation_Impl.cpp: - * ciao/ComponentServer_Impl.cpp: - * ciao/Container_Base.cpp: - * ciao/Container_Base.inl: - * ciao/Container_Impl.cpp: - * ciao/Container_Impl.inl: - * ciao/Cookies.cpp: - * ciao/ServerActivator_Impl.cpp: - - Bunch of fixes to remove compile errors when exceptions are set - to 0. - -Thu Jan 1 18:46:02 2004 Balachandran Natarajan - - * tools/XML_Helpers/Cascadable_DocHandler.i: - - Fixed compile errors when exceptions are turned off. - -Thu Jan 1 18:41:06 2004 Balachandran Natarajan - - * Makefile: - - Do not compile CIAO with static_libs_only=1. - -Thu Jan 1 13:53:53 2004 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp (class Nameable) - - Added support for iteration over Names edges. - - -Thu Jan 1 17:23:44 UTC 2004 Don Hinton - - * Makefile: - Moved coreclean target to bottom of file so that the all target - will come first. Added ALT_DIRS variable that contains CIDLC, - examples, and tests directories that should not be built by - default. Set the DIRS variable = CORE_DIRS by default and add - ALT_DIRS only if BOOST_ROOT and UTILITY_ROOT have been set. - This will need to be adjusted a bit, since the ALT_DIRS don't - have regular Makefiles right now, but it's a start and will - allow all the *nix builds to start building the CORE_DIRS in the - regular autobuilds. - - * ciao/Makefile: - * ciao/Makefile.CIAO_Client: - * ciao/Makefile.CIAO_Container: - * ciao/Makefile.CIAO_Server: - * tools/Makefile: - * tools/Assembly_Deployer/Makefile: - * tools/Assembly_Deployer/Makefile.Assembly_Deployer: - * tools/Assembly_Deployer/Makefile.Assembly_Manager: - * tools/ComponentServer/Makefile: - * tools/ComponentServer/Makefile.ComponentServer: - * tools/ComponentServer/Makefile.ComponentServer_test_client: - * tools/Daemon/Makefile: - * tools/Daemon/Makefile.CIAO_Daemon: - * tools/Daemon/Makefile.DaemonController: - * tools/RTComponentServer/Makefile: - * tools/RTComponentServer/Makefile.RTComponentServer: - * tools/ServerActivator/Makefile: - * tools/ServerActivator/Makefile.ServerActivator: - * tools/ServerActivator/Makefile.ServerActivator_test_client: - * tools/Simple_Component_Server/Makefile: - * tools/Simple_Component_Server/Makefile.Simple_Component_Server: - * tools/Simple_Component_Server/Makefile.Simple_Component_Server_test_client: - * tools/Simple_Component_Server/Makefile.Simple_Server_Stub: - * tools/XML_Helpers/Makefile: - * tools/XML_Helpers/Makefile.Helper_Test: - * tools/XML_Helpers/Makefile.XML_Helpers: - Added new Makefiles generated by MPC and lightly modified to - remove unneeded variables and targets (mainly realclean, and idl - related ones that are OBE due to recent fixes to the underlying - make system.). - -Wed Dec 31 18:13:21 2003 Boris Kolpackov - - * CCF/CCF/CompilerElements/Preprocessor.cpp: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Exception.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Module.hpp: - * CCF/CCF/IDL2/SemanticAction/Native.hpp: - * CCF/CCF/IDL2/SemanticAction/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Struct.hpp: - * CCF/CCF/IDL2/SemanticAction/TypeId.hpp: - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/ValueType.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.tpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Module.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.hpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.cpp: - * CCF/CCF/IDL2/SemanticGraph/Exception.hpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp: - * CCF/CCF/IDL2/SemanticGraph/Fundamental.cpp.m4: - * CCF/CCF/IDL2/SemanticGraph/Interface.cpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Member.cpp: - * CCF/CCF/IDL2/SemanticGraph/Module.cpp: - * CCF/CCF/IDL2/SemanticGraph/Name.cpp: - * CCF/CCF/IDL2/SemanticGraph/Name.hpp: - * CCF/CCF/IDL2/SemanticGraph/Native.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.cpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Translation.hpp: - * CCF/CCF/IDL2/SemanticGraph/TypeId.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.cpp: - * CCF/CCF/IDL2/SemanticGraph/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL2/Traversal/Interface.tpp: - * CCF/CCF/IDL2/Traversal/ValueType.cpp: - * CCF/CCF/IDL2/Traversal/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/ValueType.tpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/SemanticAction/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Consumes.hpp: - * CCF/CCF/IDL3/SemanticAction/Emits.hpp: - * CCF/CCF/IDL3/SemanticAction/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Home.hpp: - * CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp: - * CCF/CCF/IDL3/SemanticAction/Provides.hpp: - * CCF/CCF/IDL3/SemanticAction/Publishes.hpp: - * CCF/CCF/IDL3/SemanticAction/Uses.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.hpp: - * CCF/CCF/IDL3/SemanticGraph/Component.hpp: - * CCF/CCF/IDL3/SemanticGraph/Elements.cpp: - * CCF/CCF/IDL3/SemanticGraph/EventType.cpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - * CCF/CCF/IDL3/Traversal/EventType.tpp: - * CCF/CCF/CIDL/SemanticAction/Composition.hpp: - * CCF/CCF/CIDL/SemanticAction/Factory.hpp: - * CCF/CCF/CIDL/SemanticAction/HomeExecutor.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Composition.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp: - * CCF/CCF/CIDL/SemanticGraph/Elements.cpp: - * CCF/CCF/CIDL/SemanticGraph/Executor.cpp: - * CCF/Documentation/TODO: - - Minor cosmetic changes and cleanups. - - -Wed Dec 31 12:27:16 2003 Tao Lu - - * docs/tutorial/Hello/hello.mpc: - Updated this file to avoid duplicated project names in - MPC generated solution file for VC. - -Wed Dec 31 10:16:17 2003 Boris Kolpackov - - * CIAO/ciao/Component_Base.idl: - - Replaced inclusion of IFR_Client/Interface.pidl with orb.idl - since it has all that's needed. - -Tue Dec 30 17:47:49 2003 Boris Kolpackov - - * ciao/CCM_Base.idl: - - Temporarily commented import declaration even though it is - conditionally commented out. Current CIDLC's preprocessor - does not handle conditional compilation. - -Tue Dec 30 17:03:27 2003 Boris Kolpackov - - * CCF/CCF/CompilerElements/Diagnostic.hpp: - * CCF/CCF/CompilerElements/TokenStream.hpp: - - Cosmetic changes. - - - * CCF/CCF/CompilerElements/Makefile.alt: - * CCF/CCF/CompilerElements/Preprocessor.cpp: - * CCF/CCF/CompilerElements/Preprocessor.hpp: - * CCF/CCF/CompilerElements/PreprocessorToken.cpp: - * CCF/CCF/CompilerElements/PreprocessorToken.hpp: - - New (though not very capable) preprocessor for the time being. - - - * CCF/CCF/IDL2/SemanticAction/Native.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Native.hpp: - * CCF/CCF/IDL2/SemanticGraph/Native.cpp: - * CCF/CCF/IDL2/SemanticGraph/Native.hpp: - * CCF/CCF/IDL2/Traversal/Native.cpp: - * CCF/CCF/IDL2/Traversal/Native.hpp: - - Added support for IDL2 native feature. - - * CCF/CCF/IDL2/SemanticAction/ValueType.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/ValueType.hpp: - - Extended support for IDL2 valuetype feature. - - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticGraph/Attribute.cpp: - * CCF/CCF/IDL2/SemanticGraph/Makefile.alt: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/Traversal/Fundamental.hpp: - * CCF/CCF/IDL2/Traversal/Makefile.alt: - - Cosmetic changes. - - - * CCF/CCF/IDL3/SemanticAction/EventType.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/EventType.hpp: - - Added support for IDL3 eventtype feature. - - * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFinder.hpp: - - Added support for IDL3 home finder feature. - - * CCF/CCF/IDL3/LexicalAnalyzer.cpp: - * CCF/CCF/IDL3/LexicalAnalyzer.hpp: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - - Cosmetic changes. - - - * CCF/CCF/CIDL/LexicalAnalyzer.cpp: - * CCF/CCF/CIDL/LexicalAnalyzer.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.cpp: - * CCF/CCF/CIDL/SemanticGraph/Composition.hpp: - - Cosmetic changes. - - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - * CCF/Example/IDL2/CxxMapping/Makefile.alt: - * CCF/Example/IDL2/CxxMapping/driver.cpp: - * CCF/Test/Makefile.alt: - * CCF/Test/CIDL/Compiler/GeneratorImpl.hpp: - * CCF/Test/CIDL/Compiler/Makefile.alt: - * CCF/Test/CIDL/Compiler/driver.cpp: - * CCF/Test/CompilerElements/Makefile.alt: - * CCF/Test/CompilerElements/CPP/Makefile.alt: - * CCF/Test/CompilerElements/CPP/driver.cpp: - * CCF/Test/IDL2/Compiler/Makefile.alt: - * CCF/Test/IDL2/Compiler/driver.cpp: - * CCF/Test/IDL2/Traversal/Recreate/GeneratorImpl.hpp: - * CCF/Test/IDL3/Compiler/Makefile.alt: - * CCF/Test/IDL3/Compiler/driver.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/cidlc.cpp: - - Updated to reflect changes above. - - - * CCF/Documentation/TODO: - - Reflected new achievements. - - -Tue Dec 30 13:53:20 2003 Tao Lu - - * examples/Philosophers/Philosophers.idl: - * examples/Philosophers/README: - Moved this unfinished example from examples/handcrafted here. - -Tue Dec 30 13:39:00 2003 Tao Lu - - * ChangeLog: - Updated my ChangeLog entries to the correct format. - Thanks for the help from Bala and Boris. - -Tue Dec 30 11:42:08 2003 Tao Lu - - * examples/handcrafted/examples.mwc: - Removed this file since MPC works recursively now. - -Tue Dec 30 11:28:43 2003 Tao Lu - - * exmaples/handcrafted/BasicSP: - Removed this directory. This example has been moved to - examples/OEP/BasicSP and been modified to use the CIDL compiler. - -Tue Dec 30 11:26:24 2003 Tao Lu - - * examples/handcrafted/Philosophers: - Removed this directory. - -Tue Dec 30 11:20:39 2003 Tao Lu - - * examples/handcrafted/Hello: - Removed this directory. This example has been moved to - docs/tutorial/Hello and been modified to use the CIDL compiler. - -Tue Dec 30 10:56:03 2003 Tao Lu - - * examples/handcrafted/Display: - Removed this directory. This example has been moved to - examples/OEP/Display and been modified to use the CIDL compiler. - -Tue Dec 23 16:26:19 2003 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Operation.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Elements.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.hpp: - * CCF/CCF/IDL2/SemanticGraph/Interface.hpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.cpp: - * CCF/CCF/IDL2/SemanticGraph/Operation.hpp: - * CCF/CCF/IDL2/Traversal/Operation.cpp: - * CCF/CCF/IDL2/Traversal/Operation.hpp: - * CCF/CCF/IDL2/Traversal/Operation.tpp: - * CCF/Test/IDL2/SemanticGraph/HandBuilt/Builder.cpp: - - Added support for oneway operations. - - * CCF/CCF/IDL3/LexicalAnalyzer.cpp: - * CCF/CCF/IDL3/Makefile.archive: - * CCF/CCF/IDL3/Parser.cpp: - * CCF/CCF/IDL3/Parser.hpp: - * CCF/CCF/IDL3/SemanticAction.hpp: - * CCF/CCF/IDL3/SemanticAction/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Makefile.alt: - * CCF/CCF/IDL3/SemanticGraph/Home.cpp: - * CCF/CCF/IDL3/SemanticGraph/Home.hpp: - - Added support for home finders. - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - - Added support for feature mentioned above. - - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - - Added coverage for features mentioned above. - - * CCF/Documentation/TODO: - - Reflected new achievements. - -Tue Dec 23 12:03:27 2003 Boris Kolpackov - - * CIDLC/CIDLC.vcproj: - - Updated VC7.1 projects. Also temporarily excluded from the - build generators that are still to be ported. - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.cpp: - - Changed 'interface' to 'interface_' since VC7.1 naively believes - that interface is an alias for struct. - -Tue Dec 23 11:34:56 2003 Boris Kolpackov - - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/IDL2/IDL2.vcproj: - * CCF/CCF/IDL3/IDL3.vcproj: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CCF/CCF/CompilerElements/CompilerElements.vcproj: - - Updated VC7.1 projects. - - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Attribute.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Operation.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/CCF/IDL2/SemanticGraph/Elements.hpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.hpp: - * CCF/CCF/IDL2/SemanticGraph/Graph.tpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Consumes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Emits.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/HomeFactory.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Provides.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Publishes.cpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Uses.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.cpp: - - Got rid of some warnings. - -Tue Dec 23 10:03:38 2003 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SemanticGraph.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Enum.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.cpp: - * CCF/CCF/IDL2/SemanticGraph/Enum.hpp: - * CCF/CCF/IDL2/SemanticGraph/Makefile.alt: - * CCF/CCF/IDL2/Traversal/Enum.cpp: - * CCF/CCF/IDL2/Traversal/Enum.hpp: - - Added support for IDL enum type. - - * CCF/CCF/IDL2/SemanticGraph/Member.hpp: - * CCF/CCF/IDL2/SemanticGraph/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Exception.hpp: - * CCF/CCF/IDL2/Traversal/Attribute.hpp: - - Cosmetic changes. - -Mon Dec 22 16:50:18 2003 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.hpp: - - New version of local executor mapping generator. - - * CIDLC/cidlc.cpp: - - New version of CIDL compiler driver with temporarily disabled - generators that require porting. - - * CIDLC/Makefile.alt: - - Temporarily disabled generators that require porting. - -Mon Dec 22 16:26:21 2003 Boris Kolpackov - - * CCF: - - Added new version of CCF. - -Mon Dec 22 15:35:19 2003 Boris Kolpackov - - * CCF: - - Removed (through cvs, not physically) previous version in - preparation for commitment of the new version. - -Thu Dec 18 09:57:50 2003 Balachandran - - * CIAO version 0.3.6 released. - -2003-12-17 Tao Lu - - * examples/Hello/step-by-step.html: - - Added this html file for explaination of the step by step tutorial. - -Tue Dec 16 18:25:01 2003 Tao Lu - - * docs/tutorial/Hello/README: - * docs/tutorial/Hello/config: - * docs/tutorial/Hello/CIAO_Installation_Data.ini: - * docs/tutorial/Hello/hello.idl: - * docs/tutorial/Hello/hello.cidl: - * docs/tutorial/Hello/hello.mpc: - * docs/tutorial/Hello/hello.csd: - * docs/tutorial/Hello/hello.ssd: - * docs/tutorial/Hello/hello_exec.cpp: - * docs/tutorial/Hello/hello_exec.h: - * docs/tutorial/Hello/hello_stub_export.h: - * docs/tutorial/Hello/hello_svnt_export.h: - * docs/tutorial/Hello/hello_exec_export.h: - * docs/tutorial/Hello/client.cpp: - * docs/tutorial/Hello/simple_client.cpp: - * docs/tutorial/Hello/run_test.pl: - * docs/tutorial/Hello/run_simple_test.pl: - - Changed Nanbor's handcrafted helloworld example to use the CIDL compiler. - Stardard CIAO naming is used (_svnt, _exec etc.). - -Tue Dec 16 14:14:59 2003 Tao Lu - - * docs/tutorial/hello/index.html: - - Removed this file. We will use Nanbor's Hello example in the tutorial. - The step-by-step example will use another name and be kept in CIAO/examples. - -Mon Dec 8 16:14:59 2003 Balachandran Natarajan - - * docs/todo.html: - * docs/RT-Extension.html: - - Updated files. - -2003-12-08 Tao Lu - - * examples/Hello/Receiver/Receiver_svnt.h: - * examples/Hello/Sender/Sender_svnt.h: - - Removed two generated files. - -Sun Dec 7 20:38:55 2003 Balachandran Natarajan - - * examples/Hello/Sender/starter.cpp: - * examples/Hello/Hello_Base/Hello_Base.idl: - - Fixed fuzz errors. - -Sun Dec 7 20:32:41 2003 Balachandran Natarajan - - * examples/Hello/Receiver/Receiver_svnt.h: - * examples/Hello/Sender/Sender_svnt.h: - * examples/Hello/descriptors/run_test_default.pl: - - Fixed fuzz errors. - -Wed Dec 3 10:55:41 2003 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - Changed comment to indicate that the interface uses a reference and - not porvides it. Thanks to Gautam Thaker for pointing this out. - -Wed Dec 3 12:25:20 2003 Arvind S. Krishna - - * performance-tests/Benchmark/NOTE.txt: - * performance-tests/Benchmark/descriptors/NOTE.txt: - Moved file to the right directory and updated name of the .cad file - to the right one. Thanks to Gautam Thaker for pointing this out. - - -Tue Dec 2 18:40:59 2003 Tao Lu - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/descriptors/run_test_default.pl: - * examples/Hello/descriptors/run_test_remote.pl: - Added two auto run perl scripts and fixed the bug in the - Receiver_exec which caused the OBV run time error when - the Sender and the Receiver are not collocated. - -Tue Dec 2 18:32:23 2003 Tao Lu - - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/descriptors/run_test_default.pl: - * examples/Hello/descriptors/run_test_remote.pl: - Added two auto run perl scripts and fixed the bug in the - Receiver_exec which caused the OBV run time error when - the Sender and the Receiver are not collocated. - -Mon Dec 1 17:49:43 2003 Tao Lu - - * examples/Hello/descriptors/remote.cad: - * examples/Hello/descriptors/remote.dat: - Added these 2 files for the example to run on remote setting. - -Mon Dec 1 02:35:18 2003 Tao Lu - - * examples/Hello/Sender/Sender.mpc: - Added the empty IDL_Files part in the starter project to get rid - of the linking error(MPC generates makefile which links in - unnecessary linkage reqirements). Also deleted all the Makefiles - in the example. The user should run mwc.pl to regenerate the - Makefile before building the project. - -Sun Nov 30 20:51:06 2003 Tao Lu - - * examples/Hello/Sender/Makefile.Hello_Starter: - Added this makefile which will make the starter program. - -Sun Nov 30 11:47:29 2003 Tao Lu - - * examples/Hello: - Moved the starter.cpp into the Sender project to so the - dependency will be set correctly. - -Sat Nov 29 15:57:54 UTC 2003 Johnny Willemsen - - * examples/handcrafted/BasicSP/*.mpc: - * examples/handcrafted/Display/*.mpc: - Removed all MPC files for this directory and sub directories - because these examples are going to be removed and at this moment - these MPC files cause problems with the MPC generation because - of duplicate names. - -Fri Nov 28 14:09:56 2003 Tao Lu - - * examples/Hello/README: - * examples/Hello/Makefile: - * examples/Hello/Hello_Base/Hello_Base_stub_export.h: - * examples/Hello/Hello_Base/Makefile.Hello_Base_stub: - * examples/Hello/Hello_Base/Hello_Base.idl: - * examples/Hello/Hello_Base/Hello_Base_svnt_export.h: - * examples/Hello/Hello_Base/Makefile.Hello_Base_svnt: - * examples/Hello/Hello_Base/Hello_Base.mpc: - * examples/Hello/Hello_Base/Makefile: - * examples/Hello/Sender/Sender.cidl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Makefile: - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec_export.h: - * examples/Hello/Sender/Makefile.Hello_Base_Sender_exec: - * examples/Hello/Sender/Sender.mpc: - * examples/Hello/Sender/Sender_stub_export.h: - * examples/Hello/Sender/Makefile.Hello_Base_Sender_stub - * examples/Hello/Sender/SenderEI.idl: - * examples/Hello/Sender/Sender_svnt.h: - * examples/Hello/Sender/Makefile.Hello_Base_Sender_svnt: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/Sender/Sender_svnt_export.h: - * examples/Hello/Receiver/ReceiverEI.idl: - * examples/Hello/Receiver/Makefile: - * examples/Hello/Receiver/Receiver_Impl.ccd: - * examples/Hello/Receiver/Makefile.Hello_Base_Receiver_exec: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Receiver/Makefile.Hello_Base_Receiver_stub: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Makefile.Hello_Base_Receiver_svnt: - * examples/Hello/Receiver/Receiver_exec_export.h: - * examples/Hello/Receiver/Receiver.cidl: - * examples/Hello/Receiver/Receiver_stub_export.h: - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver_svnt.h: - * examples/Hello/Receiver/Receiver.mpc: - * examples/Hello/Receiver/Receiver_svnt_export.h: - * examples/Hello/starter/Makefile: - * examples/Hello/starter/Makefile.Hello_Starter: - * examples/Hello/starter/starter.cpp: - * examples/Hello/starter/starter.mpc: - * examples/Hello/descriptors/CIAO_Installation_Data.ini: - * examples/Hello/descriptors/Receiver.ssd: - * examples/Hello/descriptors/default.cad: - * examples/Hello/descriptors/test.dat: - * examples/Hello/descriptors/Sender.csd: - * examples/Hello/descriptors/Receiver.csd: - * examples/Hello/descriptors/Sender.ssd: - - Added the files for Hello example. - -Fri Nov 28 13:58:58 2003 Tao Lu - - * examples/Hello: - - Added the Hello example to CIAO. Thanks nanbor for the - handcrafted examples from which I learned to program do CIAO - programming. This example is meant to be used a step-by-step - tutorial for CIAO. - -Wed Nov 26 22:16:34 2003 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - - Changed generated exception list of disconnect_* operation for - an emits declaration to match the correct exception list - generated in ServantSourceGenerator.cpp. - -Tue Nov 25 19:46:07 2003 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.hpp: - - Corrected a comment. - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed servant code generation to output only for components - and homes that are used in a CIDL composition. Thanks to - Gary Duzan for reporting the problem. Also - added support for attributes declared in a home. - -Tue Nov 25 15:39:51 2003 Boris Kolpackov - - * CCF/CCF/CompilerElements/FileSystem.hpp: - - Made normalize() function use 'native' path type when - constructing the path. - -Tue Nov 25 15:06:02 2003 Boris Kolpackov - - * CIDLC/cidlc.cpp: - - Some code to support #include handling. - -Tue Nov 25 14:47:18 2003 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - - Added capability to iterate over options. - - * CCF/CCF/CompilerElements/FileSystem.hpp: - - Added normalize() function to normalize absolute paths. - - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Include.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - - Added #include handling. - - * CCF/Test/IDL2/Parser/Include/root.idl: - * CCF/Test/IDL2/Parser/Include/bar/bar.idl: - * CCF/Test/IDL2/Parser/Include/bar/baz.idl: - * CCF/Test/IDL2/Parser/Include/foo/foo.idl: - - Simple test for #include. - -Tue Nov 25 09:34:10 2003 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTrip/run_test.pl - Changed the script to take the right svc.conf file - -Mon Nov 24 19:24:42 2003 Balachandran Natarajan - - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp: - * examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp: - - Cosmetic fixes. - -Mon Nov 24 16:37:12 2003 Balachandran Natarajan - - * ciao/ComponentsC.h: - - Removed unneeded inclusion of ComponentsC.i - -Mon Nov 24 14:48:09 2003 Jeff Parsons - - * ciao/ComponentsS.h: - - Removed unneeded inclusion of ComponentsS_T.h. - -Mon Nov 24 14:41:22 2003 Jeff Parsons - - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Visitors.cpp: - * tools/Assembly_Deployer/Deployment_Configuration.cpp: - * tools/Daemon/DaemonController.cpp: - * tools/Daemon/controller_i.cpp: - * tools/ServerActivator/ServerActivator.cpp: - * tools/ServerActivator/ServerActivator_test_client.cpp: - * tools/Simple_Component_Server/Simple_Component_Server.cpp: - - Added missing ACE file includes. - -Mon Nov 24 14:21:58 2003 Jeff Parsons - - * ciao/Container_Base.cpp: - * ciao/ServerActivator_Impl.cpp: - * ciao/Server_init.cpp: - - Added missing ACE includes. - -Mon Nov 24 13:39:43 2003 Jeff Parsons - - * CIDLC/Collectors.hpp: - - Cosmetic changes. - - * CIDLC/Literals.hpp: - - Added /* */ in a string literal around an arg name which - is never used in generated methods where it appears in the - argument list. - - * CIDLC/ServantSourceGenerator.cpp: - - Commented out some unused arg names, and removed some extra - newlines. In the connect() operation generated for a - component, added ACE_UNUSED_ARG() for an argument which is - unused if the component has no receptacles declared. - - * CCF/CCF/IDL2/SyntaxTree/TranslationCtor.cpp: - - New file with a dummy class and constructor, added as a workaround - for errors related to the protected default constructor of the - real TranslationRegion class, simlar to what has already been - added for the Elements, Interface and Valuetype classes in - IDL2::SyntaxTree. - - * CCF/CCF/IDL2/SyntaxTree/IDL2.mpc: - - Updated with recently added files. - -Thu Nov 20 20:05:34 2003 Balachandran Natarajan - - * ciao/ComponentsS.h: - * ciao/ComponentsS_T.h: - - Removed wrong includes. - -Thu Nov 20 17:50:55 2003 Balachandran Natarajan - - * tools/RTComponentServer/RTComponentServer.mpc: - - Inherit the project form ACEXML since we need that. - -Thu Nov 6 07:55:20 2003 Balachandran Natarajan - - * Makefile: - - Added coreclean target for doing realclean on a core set of - directories in the nightly build. - -Wed Nov 5 14:07:06 2003 Boris Kolpackov - - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: - - Got rid of some warnings. - - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/Parsing/Recovery.hpp: - * CCF/CCF/IDL2/SyntaxTree/Elements.hpp: - - Added a work-around to subvert constness of descriptor - member in spirit::parser_error. Joel de Guzman acknowledged - that this is an architectural error but unfortunately it - doesn't seem he is going to fix it any time soon (even though - patch is available). - -Tue Nov 4 21:21:06 2003 Balachandran Natarajan - - * ciao/ComponentsC.h: - * ciao/ComponentsS.h; - - Regenerated these files. Not sure why this is maintained in the - repo. - - * examples/handcrafted/Hello/hello_executors.h: - - #include "tao/LocalObject.h" - -Tue Nov 04 19:35:10 2003 Nanbor Wang - - * COPYING: Added ACE/TAO/CIAO Copyright disclaimer. Thanks to - Roland Schimmack for motivating the change. - -Tue Nov 4 17:11:06 2003 Balachandran Natarajan - - * tools/Daemon/CIAO_Daemon.cpp: Fixed warnings from g++. - -Tue Nov 4 16:51:22 2003 Balachandran Natarajan - - * tools/Daemon/controller_i.cpp: - - #included "ace/OS_NS_strings.h" - - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/ServerActivator/ServerActivator.cpp: - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/RTConfig_Handlers.cpp: - * tools/XML_Helpers/Softpkg_Handlers.cpp: - * tools/XML_Helpers/XML_Utils.cpp: - - #included "ace/OS_String.h" to get the above files compiling - with g++. We still get a link error that Don is looking at. - -Tue Nov 4 16:34:45 2003 Balachandran Natarajan - - * ciao/Active_Objref_Map.h: - * ciao/Client_init.h: - * ciao/Object_Set_T.h: - * ciao/Server_init.h: - - Added new includes that are needed to get them compiling. - -Wed Oct 29 16:39:48 2003 Jeff Parsons - - * CIDLC/ServantSourceGenerator.cpp: - - Removed extra generated close brace. - -Wed Oct 29 15:56:33 2003 Jeff Parsons - - * CCF/CCF/IDL2/Traversal/Interface.hpp: - * CCF/CCF/IDL2/Traversal/Struct.hpp: - - Cosmetic changes. - - * CIDLC/CIDLC.vcproj: - - Added SizeTypeCalculator.{h,cpp} to project. - - * CIDLC/Literals.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Fixed bugs in code generation - missing 'Consumer' appended - to eventtype name, and event typename used for concatenation - of operation name instead of event identifier name. - - * CIDLC/SizeTypeCalculator.cpp: - - Added support for wstrings, sequences and interfaces. - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added support for typedefs, structs, sequences and interfaces. - - * CIDLC/cidlc.cpp: - - Added instantiation and launch of SizeTypeCalculator. - -Wed Oct 29 15:19:07 2003 Boris Kolpackov - - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp.m4: - * CCF/CCF/IDL2/SyntaxTree/Elements.hpp: - * CCF/CCF/IDL2/SyntaxTree/Interface.hpp: - * CCF/CCF/IDL2/SyntaxTree/Sequence.hpp: - * CCF/CCF/IDL2/SyntaxTree/Struct.hpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.cpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.hpp: - * CCF/CCF/IDL3/SyntaxTree/Component.hpp: - * CCF/CCF/IDL3/SyntaxTree/EventType.hpp: - * CCF/CCF/IDL3/SyntaxTree/Home.hpp: added support for sharing - context by typedef temporary and principal syntax tree node. - -Wed Oct 29 13:36:47 2003 Boris Kolpackov - - * CCF/CCF/IDL2/Traversal/Elements.cpp: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL2/Traversal/Typedef.hpp: fixed bug in typedef - traversal scheme. - -Fri Oct 24 19:16:21 2003 Boris Kolpackov - - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL2/Traversal/Typedef.hpp: Fixed inheritance ambiguity. - - * CIDLC/Makefile.alt: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: Added some functions for - typedef testing. - - * CIDLC/SizeTypeCalculator.cpp: - * CIDLC/SizeTypeCalculator.hpp: Added initial implementation - of fixed/variable type size calculation. - -Fri Oct 24 18:17:21 2003 Jeff Parsons - - * CCF/CCF/IDL2/IDL2.vcproj: - - Added new front end files to the project. - - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp: - * CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp: - * CCF/CCF/IDL2/SyntaxTree/Struct.cpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.hpp: - * CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp: - - Fixed various minor errors, such as removal of unused argument - identifiers, and addition of 'using std". - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - Added case for sequences, and typedefs of string and wstring. - -Fri Oct 24 17:14:51 2003 Boris Kolpackov - - * CCF/CCF/IDL2/Traversal/Typedef.hpp: New implementation of - typedef traverser. - -Fri Oct 24 11:31:34 2003 Venkita Subramonian - - * CIAO version 0.3.5 released. - -Thu Oct 16 16:45:35 2003 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: - * CCF/CCF/IDL2/SyntaxTree.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Struct.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.cpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Struct.hpp: - * CCF/CCF/IDL2/SyntaxTree/Makefile.alt: - * CCF/CCF/IDL2/SyntaxTree/Member.cpp: - * CCF/CCF/IDL2/SyntaxTree/Member.hpp: - * CCF/CCF/IDL2/SyntaxTree/Operation.hpp: - * CCF/CCF/IDL2/SyntaxTree/Struct.cpp: - * CCF/CCF/IDL2/SyntaxTree/Struct.hpp: - * CCF/CCF/IDL2/Traversal/Makefile.alt: - * CCF/CCF/IDL2/Traversal/Member.cpp: - * CCF/CCF/IDL2/Traversal/Member.hpp: - * CCF/CCF/IDL2/Traversal/Struct.cpp: - * CCF/CCF/IDL2/Traversal/Struct.hpp: - * CCF/CCF/IDL2/Traversal/Typedef.hpp: - * CCF/CCF/IDL3/SyntaxTree/Operation.hpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - Added support for struct. - - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - Added a few structs for testing. - - * CCF/Documentation/TODO: Marked some items as done or - partially done. - -Thu Oct 16 12:55:06 2003 Boris Kolpackov - - * CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp: - * CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp: - * CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp: Added fake ctor - definition for some compilers (like MSVC) that insist they - should be defined (even though never used). - -Thu Oct 16 12:07:01 2003 Boris Kolpackov - - * CCF/CCF/IDL2/SemanticAction/Impl/Interface.hpp: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.cpp.m4: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp.m4: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.m4: - * CCF/CCF/IDL2/SyntaxTree/Elements.cpp: - * CCF/CCF/IDL2/SyntaxTree/Elements.hpp: - * CCF/CCF/IDL2/SyntaxTree/Interface.cpp: - * CCF/CCF/IDL2/SyntaxTree/Interface.hpp: - * CCF/CCF/IDL2/SyntaxTree/Sequence.hpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.cpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.hpp: - * CCF/CCF/IDL2/SyntaxTree/ValueType.cpp: - * CCF/CCF/IDL2/SyntaxTree/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/BuiltIn.hpp: - * CCF/CCF/IDL2/Traversal/BuiltIn.hpp.m4: - * CCF/CCF/IDL2/Traversal/Elements.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp: - * CCF/CCF/IDL3/SyntaxTree/Component.cpp: - * CCF/CCF/IDL3/SyntaxTree/Component.hpp: - * CCF/CCF/IDL3/SyntaxTree/EventType.hpp: - * CCF/CCF/IDL3/SyntaxTree/Home.hpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp: Added the - SyntaxTree::ForwardDeclarableTypeDecl base class and moved - there {virtual bool defined () const;}. Added - {virtual bool complete () const;} to TypeDecl to reflect type - completeness. Also changed some type names for consistency. - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: Minor changes to - reflect above. - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - * CIDLC/cidlc.cpp: Minor changes to reflect above. - -Wed Oct 15 15:43:13 2003 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/Makefile.archive: - * CCF/CCF/IDL2/Parser.cpp: - * CCF/CCF/IDL2/Parser.hpp: - * CCF/CCF/IDL2/SyntaxTree.hpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/CCF/IDL2/SyntaxTree/Makefile.alt: - * CCF/CCF/IDL2/SyntaxTree/Sequence.cpp: - * CCF/CCF/IDL2/SyntaxTree/Sequence.hpp: - * CCF/CCF/IDL2/Traversal/Makefile.alt: - * CCF/CCF/IDL2/Traversal/Sequence.cpp: - * CCF/CCF/IDL2/Traversal/Sequence.hpp: Added support for - unbounded sequence. - - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - Added a few sequences for testing. - -Wed Oct 15 13:59:33 2003 Boris Kolpackov - - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp: - * CCF/CCF/IDL2/SyntaxTree/BuiltIn.hpp.m4: - * CCF/CCF/IDL2/SyntaxTree/Elements.hpp: - * CCF/CCF/IDL2/SyntaxTree/Interface.hpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.cpp: - * CCF/CCF/IDL2/SyntaxTree/Typedef.hpp: - * CCF/CCF/IDL2/SyntaxTree/ValueType.hpp: - * CCF/CCF/IDL2/Traversal/Elements.cpp: - * CCF/CCF/CIDL/SemanticAction/Impl/HomeExecutor.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Component.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Home.hpp: - * CCF/CCF/IDL3/SemanticAction/Impl/Include.hpp: - * CCF/CCF/IDL3/SyntaxTree/Component.hpp: - * CCF/CCF/IDL3/SyntaxTree/EventType.hpp: - * CCF/CCF/IDL3/SyntaxTree/Home.hpp: - * CCF/CCF/IDL3/Traversal/Operation.cpp: Second part of - typedef-related infrastructure. - - * CCF/Example/CIDL/LocalExecutorMapping/test-0.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-0_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-1.idl: Added a few - typedef's for testing. - - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/Makefile.alt: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: Some minor - clean-up's. - - * CCF/Documentation/TODO: Added a few more items. - -Tue Oct 14 22:44:43 2003 Nanbor Wang - - * examples/handcrafted/Hello/simple_client.cpp: - * examples/handcrafted/Hello/client.cpp: Added the missing streams - header file. - -Tue Oct 14 17:18:43 2003 Boris Kolpackov - - * CIDLC/Makefile.alt: Added alternative (to mpc) means of - building CIDL compiler. - -Tue Oct 14 16:57:54 2003 Boris Kolpackov - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/RepositoryIdGenerator.cpp: Some minor clean-up's. - -Tue Oct 14 16:41:41 2003 Boris Kolpackov - - * CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/IDL2/Makefile.archive: - * CCF/IDL2/Parser.cpp: - * CCF/IDL2/Parser.hpp: - * CCF/IDL2/SemanticAction.hpp: - * CCF/IDL2/SyntaxTree.hpp: - * CCF/IDL2/Traversal.hpp: - * CCF/IDL2/SemanticAction/Factory.hpp: - * CCF/IDL2/SemanticAction/Typedef.hpp: - * CCF/IDL2/SemanticAction/Impl/Factory.hpp: - * CCF/IDL2/SemanticAction/Impl/Interface.hpp: - * CCF/IDL2/SemanticAction/Impl/Typedef.cpp: - * CCF/IDL2/SemanticAction/Impl/Typedef.hpp: - * CCF/IDL2/SyntaxTree/BuiltIn.hpp: - * CCF/IDL2/SyntaxTree/BuiltIn.hpp.m4: - * CCF/IDL2/SyntaxTree/Elements.cpp: - * CCF/IDL2/SyntaxTree/Elements.hpp: - * CCF/IDL2/SyntaxTree/Elements.tpp: - * CCF/IDL2/SyntaxTree/Interface.hpp: - * CCF/IDL2/SyntaxTree/Makefile.alt: - * CCF/IDL2/SyntaxTree/Module.hpp: - * CCF/IDL2/SyntaxTree/Operation.hpp: - * CCF/IDL2/SyntaxTree/Translation.cpp: - * CCF/IDL2/SyntaxTree/Translation.hpp: - * CCF/IDL2/SyntaxTree/TypeId.cpp: - * CCF/IDL2/SyntaxTree/Typedef.cpp: - * CCF/IDL2/SyntaxTree/Typedef.hpp: - * CCF/IDL2/SyntaxTree/ValueType.hpp: - * CCF/IDL2/Traversal/BuiltIn.hpp: - * CCF/IDL2/Traversal/BuiltIn.hpp.m4: - * CCF/IDL2/Traversal/Elements.cpp: - * CCF/IDL2/Traversal/Elements.hpp: - * CCF/IDL2/Traversal/Interface.hpp: - * CCF/IDL2/Traversal/Module.hpp: - * CCF/IDL2/Traversal/Operation.hpp: - * CCF/IDL2/Traversal/Translation.hpp: - * CCF/IDL2/Traversal/TypeId.hpp: - * CCF/IDL2/Traversal/Typedef.cpp: - * CCF/IDL2/Traversal/Typedef.hpp: - * CCF/IDL3/SyntaxTree/Component.hpp: - * CCF/IDL3/SyntaxTree/EventType.hpp: - * CCF/IDL3/SyntaxTree/Home.hpp: - * CCF/IDL3/SyntaxTree/Operation.hpp: - * CCF/IDL3/Traversal/Component.hpp: - * CCF/IDL3/Traversal/EventType.hpp: - * CCF/IDL3/Traversal/Home.hpp: - * CCF/IDL3/Traversal/Operation.hpp: - * CCF/CIDL/SyntaxTree/Composition.hpp: - * CCF/CIDL/SyntaxTree/HomeExecutor.hpp: - * CCF/CIDL/Traversal/Composition.hpp: - * CCF/CIDL/Traversal/HomeExecutor.hpp: First part of - typedef-related infrastructure. - - * CCF/CodeGenerationKit/IndentationIDL.hpp: - * CCF/CompilerElements/Preprocessor.hpp: - * Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - * Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * Example/CIDL/LocalExecutorMapping/test-0.idl: Some minor - clean-up's. - - * Documentation/TODO: Added a few more items. - -Tue Oct 14 00:54:10 2003 Nanbor Wang - - * performance-tests/Benchmark/RoundTrip/svc.conf: - Changed to load Advanced_Resource_Factory dynamically. - - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.h: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - Changed to implement the Benchmark::Latency_Test interface - instead of the Latency_Test interface. Otherwise, we won't be - able to connect the interface to a receptacle expecting another - interface type. - -Tue Oct 14 00:54:10 2003 Nanbor Wang - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - Fixed a minor compilation problem. - - * performance-tests/Benchmark/descriptors/Test-ior.cad: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - - Changed to output IOR to a fixed file named "rtserver.ior" and - refer to the object as file://rtserver.ior in the cad file - -Mon Oct 13 23:41:10 2003 Nanbor Wang - - * examples/handcrafted/Display/RateGen/controller.cpp: - * examples/handcrafted/Display/RateGen/client.cpp: Added inclusion - of "ace/streams.h" to make them compile. - -Mon Oct 13 22:31:10 2003 Nanbor Wang - - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.cpp: - Fixed a fuzz warning. - -Mon Oct 13 16:49:00 2003 Venkita Subramonian - - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/ComponentServer_Task.h: - Added /**/ to fix Fuzz errors. - -Sun Oct 12 20:44:41 2003 Jeff Parsons - - * CIDLC/Collectors.hpp: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ExecutorMappingGenerator.hpp: - * CIDLC/Literals.hpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - Changed top of files to match the title/author/cvs id format for - all other CCF and CIDLC files. - - * CIDLC/TypeNameEmitter.cpp: - * CIDLC/TypeNameEmitter.hpp: - - New files, adding support for all basic IDL types, and factoring - out the typename emitter classes for operation return types and - parameters into a separate translation unit, to eliminate the - duplication in ServantHeaderGenerator.cpp and - ServantSourceGenerator.cpp. - - * CIDLC/cidlc.mpc: - * CIDLC/CIDLC.vcproj: - - Updated with the new files above. - -Sun Oct 12 18:36:16 2003 Arvind S. Krishna - - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/Benchmark.idl: - * performance-tests/Benchmark/server.cpp: - * performance-tests/Benchmark/svc.conf: - * performance-tests/Benchmark/LatencyTest.h: - * performance-tests/Benchmark/LatencyTest.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl: - Added test scenario in which a CORBA component interacts with - a CORBA server. - -Sat Oct 11 00:18:13 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: My previous change didn't - completely fix the script. It was using the obsolet dependency - MPC keyword "depends" instead of "after", and the dependencies - was partially broken. - -Fri Oct 10 18:39:18 2003 Jeff Parsons - - * CIDLC/CIDLC.vcproj: - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/Literals.hpp: - * CIDLC/RepositoryIdGenerator.cpp: - * CIDLC/RepositoryIdGenerator.hpp: - * CIDLC/cidlc.cpp: - - Added backend support for typeid and typeprefix, used in - computing the repository id string. - -Fri Oct 10 15:54:00 2003 Boris Kolpackov - - * CCF/CCF/IDL2/LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/SyntaxTree/BuildIn.m4: - * CCF/CCF/IDL2/SyntaxTree/BuildIn.hpp: - * CCF/CCF/IDL2/SyntaxTree/BuildIn.hpp.m4: - * CCF/CCF/IDL2/SyntaxTree/BuildIn.cpp: - * CCF/CCF/IDL2/SyntaxTree/BuildIn.cpp.m4: - * CCF/CCF/IDL2/Traversal/BuildIn.hpp: - * CCF/CCF/IDL2/Traversal/BuildIn.hpp.m4: - * CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/test-2.idl: - * CCF/Example/CIDL/LocalExecutorMapping/test-1_exec.idl.orig: - * CCF/Example/CIDL/LocalExecutorMapping/test-2_exec.idl.orig: - * CIDLC/cidlc.cpp: Added support for all built-in types (spec - calls them 'base types') in CCF and in CIDL compiler driver. - - * CCF/Documentation/TODO: marked corresponding item as done. - -Thu Oct 09 00:50:24 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: Minor enhancement to the previous - change. This script now allows an optional project name prefix - to be define via the [-u] flag. If this flag is not used, the - dependent component's name will be used as project name prefix. - Since there are possibly many component depending on the same - component, using the depending componant name may not help much. - If neither -u and -p flag are used, no project name prefix will - be added (the redundant leading underscore from the previous - change has been removed.) - -Fri Oct 6 10:00:12 2003 Boris Kolpackov - - * CCF/Documentation/TODO: merged items from my off-line TODO. - -Fri Oct 03 22:45:43 2003 Chris Cleeland - - * CIAO version 0.3.4 released. - -Fri Oct 03 11:07:20 2003 Nanbor Wang - - * docs/releasenotes.html: Updated the release notes with more - recent news. - -Fri Oct 3 08:14:26 2003 Balachandran Natarajan - - * examples/handcrafted/BasicSP_EC/EC/EC.mpc: Fixed a problem with - the MPC file. Thanks to Johnny Willemsen for poitning this out. - -Thu Oct 2 15:02:10 2003 Boris Kolpackov - - * CCF/CCF/IDL2/Traversal/TypeId.hpp: - * CCF/CCF/IDL2/Traversal/TypeId.cpp: - * CCF/CCF/IDL2/Traversal.hpp: - * CCF/CCF/IDL2/SyntaxTree.hpp: - * CCF/CCF/IDL2/SemanticAction.hpp: Added missing pieces for - typeid/typeprefix support. - -Wed Oct 1 14:26:09 2003 Boris Kolpackov - - * CCF/CCF/CompilerElements/Context.hpp: added count () member - function. - - * CIDLC/RepositoryIdGenerator.hpp: - * CIDLC/RepositoryIdGenerator.cpp: implemented first phase of - repository id generation. - -Tue Sep 30 09:52:13 2003 Balachandran Natarajan - - * performance-tests/mico/mico-thrput-st/client.cc: - * performance-tests/mico/mico-thrput-st/server.cc: - - Fixed fuzz errors. - - -Fri Sep 26 12:13:44 2003 Nanbor Wang - - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - Changed to deploy Test-IOR.cad instead of - Test-Name-Service.cad. - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h: - Fixed some extra line-breaks that were causing compilation errors. - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - Fixed a compilation error. - - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - Removed a redundant comma. - - * tools/ComponentServer/ComponentServer.cpp: - Fixed execution error in "debug mode." - -Wed Sep 24 20:59:09 2003 Balachandran Natarajan - - * examples/handcrafted/BasicSP_EC2/EC/EC.mpc: Fixed problems that - missed my last checkiin "Sun Sep 21 17:07:45 2003 Balachandran - Natarajan ". - -Sun Sep 21 17:15:24 2003 Balachandran Natarajan - - * bin/generate_component_mpc.pl: Appended the value provided to - the -p option to the project names. - -Sun Sep 21 17:07:45 2003 Balachandran Natarajan - - * examples/handcrafted/BasicSP_EC/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC/EC/EC.mpc - * examples/handcrafted/BasicSP_EC2/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc: - Changed the project file names so that they don't clash with the - project names in examples/handcrafted/BasicSP. This shold get - rid of warning in VC7 builds hosted by remedy. - -Fri Sep 19 14:27:57 2003 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc: - Fixed to adhere to latest mpc changes. This also ensured proper - make files to be generated. - -Fri Sep 19 13:31:50 2003 Arvind S. Krishna - - * performance-tests/Benchmark/descriptors/Test-IOR.cad: - cad file to test CORBA server with Component client - * performance-tests/Benchmark/RoundTripClient/run_test_ior.pl: - Perl script to run the benchmark - * performance-tests/Benchmark/RounTrip_server: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp: - * performance-tests/Benchmark/RoundTripServer/LatencyTest.h: - * performance-tests/Benchmark/RoundTripServer.mpc: - * performance-tests/Benchmark/RoundTripServer/server.cpp: - * performance-tests/Benchmark/RoundTripServer/Test.idl: - A server to communicate with CIAO client, implementing the same - interface needed. - -Tue Sep 16 14:04:06 2003 Boris Kolpackov - - * CCF/Example/ComponentDeploymentDescriptor: Added small example - that shows how syntax tree traversal mechanism can be used in - different code generation tasks. - -Thu Aug 28 12:30:10 2003 Boris Kolpackov - - * CCF/CFF/IDL2/SyntaxTree/Elements.*: Made SyntaxTree::Node - capable of holding arbitrary context information (see - SyntaxTree::Node::context ()). Plus some minor architectural - changes. - - * CCF/CFF/IDL2/SyntaxTree/TypeId.* - * CCF/CFF/IDL2/SemanticAction/TypeId.* - * CCF/CFF/IDL2/SemanticAction/Impl/TypeId.* - * CCF/CFF/IDL2/LexicalAnalyzer.* - * CCF/CFF/IDL2/Parser.*: Added support for typeid and typeprefix. - -Tue Aug 26 16:59:49 2003 Nanbor Wang - - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/RTComponentServer/RTConfig_Manager.inl: - * tools/RTComponentServer/RTServer_Impl.cpp: - * tools/RTComponentServer/RTServer_Impl.h: - * tools/XML_Helpers/RTConfig_Handlers.cpp: Fixed compilation - problem on Linux. - -Tue Aug 26 10:14:03 2003 Diego Sevilla - - * CIDLC/ServantSourceGenerator.cpp: Correctly generate get and set - operations for attributes in the servant code. An error in how - I built the traverse was preventing that. - -Tue Aug 26 09:27:17 2003 Jeff Parsons - - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Changed the constructor of SetAttributeEmitter to take - INArgTypeNameEmitter as a delegate instead of - ReturnTypeNameEmitter, which was previously the case, causing - the code generation to emit the return type char* instead - of the correct IN argument type const char*. Thanks to - Roland Schimmack for reporting the bug. - -Mon Aug 25 09:47:19 2003 Nanbor Wang - - * examples/OEP/Display/NavDisplayGUI_exec/RootPanel.h: Fixed a - compilation error by adding inclusion of "ace/Null_Mutex.h" and - define QT_GENUINE_STR. - -Mon Aug 25 07:42:14 2003 Nanbor Wang - - * tools/RTComponentServer/ComponentServer_Task.cpp: - * tools/RTComponentServer/ComponentServer_Task.h: - * tools/RTComponentServer/RTConfig_Manager.h: Fixed merge errors - by adding inclusion of "tao/ORB.h", "ace/Null_Mutex.h" and - such. - -Sun Aug 24 22:03:55 2003 Nanbor Wang - - Merged the RTCIAO-0 branch into main trunk. - - Sun Aug 24 21:45:33 2003 Nanbor Wang - - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - * tools/Daemon/Daemon.mpc: Both CIAO_Daemon and Assembly_Manager - depend on RTCORBA library now because they both required to - handle RTCORBA related types. - - * tools/Assembly_Deployer/Assembly_Visitors.cpp: - * tools/Assembly_Deployer/Assembly_Visitors.h: Decoupled the - container creation functionality from the creation of - ComponentServer into a separate method. This allows us to - better manage the type of container and the associating policy - sets. - - * tools/Assembly_Deployer/Deployment_Configuration.cpp: - * tools/Assembly_Deployer/Deployment_Configuration.h: Changed the - get_activator[_ior] functions to return default activator where - there's no valid activator id available instead of throwing an - exception. - - * tools/ComponentServer/ComponentServer.cpp: Invoke the init - method of ComponentServer servant. This function is now - supported. - - * tools/RTComponentServer/ComponentServer_Task.cpp: - * tools/RTComponentServer/ComponentServer_Task.h: - * tools/RTComponentServer/RTComponentServer.cpp: - * tools/RTComponentServer/RTComponentServer.mpc: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTServer_Impl.cpp: - * tools/RTComponentServer/RTServer_Impl.h: - * tools/RTComponentServer/RTServer_Impl.inl: Added/Changed to - properly support the real-time ComponentServer implementation. - - * tools/ServerActivator/ServerActivator.cpp: Fixed a fuzz error. - - * tools/XML_Helpers/Assembly_Spec.inl: Changed to return 0 if - rtcad_filename and rtpolicyset_ref is not specified in the - original XML file. - - Thu Aug 14 16:27:52 2003 Nanbor Wang - - * tools/XML_Helpers/RTCAD-example.rtd: - * tools/XML_Helpers/RTCAD-example.cad: Added new file to show some - example cad and rtd files. - - * tools/XML_Helpers/main.cpp: - * tools/XML_Helpers/XML_Utils.cpp: Extended to invoke the RTCAD - handler. - - * tools/XML_Helpers/RTConfig_Handlers.h: - * tools/XML_Helpers/RTConfig_Handlers.cpp: Fixed run-time errors. - - Wed Aug 13 01:48:46 2003 Nanbor Wang - - * tools/RTComponentServer/RTComponentServer.mpc: Added dependency - to XML_Helpers library. - - * tools/XML_Helpers/XML_Utils.h: Added parse_rtcad_extension - static method. This is yet to be implemented. - - * tools/XML_Helpers/RTConfig_Handlers.h: - * tools/XML_Helpers/RTConfig_Handlers.inl: - * tools/XML_Helpers/RTConfig_Handlers.cpp: Added new files for - parsing RTConfig extention. - - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/XML_Helpers/RTConfiguration.idl: Renamed - RTORB_Resources_Info to RTORB_Resource_Info. - - * tools/XML_Helpers/XMLHelper.mpc: Added rtcorba as a base - project. We now depend on RTCORBA. - - Sun Aug 10 13:50:15 2003 Nanbor Wang - - * tools/RTComponentServer/RTConfiguration.idl: - * tools/RTComponentServer/RTConfigurationClient.cpp: - * tools/RTComponentServer/RTComponentServer.mpc: Removed - RTConfiguration.idl and the stub wrapper - RTConfigurationClient.cpp. They have been moved to XML_Helpers - library. - - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTConfig_Manager.cpp: Changed to include - RTConfigurationC.h from XML_Helpers subdir and make sure - RTCORBA.h is included before RTConfigurationC.h. - - * tools/XML_Helpers/XMLHelpers.mpc: - * tools/XML_Helpers/RTConfiguration.idl: - * tools/XML_Helpers/RTConfiguration_Stubs.cpp: Added - RTConfiguration info and its wrapper cpp file. This wrapper cpp - file is used to ensure that RTCORBA.h is included before - RTConfigurationC.h. - - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Handlers.h: - * tools/XML_Helpers/Assembly_Handlers.inl: - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Assembly_Spec.inl: Extended to parse and store - information in and - . - - Wed Aug 06 17:02:02 2003 Nanbor Wang - - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTConfig_Manager.cpp: Added support for - keeping PriorityBands information. - - Sun Aug 3 23:12:20 2003 Nanbor Wang - - * tools/RTComponentServer/RTConfig_Manager.cpp: Fixed mismatched - throw specifications. Added inclusion of "ace/SString.h" as ACE - now only includes "ace/SStringfwd.h". - - Sun Aug 03 00:45:59 2003 Nanbor Wang - - * tools/RTComponentServer/RTConfig_Manager.cpp: Fixed some - accidental pastings of code. - - Fri Aug 01 13:50:34 2003 Nanbor Wang - - * tools/RTComponentServer/RTComponentServer.mpc: - * tools/RTComponentServer/RTConfig_Manager.cpp: - * tools/RTComponentServer/RTConfig_Manager.h: - * tools/RTComponentServer/RTConfig_Manager.inl: - * tools/RTComponentServer/RTConfiguration.idl: Added code for - managing named collection of RTCORBA related policies. - - Sun Jul 06 21:37:22 2003 Nanbor Wang - - * tools/RTComponentServer/ComponentServer_Task.cpp (svc): Changed - to take advantage of CIAO::Activator_Callback interface change - for getting back our own ConfigValues. We will need to use - these configuration values in the future. - - Sun Jul 06 11:50:48 2003 Nanbor Wang - - * tools/RTComponentServer/ComponentServer_Task.cpp: - * tools/RTComponentServer/ComponentServer_Task.h: - * tools/RTComponentServer/ComponentServer_Task.inl: - * tools/RTComponentServer/README: - * tools/RTComponentServer/RTComponentServer.cpp: - * tools/RTComponentServer/RTComponentServer.mpc: Added the - skeleton of RTComponentServer. - - Sun Jul 06 11:33:55 2003 Nanbor Wang - - * Added: this temporary ChangeLog file for changes within the - RTComponentServer. - - -Sun Aug 24 21:38:24 2003 Nanbor Wang - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: Added an extra argument of type - CORBA::PolicyList to the init method which we can use to pass - extra RTCORBA policies into the RT Container. - - * ciao/Container_Impl.cpp: - * ciao/Container_Impl.h: Fixed memory management of cached - ConfigValue valuetype. - - * ciao/ServerActivator_Impl.h: - * ciao/ServerActivator_Impl.cpp: Extended the server activator to - specify RTCAD filename when instantiating a RTComponentServer. - - * examples/OEP/Display/descriptors/HUDisplay-rtcad.cad: - * examples/OEP/Display/descriptors/NOTE-win.txt: - * examples/OEP/Display/descriptors/RTsvc.conf: - * examples/OEP/Display/descriptors/test.rtd: - * examples/OEP/Display/descriptors/svcmap.dat: Added an RTCCM - example. - -Wed Aug 20 17:44:29 2003 Diego Sevilla - - * CIDLC/DescriptorGenerator.cpp: Small fix to make it compile - under linux also. - -Wed Aug 20 17:36:02 2003 Arvind S. Krishna - - * performance-tests/mico: - Directory where mico specific tests will be added - - * performance-tests/mico/mico-thrput-st: - Single threaded throughput tests for the MICO ORB - - * performance-tests/mico/mico-thrput-st/server.cc: - * performance-tests/mico/mico-thrput-st/client.cc: - * performance-tests/mico/mico-thrput-st/RoundTrip_impl.cc: - * performance-tests/mico/mico-thrput-st/RoundTrip_impl.h: - * performance-tests/mico/mico-thrput-st/Makefile: - * performance-tests/mico/mico-thrput-st/mico-env: - * performance-tests/mico/mico-thrput-st/RoundTrip.idl: - Single threaded througput test for MICO ORB. This experiment - uses the same interface as the one used in TAO for generating - daily performance stats. Further, the test also uses ACE for - generating results. - -Wed Aug 20 17:19:52 2003 Jeff Parsons - - * CIDLC/cidlc.mpc: - - Added new and missing files. - -Wed Aug 20 17:09:18 2003 Jeff Parsons - - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - - Added missing header files to the project. - - * CCF/CCF/CodeGenerationKit/Regex.hpp: - - Boris Kolpackov's change - to allow a choice of delimiters when passing a - regular expression string to the perl_s() method. - - * CIDLC/ExecutorMappingGenerator.cpp: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantSourceGenerator.cpp: - - Minor cosmetic changes. - - * CIDLC/DescriptorGenerator.cpp: - * CIDLC/DescriptorGenerator.hpp: - - New files, containing code for an XML generator, the - CORBA Component Descriptor .ccd file. - - * CIDLC/CIDLC.vcproj: - * CIDLC/cidlc.cpp: - - Updated these files to recognize the new generator. - Also changed the output directory of the executable - to be CIAO_ROOT/bin. - -Wed Aug 20 14:48:15 2003 Diego Sevilla - - * CCF/Example/CodeGenerationKit/Indentation/XML/Makefile.alt: - * CCF/Example/CodeGenerationKit/Indentation/XML/XML.mpc: - * CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp: - Added example of usage for the XML indenter. - - * CCF/CCF/CodeGenerationKit/IndentationXML.hpp: Added XML - indenter. - -Tue Aug 19 16:06:01 2003 Diego Sevilla - - * CIDLC/cidlc.mpc: Some cleaning of the MPC file: Removed unneeded - Instrocpection and added the CompilerElements library. - -Mon Aug 18 14:08:05 2003 Arvind S. Krishna - - * performance-tests/Benchmark/descriptors/test-multi-process.dat: - This file contains host port locations for running components - in multiple hosts/processes. Will be used as an example - scenario for benchmarking experiments - -Mon Aug 18 12:11:55 2003 Arvind S. Krishna - - * performance-tests/Benchmar/Multi_Threaded/NOTE.txt: - Updated information on pre-conditions necessary to run the - experiment - -Mon Aug 18 12:01:37 2003 Arvind S. Krishna - - * performance-tests/Benchmar/Multi_Threaded/Multi_Threaded.mpc: - * performance-tests/Benchmar/Multi_Threaded/client.cpp: - * performance-tests/Benchmar/Multi_Threaded/Client_Task.h: - * performance-tests/Benchmar/Multi_Threaded/Client_Task.cpp: - * performance-tests/Benchmar/Multi_Threaded/run_test.pl: - * performance-tests/Benchmar/Multi_Threaded/svc.conf: - * performance-tests/Benchmar/Multi_Threaded/NOTE.txt: - * performance-tests/Benchmar/Multi_Threaded/README: - Test that measures round-trip latency behavior using a - multi-threaded client. - - * performance-tests/Benchmark/descriptors/Multi_Threaded.cad: - * performance-tests/Benchmark/descriptors/CIAO_Installation_Data.ini: - Appropriate CAD file to configure the above experiment - -Sun Aug 17 22:43:55 2003 Nanbor Wang - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Container_Impl.cpp: Changed the signature of - CIAO::Container to pass in a CORBA::PolicyList. We will need - this to initialize RT_Session_Container and the future - unclassified container. - - * docs/ConfigValues.html: - * docs/XML/ciao_rt_cad_ext.dtd: - * docs/XML/componentassembly.dtd: Updated documentation on - extension element usage, RTCAD extension usage and recognizable - ConfigValues names. - - * examples/OEP/Display/RateGen/client.cpp: - * examples/OEP/Display/RateGen/controller.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/RootPanel.h: - * examples/OEP/Display/NavDisplayGUI_exec/RootPanel.h: - * examples/OEP/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp: - Reordered order of inclusion to make sure ACE headers are seen - by the compiler first. - -Sun Aug 17 09:53:57 2003 Diego Sevilla - - * CCF/CCF/CCF.mwc: Fixed a bug in the name of a file that was - preventing the build in VC71. - -Fri Aug 15 16:26:03 2003 Jeff Parsons - - * CIAO/CCF/CCF/CIDL/CIDL.vcproj: - * CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CIAO/CCF/CCF/CompilerElements/CompilerElements.vcproj: - * CIAO/CCF/CCF/IDL2/IDL2.vcproj: - * CIAO/CCF/CCF/IDL3/IDL3.vcproj: - * CIAO/CIDLC/CIDLC.vcproj: - - Turned off detection of 64-bit portability issues in these - projects. There are places in the Boost library where they - play fast and loose with conversions in this area, which - leads to many warnings. - -Fri Aug 15 15:18:37 2003 Boris Kolpackov - - * CCF: - * CIDLC: - - Added VC7.1 Solutions and Projects. - -Wed Aug 13 17:37:30 2003 George Edwards - - * examples/handcrafted/BasicSP_EC/BasicSP.mpc: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC/EC/EC.mpc: - - Updated library linkage and library paths. - - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedEDE.idl: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDeviceE.idl: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.cpp: - * examples/handcrafted/BasicSP_EC/EC/ECE.idl: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.cpp: - * examples/handcrafted/BasicSP_EC/EC/EC_exec.h: - * examples/handcrafted/BasicSP_EC/EC/controller.cpp: - * examples/handcrafted/BasicSP_EC/EC/client.cpp: - - Added new Cookie implementation. - Use new method _ciao_the_ORB () to get container's ORB reference in - subscribe () and unsubscribe () methods. - -Wed Aug 13 16:23:02 2003 George Edwards - - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.cpp: - - Fixed memory management and added comments. - -Wed Aug 13 13:25:14 2003 Diego Sevilla - - * CIDLC/cidlc.mpc: Reordered static library list to suit - dependencies. - -Wed Aug 13 12:20:12 2003 George Edwards - - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - - Added #include ace/Log_Msg.h to fix compilation error. - -Wed Aug 13 10:49:14 2003 George Edwards - - * ciao/Container_Base.h: - * ciao/Container_Base.cpp: - * ciao/Container_Base.inl: - - Added _ciao_the_ORB () method to CIAO::Container to access the - container's underlying ORB. - Changed the_POA () method to _ciao_the_POA (). - -Wed Aug 13 10:42:12 2003 George Edwards - - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay_svnt.h: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h: - * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h: - - Added /**/ to pre.h and post.h includes. - -Tue Aug 12 21:56:42 2003 Arvind S. Krishna - - * tools/XML_Helper/Assembly_Spec.h: - Fixed compilation error from a missing - #include "ace/Null_Mutex.h". - -2003-08-12 Diego Sevilla - - * CIAO.mwc: Removed CCF MPC files as they still don't work the way - I expected it to. - -2003-08-11 Diego Sevilla - - * CIDLC/ServantGenerator.cpp: Removed commented code. - -2003-08-07 Diego Sevilla - - * CCF/Example/CodeGenerationKit/Indentation/IDL/IDL.mpc: - * CCF/Example/CodeGenerationKit/Indentation/Indentation.mwc: - * CCF/Example/CodeGenerationKit/CodeGenerationKit.mwc: - * CCF/Example/CIDL/LocalExecutorMapping/LocalExecutorMapping.mpc: - * CCF/Example/CIDL/CIDL.mwc: - * CCF/Example/Example.mwc: - * CCF/CCF/CompilerElements/CompilerElements.mpc: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc: - * CCF/CCF/IDL3/IDL3.mpc: - * CCF/CCF/IDL2/IDL2.mpc: - * CCF/CCF/CIDL/CIDL.mpc: - * CCF/CCF/CCF.mwc: - * CCF/CCF.mwc: - CCF Makefiles to MPC. - - * CIDLC/cidlc.mpc: Adapted to the new structure of the CIDL - compiler. - - * CIDLC/README: Updated the information regarding the new - libraries and how to build the CIDL compiler now. - - * CIDLC/parser_examples/*.*: Removed old parser examples code. - -Tue Aug 12 20:18:23 2003 George Edwards - - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.idl: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.cpp: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.idl: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.cpp: - * examples/handcrafted/BasicSP_EC2/EC/EC.idl: - * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.cpp: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.idl: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventServiceEI.idl: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.cpp: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.cpp: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h: - * examples/handcrafted/BasicSP_EC2/BasicSP.idl: - - Updated handcrafted event channel example; components now provide and use the - RtecEventChannelAdmin::EventChannel interface. - -2003-08-11 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTrip/svc.conf: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - The client was not using the proper svc conf file to run in - "single-threaded" mode. Added proper svc.conf file and support - code in the client. The .mpc file was modified to add client's - dependency with TAO_Strategies library. - -Thu Aug 07 16:46:42 2003 Nanbor Wang - - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - Changed to use base project qt-min_moc as we don't need to use - ACE_QtReactor. - -Wed Aug 06 17:00:05 2003 Nanbor Wang - - * docs/XML/ciao_rt_cad_ext.dtd: Added DTD for RT extension to cad - file. - -2003-08-06 Arvind S. Krishna - - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - Fixed problems relating to parsing arguments when the number of - iterations is specified from the command line. - -Tue Aug 05 17:25:45 2003 George Edwards - - * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP_EC2/EC/EC.mpc: - * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc: - * examples/handcrafted/BasicSP_EC2/BasicSP.mpc: - - Added library include paths and additional library to MPC - files. - - Removed file: - * examples/handcrafted/BasicSP_EC2/EC/config: - - Removed unnecessary file. - - * examples/handcrafted/BasicSP_EC2/EC/controller.cpp: - * examples/handcrafted/BasicSP_EC2/EC/client.cpp: - - Included ace/Streams.h. - -Tue Aug 05 13:23:12 2003 George Edwards - - Added files: - * examples/handcrafted/BasicSP_EC2/*.*: - * examples/handcrafted/BasicSP_EC2/BMClosedED/*.*: - * examples/handcrafted/BasicSP_EC2/BMDevice/*.*: - * examples/handcrafted/BasicSP_EC2/EC/*.*: - * examples/handcrafted/BasicSP_EC2/descriptors/*.*: - * examples/handcrafted/BasicSP_EC2/BMDisplay/*.*: - * examples/handcrafted/BasicSP_EC2/RTEventService/*.*: - - Added new event channel example. The event service is - integrated as a separate component. - -2003-08-04 Arvind S. Krishna - - * performance-tests/Benchmark/RountTripClient/run_test.pl: - * performance-tests/Benchmark/RountTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RountTrip/RoundTrip_exec.cpp: - Fixed errors in the perl file for running the example. Corrected - the way in which throughput is measured within the client - component. Also added code to enable tests to be run in the - super user mode. - -2003-08-04 Diego Sevilla - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/descriptors/RoundTripClient.cad: - * performance-tests/Benchmark/descriptors/RoundTripClient.csd: - * performance-tests/Benchmark/descriptors/RoundTripClient.ssd: - Made the test to run. Fixed some problems with UUID. Made the - client to correctly expect a component instance instead of a - home. - -Mon Jul 7 23:35:14 2003 Nanbor Wang - - * tools/RTComponentServer/ComponentServer_Task.inl: - * tools/Simple_Component_Server/Simple_Component_Server.cpp: Fixed - compilation errors/warnings on Linux. - -Fri Aug 01 23:34:38 2003 Nanbor Wang - - * tools/Simple_Component_Server/sample_client.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.cpp: Fixed compilation - errors. We need to include "ace/streams.h" explicitly if we - want to use iostream stuff. - -2003-08-01 Diego Sevilla - - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - Small bug fix. - - * performance-tests/Benchmark/Benchmark.idl: Added missing - Controller interface. - -2003-07-31 Diego Sevilla - - * performance-tests/Benchmark/Benchmark.idl: - * performance-tests/Benchmark/Benchmark.mpc: - * performance-tests/Benchmark/BenchmarkE.idl: - * performance-tests/Benchmark/Benchmark_stub_export.h: - * performance-tests/Benchmark/Benchmark_svnt_export.h: - * performance-tests/Benchmark/NOTE.txt: - * performance-tests/Benchmark/README: - * performance-tests/Benchmark/RoundTrip/README: - * performance-tests/Benchmark/RoundTrip/RoundTrip.cidl: - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc: - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_stub_export.h: - * performance-tests/Benchmark/RoundTrip/RoundTrip_svnt_export.h: - * performance-tests/Benchmark/RoundTrip/client.cpp: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.cidl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc: - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h: - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h: - * performance-tests/Benchmark/RoundTripClient/client.cpp: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/descriptors/Benchmark.cad: - * performance-tests/Benchmark/descriptors/CIAO_Installation_Data.ini: - * performance-tests/Benchmark/descriptors/RoundTrip.csd: - * performance-tests/Benchmark/descriptors/RoundTrip.ssd: - * performance-tests/Benchmark/descriptors/RoundTripClient.cad: - * performance-tests/Benchmark/descriptors/RoundTripClient.csd: - * performance-tests/Benchmark/descriptors/RoundTripClient.ssd: - * performance-tests/Benchmark/descriptors/test.dat: - Added files for the performance tests Arvind and I are - developing. - - * CIDLC/ServantHeaderGenerator.cpp: Removed usage of Traversal - namespace to avoid name clashing. - - * CIDLC/ExecutorMappingGenerator.cpp: - * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp: - Generate SessionContext by now instead of CCMContext for local - interfaces. - -Thu Jul 31 16:50:29 2003 George Edwards - - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.h: - * examples/handcrafted/BasicSP_EC/BMDevice/BMDevice_svnt.cpp: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.h: - * examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED_svnt.cpp: - - Made modifications requested. Added @@ Bala comments to - indicate changes. - -2003-07-31 Diego Sevilla - - * examples/OEP/BasicSP/EC/EC_exec.{cpp,h}: Changed the exception - specification for the new_EC method (explicit home operations - don't throw CCMException.) - - * examples/OEP/Display/RateGen/RateGen_exec.{cpp,h}: Ditto. - - * CIDLC/*: Adapted the CIDL compiler to work with the new CCF - library. Basically the same code is generated with small bugs - fixed. - -Wed Jul 30 07:26:29 2003 Balachandran Natarajan - - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.h: - * examples/handcrafted/BasicSP_EC/EC/EC_svnt.cpp: Added @@ George - comments for George. This is a code review. Same comments apply - to other components. - -Tue Jul 29 15:36:20 2003 Boris Kolpackov - - * CCF/*.*: Replaced old version with a new one. - -Thu Jul 24 16:22:27 2003 George Edwards - - Added new files: - * examples/handcrafted/BasicSP_EC/*.*: - * examples/handcrafted/BasicSP_EC/BMClosedED/*.*: - * examples/handcrafted/BasicSP_EC/BMDevice/*.*: - * examples/handcrafted/BasicSP_EC/BMDisplay/*.*: - * examples/handcrafted/BasicSP_EC/descriptors/*.*: - * examples/handcrafted/BasicSP_EC/EC/*.*: - - Modified BasicSP example to use TAO's RT event channel for - event propagation. This involved modifications to each - component's servant header and source files, which are normally - generated by the CIDL compiler. - -Sun Jul 13 20:14:42 2003 Nanbor Wang - - * README: Updated information on MPC tools. ACE/TAO are in - transition to use MPC based solution exclusively (like what CIAO - is doing already.) There are currently some mismatch between - MPC genearted Makefile/project files and the stock ones. Be - caution. - - Once we switch to all MPC based approach, this will no longer be - a problem. - -Wed Jul 09 21:06:12 2003 Nanbor Wang - - * tools/ServerActivator/ServerActivator.cpp: Fixed compilation due - to earlier change in the signature of ServerActivator_Impl::init - method. - -Tue Jul 08 10:52:56 2003 Nanbor Wang - - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/README: Reverted the previous documentation change, - instead, register the daemon interface as "CIAODaemon" in the - internal IOR table. This provides a more consistent naming - scheme throughout. Thanks to Roland Schimmack - for motivating this change. - -Tue Jul 08 07:11:23 2003 Nanbor Wang - - * tools/Daemon/README: Fixed discrepancy in document. The - IOR-Table entry for daemon interface should be "CIAO-Daemon" - instead of "CIAODaemon". Thanks to Roland Schimmack - for reporting this. - -Sun Jul 06 21:40:39 2003 Nanbor Wang - - There are two major changes in this entry. - - 1. A scheme for associating component server with a logical - configuration and to map the logical name to a real svc.conf - file. Each local CIAO_Daemon can determine what default - svc.conf file to use, if none specified, and how logical - names map to actual svc.conf files. - - 2. Added mechanism to pass the ConfigValues from - Components::Deployment::ServerActivator::create_component_server - to a Components::Deployment::ComponentServer instance which it - can later use for futher configure the ComponentServer. - - * ciao/Server_init.cpp: - * ciao/Server_init.h: Added a new Utility namespace for commonly - used server side functions. Currently only a write_IOR - method is available. - - * ciao/CIAO_Servers.idl: Updated - CIAO::Activator_Callback::register_component_server method to - pass back ComponentServer's ConfigValues. - - * docs/ConfigValues.html: Docuement the new ConfigValue name - ("CIAO-svcconf-id") that CIAO recognize. - - * ciao/ServerActivator_Impl.cpp: - * ciao/ServerActivator_Impl.h: - * ciao/ServerActivator_Impl.inl: Changed to support: - - Activator_Callback change. - - Mechanisms to maintain an (id, svc.conf) mapping, and keeping a - default svc.conf file. - - * ciao/ComponentServer_Impl.h: - * ciao/ComponentServer_Impl.inl: Changed to update the - ConfigValues when calling back to the ServerActivator. - - * examples/OEP/Display/descriptors/svcmap.dat: Added an example - svcconf-id to svc.conf filename mapping file. - - * tools/Assembly_Deployer/Assembly_Visitors.cpp: Extend the the - syntax of tag. It can now contain an optional '|' - delimited svc.conf id to provide the CIAO Daemon the logical - svc.conf file should use. - - * tools/Assembly_Deployer/Deployment_Configuration.cpp: Enhanced - to provide a more comprehensive error message. - - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/README: Extended CIAODaemon's command line options - to pass in the default svc.conf filename and the (id, svc.conf) - mapping data file. - - * tools/ComponentServer/ComponentServer.cpp: Changed to update - this component server's ConfigValues after calling back to the - ServerActivator. Removed the old write_IOR function and changed - to use the global function in CIAO::Utility namespace. - - * tools/Simple_Component_Server/Simple_Component_Server.cpp: Some - minor memory leaks were identified in this file, but I didn't - have time to fix them yet. So added comments to identify them. - -Sun Jul 06 19:41:06 2003 Nanbor Wang - - * examples/OEP/Display/NavDisplayGUI_exec/README: Documented how - one can generate a project that work for this component. - -Thu Jul 03 16:04:35 2003 Nanbor Wang - - * ciao/CCM_Core.mpc: Fixed compilation errors by - - . Including $(TAO_ROOT)/orbsvcs/orbsvcs to IDL and C++ include - paths. It's necessary to do this because security idl files - includes other stuff in that subdir. - - . Adding dependency to ifr_client to CIAO_Container library. - -Wed Jul 02 14:57:00 2003 Justin Michel - - * CIAO.mwc - * CIDLC/cidlc.mpc - * CIDLC/parser_examples/examples.mwc - * examples/OEP/examples.mwc - * examples/handcrafted/examples.mwc - * examples/handcrafted/BasicSP/EC/EC.mpc - * examples/handcrafted/Hello/hello.mpc - * tests/tests.mwc - * tools/tools.mwc - - Added workspaces and updated projects files to use - the latest MPC features. - -Wed Jun 25 11:00:00 2003 Justin Michel - - * ciao/CCM_Core.mpc: - * examples/OEP/BasicSP/BasicSP.mpc: - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/HUDisplay.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - * examples/handcrafted/BasicSP/BasicSP.mpc: - * examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/BasicSP/EC/EC.mpc: - * examples/handcrafted/Display/HUDisplay.mpc: - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Hello/hello.mpc: - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - * tools/ComponentServer/ComponentServer.mpc: - * tools/Daemon/Daemon.mpc: - * tools/ServerActivator/ServerActivator.mpc: - * tools/Simple_Component_Server/Simple_Component_Server.mpc: - * tools/XML_Helpers/XMLHelpers.mpc: - - Added and updated mpc files to use the latest - features and make use of base projects. - - -Tue Jun 24 15:42:46 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: Updated mpc file generator to - take advantage of the new CIDL rules. - - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: - * examples/handcrafted/BasicSP/BasicSP.mpc: - * examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc: - * examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/handcrafted/Display/HUDisplay.mpc: - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Hello/hello.mpc: Updated mpc files to take - advantage of the new CIDL build rules, and to use the new - ciao_servant mpc template for building servant DLLs and - ciao_component mpc template for building component executor - DLLs.. - -Sun Jun 22 15:23:00 2003 Nanbor Wang - - * examples/OEP/BasicSP/EC/EC.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: Renamed projects named - "controller" to resolve project name conflicts. - -Sun Jun 22 09:03:57 2003 Nanbor Wang - - * ciao/diffs/*: Removed obsolete diff files. - -Sat Jun 21 10:30:24 2003 Nanbor Wang - - * examples/OEP/BasicSP/BasicSP.mpc: - * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: - * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: - * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: - * examples/OEP/BasicSP/EC/EC.mpc: Added new MPC files. - - * examples/OEP/BasicSP/BasicSP.dsw: - * examples/OEP/BasicSP/BasicSP_stub.dsp: - * examples/OEP/BasicSP/BasicSP_svnt.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp: - * examples/OEP/BasicSP/EC/EC_client.dsp: - * examples/OEP/BasicSP/EC/EC_exec.dsp: - * examples/OEP/BasicSP/EC/EC_stub.dsp: - * examples/OEP/BasicSP/EC/EC_svnt.dsp: - * examples/OEP/BasicSP/EC/controller.dsp: Removed these - handcrafted projects/workspaces now that we genertae them via MPC. - -Sat Jun 21 09:50:37 2003 Nanbor Wang - - * examples/OEP/Display/HUDisplay.mpc: - * examples/OEP/Display/GPS/GPS.mpc: - * examples/OEP/Display/NavDisplay/NavDisplay.mpc: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/OEP/Display/RateGen/RateGen.mpc: Added new MPC files - that can handle CIDL and Qt files. - - * examples/OEP/Display/Display.dsw: - * examples/OEP/Display/HUDisplay_stub.dsp: - * examples/OEP/Display/HUDisplay_svnt.dsp: - * examples/OEP/Display/GPS/GPS_exec.dsp: - * examples/OEP/Display/GPS/GPS_stub.dsp: - * examples/OEP/Display/GPS/GPS_svnt.dsp: - * examples/OEP/Display/GPS/GPS_tracing_exec.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: - * examples/OEP/Display/RateGen/RateGen_client.dsp: - * examples/OEP/Display/RateGen/RateGen_exec.dsp: - * examples/OEP/Display/RateGen/RateGen_stub.dsp: - * examples/OEP/Display/RateGen/RateGen_svnt.dsp: - * examples/OEP/Display/RateGen/controller.dsp: Removed handcrafted - projects/workspaces now that we can generate them with MPC - files. - -Fri Jun 20 21:06:23 2003 Nanbor Wang - - * examples/OEP/Display/HUDisplay_stub.dsp: - * examples/OEP/Display/HUDisplay_svnt.dsp: Fixed incorrect usages - of environment variables in project files. - -Fri Jun 20 11:41:50 2003 Nanbor Wang - - * ciao/ServerActivator_Impl.cpp (create_component_server): - Added more code to generate debug info when things go wrong. - Thanks to Emre Turkay for - motivating this. - -Fri Jun 20 10:21:10 2003 Chad Elliott - - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Added inheritance from qt_moc and removed the custom definition - for MOC_Files. - -Thu Jun 19 07:54:42 2003 Chad Elliott - - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - - Added 'specific' scopes to take into account the different qt - library names on different platforms. - -Tue Jun 17 11:02:19 2003 Nanbor Wang - - * examples/handcrafted/Hello/README: Updated the obsolete - instructions to test run this component. Thanks to Jesse - Greenwald for reporting this. - -Mon Jun 16 11:16:52 2003 Chris Cleeland - - * CIAO version 0.3.3 released. - -Sun Jun 08 10:42:15 2003 Nanbor Wang - - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: Added code - to registered the ValueFactory with the ORB so we can deploy - this component independent of others in this example. Enhanced - the debug output a bit. - - * docs/releasenote.html: Added info on CIDL compiler. - - * exampels/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: - Really checked in the following change. - - Mon Jun 02 23:36:29 2003 Nanbor Wang - -Tue Jun 03 07:55:01 2003 Simon McQueen - - * CIAO version 0.3.2 released. - -Tue Jun 3 01:26:04 2003 Jeff Parsons - - * examples/OEP/BasicSP/BasicSP.dsw: - * examples/OEP/BasicSP/BasicSP_stub.dsp: - * examples/OEP/BasicSP/BasicSP_svnt.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp: - * examples/OEP/BasicSP/EC/EC_stub.dsp: - * examples/OEP/Display/HUDisplay_stub.dsp: - * examples/OEP/Display/HUDisplay_svnt.dsp: - - Updated settings in these files. - - * examples/OEP/BasicSP/NOTE.txt: - - Fixed typos. - - * examples/OEP/BasicSP/descriptors/daemon.ior: - - Removed this file from the repository - it's just a temporary. - -Mon Jun 02 23:36:29 2003 Nanbor Wang - - * exampels/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: - Regenerated and hand modified the project file. - -Mon Jun 2 22:45:05 2003 Jeff Parsons - - * ciao/ComponentsC.h: - * ciao/ComponentsS.h: - - Contains the *C.h and *S.h corresponding to the include in Components.idl. - -Mon Jun 02 12:47:50 2003 Nanbor Wang - - * README: Revised the root readme file. - -Mon Jun 2 12:42:10 2003 Jeff Parsons - - * CCF/External/Utility/Documentation/Build.html: - - New file containing build information for the CIDL compiler. - - * CIDLC/README: - - Updated file to point to the new file above and other - documentation files in that same directory. - -Mon Jun 2 02:00:04 2003 Jeff Parsons - - * examples/OEP/BasicSP/BasicSP.dsw: - * examples/OEP/BasicSP/BasicSP_stub.dsp: - * examples/OEP/BasicSP/BasicSP_svnt.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_stub.dsp: - * examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_exec.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_stub.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_stub.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp: - * examples/OEP/BasicSP/EC/EC_client.dsp: - * examples/OEP/BasicSP/EC/EC_exec.dsp: - * examples/OEP/BasicSP/EC/EC_stub.dsp: - * examples/OEP/BasicSP/EC/EC_svnt.dsp: - * examples/OEP/BasicSP/EC/controller.dsp: - * examples/OEP/Display/Display.dsw: - * examples/OEP/Display/HUDisplay_stub.dsp: - * examples/OEP/Display/HUDisplay_svnt.dsp: - * examples/OEP/Display/GPS/GPS_exec.dsp: - * examples/OEP/Display/GPS/GPS_stub.dsp: - * examples/OEP/Display/GPS/GPS_svnt.dsp: - * examples/OEP/Display/GPS/GPS_tracing_exec.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: - * examples/OEP/Display/NavDisplayGUI_exec/README - * examples/OEP/Display/RateGen/RateGen_client.dsp: - * examples/OEP/Display/RateGen/RateGen_exec.dsp: - * examples/OEP/Display/RateGen/RateGen_stub.dsp: - * examples/OEP/Display/RateGen/RateGen_svnt.dsp: - * examples/OEP/Display/RateGen/controller.dsp: - - Fixed project and workspace settings for the generated - version of the HUDisplay and BasicSP examples. - -Sun Jun 1 23:00:53 2003 Balachandran Natarajan - - * Makefile: Added the path to the RELEASE_FILES - -Sun Jun 1 19:07:49 2003 Jeff Parsons - - * CIDLC/README: - * examples/OEP?BasicSP/README: - * examples/OEP/Display/README: - - Updated these files with info about the URL for downloading - CIDL compiler binaries. - -Sun Jun 1 14:30:53 2003 Jeff Parsons - - * docs/releasenotes.html: - * docs/todo.html: - - Added items related to the CIDL compiler. - -Sat May 31 10:54:11 2003 Balachandran Natarajan - - * Makefile: We dont have any special files like INSTALL that needs - specila attention during the release. - -Fri May 30 19:33:36 2003 Jeff Parsons - - * CCF/DesignNotes: - * CCF/Makefile: - * CCF/Version: - * CCF/CCF/CCF.sln: - * CCF/CCF/Makefile: - * CCF/CCF/CIDL/CIDL.cpp: - * CCF/CCF/CIDL/CIDL.vcproj: - * CCF/CCF/CIDL/CIDL_LexicalAnalyzer.hpp: - * CCF/CCF/CIDL/CIDL_Parser.hpp: - * CCF/CCF/CIDL/CIDL_SemanticAction.hpp: - * CCF/CCF/CIDL/CIDL_SemanticActionImpl.hpp: - * CCF/CCF/CIDL/CIDL_SyntaxTree.cpp: - * CCF/CCF/CIDL/CIDL_SyntaxTree.hpp: - * CCF/CCF/CIDL/CIDL_SyntaxTreeFwd.hpp: - * CCF/CCF/CIDL/CIDL_Traversal.cpp: - * CCF/CCF/CIDL/CIDL_Traversal.hpp: - * CCF/CCF/CIDL/MSVC_Pragmas.hpp: - * CCF/CCF/CIDL/Makefile: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.cpp: - * CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj: - * CCF/CCF/CodeGenerationKit/CommandLine.cpp: - * CCF/CCF/CodeGenerationKit/CommandLine.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.cpp: - * CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.cpp: - * CCF/CCF/CodeGenerationKit/CommandLineParser.hpp: - * CCF/CCF/CodeGenerationKit/IDLStream.hpp: - * CCF/CCF/CodeGenerationKit/MSVC_Pragmas.hpp: - * CCF/CCF/CodeGenerationKit/Makefile: - * CCF/CCF/CodeGenerationKit/Regex.hpp: - * CCF/CCF/CompilerElements/DiagnosticStream.cpp: - * CCF/CCF/CompilerElements/DiagnosticStream.hpp: - * CCF/CCF/CompilerElements/ExH.hpp: - * CCF/CCF/CompilerElements/FileSystem.hpp: - * CCF/CCF/CompilerElements/MSVC_Pragmas.hpp: - * CCF/CCF/CompilerElements/Parser.hpp: - * CCF/CCF/CompilerElements/Preprocessor.hpp: - * CCF/CCF/CompilerElements/ReferenceCounting.hpp: - * CCF/CCF/CompilerElements/SemanticAction.hpp: - * CCF/CCF/CompilerElements/Token.hpp: - * CCF/CCF/CompilerElements/TokenStream.hpp: - * CCF/CCF/CompilerElements/Traversal.hpp: - * CCF/CCF/IDL2/IDL2.cpp: - * CCF/CCF/IDL2/IDL2.vcproj: - * CCF/CCF/IDL2/IDL2_LexicalAnalyzer.cpp: - * CCF/CCF/IDL2/IDL2_LexicalAnalyzer.hpp: - * CCF/CCF/IDL2/IDL2_Parser.hpp: - * CCF/CCF/IDL2/IDL2_SemanticAction.hpp: - * CCF/CCF/IDL2/IDL2_SemanticActionImpl.hpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree.cpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree.hpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree.tpp: - * CCF/CCF/IDL2/IDL2_SyntaxTreeFwd.hpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree_BuiltIn.cpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree_BuiltIn.hpp: - * CCF/CCF/IDL2/IDL2_SyntaxTree_Value.hpp: - * CCF/CCF/IDL2/IDL2_Traversal.cpp: - * CCF/CCF/IDL2/IDL2_Traversal.hpp: - * CCF/CCF/IDL2/MSVC_Pragmas.hpp: - * CCF/CCF/IDL2/Makefile: - * CCF/CCF/IDL3/IDL3.cpp: - * CCF/CCF/IDL3/IDL3.vcproj: - * CCF/CCF/IDL3/IDL3_LexicalAnalyzer.hpp: - * CCF/CCF/IDL3/IDL3_Parser.hpp: - * CCF/CCF/IDL3/IDL3_SemanticAction.hpp: - * CCF/CCF/IDL3/IDL3_SemanticActionImpl.hpp: - * CCF/CCF/IDL3/IDL3_SyntaxTree.cpp: - * CCF/CCF/IDL3/IDL3_SyntaxTree.hpp: - * CCF/CCF/IDL3/IDL3_SyntaxTreeFwd.hpp: - * CCF/CCF/IDL3/IDL3_SyntaxTree_EventType.cpp: - * CCF/CCF/IDL3/IDL3_SyntaxTree_EventType.hpp: - * CCF/CCF/IDL3/IDL3_Traversal.cpp: - * CCF/CCF/IDL3/IDL3_Traversal.hpp: - * CCF/CCF/IDL3/MSVC_Pragmas.hpp: - * CCF/CCF/IDL3/Makefile: - * CCF/External/Utility/Makefile: - * CCF/External/Utility/Version: - * CCF/External/Utility/Config/Archive.gcc.post.rules: - * CCF/External/Utility/Config/Archive.gcc.pre.rules: - * CCF/External/Utility/Config/Archive.post.rules: - * CCF/External/Utility/Config/Archive.pre.rules: - * CCF/External/Utility/Config/Documentation.post.rules: - * CCF/External/Utility/Config/Documentation.pre.rules: - * CCF/External/Utility/Config/Executable.gcc.post.rules: - * CCF/External/Utility/Config/Executable.gcc.pre.rules: - * CCF/External/Utility/Config/Executable.generic.post.rules: - * CCF/External/Utility/Config/Executable.generic.pre.rules: - * CCF/External/Utility/Config/Executable.post.rules: - * CCF/External/Utility/Config/Executable.pre.rules: - * CCF/External/Utility/Config/Recursion.post.rules: - * CCF/External/Utility/Config/Recursion.pre.rules: - * CCF/External/Utility/Config/Shared.gcc.post.rules: - * CCF/External/Utility/Config/Shared.gcc.pre.rules: - * CCF/External/Utility/Config/Shared.generic.post.rules: - * CCF/External/Utility/Config/Shared.generic.pre.rules: - * CCF/External/Utility/Config/Shared.post.rules: - * CCF/External/Utility/Config/Shared.pre.rules: - * CCF/External/Utility/Config/Thoughts: - * CCF/External/Utility/Documentation/Makefile: - * CCF/External/Utility/Documentation/News.html: - * CCF/External/Utility/Documentation/index.html: - * CCF/External/Utility/Documentation/ExH/Makefile: - * CCF/External/Utility/Documentation/ExH/Makefile.documentation: - * CCF/External/Utility/Documentation/ExH/News.html: - * CCF/External/Utility/Documentation/ExH/index.html: - * CCF/External/Utility/Documentation/ExH/Example/Makefile: - * CCF/External/Utility/Documentation/ExH/Logic/Makefile: - * CCF/External/Utility/Documentation/ExH/System/Makefile: - * CCF/External/Utility/Documentation/ReferenceCounting/Makefile: - * CCF/External/Utility/Documentation/ReferenceCounting/News.html: - * CCF/External/Utility/Documentation/ReferenceCounting/index.html: - * CCF/External/Utility/Documentation/Style/CXX.css: - * CCF/External/Utility/Documentation/Style/CXX_Blue.css: - * CCF/External/Utility/Documentation/Synch/Makefile: - * CCF/External/Utility/Documentation/Synch/News.html: - * CCF/External/Utility/Documentation/Synch/index.html: - * CCF/External/Utility/Documentation/Synch/Policy/Makefile: - * CCF/External/Utility/Utility/ExH/Compound.hpp: - * CCF/External/Utility/Utility/ExH/Compound.tpp: - * CCF/External/Utility/Utility/ExH/Converter.hpp: - * CCF/External/Utility/Utility/ExH/Converter.tpp: - * CCF/External/Utility/Utility/ExH/ExH.hpp: - * CCF/External/Utility/Utility/ExH/StringConverter.hpp: - * CCF/External/Utility/Utility/ExH/StringConverter.ipp: - * CCF/External/Utility/Utility/ExH/StringStreamConverter.hpp: - * CCF/External/Utility/Utility/ExH/StringStreamConverter.ipp: - * CCF/External/Utility/Utility/ExH/Logic/DescriptiveException.hpp: - * CCF/External/Utility/Utility/ExH/Logic/DescriptiveException.ipp: - * CCF/External/Utility/Utility/ExH/Logic/Exception.hpp: - * CCF/External/Utility/Utility/ExH/Logic/Exception.ipp: - * CCF/External/Utility/Utility/ExH/System/DescriptiveException.hpp: - * CCF/External/Utility/Utility/ExH/System/DescriptiveException.ipp: - * CCF/External/Utility/Utility/ExH/System/Exception.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/DefaultImpl.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/DefaultImpl.ipp: - * CCF/External/Utility/Utility/ReferenceCounting/ExternalLockImpl.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/ExternalLockImpl.ipp: - * CCF/External/Utility/Utility/ReferenceCounting/Interface.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/Interface.ipp: - * CCF/External/Utility/Utility/ReferenceCounting/Interface.tpp: - * CCF/External/Utility/Utility/ReferenceCounting/ReferenceCounting.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/SmartPtr.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/SmartPtr.tpp: - * CCF/External/Utility/Utility/ReferenceCounting/StrictPtr.hpp: - * CCF/External/Utility/Utility/ReferenceCounting/StrictPtr.tpp: - * CCF/External/Utility/Utility/Synch/Policy/Null.hpp: - * CCF/External/Utility/Utility/Synch/Policy/Null.ipp: - * CIDLC/CIDLC.sln: - * CIDLC/CIDLC.vcproj: - * CIDLC/ExecutorMapp:ingGenerator.cpp: - * CIDLC/ExecutorMapp:ingGenerator.hpp: - * CIDLC/Literals.hpp: - * CIDLC/Makefile: - * CIDLC/ServantGenerator.cpp: - * CIDLC/ServantGenerator.hpp: - * CIDLC/ServantHeaderGenerator.cpp: - * CIDLC/ServantHeaderGenerator.hpp: - * CIDLC/ServantSourceGenerator.cpp: - * CIDLC/ServantSourceGenerator.hpp: - * CIDLC/Version: - * CIDLC/cidlc.cpp: - - Source code, documentation and build files for the - CIDL compiler. - -Fri May 30 18:18:25 2003 Jeff Parsons - - * CIDLC/*: - - Removed all files in this directory from the repository except - DesignNotes, which will reappear in a new directory along with - other CIDL compiler checkins. The parser examples that were - in this directory are no longer useful or up to date. Soon - parts of the CIDL compiler will be checked into this directory. - - * README: - - New file. - -Fri May 30 17:41:05 2003 Jeff Parsons - - * examples/OEP/BasicSP/BMClosedED/BMClosedED_svnt.dsp: - * examples/OEP/BasicSP/BMDevice/BMDevice_svnt.dsp: - * examples/OEP/BasicSP/BMDisplay/BMDisplay_svnt.dsp: - * examples/OEP/BasicSP/EC/EC_svnt.dsp: - * examples/OEP/Display/GPS/GPS_svnt.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp: - * examples/OEP/Display/RateGen/RateGen_svnt.dsp: - - Changed the location of the CIDL compiler executable to - CIAO_ROOT/bin for the MSVC projects. - - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.h: - - Removed these file from the repository - they are generated - and shouldn't have been checked in. - -Fri May 30 15:25:29 2003 Jeff Parsons - - * examples/OEP/Display/Configuration-0.png: - * examples/OEP/Display/Display.dsw: - * examples/OEP/Display/HUDisplay.idl: - * examples/OEP/Display/HUDisplay.mpc: - * examples/OEP/Display/HUDisplay_stub.dsp: - * examples/OEP/Display/HUDisplay_stub_export.h: - * examples/OEP/Display/HUDisplay_svnt.dsp: - * examples/OEP/Display/HUDisplay_svnt_export.h: - * examples/OEP/Display/NOTE: - * examples/OEP/Display/README: - * examples/OEP/Display/cleanup_mpcfiles.cmd: - * examples/OEP/Display/GPS/GPS.cidl: - * examples/OEP/Display/GPS/GPS.idl: - * examples/OEP/Display/GPS/GPSEI.idl: - * examples/OEP/Display/GPS/GPS_exec.cpp: - * examples/OEP/Display/GPS/GPS_exec.dsp: - * examples/OEP/Display/GPS/GPS_exec.h: - * examples/OEP/Display/GPS/GPS_exec_export.h: - * examples/OEP/Display/GPS/GPS_stub.dsp: - * examples/OEP/Display/GPS/GPS_stub_export.h: - * examples/OEP/Display/GPS/GPS_svnt.dsp: - * examples/OEP/Display/GPS/GPS_svnt_export.h: - * examples/OEP/Display/GPS/GPS_tracing_exec.cpp: - * examples/OEP/Display/GPS/GPS_tracing_exec.dsp: - * examples/OEP/Display/GPS/GPS_tracing_exec.h: - * examples/OEP/Display/GPS/config: - * examples/OEP/Display/NavDisplay/NavDisplay.cidl: - * examples/OEP/Display/NavDisplay/NavDisplay.idl: - * examples/OEP/Display/NavDisplay/NavDisplayEI.idl: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_exec.h: - * examples/OEP/Display/NavDisplay/NavDisplay_exec_export.h: - * examples/OEP/Display/NavDisplay/NavDisplay_stub.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_stub_export.h: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.cpp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.dsp: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt.h: - * examples/OEP/Display/NavDisplay/NavDisplay_svnt_export.h: - * examples/OEP/Display/NavDisplay/config: - * examples/OEP/Display/NavDisplay/run_test.pl: - * examples/OEP/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/AddNavUnitCmd.h: - * examples/OEP/Display/NavDisplayGUI_exec/Command.h: - * examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/DetailView.h: - * examples/OEP/Display/NavDisplayGUI_exec/MapView.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/MapView.h: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.dsp: - * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/OEP/Display/NavDisplayGUI_exec/NavUnit.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NavUnit.h: - * examples/OEP/Display/NavDisplayGUI_exec/NodeItem.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/NodeItem.h: - * examples/OEP/Display/NavDisplayGUI_exec/QuitCmd.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/QuitCmd.h: - * examples/OEP/Display/NavDisplayGUI_exec/README: - * examples/OEP/Display/NavDisplayGUI_exec/RootPanel.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/RootPanel.h: - * examples/OEP/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/UpdatePositionCmd.h: - * examples/OEP/Display/NavDisplayGUI_exec/Worker.cpp: - * examples/OEP/Display/NavDisplayGUI_exec/Worker.h: - * examples/OEP/Display/NavDisplayGUI_exec/trolltech.gif: - * examples/OEP/Display/NavDisplayGUI_exec/worldmap1.gif: - * examples/OEP/Display/NavDisplayGUI_exec/worldmap1.xpm: - * examples/OEP/Display/RateGen/RateGen.cidl: - * examples/OEP/Display/RateGen/RateGen.idl: - * examples/OEP/Display/RateGen/RateGenEI.idl: - * examples/OEP/Display/RateGen/RateGen_client.dsp: - * examples/OEP/Display/RateGen/RateGen_exec.cpp: - * examples/OEP/Display/RateGen/RateGen_exec.dsp: - * examples/OEP/Display/RateGen/RateGen_exec.h: - * examples/OEP/Display/RateGen/RateGen_exec_export.h: - * examples/OEP/Display/RateGen/RateGen_stub.dsp: - * examples/OEP/Display/RateGen/RateGen_stub_export.h: - * examples/OEP/Display/RateGen/RateGen_svnt.dsp: - * examples/OEP/Display/RateGen/RateGen_svnt_export.h: - * examples/OEP/Display/RateGen/client.cpp: - * examples/OEP/Display/RateGen/config: - * examples/OEP/Display/RateGen/controller.cpp: - * examples/OEP/Display/RateGen/controller.dsp: - * examples/OEP/Display/RateGen/run_test.pl: - * examples/OEP/Display/descriptors/CIAO_Installation_Data.ini: - * examples/OEP/Display/descriptors/DuelDisplay.cad: - * examples/OEP/Display/descriptors/GPS.csd: - * examples/OEP/Display/descriptors/GPS.ssd: - * examples/OEP/Display/descriptors/GPS_tracing.csd: - * examples/OEP/Display/descriptors/HUDisplay.cad: - * examples/OEP/Display/descriptors/HUDisplayGUI.cad: - * examples/OEP/Display/descriptors/NOTE.txt: - * examples/OEP/Display/descriptors/NavDisplay.csd: - * examples/OEP/Display/descriptors/NavDisplay.ssd: - * examples/OEP/Display/descriptors/NavDisplayGUI.csd: - * examples/OEP/Display/descriptors/RateGen.csd: - * examples/OEP/Display/descriptors/RateGen.ssd: - * examples/OEP/Display/descriptors/RemoteDisplay.cad: - * examples/OEP/Display/descriptors/RemoteDisplayGUI.cad: - * examples/OEP/Display/descriptors/test.dat: - - New example, same as the one in examples/handcrafted/Display, - but using CIDL compiler generated code. - -Fri May 30 14:27:55 2003 Balachandran Natarajan - - * PROBLEM-REPORT-FORM (Subject): Fixed a typo. - -Fri May 30 14:15:45 2003 Balachandran Natarajan - - * VERSION: - * PROBLEM-REPORT-FORM (Subject): Files needed for the release. - -Fri May 30 14:11:11 2003 Balachandran Natarajan - - * ciao/Version.h: Changed the version info to be 0.3.1 instead of - 0.1.1. We want it to go the way ACE+TAO go. - -Fri May 30 13:57:26 2003 Balachandran Natarajan - - * Makefile: A new top level Makefile which will have the needed - information for the release. - -Fri May 30 12:29:37 2003 Jeff Parsons - - * examples/OEP/BasicSP/BasicSP.dsw: - * examples/OEP/BasicSP/BasicSP.idl: - * examples/OEP/BasicSP/BasicSP.mpc: - * examples/OEP/ - files. - - * examples/handcrafted/Display/HUDisplay_svnt.cpp: - * examples/handcrafted/Display/HUDisplay_svnt.inl: - * examples/handcrafted/Display/GPS/GPSE.idl: - * examples/handcrafted/Display/GPS/GPS_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_exec.h: - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/handcrafted/Display/RateGen/RateGenE.idl: - * examples/handcrafted/Display/RateGen/RateGen_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen_exec.h: - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - * examples/handcrafted/Display/RateGen/client.cpp: - * examples/handcrafted/Display/RateGen/controller.cpp: - * examples/handcrafted/Hello/client.cpp: - * examples/handcrafted/Hello/helloE.idl: - * examples/handcrafted/Hello/hello_servants.cpp: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Visitors.h: - * tools/Assembly_Deployer/Assembly_Visitors.inl: - * tools/ComponentServer/ComponentServer.cpp: - * tools/ComponentServer/ComponentServer_test_client.cpp: - * tools/Daemon/controller_i.cpp: - * tools/Daemon/controller_i.h: - * tools/ServerActivator/ServerActivator_test_client.cpp: - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Spec.cpp: - * tools/XML_Helpers/Assembly_Spec.inl: - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - * tools/XML_Helpers/Softpkg_Handlers.cpp: Fixed compilation errors - and warnings. They include - - Using a _var in places where a _ptr is expected. - - Incorrect Capitalization of file names. - - Unused variables warnings. - - Exception throw specification mis-matches. - - * docs/templates/CIAO_Glue_Session_Template.cpp: Propagated - previous fixes into the tempate code. - - * ciao/Container_Base.cpp: Removed a redundant ACE_INLINE decl. - -Tue Apr 15 17:07:52 2003 Nanbor Wang - - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Softpkg_Handlers.h: - * tools/XML_Helpers/XMLHelpers.mpc: - * tools/XML_Helpers/XML_Utils.h: - * tools/XML_Helpers/XML_Helpers_Export.h: Refactored these files - to make them into a library. - - * tools/XML_Helpers/XML_Helpers.dsw: - * tools/XML_Helpers/Helper_Test.dsp: - * tools/Daemon/CIAO_Daemon.dsp: - * tools/Daemon/Daemon.dsw: - * tools/Daemon/DaemonController.dsp: Removed these project files - and depend solely on MPC generated files. - - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - * tools/Daemon/Daemon.mpc: Updated MPC files to link with the new - XML_Helpers library. - -Tue Apr 15 11:07:36 2003 Nanbor Wang - - * ciao/Daemon.idl: - * ciao/Daemon_Impl.h: - * ciao/Daemon_Impl.inl: - * ciao/Daemon_Impl.cpp: - * tools/Daemon/Daemon.idl: - * tools/Daemon/Daemon_Impl.h: - * tools/Daemon/Daemon_Impl.inl: - * tools/Daemon/Daemon_Impl.cpp: - * ciao/CCM_Core.mpc: - * ciao/CIAO_Server.dsp: - * tools/Daemon/CIAO_Daemon.dsp: - * tools/Daemon/Daemon.mpc: - * tools/Daemon/DaemonController.dsp: Moved Daemon idl file and - implementations out of CIAO_Server library into Daemon - implemenation. - - Removed HomeRegistrar related files from the projects of the - CIAO_Server library. They need to be moved a a proper place in - the near future. - - * docs/todo.html: Document other refactoring needed in the - CCM_Core libraries. - -Mon Apr 14 17:06:37 2003 Nanbor Wang - - * examples/handcrafted/Display/HUDisplay_svnt.cpp: - * examples/handcrafted/Display/HUDisplay_svnt.h: - * examples/handcrafted/Display/GPS/GPS_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_exec.h: - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/GPS/GPS_svnt.h: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen_exec.h: - * examples/handcrafted/Display/RateGen/client.cpp: - * examples/handcrafted/Display/RateGen/controller.cpp: - * examples/handcrafted/Display/RateGen/run_test.pl: - * examples/handcrafted/Display/descriptors/NOTE.txt: Updated - docuemntation. Changed to inherit Pulse_Handler from - ACE_Task_Base. Reworked controller.cpp so that it won't look - like the process that actually generates the events. - -Mon Apr 14 14:57:51 2003 Nanbor Wang - - * examples/handcrafted/Display/RateGen/controller.cpp: Changed to - perform only one action in each exection of this program. I.e., - it either switch on or off the RateGen component and exit - immediately. This is to avoid the mis-conception that the - controller actually generates the Rate. - -Sat Apr 12 12:36:08 2003 Nanbor Wang - - * CIDLC/parser_examples/cidl/cidl.vcproj: - * CIDLC/parser_examples/idl2/idl2.vcproj: - * CIDLC/parser_examples/idl3/idl3.vcproj: Changed the extra - include paths from: - - ..,../spirit-1.3.0,../spirit-1.3.0/miniboost - - to: - - ..,$(SPIRIT_DIR),$(SPIRIT_DIR)/miniboost - - to be consistent with the MPC files and to decouple Spirit from - CIAO's directory strucutre. - -Sat Apr 12 10:48:13 2003 Nanbor Wang - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.inl: Incorporated - changes for fixing gcc compilation warnings. - - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/ComponentServer/ComponentServer.cpp: - * tools/ComponentServer/ComponentServer_test_client.cpp: - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Simple_Component_Server/Simple_Component_Server.cpp: Added - misiing newlines in usage messages. - -Sat Apr 12 01:25:35 2003 Nanbor Wang - - * CIDLC/parser_examples/README: - * CIDLC/parser_examples/cidl/cidl.mpc: - * CIDLC/parser_examples/idl2/idl2.mpc: - * CIDLC/parser_examples/idl3/idl3.mpc: Added new MPC files to take - advantage of MPC/MWC tool. Updated the README to provide some - minimal instructions. - -Tue Apr 8 23:10:43 2003 Jeff Parsons - - * CIDLC/parser_examples/README: - * CIDLC/parser_examples/parser_examples.sln: - * CIDLC/parser_examples/cidl/cidl.cpp: - * CIDLC/parser_examples/cidl/cidl.vcproj: - * CIDLC/parser_examples/cidl/cidl_grammar.cpp: - * CIDLC/parser_examples/cidl/cidl_grammar.h: - * CIDLC/parser_examples/cidl/hello.cidl: - * CIDLC/parser_examples/idl2/idl2.cpp: - * CIDLC/parser_examples/idl2/idl2.vcproj: - * CIDLC/parser_examples/idl2/idl2_grammar.cpp: - * CIDLC/parser_examples/idl2/idl2_grammar.h: - * CIDLC/parser_examples/idl2/test_idl2.idl: - * CIDLC/parser_examples/idl3/idl3.cpp: - * CIDLC/parser_examples/idl3/idl3.vcproj: - * CIDLC/parser_examples/idl3/idl3_grammar.cpp: - * CIDLC/parser_examples/idl3/idl3_grammar.h: - * CIDLC/parser_examples/idl3/test_idl3.idl: - - Added parser examples (IDL2, IDL3, and CIDL) using the Spirit - parser. - -Tue Apr 08 19:42:16 2003 Nanbor Wang - - * examples/handcrafted/Display/GPS/GPS_tracing_exec.h: Fixed - a class name mismatch. - -Mon Apr 07 21:20:37 2003 Nanbor Wang - - * ciao/ServerActivator_Impl.cpp: Fixed a couple of compilation - warnings with gcc. - - * ciao/CIAO_Client.dsp: - * ciao/CIAO_Container.dsp: - * ciao/CIAO_Server.dsp: Turned on RTTI to sync up with the new Any - implementation. - - * ciao/CIAO_common.h: - * ciao/Cookies.cpp: Fixed the use of old CORBA_* types. They are - no longer available in the newer version of ACE/TAO. - -Sun Apr 06 20:36:39 2003 Nanbor Wang - - * examples/handcrafted/Display/CIAO_Installation_Data.ini: - * examples/handcrafted/Display/HUDisplay.cad: - * examples/handcrafted/Display/GPS/GPS.csd: - * examples/handcrafted/Display/GPS/GPS.ssd: - * examples/handcrafted/Display/NavDisplay/NavDisplay.csd: - * examples/handcrafted/Display/NavDisplay/NavDisplay.ssd: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd: - * examples/handcrafted/Display/RateGen/RateGen.csd: - * examples/handcrafted/Display/RateGen/RateGen.ssd: Removed these - files as they have already been moved to the - examples/handcrafted/Display/descriptors/ subdirectory. - - * examples/handcrafted/Display/NOTE: Updated obsolete notes. - - Thanks to Andrey Nechypurenko - for the following - changes. He reported, motivated or sent patches for them. - - * examples/handcrafted/Display/descriptors/NOTE.txt: Fixed several - typos. - - * examples/handcrafted/Display/descriptors/DuelDisplay.cad: - * examples/handcrafted/Display/descriptors/GPS_tracing.csd: - * examples/handcrafted/Display/descriptors/HUDisplayGUI.cad: - * examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad: - Updated these assembly descriptors to use the new GPS component - that emulate a trace (instead of the random coordinates). - - * examples/handcrafted/Display/NavDisplay/client.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl: - Removed these testing artifacts because NavDisplay component - requires other component to function properly. - - * tools/XML_Helpers/Assembly_Spec.inl: Fixed VC7.1 compilation - error. - - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_tracing_exec.h: Added a - new implementation for the GPS component. This implementation - simulates coordinates of a trace instead of some random - positions. - - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - Please find in attachment slightly modified version of - NavDisplayGUI. I have modified it slightly mainly in order to - let the GUI component to find background and animation images - either based on ACE_ROOT or using ../NavDisplayGUI_exec/. - - * examples/handcrafted/Display/NavDisplayGUI_exec/README: Removed - the mentioning of run_test.pl. It's no longer valid. - -Sat Apr 05 20:08:27 2003 Nanbor Wang - - * ciao/CCM_Deployment.idl: - * ciao/Component_Base.idl: - The operation Components::Deployment::Assembly::build can throw - CreateFailure exception. It was missing in the IDL files. - - * ciao/Server_init.cpp: - Register OBV factory for CIAO::Cookie also. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - Made sure we duplicate the object reference before adding them - to subscriber/connection active maps. - - * examples/handcrafted/Display/HUDisplay.idl: - * examples/handcrafted/Display/HUDisplay.mpc: - * examples/handcrafted/Display/HUDisplay_svnt.h: - * examples/handcrafted/Display/HUDisplay_svnt.inl: - * examples/handcrafted/Display/GPS/GPS_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_exec.h: - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - Updated the example to support 2-dimentional position interface. - Also fixed the reference counting problem in the servant glue - code. - - - * examples/handcrafted/Display/RateGen/controller.cpp: - Added a new - - * examples/handcrafted/Display/descriptors/HUDisplay.cad: - * examples/handcrafted/Display/descriptors/HUDisplayGUI.cad: - * examples/handcrafted/Display/descriptors/RemoteDisplay.cad: - * examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad: - Added variety of different composition example. See NOTE.txt - under the same directory for more information. - - * examples/handcrafted/Display/descriptors/test.dat: - Added a "Remote" entry so showcase how to deploy a system across - several machines. - - * tools/Assembly_Deployer/Assembly_Deployer.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Impl.h: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Visitors.h: - Added support for establishing connections according to - Assembly_Spec. - - * tools/Assembly_Deployer/Assembly_Service.idl: - * tools/Assembly_Deployer/Assembly_Service_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Service_Impl.h: - Added a simple interface in an attempt to solve the unreliable - shutdown problem. - - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Handlers.h: - * tools/XML_Helpers/Assembly_Handlers.inl: - * tools/XML_Helpers/Assembly_Spec.cpp: - * tools/XML_Helpers/Assembly_Spec.h: - Fixed "connectevent" parsing. I had the "source" and - "destination" interface reversed. - -Fri Apr 04 22:40:11 2003 Nanbor Wang - - * examples/handcrafted/Display/descriptors/*: Moved all XML - descriptors and deployment configuration into this newly created - subdirectory to simply procedures to test this example. - - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp: - Changed to thow a BAD_INV_ORDER exception is the receptacle is - not connected instead of a MSVC structural exception. - - * tools/Daemon/Daemon.mpc: - * tools/Daemon/DaemonController.dsp: - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Spec.cpp: - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Assembly_Spec.inl: - * tools/Assembly_Deployer/Assembly_Deployer.cpp: - * tools/Assembly_Deployer/Assembly_Deployer.mpc: - * tools/Assembly_Deployer/Assembly_Impl.cpp: - * tools/Assembly_Deployer/Assembly_Impl.h: - * tools/Assembly_Deployer/Assembly_Impl.inl: - * tools/Assembly_Deployer/Assembly_Manager.cpp: - * tools/Assembly_Deployer/Assembly_Visitors.h: - * tools/Assembly_Deployer/Assembly_Visitors.inl: - * tools/Assembly_Deployer/Deployment_Configuration.cpp: - * tools/Assembly_Deployer/Deployment_Configuration.h: - * tools/Assembly_Deployer/Deployment_Configuration.inl: Added more - support for component installation when building an Assembly. - -Thu Apr 03 15:08:20 2003 Nanbor Wang - - * ciao/Assembly_Impl.*: - * tools/Assembly_Deployer/Assembly_Impl.*: Moved the Assembly - implementaiton files to the tools/Assembly_Deployer/ directory. - - * ciao/CCM_Core.mpc: - * ciao/CIAO_Server.dsp: Removed Assembly_Impl.*. - -Thu Apr 03 13:11:49 2003 Nanbor Wang - - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Assembly_Handlers.h: - * tools/XML_Helpers/Assembly_Handlers.cpp: Added support for parsing - component and home registering info. Otherwise, it'd be hard to - use a composed application. - -Wed Apr 02 17:08:00 2003 Nanbor Wang - - * tools/XML_Helpers/Assembly_Handlers.cpp: - * tools/XML_Helpers/Assembly_Handlers.h: - * tools/XML_Helpers/Assembly_Handlers.inl: - * tools/XML_Helpers/Assembly_Spec.cpp: - * tools/XML_Helpers/Assembly_Spec.h: - * tools/XML_Helpers/Assembly_Spec.inl: - * tools/XML_Helpers/Helper_Test.dsp: Added implementations for - handling componentassembly XML documents and building the - assembly specification information. These handlers currently - process only "crucial" information needed to get a system up and - running, i.e., they do not yet extract all types of information - in a componentassembly document. - - Also important is that all XML handlers in CIAO assume all XML - documents they process are valid and well-formed. ACEXML - currently does not validate XML document yet. Therefore, you - need to validate the XML documents using other XML parser (such - as msxml) shall CIAO's assembly parsing behave strangely as the - handlers assume a validator has already taken up most of the - checking responsibility. - - * tools/XML_Helpers/Softpkg_Handlers.cpp: - * tools/XML_Helpers/Softpkg_Handlers.h: - * tools/XML_Helpers/Softpkg_Handlers.inl: - * tools/XML_Helpers/XML_Utils.cpp: - * tools/XML_Helpers/XML_Utils.h: Added a new - parse_componentassembly utility function and moved some of the - helper functions out of Softpkg_Handlers. - - * tools/XML_Helpers/main.cpp: - - * bin/generate_component_mpc.pl: Added dependent library to the - list of libraries client program links to. - - * docs/XML/componentassembly.dtd: Fixed a typo in DTD definition. - - * examples/handcrafted/Display/HUDisplay.cad: Added a - - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplay/client.cpp: - * examples/handcrafted/Display/NavDisplay/run_test.pl: Added a - client program to test the component. - - * examples/handcrafted/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/AddNavUnitCmd.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/Command.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/MapView.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayEIC.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavUnit.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NavUnit.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/NodeItem.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/NodeItem.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/QuitCmd.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/QuitCmd.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/README: - * examples/handcrafted/Display/NavDisplayGUI_exec/RootPanel.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/RootPanel.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/UpdatePositionCmd.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/UpdatePositionCmd.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/Worker.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/Worker.h: - * examples/handcrafted/Display/NavDisplayGUI_exec/moc_DetailView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/moc_MapView.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/moc_NodeItem.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/moc_RootPanel.cpp: - * examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl: - * examples/handcrafted/Display/NavDisplayGUI_exec/trolltech.gif: - * examples/handcrafted/Display/NavDisplayGUI_exec/worldmap1.gif: - Added a Qt GUI based component to showcase how we can - reconfigure a system using different component easily. Thanks - to Andrey Nechypurenko for - contributing the implementation. - - * examples/handcrafted/Display/CIAO_Installation_Data.ini: Added - deployment information for the new GUI NavDisplay component - implementation. - - * examples/handcrafted/Hello/client.dsp: - * examples/handcrafted/Hello/hello_executors.dsp: - * examples/handcrafted/Hello/hello_servants.dsp: - * examples/handcrafted/Hello/hello_stub.dsp: Hmm, I probably - checked in the MPC/MWC generated project accidentally. :) - -Mon Mar 24 16:17:21 2003 Nanbor Wang - - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp: - Added implementation for servant factory methods. Thanks to - Andrey Nechypurenko for reporting this. - -Fri Mar 21 15:51:57 2003 Nanbor Wang - - * docs/new_components.html: Revised naming convention for - user-defined component executor impl IDL. - - * bin/generate_component_mpc.pl: Added an option for adding - user-defined component executor impl IDL automatically, - according the the naming convention. Fixed the dependencies to - "dependent" libraries. - - * examples/handcrafted/Display/RateGen/RateGen.csd: - * examples/handcrafted/Display/RateGen/RateGen.ssd: Simplified the - XML descriptors. - - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Display/RateGen/RateGenEI.idl: - * examples/handcrafted/Display/RateGen/RateGen_exec.h: Fixed - dependencies and naming convention. - - * examples/handcrafted/Display/GPS/GPS.csd: - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/GPS/GPS.ssd: - * examples/handcrafted/Display/GPS/GPSEI.idl: - * examples/handcrafted/Display/GPS/GPS_exec.cpp: - * examples/handcrafted/Display/GPS/GPS_exec.h: - - * examples/handcrafted/Display/NavDisplay/NavDisplay.csd: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay.ssd: - * examples/handcrafted/Display/NavDisplay/NavDisplayEI.idl: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec.h: - - * examples/handcrafted/Display/CIAO_Installation_Data.ini: Added - component implementaions for GPS and NavDisplay. - -Thu Mar 20 21:50:07 2003 Nanbor Wang - - * ciao/ComponentInstallation_Impl.cpp: Added a more comprehensive - error printout. - - * docs/index.html: Fixed a broken link. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: Added the servant - factory entry point function that I missed. - - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - * examples/handcrafted/Display/RateGen/RateGen_svnt.h: Fixed up - the servant DLL entry point. - - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Display/RateGen/RateGen_comp.idl: - * examples/handcrafted/Display/RateGen/RateGen_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen_exec.h: Added the - actual implementation for component executor. - - * examples/handcrafted/Display/CIAO_Installation_Data.ini: Added - this deployment datafile. This file will contain information - describing all the components used in this example. - - * examples/handcrafted/Display/RateGen/RateGen.csd: - * examples/handcrafted/Display/RateGen/RateGen.ssd: Added XML - component descriptors. - - * examples/handcrafted/Display/RateGen/client.cpp: Added a test - client program. - - * examples/handcrafted/Display/RateGen/run_test.pl: Added a test - script to test out this single component. - - * tools/ComponentServer/ComponentServer_test_client.cpp: Changed - the client program to debug RateGen component. We need to make - this test client more robust so we can use it to debug different - component implementations more easily. - -Tue Mar 18 16:36:07 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: - * examples/handcrafted/Display/HUDisplay.mpc: - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/RateGen/RateGen.mpc: Updated the - script and regenerated mpc file to record the original options - used to generate the MPC files. - - * examples/handcrafted/Display/NOTE: Added more info on how to - generate Makefiles/Projects for this example. - - * examples/handcrafted/Display/RateGen/RateGen.idl: Fixed a typo. - - * examples/handcrafted/Display/RateGen/RateGen_Impl.idl: - * examples/handcrafted/Display/RateGen/RateGen_exec.cpp: - * examples/handcrafted/Display/RateGen/RateGen_exec.h: Added the - actual component and home implementations. This particular - component implementation shows how to suppoort SessionComponent - interface in a component implementation (you will need to do - that for any non-trivial component implementations that require - to access component-specific context.) - -Tue Mar 18 12:03:29 2003 Nanbor Wang - - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Renamed various - "_ciao_deactivate*" operations to "ciao_passivate*" to be more - consistent with the CC* opertions. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/GPS/GPS_svnt.h: - * examples/handcrafted/Display/GPS/GPS_svnt.inl: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.inl: - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - * examples/handcrafted/Display/RateGen/RateGen_svnt.h: - * examples/handcrafted/Display/RateGen/RateGen_svnt.inl: - Propagated the SessionComponent opertion support to CIDL - templates and the multiple component example "generated" files. - -Mon Mar 17 23:10:47 2003 Nanbor Wang - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Added support for - SessionComponent specific operations, - ccm_{activate,passivate,remove}. These changes still need to be - propagated to the CIDL templates. - - We also need to review how Deployment::Container and CCMHome - manage the lifecyles of homes, components, and facet servants. - -Sun Mar 16 21:57:10 2003 Nanbor Wang - - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * examples/handcrafted/Display/GPS/GPS_svnt.h: - * examples/handcrafted/Display/GPS/GPS_svnt.inl: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.inl: - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - * examples/handcrafted/Display/RateGen/RateGen_svnt.h: - * examples/handcrafted/Display/RateGen/RateGen_svnt.inl: Added - code to support SessionComponent::set_session_context operation - and make sure the Context objects also inherit from - TAO_Local_RefCounted_Object. - - * examples/handcrafted/Hello/helloE.idl: - * examples/handcrafted/Hello/hello_executors.h: - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Changed to implement - component specific context as a SessionContext, plus the - aforementioned changes. - -Sun Mar 16 11:43:20 2003 Nanbor Wang - - * docs/ConfigValues.html: - * docs/index.html: Updated the main document entry page. It is - grossly outdated. - - * tools/ComponentServer/ComponentServer.mpc: - * tools/Daemon/Daemon.mpc: - * tools/ServerActivator/ServerActivator.mpc: - * tools/XML_Helpers/XMLHelpers.mpc: Added more mpc files. - -Sat Mar 15 11:43:34 2003 Nanbor Wang - - * ciao/Makefile: - * ciao/Makefile.client: - * ciao/Makefile.container: - * ciao/Makefile.server: Removed Makefiles. I depend on MPC files - exclusively at the moment. - - * ciao/Assembly_Impl.cpp: - * ciao/Assembly_Impl.h: - * ciao/CCM_Core.mpc: - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Container_Impl.h: - * ciao/Daemon_Impl.h: - * ciao/Object_Set_T.cpp: - * ciao/ServerActivator_Impl.h: Fixed Linux build errors. Some - warnings are not fixed due to incomplete implementations and I - want to make sure they got addressed in some future point. - -Fri Mar 14 23:19:52 2003 Nanbor Wang - - * ciao/CCM_Core.mpc: Updated the core MPC file to reflect recent - added files. - -Fri Mar 14 16:08:22 2003 Nanbor Wang - - * docs/todo.html: Recorded a compilation error in the generated - code that I commented out for later "study." - - * examples/handcrafted/Display/NavDisplay/NavDisplay.idl: Fixed a - typo. - - * examples/handcrafted/Display/NavDisplay/NavDisplayE.idl: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.cpp: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt.inl: - Added new "generated" code. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/Executor.idl: Updated templates based on the code - they generated. - -Thu Mar 13 20:11:49 2003 Nanbor Wang - - * examples/handcrafted/Display/NavDisplay/NavDisplay.idl: - * examples/handcrafted/Display/GPS/GPS.idl: - * examples/handcrafted/Display/Configuration-0.png: Updated the - port names so they make more sense in the context. Thanks to - Dave Sharp and Wendy Rolls for the suggestions. - - * examples/handcrafted/Display/RateGen/RateGen_svnt.h: Added the - missing factory entry point for the servant home. - - * examples/handcrafted/Display/GPS/GPSE.idl: - * examples/handcrafted/Display/GPS/GPS_svnt.cpp: - * examples/handcrafted/Display/GPS/GPS_svnt.h: - * examples/handcrafted/Display/GPS/GPS_svnt.inl: Added new - "generated" code. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/Executor.idl: Updated templates based on the code - they generated (manually. Did I mention how much fun it was to - generate code manually?) - -Wed Mar 12 23:29:27 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: Fixed an incomplete library - expansion and added a flag to specify library path - dependencies. - - * docs/releasenotes.html: Updated the status of single component - deployment capability. I forgot to do that when it was done. - - * examples/handcrafted/Display/NOTE: Added directions on how to - generate various mpc files. - - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/RateGen/RateGen.mpc: Regenerated - MPC files to fix incomplete dependent library names and to add - library path dependencies. - - * examples/handcrafted/Display/HUDisplay.idl: - * examples/handcrafted/Display/RateGen/RateGen.idl: - * examples/handcrafted/Display/HUDisplayE.idl: - * examples/handcrafted/Display/RateGen/RateGenE.idl: Moved the - opmode interface definition from RateGen.idl back to - HUDisplay.idl. This interface is a supported interface of - RateGen but it should be viewed as a shared interface. - - * examples/handcrafted/Display/RateGen/RateGen_svnt.cpp: - * examples/handcrafted/Display/RateGen/RateGen_svnt.h: - * examples/handcrafted/Display/RateGen/RateGen_svnt.inl: Added - more handcrafted servant glue code for RateGen component. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/Executor.idl: Updated and fixed CIDL template - code based on results from using these templates manually. - -Wed Mar 12 00:03:56 2003 Nanbor Wang - - * examples/handcrafted/Display/HUDisplay_svnt.h: - * examples/handcrafted/Display/HUDisplay_svnt.cpp: Added forgotten - _get_component implementation. - -Tue Mar 11 22:47:06 2003 Nanbor Wang - - * examples/handcrafted/Display/HUDisplayE.idl: Removed redundant - operations that have already been defined in the facet interface. - - * examples/handcrafted/Display/HUDisplay_svnt.cpp: - * examples/handcrafted/Display/HUDisplay_svnt.h: - * examples/handcrafted/Display/HUDisplay_svnt.inl: Added hand - generated code based on the glue code template in - - docs/templates/ - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: Updated template - code based on results from hand generated code. - -Tue Mar 11 15:18:52 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: Added this new to auto-generate - the mpc files for a single component implementation. The mpc - file generated by the script should work for most simple - component implementation, without modification and can serve as - a template for more complicated ones. This script also - generates hints that can be fed back to a shell to create the - necessary export definition files. - - * docs/todo.html: Added improvement items that can be done for - generate_component_mpc.pl. - - * bin/gen_export_files.cmd: Removed. The new - generate_component_mpc script provides more accurate hints on - how to create export files. - - - Renamed and reorganized all files in the following - multi-component example according to the guideline I set in - docs/new_component.html. - - * examples/handcrafted/Display/Display.mpc: - * examples/handcrafted/Display/HUD_skel_export.h: - * examples/handcrafted/Display/HUD_stub_export.h: - * examples/handcrafted/Display/GPS/GPS_skel_export.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_skel_export.h: - * examples/handcrafted/Display/RateGen/RateGen_skel_export.h: - Removed. - - * examples/handcrafted/Display/HUDisplay.mpc: - * examples/handcrafted/Display/HUDisplay_stub_export.h: - * examples/handcrafted/Display/HUDisplay_svnt_export.h: - * examples/handcrafted/Display/GPS/GPS_exec_export.h: - * examples/handcrafted/Display/GPS/GPS_svnt_export.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_exec_export.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay_svnt_export.h: - * examples/handcrafted/Display/RateGen/RateGen_exec_export.h: - * examples/handcrafted/Display/RateGen/RateGen_svnt_export.h: - Modified. - - * examples/handcrafted/Display/HUDisplay.idl: - * examples/handcrafted/Display/HUDisplayE.idl: - * examples/handcrafted/Display/GPS/GPS.mpc: - * examples/handcrafted/Display/GPS/GPS_stub_export.h: - * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: - * examples/handcrafted/Display/NavDisplay/NavDisplay_stub_export.h: - * examples/handcrafted/Display/RateGen/RateGen.idl: - * examples/handcrafted/Display/RateGen/RateGen.mpc: - * examples/handcrafted/Display/RateGen/RateGen_stub_export.h: - Added. - -Tue Mar 11 11:41:39 2003 Nanbor Wang - - * bin/generate_component_mpc.pl: Added a MPC file generater perl - script for creating new MPC definitions for single component - implementations. - -Sun Mar 09 14:38:59 2003 Nanbor Wang - - * docs/new_components.html: Added this new document to describe - files involved in creating a new components. - - * docs/com-impl.html: Added a link to the new component - implementation. document - - * docs/imgs/File-Gen-Existing.png: - * docs/imgs/File-Gen-Future.png: - * docs/imgs/File_Generation_Flow.vsd: Updated the tools/files - collaboration diagram to reflect the latest plan. - - * examples/handcrafted/Hello/hello.mpc: Updated the MPC file to - make sure it works properly. We need to figure out a way to - auto-generate a template of this file. - -Thu Mar 06 20:29:42 2003 Nanbor Wang - - The following changes integrate the XML parsing of softpkg - descriptors with the daemon management framework so we can now - instantiate and test a single component implementation using - its softpkg descriptor. - - * ciao/ComponentServer_Impl.cpp: - * ciao/ComponentServer_Impl.h: - * ciao/ComponentServer_Impl.inl: Added a cached - ComponentInstallation reference so we can pass it to the - containers this ComponentServer creates. - - * ciao/Container_Impl.cpp: - * ciao/Container_Impl.h: Added an extra argument in init for - taking in the ComponentInstallation reference. Also modified - the install_home related mechanisms to use ComponentInstallation - interface to acquire the actual implementation "locations". - - * tools/ServerActivator/ServerActivator_test_client.cpp: - * tools/ComponentServer/ComponentServer_test_client.cpp: Changed - to use UUID. - - * tools/XML_Helpers/Cascadable_DocHandler.h: Removed a redundant - export decl. - - * tools/Daemon/DaemonController.dsp: Added files from the - XML_Helpers directories for the added XML handling capability. - - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/Softpkg_Commands.cpp: - * tools/Daemon/Softpkg_Commands.h: Added new commands to start and - terminate ComponentServer for running one component home. - - * examples/handcrafted/Hello/CIAO_Installation_Data.ini: - * examples/handcrafted/Hello/client.cpp: - * examples/handcrafted/Hello/hello.ssd: - * examples/handcrafted/Hello/run_test.pl: Changed and set up the - test to start up a ComponentServer via Daemon. - -Wed Mar 05 21:43:44 2003 Nanbor Wang - - Moved all Daemon controller related classes into CIAO::Daemon_i - namespace. - - * tools/Daemon/Softpkg_Commands.cpp: - * tools/Daemon/Softpkg_Commands.h: - * tools/Daemon/Softpkg_Commands.inl: Added two new "start_home" - and "end_home" command for starting up and shutting down a - ComponentServer for a single component home. Still need - implementation. - - * tools/Daemon/DaemonController.cpp: - * tools/Daemon/DaemonController.dsp: - - * tools/Daemon/controller_i.cpp: - * tools/Daemon/controller_i.h: - * tools/Daemon/controller_i.inl: - * tools/Daemon/Daemon_Commands.cpp: - * tools/Daemon/Daemon_Commands.h: - * tools/Daemon/Daemon_Commands.inl: Moved most of the Daemon - controlling commands into this file. - -Tue Mar 04 20:40:21 2003 Nanbor Wang - - * examples/handcrafted/Display/RateGen/RateGenE.idl: Fixed a typo. - Thanks to Jeff Gray for pointing it out. - -Thu Feb 27 22:15:48 2003 Nanbor Wang - - * ciao/ComponentServer_Impl.h: Fixed a cut-n-paste error in a comment. - - * ciao/ServerActivator_Impl.cpp: - * ciao/ServerActivator_Impl.h: Changed to cache an IOR to - the ComponentInstallation interface and pass the IOR with - -ORBInitRef option to the ComponentServer. We will need it when - installing a component home in the container. - - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Removed inheriting - the component specific context from the SessionContext local - interface. This component example should be run as Service - component, not Session component. - - * tools/ServerActivator/README: - * tools/Daemon/CIAO_Daemon.cpp: - * tools/ServerActivator/ServerActivator.cpp: Changed to propagate - the ComponentInstallation somehow. - - * tools/ServerActivator/ServerActivator_test_client.cpp: Removed a - redundant $Id$ tag. - -Sat Feb 22 23:45:52 2003 Nanbor Wang - - * docs/releasenotes.html: - * docs/todo.html: Updated information regarding different - component deployment schemes. - - * examples/handcrafted/Hello/hello.csd: - * examples/handcrafted/Hello/hello.ssd: Fixed syntax errors. - - * tools/XML_Helpers/Softpkg_Handlers.cpp: - * tools/XML_Helpers/Softpkg_Handlers.h: - * tools/XML_Helpers/Softpkg_Handlers.inl: - * tools/XML_Helpers/XML_Utils.cpp: - * tools/XML_Helpers/XML_Utils.h: - * tools/XML_Helpers/XML_Utils.inl: Added these new file to extract - necessary information to install the component specified in a - .csd (component softpkg descriptor) file. The - Softpkg_Handlers.* contain the XML Handler(s) for parsing the - csd document and XML_Utils.* contain the file Assembly tools can - use to extract the needed info. Notice that the XML handler - currently don't do a lot of validation. - - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - * tools/XML_Helpers/Cascadable_DocHandler.h: - * tools/XML_Helpers/Cascadable_DocHandler.i: Added error handling - functions and allows it to accept a Locator from the parser to - show error location. - - * tools/XML_Helpers/Svcconf.dsp: - * tools/XML_Helpers/Svcconf.dsw: Renamed these files to the - following: - - * tools/XML_Helpers/XMLHelpers.dsp: - * tools/XML_Helpers/Helper_Test.dsw: - * tools/XML_Helpers/main.cpp: Added new files into the project - file and changed the project and workspace name. - - -Thu Feb 20 22:15:08 2003 Nanbor Wang - - Manually generated the following XML descriptors. These are the - minimum to install a component. Currently, I just get the UUID - using win32's UUIDGEN or GUIDGEN. - - * examples/handcrafted/Hello/hello.csd: Component softpkg descriptor. - - * examples/handcrafted/Hello/hello.ssd: CIAO's servant softpkg - descriptor. - - * examples/handcrafted/Hello/hello.ccd: CORBA component descriptor. - -Wed Feb 19 13:30:19 2003 Boris Kolpackov - - * CIDLC/DesignNotes: Reorganized stuff a bit again and added some - comments on Jeff's comments. - -Mon Feb 17 17:47:55 2003 Boris Kolpackov - - * CIDLC/DesignNotes: Reorganized stuff a bit and added some new - ideas/notes. - -Sun Feb 16 21:30:42 2003 Nanbor Wang - - * docs/releasenotes.html: Updated release info with the following. - - * ciao/ComponentInstallation_Impl.cpp: - * ciao/ComponentInstallation_Impl.h: Fixed a problem of empty - persistent backing store file. I need to store the - configuration data under a subsection (as oppose to the root - section.) - - * ciao/CIAO_Server.dsp: - * ciao/Daemon.idl: - * ciao/Daemon_Impl.cpp: - * ciao/Daemon_Impl.h: - * ciao/Daemon_Impl.inl: Added a generic server process control - interface that provides operations to query available service - interfaces and to shutdown the server process. - - * tools/Daemon/CIAO_Daemon.cpp: - * tools/Daemon/CIAO_Daemon.dsp: - * tools/Daemon/CIAO_Installation_Data.ini: - * tools/Daemon/Daemon.dsw: - * tools/Daemon/README: - * tools/Daemon/DaemonController.cpp: - * tools/Daemon/DaemonController.dsp: - * tools/Daemon/controller_i.cpp: - * tools/Daemon/controller_i.h: - * tools/Daemon/controller_i.inl: Added new per-host CIAO_Daemon - implementaion which offer both ComponentInstallation interface - which manages the local component implementation cache, and - ServerActivator interface which the Assembly framework interacts - with to spawn new ComponentServer processes. See the README - file in this directory and releasenotes.html for more details. - - There's also a DaemonController tool which provides a command - line interface to control the daemon process and to interact - with ComponentInstallation and ServerActivation interfaces. - -Sat Feb 15 22:54:11 2003 Nanbor Wang - - * ciao/CIAO_Server.dsp: - * ciao/ComponentInstallation_Impl.cpp: - * ciao/ComponentInstallation_Impl.h: - * ciao/ComponentInstallation_Impl.inl: Filled in the - implementation for ComponentInstallation interface. We - currently only provide a naive implemntation for this - interface. It currently manages the pathnames to various - component implementations so a Container can fetch a - implementation from its UUID. - - * examples/handcrafted/Hello/hello_servants.dsp: Added CIAO_server - to the list of link libraries. I need to move the base - container implementation from the CIAO_Server library to - CIAO_Container library. - -Fri Feb 14 23:15:39 2003 Nanbor Wang - - * docs/todo.html: Added info on why the Assembly tools should - be responsible of the act of home registration. - - * ciao/Container_Impl.cpp: - * ciao/ServerActivator_Impl.cpp: - * ciao/ComponentServer_Impl.cpp: Changed the use of ACE_NEW_RETURN - to ACE_NEW_THROW_EX. - - * ciao/ComponentServer_Impl.h: Cosmetic changes. - - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Fixed - signature based on RTF 1.1. - - * tools/ComponentServer/ComponentServer.cpp: Added comments - explaining why we are not init'ing the component server right - now. - - * tools/ServerActivator/README: - * examples/handcrafted/Hello/client.cpp: - * tools/ServerActivator/ServerActivator_test_client.cpp: Forced in - hack to test out installing the HelloWorldHome using the new - ServerActivator -> ComponentServer -> Container interfaces. - - * tools/Simple_Component_Server/Simple_Component_Server.cpp: Fix - -Fri Feb 14 17:10:50 2003 Nanbor Wang - - * docs/ConfigValues.html: Updated more supported ConfigValues types. - - * docs/releasenotes.html: - * docs/todo.html: - - * ciao/Client_init.cpp: - * ciao/Server_init.cpp: - * ciao/Client_init.h: - * ciao/Server_init.h: Removed "ciao/" from the include paths. We - now always include ciao core files as they are specified in the - include path directly. - - * ciao/CIAO_Server.dsp: - * ciao/CIAO_Servers.idl: - * ciao/ComponentServer_Impl.cpp: - * ciao/ComponentServer_Impl.h: - * ciao/ComponentServer_Impl.inl: - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: - * ciao/Container_Impl.cpp: - * ciao/Container_Impl.h: - * ciao/Container_Impl.inl: - * ciao/Object_Set_T.cpp: - * ciao/Object_Set_T.h: - * ciao/Object_Set_T.inl: - * ciao/ServerActivator_Impl.cpp: - * ciao/ServerActivator_Impl.h: - * ciao/ServerActivator_Impl.inl: Filled in more implementations. - - * tools/ServerActivator/README: - * tools/ServerActivator/ServerActivator.cpp: - * tools/ServerActivator/ServerActivator.dsp: - * tools/ServerActivator/ServerActivator.dsw: - * tools/ServerActivator/ServerActivator_test_client.cpp: - * tools/ServerActivator/ServerActivator_test_client.dsp: Added a - ServerActivator implementation. - - * tools/ComponentServer/ComponentServer.cpp: - * tools/ComponentServer/ComponentServer.dsp: - * tools/ComponentServer/ComponentServer.dsw: - * tools/ComponentServer/ComponentServer_test_client.cpp: - * tools/ComponentServer/ComponentServer_test_client.dsp: - * tools/ComponentServer/README: Added a more comprehensive - ComponentServer implementation. - -Sun Feb 09 20:39:05 2003 Nanbor Wang - - * docs/todo.html: Added more todo items as we go along. :) - - * ciao/Component_Base.idl: - * ciao/CCM_Deployment.idl: Changed the create method in - ::Components::Deployment::AssemblyFactory to create_assembly per - CCM RTF 1.1. - - * ciao/Assembly_Impl.cpp: - * ciao/Assembly_Impl.h: - * ciao/Assembly_Impl.inl: CCM RTF 1.1 changes. Also added other - test code in the file and explained how to create an Assembly - object. - - * ciao/CIAO_Core.mpc: - * ciao/CIAO_Client.dsp: - * ciao/CIAO_Server.dsp: - * ciao/CIAO_Value.idl: Added a CIAO internal cookie valuetype so - we can downcast the incoming ::Components::Cookie back to CIAO's - internal implementation type CIAO::Cookie easily. The original - "brute force cast" didn't work and CIAO::Cookie also provides a - way to fish out the internal octetseq we need internally. - - * ciao/Cookies.cpp: - * ciao/Cookies.h: - * ciao/Cookies.inl: Changed to inherit the internal cookie - implementation from OBV_CIAO::Cookie instead of - OBV_Components::Cookie. Also changed the extract method to be - static. - - * ciao/Client_init.cpp: Added a new valuefactory to create - ::Components::Cookie valuetype when receiving CIAO::Cookie from - the server. This should really be handled by supporting - truncatable valuetype in TAO. - - * docs/templates/CIAO_Glue_Session_Template.inl: Applied some of - the bug fixes from using Active Map and Cookie. These template - files need to be reviewed further. - - * tests/temp/README: - * tests/temp/assembly/README: - * tests/temp/assembly/assembly.dsw: - * tests/temp/assembly/client.cpp: - * tests/temp/assembly/client.dsp: - * tests/temp/assembly/control.idl: - * tests/temp/assembly/control.mpc: - * tests/temp/assembly/run_test.pl: - * tests/temp/assembly/server.cpp: - * tests/temp/assembly/server.dsp: Added this test to make sure the - demonstrate how to use AssemblyFactory and Assembly interface, - and the Assembly's are being managed properly. More - importantly, I used this test to make sure the internal - implementation for Cookie and Active_Object_Map are working - correctly. - - * tools/XML_Helpers/Svcconf.dsp: - * tools/XML_Helpers/Svcconf.dsw: - * tools/XML_Helpers/Svcconf_Handler.cpp: - * tools/XML_Helpers/Svcconf_Handler.h: - * tools/XML_Helpers/Svcconf_Handler.i: - * tools/XML_Helpers/main.cpp: - * tools/XML_Helpers/svc.conf.xml: Added an example to demonstrate - how to write a subclass of Cascadable_DocHandler and how to use - the Skip_DocHandler. Just so I won't forget how to use them. - -Sat Feb 08 20:45:20 2003 Nanbor Wang - - * ciao/*: WiP intermediate checkins. - - * ciao/Object_Set_T.h: - * ciao/Object_Set_T.cpp (object_in_set): Added a new method to - check if an object is already in the set or not. - -Fri Feb 07 23:35:35 2003 Nanbor Wang - - * ciao/Object_Set_T.h: - * ciao/Object_Set_T.i: - * ciao/Object_Set_T.cpp: Added a naive implementation of an object - reference set. It is naive because it simply keeps object - references in an objref_var array without checking for - duplication. More importantly, it takes O(n) to to look for an - object reference and return it. What we really need is a - thread-safe hash_set<> like class here. Since this is mostly - used only during setup/assemble time for a CIAO application, - i.e., not on critical path, this class serves as a place holder - for later, more efficient implementation. - - This new class is needed to support ServerActivator, - ComponentServer, and Container interface in - Components::Deployment module. - - * docs/ConfigVAlues.html: Added this new document page to record - what configuration values can be used to initialize - ComponentServer's and Container's. - - * docs/todo.html: Documented more future todo tasks and ideas. - -Tue Feb 04 23:10:56 2003 Nanbor Wang - - * docs/todo.html: Added a new item descirbing things that need to - be done for component/home configuration using CCM's XML - property files. - - * tools/XML_Helpers/Handler-Interaction.png: - * tools/XML_Helpers/Handler-Interaction.vsd: - * tools/XML_Helpers/README: Files that document how to use - Cascadable_DocHandler and interactions among handlers of - different layers. - - * tools/XML_Helpers/Cascadable_DocHandler.cpp: - * tools/XML_Helpers/Cascadable_DocHandler.h: - * tools/XML_Helpers/Cascadable_DocHandler.i: A - ACEXML_DefaultHandler subclass which can be easily cascaded - together to handle hierarchical XML document structure. There - is also a Skip_DocHandler class which subclasses from - Cascadable_DocHandler and can be used to skip over some certain - XML tags completely. These helper classes should probably be - collected under ACEXML in the future. - -Sun Feb 02 21:05:39 2003 Nanbor Wang - - * ciao/Cookies.cpp (insert): Fixed a warning. - - * ciao/CCM_Base.idl: Changed to include instead of . - - * ciao/CCM_Event.idl: Fixed a typo I put in last. - -Sun Feb 02 15:23:26 2003 Nanbor Wang - - * docs/XML/componentassembly.dtd: - * docs/XML/corbacomponent.dtd: - * docs/XML/properties.dtd: - * docs/XML/softpkg.dtd: Updated these files with the ones from my - web page. They are now in-sync with the latest RTF. - -Wed Jan 29 13:27:01 2003 Jeff Parsons - - * CIDLC/DesignNotes: - - Added a list of items from the IDL compiler that need redesign and - can perhaps be done incrementally in the CIDL compiler, and - eventually integrated back into the IDL compiler. - -Wed Jan 22 16:05:18 2003 Boris S Kolpackov - - * CIDLC/DesignNotes: added some more ideas. - -Wed Jan 22 13:54:12 2003 Boris S Kolpackov - - * CIDLC/DesignNotes: added this file to capture and document CIDL - complier design ideas/decisions. - -Tue Jan 21 16:20:44 2003 Boris S Kolpackov - - * tools/CIDLC: - * CIDLC: moved CIDLC directory one level up. - -Mon Jan 13 15:23:09 2003 Nanbor Wang - - * docs/templates/Executor.idl: Added meta-code for user-defined - oeprations, factory operations, and finder operations. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: Filled in the - rest of the CIDL generated Servant Glue code templates. - -Mon Jan 13 11:18:37 2003 Nanbor Wang - - * ciao/Component_Base.idl: - * ciao/CCM_Base.idl: Based on Components 1.1 RTF - Events::unsubscribe operations now return the unsubscribed - consumber object reference instead of void. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: Filled in most of - the operations for component servant. Only opeations left - unimplemented include Events::get_*_publishers which I will - implement in the *_Context class later. - - There are several other oeprations that throw NO_IMPLEMENT - exception or are no-op currently. Missing them probably is okay - for now. Next up, Home Servant template. - -Mon Jan 13 00:27:03 2003 Nanbor Wang - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: Filled in a great - more generated code. This is almost done, finally. - - * docs/templates/CIAO_Glue_Session_Template.cpp: - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/Executor.idl: Changed to lead template comments - with '##' instead of # to diffentiate them from preprocessor - directives that we should generate. - - * ciao/HomeRegistrar_i.inl: - * ciao/HomeRegistrar_i.cpp: Fixed incorrect uses of exception macros. - - * ciao/Cookies.h: - * ciao/Cookies.cpp: Added a new insert method which "encode" an - Active_Objref_Map key into the Cookie. - - * ciao/Container_Base.inl: - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: Added a new get_objref method which - basically allow us to get the component reference using POA's - servant_to_reference operation. Added a new inline file and - fixed some incorrect uses of exception macros. - - * ciao/Component_Base.idl: - * ciao/CCM_Base.idl: Based on Components 1.1 RTF - Receptacles::disconnect operations now return the disconnected - object reference instead of void. - -Fri Jan 10 12:03:00 2003 Boris S Kolpackov - - * tools/CCIDL: - * tools/CIDLC: - * tools/CIDLC/README: Renamed CCIDL to CIDLC. Added some - explanations about naming convention choosen for CIDL compiler. - -Thu Jan 09 00:57:37 2003 Nanbor Wang - - * docs/templates/cidl_template.cidl: Added an example CIDL file. - - * docs/templates/CIAO_Glue_Session_Template.h: - * docs/templates/CIAO_Glue_Session_Template.inl: - * docs/templates/CIAO_Glue_Session_Template.cpp: Added more - implementation code. - -Wed Jan 08 16:48:28 2003 Nanbor Wang - - * docs/templates/CIAO_Glue_Session_Template.h: Added the complete - list of operations that needs to be supported. Next up, the - implementation templates. - - * ciao/Active_Objref_Map.cpp: - * ciao/Active_Objref_Map.h: Defined a typedef called - CIAO::Active_Objref_Map for managing CORBA::Object_var's using - the ACE_Active_Map_Manager and instantiate the template. - - * ciao/Cookies.cpp: - * ciao/Cookies.h: Added insertion/extraction of - ACE_Active_Map_Manager_Key operations. - -Tue Jan 07 23:28:28 2003 Nanbor Wang - - * ciao/CIAO_common.h: Added a new file to collect common CIAO - macros. - - * ciao/CIAO_Component_i.cpp: - * ciao/CIAO_Component_i.h: Removed. - * ciao/Client_init.cpp: - * ciao/Client_init.h: The old CIAO_client_init in - CIAO_Component_i is now called Client_init under CIAO namespace. - This function initlializes the value factories for client side ORB. - - * ciao/Server_init.cpp: - * ciao/Server_init.h: Added new function Server_init under CIAO - namespace to initialize server side value factories for server - side ORB. - - * ciao/Cookies.cpp: - * ciao/Cookies.h: - * ciao/Cookies.inl: Added server-side implementation of - Components::Cookie called CIAO::Map_Key_Cookie. This - implementation is only used within the containers (i.e., server - side). Client doesn't need to know how to interpret a Cookie. - - * ciao/Container_Base.h: - * ciao/HomeRegistrar_i.h: Fixed various ACE-guideline conformity - problems. - - * ciao/CCM_Core.mpc: - * ciao/CIAO_Client.dsp: - * ciao/CIAO_Container.dsp: - * ciao/CIAO_Server.dsp: - * ciao/Makefile.client: - * ciao/Makefile.container: - * ciao/Makefile.server: Updated various makefiles/projects. - -Tue Jan 07 07:48:02 2003 Nanbor Wang - - * ciao/Container_Base.cpp (install_servant): Changed to decrease - the refcount of servant by one to make sure servants get - "released" properly. - -Fri Jan 03 11:27:12 2003 Nanbor Wang - - * docs/templates/Executor.idl: This pseudo-meta IDL template file - summarizes the standard executor mapping and serves as a - template for CCIDL compiler. - -Sun Dec 22 23:12:49 2002 Nanbor Wang - - * examples/handcrafted/Display/RateGen/RateGen.idl: - * examples/handcrafted/Display/GPS/GPS.idl: - * examples/handcrafted/Display/NavDisplay/NavDisplay.idl: - * examples/handcrafted/Display/HUDisplay.idl: - * examples/handcrafted/Display/Display.mpc: Added more files for - this multi-component example. - - The followings should go to the ChangeLog under $(ACE_ROOT) - - * bin/MakeProjectCreator/configs/ciao_client.mpc: - * bin/MakeProjectCreator/configs/ciao_component.mpc: - * bin/MakeProjectCreator/configs/ciao_server.mpc: Added libpaths - defintions. - -Sat Dec 21 15:09:55 2002 Nanbor Wang - - * tools/Simple_Component_Server/Simple_Component_Server.dsp: - * examples/handcrafted/Hello/run_test.pl: Changed to generate - Simple_Component_Server executable in the project directory. - - * examples/handcrafted/Hello/hello.mpc: - * ciao/CCM_Core.mpc: - * tools/Simple_Component_Server/Simple_Component_Server.mpc: - Created MPC specifications. - - The followings should go to the ChangeLog under $(ACE_ROOT) - - * bin/MakeProjectCreator/configs/ciao_client.mpc: - * bin/MakeProjectCreator/configs/ciao_component.mpc: - * bin/MakeProjectCreator/configs/ciao_server.mpc: Created MPC - templates for CIAO client, component implmentation, and server - tools. - -Fri Dec 20 23:09:53 2002 Nanbor Wang - - * ciao/Makefile.server: Added HomeRegistrar.idl and - HomeRegistrar_i to the makefile. - - * tools/Simple_Component_Server/Makefile: Added a new makefile. - -Fri Dec 20 20:32:53 2002 Nanbor Wang - - * ciao/CCM_Component.idl: - * ciao/CCM_Container.idl: - * ciao/Container_Base.cpp: - * ciao/Makefile.client: - * ciao/Makefile.container: - * ciao/Makefile.server: Fixed compilation erros and Makefiles on - Linux. - -Thu Dec 19 20:44:39 2002 Nanbor Wang - - * examples/handcrafted/Display/README: - * examples/handcrafted/Display/Configuration-0.png: Added new - files explaining the purpose of the the new example and what it - will do. - -Wed Dec 18 20:37:06 2002 Nanbor Wang - - * examples/handcrafted/Hello/run_test.pl: Added a script to - automate running this stuff. - - * examples/handcrafted/Hello/README: Replaced the reference to - CIAO_single_com_server to Simple_Component_Server. - -Tue Dec 17 23:30:59 2002 Nanbor Wang - - * tools/CIAO_single_com_server/*: - * tools/Simple_Component_Server/*: Changed the name of the simple - server from CIAO_single_com_server to Simple_Component_Server. - The original name didn't make too much sense at all. - -Tue Dec 17 22:49:32 2002 Nanbor Wang - - * ciao/CIAO_Server.dsp: - * ciao/HomeRegistrar.idl: - * ciao/HomeRegistrar_i.{h,inl,cpp}: Added a NameService based - HomeFinder extension. This interface defines the registration - operation, which is not defined in the CCM specification. This - is part of the CIAO_Server library. - - * tools/CIAO_single_com_server/CIAO_single_com_server.cpp: Changed - to register installed components with the HomeRegistrar instead - of dumping the IOR into a file. The only thing that gets dumped - into a file now is the IOR for the HomeFinder interface which - HomeRegistrar inherits. - - * examples/handecrafted/Hello/README: Added information on the - procedures one should follow to run this test. - - * examples/handcrafted/Hello/config: Updated the component server - config file to include the repo ids and canonical name for the - home. - - * examples/handcrafted/Hello/client.dsp: - * examples/handcrafted/Hello/client.cpp: Changed to use acquire - the home object reference thru the HomeFinder interface, instead - of passing it in explicitly. - - * examples/handcrafted/Hello/hello.dsw: - * examples/handcrafted/Hello/server.cpp: - * examples/handcrafted/Hello/server.dsp: Removed server from the - workspace. As we now have a true component server, we no longer - need a server process for this example. - - -Mon Dec 16 10:56:46 2002 Nanbor Wang - - * tools/CIAO_single_com_server/CIAO_single_com_server.cpp: Fixed - command line argument parsing problem. We now process the - command line argument for ORB correctly. - -Sun Dec 15 23:54:16 2002 Nanbor Wang - - * tools/CIAO_single_com_server/*: Added a new prototype component - server. We can now run session components on a generic server - using a proprietary config file for component installation. - - * ciao/Container_Base.{h,cpp}: Fixed incorrect usage of ACE_DLL - where executor and servant Dlls got unloaded prematurely. - -Wed Dec 11 14:39:08 2002 Nanbor Wang - - A lot have changed since last ChangeLog entry. Most of the - changes are intermediate so I didn't even try to record them. - - * ciao/CCMCore.dsw: - * ciao/CIAO_Container.dsp: - * ciao/CIAO_Server.dsp: Moved Container_Base.* from CIAO_Container - library to CIAO_Server library. These classes in Container_Base - are really run-time container management interfaces than - container interfaces themselves. - - * ciao/Container_Base.cpp: - * ciao/Container_Base.h: Added _ciao_install_home which enable - installing a component home from relevant DLL named and entry - points. We are not managing the lifecycle of DLL objects in the - implementation yet (we just never unlink DLL. :) This will have - to be changed in the future. - - * examples/handcrafted/Hello/hello_servants.cpp: - * examples/handcrafted/Hello/hello_servants.h: Added an entry - point "create_HelloWorld_Servant" so we can use the glue code - with the new "generic server." - - * examples/handcrafted/Hello/server.cpp: - * examples/handcrafted/Hello/server.dsp: Reworked the server - implementation so that it is no longer tied to a specific - component implementation. I.e., we can use the same server to - host any *one* component now. - - * examples/handcrafted/Hello/client.dsp: Added a missing link - directory. - -Tue Nov 05 23:42:04 2002 Nanbor Wang - - * CCMCore.dsp: - * CIAO_BaseC.cpp: - * CIAO_BaseC.h: - * CIAO_BaseC.i: - * CIAO_ComponentC.cpp: - * CIAO_ComponentC.h: - * CIAO_ComponentC.i: - * CIAO_ContainerC.cpp: - * CIAO_ContainerC.h: - * CIAO_ContainerC.i: - * CIAO_Container_ExC.cpp: - * CIAO_Container_ExC.h: - * CIAO_Container_ExC.i: - * CIAO_DeploymentC.cpp: - * CIAO_DeploymentC.h: - * CIAO_DeploymentC.i: - * CIAO_EventC.cpp: - * CIAO_EventC.h: - * CIAO_EventC.i: - * CIAO_TransactionC.cpp: - * CIAO_TransactionC.h: - * CIAO_TransactionC.i: - * Component_BaseC.cpp: - * Component_BaseC.h: - * Component_BaseC.i: - * Component_BaseS.cpp: - * Component_BaseS.h: - * Component_BaseS.i: - * Component_BaseS_T.cpp: - * Component_BaseS_T.h: - * Component_BaseS_T.i: - * CosPersistentStateC.cpp: - * CosPersistentStateC.h: - * CosPersistentStateC.i: - * CosPersistentStateS.cpp: - * CosPersistentStateS.h: - * CosPersistentStateS.i: - * CosPersistentStateS_T.cpp: - * CosPersistentStateS_T.h: - * CosPersistentStateS_T.i: Removed generated files. - - * CCMCore.dsw: - * CIAO_CLIENT_Export.h: - * CIAO_Client.dsp: - * CIAO_Component.pidl: - * CIAO_Container.dsp: - * CIAO_Container_Export.h: - * CIAO_SERVER_Export.h: - * CIAO_Server.dsp: - * README: Split up the CCM Core library into 3 libraries for clients, - component implementations, and component servers. - -Thu Sep 26 15:20:13 2002 Nanbor Wang - - * ciao/CCMCore.dsp: - * ciao/CIAO_Base.pidl: - * ciao/CIAO_BaseC.cpp: - * ciao/CIAO_BaseC.h: - * ciao/CIAO_BaseC.i: - * ciao/CIAO_Component.pidl: - * ciao/CIAO_ComponentC.cpp: - * ciao/CIAO_ComponentC.h: - * ciao/CIAO_ComponentC.i: - * ciao/CIAO_Container.pidl: - * ciao/CIAO_ContainerC.cpp: - * ciao/CIAO_ContainerC.h: - * ciao/CIAO_ContainerC.i: - * ciao/CIAO_Container_Ex.pidl: - * ciao/CIAO_Container_ExC.cpp: - * ciao/CIAO_Container_ExC.h: - * ciao/CIAO_Container_ExC.i: - * ciao/CIAO_Deployment.pidl: - * ciao/CIAO_DeploymentC.cpp: - * ciao/CIAO_DeploymentC.h: - * ciao/CIAO_DeploymentC.i: - * ciao/CIAO_Event.pidl: - * ciao/CIAO_EventC.cpp: - * ciao/CIAO_EventC.h: - * ciao/CIAO_EventC.i: - * ciao/CIAO_Transaction.pidl: - * ciao/CIAO_TransactionC.cpp: - * ciao/CIAO_TransactionC.h: - * ciao/CIAO_TransactionC.i: Changed to split the component idl - file into severl smaller idl files. - - * ciao/Makefile: An empty place holder for now. - - * ciao/Version.h: - * ciao/ciao.rc: Added version information files. - -Thu Jul 18 22:14:59 2002 Nanbor Wang - - * examples/handcrafted/Philosophers/Philosophers.idl (Example): - -Mon Jun 17 17:35:31 2002 Nanbor Wang - - * docs/index.html: - * docs/imgs/CCM.vsd: - * docs/imgs/basic-container.png: - * docs/imgs/component-basic.png: - * docs/imgs/deployment.png: - * docs/imgs/extended-container.png: - * docs/imgs/home-config.png: Added CIAO documentation. diff --git a/CIAO/MPC/config/ami4ccm_lem_stub.mpb b/CIAO/MPC/config/ami4ccm_lem_stub.mpb deleted file mode 100644 index a041ad82cd1..00000000000 --- a/CIAO/MPC/config/ami4ccm_lem_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ami4ccm_stub, ccm_session_stub { - after += AMI4CCM_lem_stub - libs += AMI4CCM_lem_stub -} diff --git a/CIAO/MPC/config/ami4ccm_servant.mpb b/CIAO/MPC/config/ami4ccm_servant.mpb deleted file mode 100644 index c3be13f487f..00000000000 --- a/CIAO/MPC/config/ami4ccm_servant.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ami4ccm_lem_stub, portableserver { - after += AMI4CCM_svnt - libs += AMI4CCM_svnt -} diff --git a/CIAO/MPC/config/ami4ccm_stub.mpb b/CIAO/MPC/config/ami4ccm_stub.mpb deleted file mode 100644 index dc7cb65757f..00000000000 --- a/CIAO/MPC/config/ami4ccm_stub.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ciao_connector_base, messaging { - after += AMI4CCM_stub - libs += AMI4CCM_stub - includes += $(CIAO_ROOT)/connectors/ami4ccm -} diff --git a/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb b/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb deleted file mode 100644 index a6e9027fb10..00000000000 --- a/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -feature(ccm_direct_collocation) { - avoids += ccm_direct_collocation -} diff --git a/CIAO/MPC/config/avoids_ccm_lw.mpb b/CIAO/MPC/config/avoids_ccm_lw.mpb deleted file mode 100644 index dd253dd1a9b..00000000000 --- a/CIAO/MPC/config/avoids_ccm_lw.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -feature(ccm_lw) { - avoids += ccm_lw -} diff --git a/CIAO/MPC/config/avoids_ccm_noevent.mpb b/CIAO/MPC/config/avoids_ccm_noevent.mpb deleted file mode 100644 index 4c2a31f14d1..00000000000 --- a/CIAO/MPC/config/avoids_ccm_noevent.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -feature(ccm_noevent) { - avoids += ccm_noevent -} diff --git a/CIAO/MPC/config/ccm.mpb b/CIAO/MPC/config/ccm.mpb deleted file mode 100644 index 64d9dcfb6dd..00000000000 --- a/CIAO/MPC/config/ccm.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project : ccm_direct_collocation{ - includes += $(CIAO_ROOT)/ccm -} diff --git a/CIAO/MPC/config/ccm_configvalue.mpb b/CIAO/MPC/config/ccm_configvalue.mpb deleted file mode 100644 index a98fdea2ad6..00000000000 --- a/CIAO/MPC/config/ccm_configvalue.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ccm_stub { - after += CCM_ConfigValue_Factory - libs += CCM_ConfigValue_Factory -} diff --git a/CIAO/MPC/config/ccm_cookie.mpb b/CIAO/MPC/config/ccm_cookie.mpb deleted file mode 100644 index 3846773a170..00000000000 --- a/CIAO/MPC/config/ccm_cookie.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ccm_stub { - after += CCM_Cookie_Factory - libs += CCM_Cookie_Factory -} diff --git a/CIAO/MPC/config/ccm_direct_collocation.mpb b/CIAO/MPC/config/ccm_direct_collocation.mpb deleted file mode 100644 index bab25624730..00000000000 --- a/CIAO/MPC/config/ccm_direct_collocation.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -feature (ccm_direct_collocation) : taobaseidldefaults { - macros += CCM_DIRECTCOLL - idlflags += -DCCM_DIRECTCOLL -Gd -} diff --git a/CIAO/MPC/config/ccm_executor.mpb b/CIAO/MPC/config/ccm_executor.mpb deleted file mode 100644 index 44dff4fef44..00000000000 --- a/CIAO/MPC/config/ccm_executor.mpb +++ /dev/null @@ -1,3 +0,0 @@ -// -*- MPC -*- -project : ccm_lem_stub { -} diff --git a/CIAO/MPC/config/ccm_lem_stub.mpb b/CIAO/MPC/config/ccm_lem_stub.mpb deleted file mode 100644 index 5916f96c13e..00000000000 --- a/CIAO/MPC/config/ccm_lem_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ccm_stub { - after += CCM_lem_stub - libs += CCM_lem_stub -} diff --git a/CIAO/MPC/config/ccm_lw.mpb b/CIAO/MPC/config/ccm_lw.mpb deleted file mode 100644 index 84cf676c29c..00000000000 --- a/CIAO/MPC/config/ccm_lw.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -feature (ccm_lw) : taobaseidldefaults { - macros += CCM_LW - idlflags += -DCCM_LW -Gcl -} diff --git a/CIAO/MPC/config/ccm_noevent.mpb b/CIAO/MPC/config/ccm_noevent.mpb deleted file mode 100644 index 83e01ba8a31..00000000000 --- a/CIAO/MPC/config/ccm_noevent.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -feature (ccm_noevent) : taobaseidldefaults { - macros += CCM_NOEVENT - idlflags += -DCCM_NOEVENT -Gcm -} diff --git a/CIAO/MPC/config/ccm_session_stub.mpb b/CIAO/MPC/config/ccm_session_stub.mpb deleted file mode 100644 index b5bbd510f72..00000000000 --- a/CIAO/MPC/config/ccm_session_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ccm_lem_stub { - after += CCM_session_stub - libs += CCM_session_stub -} diff --git a/CIAO/MPC/config/ccm_stub.mpb b/CIAO/MPC/config/ccm_stub.mpb deleted file mode 100644 index 609aaecadc5..00000000000 --- a/CIAO/MPC/config/ccm_stub.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ifr_client, valuetype, pi, codecfactory, ciao_vcwarnings, ccm, ciaoidldefaults { - includes += $(CIAO_ROOT) - after += CCM_stub - libs += CCM_stub -} diff --git a/CIAO/MPC/config/ccm_svnt.mpb b/CIAO/MPC/config/ccm_svnt.mpb deleted file mode 100644 index 425e1e8c9ac..00000000000 --- a/CIAO/MPC/config/ccm_svnt.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ccm_session_stub, portableserver, avoids_minimum_corba, \ - avoids_corba_e_micro, ccm_direct_collocation { - after += CCM_svnt - libs += CCM_svnt -} diff --git a/CIAO/MPC/config/ciao.mpb b/CIAO/MPC/config/ciao.mpb deleted file mode 100644 index 761c8aa28b5..00000000000 --- a/CIAO/MPC/config/ciao.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project: ccm_direct_collocation { - includes += $(CIAO_ROOT) - libpaths += $(ACE_ROOT)/lib -} diff --git a/CIAO/MPC/config/ciao_base.mpb b/CIAO/MPC/config/ciao_base.mpb deleted file mode 100644 index f7b4ef5b6cf..00000000000 --- a/CIAO/MPC/config/ciao_base.mpb +++ /dev/null @@ -1,4 +0,0 @@ -project : ccm_cookie, ccm_configvalue, ccm_direct_collocation { - after += CIAO_Base_stub - libs += CIAO_Base_stub -} diff --git a/CIAO/MPC/config/ciao_connector_base.mpb b/CIAO/MPC/config/ciao_connector_base.mpb deleted file mode 100644 index 0f591af922c..00000000000 --- a/CIAO/MPC/config/ciao_connector_base.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project { - includes += $(CIAO_ROOT)/connectors -} \ No newline at end of file diff --git a/CIAO/MPC/config/ciao_container_base_stub.mpb b/CIAO/MPC/config/ciao_container_base_stub.mpb deleted file mode 100644 index 1b9cda55ada..00000000000 --- a/CIAO/MPC/config/ciao_container_base_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ccm_svnt, avoids_corba_e_micro { - after += CIAO_Container_Base_stub - libs += CIAO_Container_Base_stub -} diff --git a/CIAO/MPC/config/ciao_deployment_handlers.mpb b/CIAO/MPC/config/ciao_deployment_handlers.mpb deleted file mode 100644 index 32df4ea69fb..00000000000 --- a/CIAO/MPC/config/ciao_deployment_handlers.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ciao_base, dance_stub, ciao_session_container, ciao_logger { - includes += $(CIAO_ROOT) - libs += CIAO_Deployment_Handlers - after += CIAO_Deployment_Handlers -} \ No newline at end of file diff --git a/CIAO/MPC/config/ciao_example_output.mpb b/CIAO/MPC/config/ciao_example_output.mpb deleted file mode 100644 index 6d5c0e30161..00000000000 --- a/CIAO/MPC/config/ciao_example_output.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project { - libout = ../lib -} diff --git a/CIAO/MPC/config/ciao_exe.mpb b/CIAO/MPC/config/ciao_exe.mpb deleted file mode 100644 index c5d979242f0..00000000000 --- a/CIAO/MPC/config/ciao_exe.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project : ciao { - install = $(CIAO_ROOT)/bin -} diff --git a/CIAO/MPC/config/ciao_executor.mpb b/CIAO/MPC/config/ciao_executor.mpb deleted file mode 100644 index a54a9d3b59b..00000000000 --- a/CIAO/MPC/config/ciao_executor.mpb +++ /dev/null @@ -1,3 +0,0 @@ -// -*- MPC -*- -project : ccm_svnt, ciao_container_base_stub { -} diff --git a/CIAO/MPC/config/ciao_lib.mpb b/CIAO/MPC/config/ciao_lib.mpb deleted file mode 100644 index cb334cbd75b..00000000000 --- a/CIAO/MPC/config/ciao_lib.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project : ciao { - libout = $(ACE_ROOT)/lib -} diff --git a/CIAO/MPC/config/ciao_logger.mpb b/CIAO/MPC/config/ciao_logger.mpb deleted file mode 100644 index dfd8404b29d..00000000000 --- a/CIAO/MPC/config/ciao_logger.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ciao, acelib { - after += CIAO_Logger - libs += CIAO_Logger -} \ No newline at end of file diff --git a/CIAO/MPC/config/ciao_output.mpb b/CIAO/MPC/config/ciao_output.mpb deleted file mode 100644 index 30c2293e5ce..00000000000 --- a/CIAO/MPC/config/ciao_output.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project { - libout = $(ACE_ROOT)/lib -} - diff --git a/CIAO/MPC/config/ciao_servant.mpb b/CIAO/MPC/config/ciao_servant.mpb deleted file mode 100644 index 0ea8ccf3989..00000000000 --- a/CIAO/MPC/config/ciao_servant.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -project : ciao_logger, \ - ccm_svnt, taoidldefaults, portableserver, ccm_cookie, ccm_session_stub, \ - ciao_session_container_stub, ccm_direct_collocation { - after += CIAO_Servant_Impl - libs += CIAO_Servant_Impl -} diff --git a/CIAO/MPC/config/ciao_session_container.mpb b/CIAO/MPC/config/ciao_session_container.mpb deleted file mode 100644 index 0d8dad09bfe..00000000000 --- a/CIAO/MPC/config/ciao_session_container.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : utils, ciao_servant, \ - ciao_session_container_stub, ccm_direct_collocation { - libs += CIAO_Session_Container - after += CIAO_Session_Container -} diff --git a/CIAO/MPC/config/ciao_session_container_stub.mpb b/CIAO/MPC/config/ciao_session_container_stub.mpb deleted file mode 100644 index 729eeb85913..00000000000 --- a/CIAO/MPC/config/ciao_session_container_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ciao_container_base_stub, ccm_direct_collocation { - libs += CIAO_Session_Container_stub - after += CIAO_Session_Container_stub -} diff --git a/CIAO/MPC/config/ciao_vcwarnings.mpb b/CIAO/MPC/config/ciao_vcwarnings.mpb deleted file mode 100644 index 40e9d48107f..00000000000 --- a/CIAO/MPC/config/ciao_vcwarnings.mpb +++ /dev/null @@ -1,18 +0,0 @@ -// -*- MPC -*- -// This file contains optional features that disable VC8 warnings that were -// not present in earlier versions. Some people may consider these superfluous -// or have already checked code to be sure it causes no trouble. So these -// warnings are disabled by default. To enable them, generate your projects -// with the feature set to 0. - -feature(vc_avoid_deprecated_warnings) { - specific(prop:microsoft) { - DisableSpecificWarnings += 4996 - } -} - -feature(vc_avoid_dominance_warnings) { - specific(prop:microsoft) { - DisableSpecificWarnings += 4250 - } -} diff --git a/CIAO/MPC/config/ciaoexe.mpb b/CIAO/MPC/config/ciaoexe.mpb deleted file mode 100644 index a780fe0077c..00000000000 --- a/CIAO/MPC/config/ciaoexe.mpb +++ /dev/null @@ -1,4 +0,0 @@ -// -*- MPC -*- -project { - install = $(CIAO_ROOT)/bin -} diff --git a/CIAO/MPC/config/ciaoidldefaults.mpb b/CIAO/MPC/config/ciaoidldefaults.mpb deleted file mode 100644 index a633dd2a65f..00000000000 --- a/CIAO/MPC/config/ciaoidldefaults.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -project : ccm_lw, ccm_noevent, ccm_direct_collocation, taoidldefaults { - idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm - - Modify_Custom (IDL) { - } -} diff --git a/CIAO/MPC/config/ciaolib_with_idl.mpb b/CIAO/MPC/config/ciaolib_with_idl.mpb deleted file mode 100644 index fc6c0564908..00000000000 --- a/CIAO/MPC/config/ciaolib_with_idl.mpb +++ /dev/null @@ -1,3 +0,0 @@ -// -*- MPC -*- -project : ciao_lib, ciaoidldefaults { -} diff --git a/CIAO/MPC/config/componentidldefaults.mpb b/CIAO/MPC/config/componentidldefaults.mpb deleted file mode 100644 index 2d6ec0ac9ae..00000000000 --- a/CIAO/MPC/config/componentidldefaults.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ciaoidldefaults, anytypecode { - idlflags += -Gsv -Glem -Gxhst -Gxhsk -Gxhsv -Gxhex -} - diff --git a/CIAO/MPC/config/connectoridldefaults.mpb b/CIAO/MPC/config/connectoridldefaults.mpb deleted file mode 100644 index 56363023105..00000000000 --- a/CIAO/MPC/config/connectoridldefaults.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : componentidldefaults { - idlflags += -Gcn -Gxhcn -I$(CIAO_ROOT)/connectors -Sa -St - idlflags -= -Gxhex -} diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb deleted file mode 100644 index 3719f47ffaf..00000000000 --- a/CIAO/MPC/config/dds4ccm.mpb +++ /dev/null @@ -1,23 +0,0 @@ -// -*- MPC -*- -feature(dds4ccm_opendds) : taoidldefaults, dcps_rtps, dcps_qos_xml_handler { - after += CIAO_OpenDDS_Dcps_lem_gen - macros += CIAO_DDS4CCM_OPENDDS=1 - idlflags += -DCIAO_DDS4CCM_OPENDDS=1 \ - -Wb,dds_impl=opendds \ - -I $(CIAO_ROOT)/connectors \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl/dds \ - -I $(DDS_ROOT) - includes += $(CIAO_ROOT)/connectors/dds4ccm/idl \ - $(CIAO_ROOT)/connectors \ - $(CIAO_ROOT)/connectors/dds4ccm/idl/dds \ - $(DDS_ROOT)\ - $(DDS_ROOT)/dds -} - -feature(dds4ccm_ndds) : ndds_idltocpp_stub { -} - -feature(!dds4ccm_opendds, !dds4ccm_ndds) { - requires += dummy_label -} diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb deleted file mode 100644 index 7f14385b76f..00000000000 --- a/CIAO/MPC/config/dds4ccm_base.mpb +++ /dev/null @@ -1,16 +0,0 @@ -// -*- MPC -*- -feature(dds4ccm_opendds) : dds4ccm_stub, ciao_connector_base, dcps_qos_xml_handler, dcps_rtps, dds4ccm_opendds_lem_stub { - after += DDS4CCM_lem_gen -} - -feature(dds4ccm_ndds) : dds4ccm_stub, ndds_idltocpp_lem_stub, ndds_idltocpp_impl, ciao_connector_base { - after += DDS4CCM_lem_gen -} - -feature(dds4ccm_coredx) : dds4ccm_stub, ciao_connector_base { - after += DDS4CCM_lem_gen -} - -feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) { - requires += dummy_label -} diff --git a/CIAO/MPC/config/dds4ccm_dcps.mpb b/CIAO/MPC/config/dds4ccm_dcps.mpb deleted file mode 100644 index 1a2795ae93f..00000000000 --- a/CIAO/MPC/config/dds4ccm_dcps.mpb +++ /dev/null @@ -1,2 +0,0 @@ -feature(dds4ccm_opendds) : dcps { -} diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb deleted file mode 100644 index 43ebbf90d8d..00000000000 --- a/CIAO/MPC/config/dds4ccm_impl.mpb +++ /dev/null @@ -1,18 +0,0 @@ -// -*- MPC -*- -feature(dds4ccm_opendds) : gen_ostream, dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_opendds_lem_stub, dcps_qos_xml_handler, dcps_rtps, dds4ccm_logger { - after += CIAO_DDS4CCM_DDS_Impl - libs += CIAO_DDS4CCM_DDS_Impl - includes += $(CIAO_ROOT)/connectors \ - $(CIAO_ROOT)/connectors/dds4ccm/idl -} - -feature(dds4ccm_ndds) : gen_ostream, dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { - after += CIAO_DDS4CCM_DDS_Impl - libs += CIAO_DDS4CCM_DDS_Impl - includes += $(CIAO_ROOT)/connectors \ - $(CIAO_ROOT)/connectors/dds4ccm/idl -} - -feature(!dds4ccm_opendds, !dds4ccm_ndds) { - requires += dummy_label -} diff --git a/CIAO/MPC/config/dds4ccm_lem_stub.mpb b/CIAO/MPC/config/dds4ccm_lem_stub.mpb deleted file mode 100644 index fc1dfcbeecd..00000000000 --- a/CIAO/MPC/config/dds4ccm_lem_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : dds4ccm_stub, ccm_session_stub { - libs += DDS4CCM_lem_stub - after += DDS4CCM_lem_stub -} \ No newline at end of file diff --git a/CIAO/MPC/config/dds4ccm_logger.mpb b/CIAO/MPC/config/dds4ccm_logger.mpb deleted file mode 100644 index 2bb60450b20..00000000000 --- a/CIAO/MPC/config/dds4ccm_logger.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ciao, acelib { - after += DDS4CCM_Logger - libs += DDS4CCM_Logger -} \ No newline at end of file diff --git a/CIAO/MPC/config/dds4ccm_opendds_lem_stub.mpb b/CIAO/MPC/config/dds4ccm_opendds_lem_stub.mpb deleted file mode 100644 index de4cfd6b01e..00000000000 --- a/CIAO/MPC/config/dds4ccm_opendds_lem_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : dds4ccm_stub, ccm_session_stub { - libs += CIAO_OpenDDS_Dcps_lem_stub - after += CIAO_OpenDDS_Dcps_lem_stub -} diff --git a/CIAO/MPC/config/dds4ccm_skel.mpb b/CIAO/MPC/config/dds4ccm_skel.mpb deleted file mode 100644 index 8a4aaab37b7..00000000000 --- a/CIAO/MPC/config/dds4ccm_skel.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : dds4ccm_stub { - libs += DDS4CCM_skel - after += DDS4CCM_skel -} \ No newline at end of file diff --git a/CIAO/MPC/config/dds4ccm_stub.mpb b/CIAO/MPC/config/dds4ccm_stub.mpb deleted file mode 100644 index dada6ffb5dd..00000000000 --- a/CIAO/MPC/config/dds4ccm_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : dds4ccm, ccm_stub { - libs += DDS4CCM_stub - after += DDS4CCM_stub -} \ No newline at end of file diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb deleted file mode 100644 index 22af464f67c..00000000000 --- a/CIAO/MPC/config/dds4ccm_ts_default.mpb +++ /dev/null @@ -1,48 +0,0 @@ -// -*- MPC -*- -feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps_rtps { - Define_Custom(DDSGenerator) : TypeSupport { - commandflags += -DCIAO_DDS4CCM_OPENDDS=1 -UDDS4CCM_NEEDS_SEQUENCES_DEFINED - keyword opendds_ts_flags = commandflags - keyword dds_ts_flags = commandflags - } -} - -feature(dds4ccm_coredx) : dds4ccm, coredx_ts_defaults, coredxlib { - Define_Custom(DDSGenerator) : CoreDXTypeSupport { - keyword dds_ts_flags = commandflags - } -} - -feature(dds4ccm_ndds) : dds4ccm, ndds_idltocpp_ts_defaults { -} - -feature(!dds4ccm_opendds) { - // this allows the user's project to reference opendds_ts_flags, - // which will simply be ignored - Define_Custom(OpenDDSDummyTypeSupport) { - keyword opendds_ts_flags - } -} - -feature(!dds4ccm_ndds) { - // this allows the user's project to reference ndds_ts_flags, - // which will simply be ignored - Define_Custom(NDDSDummyTypeSupport) { - keyword ndds_ts_flags - } -} - -feature(!dds4ccm_coredx) { - // this allows the user's project to reference coredx_ts_flags, - // which will simply be ignored - Define_Custom(CoreDXDummyTypeSupport) { - keyword coredx_ts_flags - } -} - -feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) : typecode { - Define_Custom(DDSGenerator) { - keyword dds_ts_flags - } -} - diff --git a/CIAO/MPC/config/ndds_idltocpp.mpb b/CIAO/MPC/config/ndds_idltocpp.mpb deleted file mode 100644 index 51646e38b43..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp.mpb +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -project : nddslib, nddsmonitor, taoidldefaults, taolib { - requires += ndds - macros += CIAO_DDS4CCM_NDDS=1 - idlflags += -DCIAO_DDS4CCM_NDDS=1 \ - -DDDS4CCM_NEEDS_SEQUENCES_DEFINED \ - -Wb,dds_impl=ndds \ - -I $(CIAO_ROOT)/connectors \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds - includes += $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds \ - $(CIAO_ROOT)/connectors \ - $(CIAO_ROOT)/connectors/dds4ccm/idl -} diff --git a/CIAO/MPC/config/ndds_idltocpp_impl.mpb b/CIAO/MPC/config/ndds_idltocpp_impl.mpb deleted file mode 100644 index aea231c9585..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp_impl.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ndds_idltocpp_stub, dds4ccm_logger { - after += CIAO_DDS4CCM_DDS_NDDS - libs += CIAO_DDS4CCM_DDS_NDDS -} - diff --git a/CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb b/CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb deleted file mode 100644 index 81209c160b1..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp_lem_stub.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ndds_idltocpp_stub, ccm_session_stub { - libs += CIAO_NDDS_lem_stub - after += CIAO_NDDS_lem_stub -} \ No newline at end of file diff --git a/CIAO/MPC/config/ndds_idltocpp_skel.mpb b/CIAO/MPC/config/ndds_idltocpp_skel.mpb deleted file mode 100644 index 63a457ad94b..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp_skel.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -project : ndds_idltocpp_stub { - libs += CIAO_NDDS_skel - after += CIAO_NDDS_skel -} \ No newline at end of file diff --git a/CIAO/MPC/config/ndds_idltocpp_stub.mpb b/CIAO/MPC/config/ndds_idltocpp_stub.mpb deleted file mode 100644 index a117a99ec19..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp_stub.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project : ndds_idltocpp { - includes += $(ACE_ROOT) $(CIAO_ROOT) - libs += CIAO_NDDS_stub - after += CIAO_NDDS_stub -} \ No newline at end of file diff --git a/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb b/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb deleted file mode 100644 index 1dc2cfe14af..00000000000 --- a/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb +++ /dev/null @@ -1,11 +0,0 @@ -// -*- MPC -*- -project : ndds_cck_ts_defaults, nddslib, taolib { - Define_Custom(DDSGenerator) : NDDSTypeSupport { - commandflags += -typeSequenceSuffix RTISeq -verbosity 1 - commandflags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl - commandflags += -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) - keyword dds_ts_flags = commandflags - } - - dynamicflags += NDDS_USER_DLL_EXPORT -} diff --git a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb b/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb deleted file mode 100644 index 818cfd22af6..00000000000 --- a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb +++ /dev/null @@ -1,22 +0,0 @@ -// -*- MPC -*- -project { - // Set the idl3_to_idl2 compiler and flags as template values - specific { - tao_idl3_to_idl2 = $(ACE_ROOT)/bin/tao_idl3_to_idl2 - tao_idl3_to_idl2_dep = $(ACE_ROOT)/bin/tao_idl3_to_idl2 - } - - Define_Custom(IDL3TOIDL2) { - automatic = 1 - dependent = $(TAO_IDL3_TO_IDL2_DEP) - command = $(TAO_IDL3_TO_IDL2) - commandflags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs - libpath = $(ACE_ROOT)/lib - inputext = .idl - generic_outputext = _IDL2.idl - keyword idl3toidl2flags = commandflags - } - - after += TAO_IDL3_TO_IDL2_EXE - idl3toidl2flags += $(TAO_IDL3_TO_IDL2_FLAGS) -} diff --git a/CIAO/MPC/config/taoidl3toid2_ccm_lw.mpb b/CIAO/MPC/config/taoidl3toid2_ccm_lw.mpb deleted file mode 100644 index f8dd7b6773c..00000000000 --- a/CIAO/MPC/config/taoidl3toid2_ccm_lw.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -feature (ccm_lw) : taobaseidl3toidl2defaults { - macros += CCM_LW - idl3toidl2flags += -DCCM_LW -} diff --git a/CIAO/MPC/config/taoidl3toidl2defaults.mpb b/CIAO/MPC/config/taoidl3toidl2defaults.mpb deleted file mode 100644 index d16eb893948..00000000000 --- a/CIAO/MPC/config/taoidl3toidl2defaults.mpb +++ /dev/null @@ -1,3 +0,0 @@ -// -*- MPC -*- -project: taobaseidl3toidl2defaults, taoidl3toid2_ccm_lw { -} diff --git a/CIAO/MPC/config/taoidl3toxmidefaults.mpb b/CIAO/MPC/config/taoidl3toxmidefaults.mpb deleted file mode 100644 index f66081f26f7..00000000000 --- a/CIAO/MPC/config/taoidl3toxmidefaults.mpb +++ /dev/null @@ -1,23 +0,0 @@ -// -*- MPC -*- -project : xerces { - // Set the idl3_to_xmi compiler and flags as template values - specific { - tao_idl3_to_xmi = <%quote%>$(ACE_ROOT)/bin/tao_idl3_to_xmi<%quote%> - tao_idl3_to_xmi_dep = <%quote%>$(ACE_ROOT)/bin/tao_idl3_to_xmi<%quote%> - } - - Define_Custom(IDL3TOXMI) { - automatic = 1 - dependent = $(TAO_IDL3_TO_XMI_DEP) - command = $(TAO_IDL3_TO_XMI) - libpath = $(ACE_ROOT)/lib - inputext = .idl - generic_outputext = .xmi - keyword idl3toxmiflags = commandflags - } - - after += CIAO_IDL3_TO_XMI_EXE - // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) - idl3toxmiflags += $(TAO_IDL3_TO_XMI_FLAGS) -} diff --git a/CIAO/NEWS b/CIAO/NEWS deleted file mode 100644 index 2b2d49066bd..00000000000 --- a/CIAO/NEWS +++ /dev/null @@ -1,1669 +0,0 @@ -USER VISIBLE CHANGES BETWEEN CIAO-1.3.3 and CIAO-1.3.4 -======================================================= - -USER VISIBLE CHANGES BETWEEN CIAO-1.3.2 and CIAO-1.3.3 -======================================================= - -. In order to support RTI Connext DDS 5.2.0 we introduced - a new NDDSSCRIPTDIR environment variable which should - be the directory in which the RTI scripts are available. - This will be $NDDSHOME/scripts for RTI 5.1.0 and older - and $NDDSHOME/bin for RTI 5.2.0 and newer. With GNU - make we will detect this automatically - -USER VISIBLE CHANGES BETWEEN CIAO-1.3.1 and CIAO-1.3.2 -======================================================= - -. Improved interoperability between the RTI Shapes UI and - the DDS4CCM Shapes tutorial - -USER VISIBLE CHANGES BETWEEN CIAO-1.3.0 and CIAO-1.3.1 -======================================================= - -. CIAO is now hosted on github (https://github.com/DOCGroup/ATCD). - As part of the release process we now generate a ChangeLog - for each release which is stored in the ChangeLogs directory - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.8 and CIAO-1.3.0 -======================================================= - -. Reduced size of all doxygen documentation by changing the - type of diagrams shown - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.7 and CIAO-1.2.8 -======================================================= - -. Added support for RTI DDS 5.1.0 and deprecated support - for RTI DDS 5.0.0 - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.6 and CIAO-1.2.7 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.5 and CIAO-1.2.6 -======================================================= - -. When a component gets removed from a deployment it is - now unregistered from the naming service - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.4 and CIAO-1.2.5 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.3 and CIAO-1.2.4 -======================================================= - -. Made support for bounded strings as part of a deployment - plan compliant with the OMG specification - -. CentOS 6.3 and RHEL 6.4 are now supported and maintained - platforms for CIAO including DDS4CCM with RTI DDS integration - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.2 and CIAO-1.2.3 -======================================================= - -. Support for deploying CCM components on Android. Added - docs/CIAO_android_port.html, describing how to set up an - mixed Linux-Android port - -. Added examples/ciao_android.lst with tests which are - made suitable to run on a mixed Linux-Android environment. - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.1 and CIAO-1.2.2 -======================================================= - -. The DDS4CCM State connector now keeps the state in - DDS. The listeners are now using DDS read so that the - state is not destroyed within DDS - -USER VISIBLE CHANGES BETWEEN CIAO-1.2.0 and CIAO-1.2.1 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.9 and CIAO-1.2.0 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.8 and CIAO-1.1.9 -======================================================= - -. Improved support of DDS4CCM with OpenDDS as underlying - DDS implementation - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.7 and CIAO-1.1.8 -======================================================= - -. Added type_name attribute to DDS4CCM TopicBase connector - -. Fixed a few code generation bugs - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.6 and CIAO-1.1.7 -======================================================= - -. Added support for RTI DDS 5.0.0 rev00 - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.5 and CIAO-1.1.6 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.4 and CIAO-1.1.5 -======================================================= - -. Added basic hello world example - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.3 and CIAO-1.1.4 -======================================================= - -. The CIAO DDS4CCM integration with OpenDDS has been reworked in a way - that OpenDDS doesn't know anything anymore from CIAO. In order to use - DDS4CCM with OpenDDS you need OpenDDS 3.3 or higher. - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.2 and CIAO-1.1.3 -======================================================= - -. DDS4CCM with OpenDDS 3.2 or higher now can use the QoS XML files. The DDS4CCM - profile#library convention is handled as filename#profile. - -. Further extended and improved support for OpenDDS as DDS vendor. Several - unit tests have been updated to wait for DDS status callbacks in order - to start the test instead of starting on ccm_activate - -. Refactored domain participant re-use in DDS4CCM. Domain participant re-use - was initially implemented for RTI DDS but now it's available for other DDS - vendors as well. - -. Added support for so called service components which are available through - the component context using resolve_service_reference. Service components - are deployed as regular components, but are installed by the installation - handler (see the TTSCTest test) or they install themselves into the service - registry (see TTSConnContext). These components can be seen as container - plugins which are going to be used for various extensions without causing the - container to be huge and unmaintainable - -. Removed preliminary support for the extension container - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.1 and CIAO-1.1.2 -======================================================= - -. Added support for DDS4CCM with OpenDDS 3.2 or higher as DDS implementation. - At this moment basic integration has been completed, all tests/examples do - compile and part of them do run. To be added are support for the QoS XML files - and the sharing of domain participants between connectors when using OpenDDS. - After these extensions have been implemented we will analyze and resolve - the test failures - -USER VISIBLE CHANGES BETWEEN CIAO-1.1.0 and CIAO-1.1.1 -======================================================= - -. Fixed problem with component sequence attributes - -. Minor bug fixes - -. Generated starter executors with -Gex have much more doxygen documentation - being generated - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.8 and CIAO-1.1.0 -======================================================= - -. Added support for new ciao config property "edu.vanderbilt.dre.CIAO.OpenMode" - which controls the mode that is used to load the shared libraries for - a home or component. By default we use ACE_DEFAULT_SHLIB_MODE - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.7 and CIAO-1.0.8 -======================================================= - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.6 and CIAO-1.0.7 -======================================================= - -. -Glfa has been removed from tao_idl. The local executor mapping can only - be generated for the current file. Also at the moment an interface is - compiled with tao_idl, the option -Gsv has to be used to generate the needed - CCM facet servant - -. CIAO now supports the synchronous port and the ami4ccm lem pragma as - documented in the AMI4CCM Initial submission by Remedy IT (mars/11-06-01) - -. Homes are now functional for connectors - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.0.6 -======================================================= - -. It is now possible to connect connections in a deployment plan - at deployment time instead of connecting them on first use. - This can be established by setting the CIAO_PRE_ESTABLISH_CONNECTIONS - define in your config.h. - -. The DDS4CCM connector now only creates a DDS subscriber or - DDS publisher when they are needed. Previously, the DDS4CCM - always created a DDS publisher and DDS subscriber, regardless - of need. - -. Besides late binding, it is now possible to reset the topic - name in the DDS4CCM connector. This means that the DDS4CCM - connector is able to switch between topics of the same data - type at runtime. Resetting a topic name means that DDS will - be closed down and started again, using the new topic name. - On the outside, all connections to and from the connector - stay intact; therefor the user doesn't need to re-establish - the connections again. Please see - $CIAO_ROOT/connectors/dds4ccm/tests/ResetTopic/README for - more info. This directory also contains some examples on how - to reset a topic name. - Since this is not spec-compliant behavior, an issue has been be - raised on the DDS4CCM specification. - -. Improved thread safety in the CIAO core. - -. Direct collocation between components is now supported. In order to enable - this add ccm_direct_collocation=1 to your default.features. We do recommend - to use the new -ORBCollocationStrategy best which does not require all - user components to be compiled with direct collocation enabled. Enabling - direct collocation does increase the size of the generated code - -. All facet servants are now generated in the new _svnt_T.{h,cpp} files. This - is a first step in more refactoring in the CIAO servants. Together with the - TAO skeleton refactoring the skeleton for the Null_Component example decreased - from 40206 bytes to 24971 bytes, the generated servant from 56959 bytes to - 54933 bytes. The skeleton for the related Null_Interface reduced from - 9559 bytes to 4526 bytes. - -. Added support for DDS4CCM using RTI DDS 4.5e on RHEL 6.1 - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.4 and CIAO-1.0.5 -======================================================= - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.3 and CIAO-1.0.4 -======================================================= - -. The thread switch feature in DDS4CCM now requires that - ACE_HAS_REACTOR_NOTIFICATION_QUEUE is enabled. - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.2 and CIAO-1.0.3 -======================================================= - -. DDS4CCM now compiles with OpenDDS integration enabled. This will not run - because several methods in the core of DDS4CCM are still commented out. - -. The display example has been upgraded to Qt4 and has been made functional - again - -. The hello example has been updated to the latest implementation guidelines - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.1 and CIAO-1.0.2 -======================================================= - -. Generate servant code for facets and receptacles is now thread safe, the - code for consumers/publishers/emitters still have some thread safety issues - and a possible deadlock - -. Improved disconnect of connections in general and extended our test suite - for that - -. Restructured base projects for dds4ccm to make a clear distinction between - plain ndds and our idl to cpp wrapper around it - -. Validated with ndds 4.5drev03 - -. Added serialize_key_with_dispose and propagate_dispose_of_unregistered_instances - as BOOLEAN_TRUE to the DDS QoS xml file for several tests to always get - the key of the sample in the on_deletion callback - -. The logging service now supports custom backends. These are enabled - using CIAO_LOG_BACKEND. Please see the DAnCE NEWS file for more - details. DDS4CCM also supports the custom backend service, - initialized with DDS4CCM_LOG_BACKEND. - -USER VISIBLE CHANGES BETWEEN CIAO-1.0.0 and CIAO-1.0.1 -======================================================= - -. Improved disconnect of Simplex/Multiple facets and receptacles. - -. Improved disconnect of consumers and publishers. - -. Resolved some memory leaks in the DDS4CCM library. Therefor a lot of tests were - rewritten, using the generated executor implementation. - -. Improved doxygen documentation. - -. Improved IDL to C++ wrapper for NDDS. Therefor one is able to create a NDDS only - application without using the DDS4CCM connector itself. See - $CIAO_ROOT/connectors/dds4ccm/examples/IDL2CPPWrapper for an example of such an - application. - -. Improved the DDS4CCM connector so that the user is able to implement his/her own - connector. - See $CIAO_ROOT/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp/h - for an implementation of such a connector. - -. Improved the DDS4CCM connector so that it can handle more than one topic. - See $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/ for an implementation - of such a connector. - -USER VISIBLE CHANGES BETWEEN CIAO-0.8.3 and CIAO-1.0.0 -======================================================= - -. Implemented 'LateBinding' in the DDS4CCM connector. - This means that the DDS entities will NOT be created and initialized - when the topic name is empty at deployment time (e.g. the topic_name - is empty in the deployment plan). - The DDS entities will be created and initialized once the topic name is - set at run time. - -. Reworked dds4ccm core to make it easier to implement custom dds4ccm - connectors. Any already written custom dds4ccm connectors will need to be - updated because of changes in the C++ template signature and the internal - classes. - -. Improved dds4ccm logging - -. AMI4CCM reply handler is now generated for any user component that uses - AMI4CCM, not with the AMI4CCM connector anymore - -USER VISIBLE CHANGES BETWEEN CIAO-0.8.2 and CIAO-0.8.3 -======================================================= - -. Tests for the Component Implementation Framework have been added. - Because of this, two methods ('get_named_receptacles' and - 'get_connections') off the receptacle interface were implemented - in the CCM core. - -. DAnCE has been made an entirely separate product from CIAO, and has - been moved from ACE_wrappers/TAO/CIAO/DAnCE to - ACE_wrappers/TAO/DAnCE. - -. A new option has been added to the TAO IDL compiler. This option - extends the -Gex option. When applying -Gexr, the TAO IDL compiler - will generate an extra method which retrieves the ACE_Reactor from - the ORB. One should use this option when an ACE_reactor. In code, - use 'this->reactor ()' to get the ACE_Reactor. A CORBA::INTERNAL - exception is thrown when the ACE_Reactor cannot be retrieved. - The goal of this method is to prevent memory leaks. - -. The DDS4CC connector now has its own logging level. This log level - can only be set using an environment variable, called DDS4CCM_LOG_LEVEL. - The following log levels are defined: - - DDS4CCM_LOG_LEVEL_ERROR 1 - - DDS4CCM_LOG_LEVEL_CAST_ERROR 2 - - DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN 3 - - DDS4CCM_LOG_LEVEL_4 4 //unused - - DDS4CCM_LOG_LEVEL_5 5 //unused - - DDS4CCM_LOG_LEVEL_ACTION 6 - - DDS4CCM_LOG_LEVEL_UNIMP_ACTION 7 - - DDS4CCM_LOG_LEVEL_ACTION_STARTING 8 - - DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL 9 - - DDS4CCM_LOG_LEVEL_DDS_STATUS 10 - -. Started the implementation of the Qos4CCM specification. - Therefor an Extension Container has been added to CIAO. - For now its possible to register the various interceptors - (Client, Server, Servant and Stub interceptors) with an Extension - Container (see $CIAO_ROOT/tests/COPI/Registration/Client). - At this moment, DAnCE is unable to deploy an Extension Container - 'out of the box'. If the DANCE_DEPLOYS_EXTENSION_CONTAINER define - in config.h is set, DAnCE will deploy only Extension Containers - (and no Session Containers). In the future, DAnCE should be able - to deploy Extension Containers via a Deployment plan. - -. Added nddsmonitor as MPC feature to enable linking with the rtimonitor - library - -. Resolved several memory leaks in CIAO/DAnCE/DDS4CCM - -. The tao_idl option -Gex now also generates a member and implemented set/get - methods for attributes defined in components - -. Added mpc feature ccm_noevent which disable the CORBA event support in - the core libraries and generated code - -. Implemented disconnect for local facets - -USER VISIBLE CHANGES BETWEEN CIAO-0.8.1 and CIAO-0.8.2 -======================================================= - -. Separate lifecycle of the dds4ccm connector and its facets - -. Improved dds4ccm logging - -. Fixed several memory leaks in CIAO and DAnCE - -. Destructors for component executors prior to this release were never - invoked. This bug has been fixed, and component executors are now - properly destructed. - -. Installation handlers, deployment interceptors, and locality - configurators are now loaded at run-time instead of statically - configure at compile time. This is accomplished with the use of - a locality configuration file passed on the command line. Please - see CIAO/examples/Hello/descriptors/run_test_shs.pl and - DAnCE/tests/CIAO/Executor-Destructors/Component.cdp for examples of - how to pass this file to the locality manager. The default locality - configuration is loaded from DAnCE/bin/ciao.localityconfig. Please - see documentation located in DAnCE/docs/localityManager-Plugins.txt. - -. Names for operations in the deployment interceptors have changed - slightly to remove the 'instance_' prefix on all operation - names. Please see DAnCE/DAnCE/DAnCE_DeploymentInterceptors.idl. - -. Deployment interceptors have a new operation that is invoked when - unexpected events occur. This is currently only invoked when the - NodeApplication receives notification that a locality manager has - exited unexpectedly. - -. A locality configurator that sets the process priority has been - included. - -USER VISIBLE CHANGES BETWEEN CIAO-0.8.0 and CIAO-0.8.1 -======================================================= - -. Implemented _get_component for AMI4CCM - -. Implemented resetting of Query Conditions in the - DDS4CCM connector. This according to the beta 3 - specification. - -. Added a preliminary System Health and Status Service. Please see - DAnCE/tools/System_Health. This has two parts: there is the - interceptor, which publishes instance status updates using a - strategizeable transport protocol (included in this release is a - simple CORBA transport plugin), and there is the dance_shs_daemon. - A test which uses the SHS service is - CIAO/examples/Hello/descriptors/run_test_shs.pl. - -. Added a new configuration plugin facility to the LocalityManager. - This faciliy will invoke configuration plugins based on - configProperties attached to an explicitly deployed LocalityManager - instance. Included plugins are one for CPU Affinity, and another - for setting the locality manager process name. Both work only under - Linux 2.6 and later. Please see - DAnCE/tests/LocalityManager/ProcessName and - DAnCE/tests/LocalityManager/CPUAffinity for information on how to - use these plugins. - -. There is a known bug when running some of the LocalityManager tests - (DAnCE/tests/LocalityManager), in which an attempt to tear down a - locality manager with no installed components results in a memory - access violation. This will be fixed in CIAO 0.8.2. - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.9 and CIAO-0.8.0 -======================================================= - -. Generalized DDS4CCM connector support to allow user-defined - DDS4CCM connectors - -. Added support for structs in the deployment plan - -. Updated DDS4CCM to the beta 3 specification which includes - - explicit support for ContentFilterTopics - - porttype may contain attributes - - all sequence are now inout instead of out - - DDS vendors can deliver their own partial template specialization to - handle differences between vendors - -. Completed AMI4CCM support - -. Added tutorials for DDS4CCM and AMI4CCM - -. Updated Quoter tutorial for the latest CoSMIC release - -. The ACE_FOR_TAO MPC feature is not supported anymore for CIAO - -. The DeploymentInterceptor interfaces have been merged into - a single interface. - -. All currently defined interception points are currently invoked - at the locality level when deploying plans. - -. The NodeApplication and LocalitManager have been refactored to use - a thread pool based dispatching system for executing deployment actions. - This allows the NodeApplication to use multiple threads to spawn new - dance_locality_manager processes. The LocalityManager will, for the - time being, be restricted to using only the ORB thread for dispatching - deployment events. - -. Most deployment errors are now passed to installed deployment interceptors. - DAnCE will include interceptors for extant semantics (first failure) and - initial support for best effort semantics, whereby deployment failures are - logged by otherwise ignored. - -. An Artifact Installation framework has been added to DAnCE and integrated - into the NodeApplication. - The framework provides a plugin system for installation handlers and a - pluggable local node installation repository/cache. - Installation handlers are selected based on the 'scheme' identifiers of - location URLs from installation artifact entities in the deployment plan. - Multiple installation schemes can be nested inside a single location URL - as ://://. - The framework comes with 'file' and 'http' scheme installation handlers - and a simple local filesystem based installation repository/cache. - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.8 and CIAO-0.7.9 -======================================================= - -. CIAO's default makefiles (traditional ACE/GNU, not autoconf/automake) - now support installation with "make install". - Please see the ACE-INSTALL.html file for instructions. - -. CIAO now enabled the LwCCM profile by default. This reduces the - size of the generated code and the core libraries significantly. - If you need any of the full CCM features, set ccm_lw=0 in your - default.features file. - -. Updated AMI4CCM naming and extended the test suite - -. DDS4CCM tests and examples now instantiate the CCM_DDS::Typed module which - gives us the DDS_Event and DDS_State connectors directly without requiring - the user to manually derive a connector from DDS_Event and/or DDS_State - -. The way attributes are set from the cdp file onto the components - has changed, any mismatch between the attribute datatype in IDL - and the CDP file will cause to a StartError - -. The interpretation of locality constraints in deployment plans has changed - slightly. Previously, any components not explicitly included as part of - a locality group would be installed into their own, seperate locality. Now - they will be installed into an arbitrarily chosen locality on the same node. - -. The first version of the DAnCE LocalityManager entity has been added to - the repository. As such, launching components with ciao_componentserver - is no longer supported, and dance_locality_manager should be used instead - as the component server argument to dance_node_manager. - -. The way explicitly homed components are represented in deployment plans - has changed. The section needs to have an execParameter - with name "edu.vanderbilt.dre.DAnCE.ImplementationType" and value - "edu.vanderbilt.dre.CCM.HomedComponent". The section needs - to have a configProperty with name "edu.vanderbilt.dre.CIAO.ComponentHomeId" - and value is the field of the home that is managing that component. - -. The way component server processes are explicitly deployed and passed - command line arguments has changed. The field must - have an execParameter named "edu.vanderbilt.dre.DAnCE.ImplementationType" - and value "edu.vanderbilt.dre.DAnCE.LocalityManager". To pass command - line arguments, the instance must have a configProperty named - "edu.vanderbilt.dre.DAnCE.LocalityArguments". - -. Connection of emits/publish/consume ports is no longer supported via - externalReference endpoints. Simplex and multiplex facet/receptacle - connections continue to be supported. - -. DDS4CCM is compliant to the beta 2 specification, the next micro release - will be updated to match beta 3. - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.7 and CIAO-0.7.8 -======================================================= - -. dance_plan_launcher has been extensively re-factored, resulting in several - new features: - 1) dance_plan_launcher may now deploy locality-constrained plans directly to - a NodeManager. - 2) dance_plan_launcher now has the ability to deploy CDR encoded deployment - plans in a portable manner. - 3) dance_plan_launcher's command line options have been cleaned up to be - more intuitive. The major user-visible change is -q (for application - teardown) has been renamed -s. - 4) Most plan_launcher business logic is encapsulated in an implementation - library that may be leveraved by users to write custom executor agents. - -. All DDS4CCM callbacks will be deliverd to the user component on the CCM - thread, not on the DDS thread. This does mean a small performance penalty, - if you don't want to get this threadswitch, define CIAO_DDS4CCM_CONTEXT_SWITCH - to zero in your config.h file - -. DDS4CCM uses a ContentFilteredTopic to implement the QueryFilter. If you - want to use DDS QueryCondition instead add DDS4CCM_USES_QUERY_CONDITION - as 1 to your config.h file - -. The user sequences in our DDS4CCM examples and tests have been updated to use - Seq as postfix instead of _Seq. The RTI DDS specific sequence is now named - with the RTISeq postfix - -. DDS4CCM doesn't work anymore with RTI DDS 4.4d, you will need to use at - least 4.5b version with an updated CCK - -. AMI4CCM has been partly implemented into TAO_IDL and the Hello example has been - updated. The naming conventions and exact code generated will be reviewed - after this micro release. - -. The DDS4CCM connectors do initialize themselves completely after creation, - this does mean that one DDS_Event connector has always 1 writer and 2 readers, also - when you just write samples and don't use read or listen. The latency performance - test shows current an overhead of 10% to 13%, but this does include the additional - readers. - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.6 and CIAO-0.7.7 -======================================================= - -. Reworked MPC support for dds4ccm. If you want to use dds4ccm you need - to obtain the source distribution and for NDDS add dds4ccm_ndds=1 to - your default.features file and generate the project files - -. Implemented more dds wrapper calls in the dds4ccm library - -. All DDS4CCM connectors are now generated by tao_idl - -. Did major cleanup in DAnCE to reduce dependencies and code size - -. Fix bug with DAnCE logging that cause the dance_node_manager not - to log any messages - -. Extended dds4ccm test suite - -. Fixed -Glfa support - -. Added a new tool, dance_split_plan, which will allow a user - to split a deployment plan into locality-constrained CDR-encoded deployment - plans. - -. Added a new tool, dance_convert_plan, which will allow a user to validate - and optionally convert a XML encoded deployment plan into CDR. - -. CIAO and DAnCE logging are silent by default, no messages are printed anymore. - If you want to enable logging use the environment variables CIAO_LOG_LEVEL, - DANCE_LOG_LEVEL, CIAO_TRACE_ENABLE, DANCE_TRACE_ENABLE, DANCE_LOG_FILE, - and CIAO_LOG_FILE. For the executables we have the commandline arguments - -DAnCELogLevel, -DAnCETraceEnable, -DAnCELogFile, -CIAOLogLevel, - -CIAOTraceEnable, and -CIAOLogFile - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.5 and CIAO-0.7.6 -======================================================= - -. Added support for the environment variable DDS4CCM_NDDS_LOG_VERBOSITY. - This controls the ndds verbosity which is default set to silent - -. Added support for the DDS State and Event connector with all ports. - A set of tests has been added to test these connectors. We implement - now the biggest part of the recent OMG 09-10-25 specification - -. Extended AMI4CCM prototype with the latest ideas. The TAO_IDL compiler - has some hardcoded generation just for Hello example. It has to be - extended to generate the AMI4CCM connector and after that we can - remove the hardcoded generation with the real generation code - -. Added support for components/connectors with local interface. In the - cdp a deployRequirement has to be specified for any local connector - -. Use the templated module support for dds4ccm - -. Added suppor for #pragma ciao lem to handle the issues with the - include of the E.idl file - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.4 and CIAO-0.7.5 -======================================================= - -. Added rudimentary support for PlanLocality, which allows DAnCE to spawn - multiple CIAO processes per node. Currently, only SameProcess - constraints are honored. SameProcess constraints are honored by - creating a separate process per constraint as it appears in the - plan, with the appropriate component instances spawned in each - process. - - Constraints are not rigerously checked by the runtime, so behaviour - when a component instance appears in multiple SameProcess - constraints is currently undefined. - - Components not appearing in any constraint are placed in a default - component server process. - -. DDS4CCM has been updated to match the beta 2 spec. If you want use - a templated module, use TYPED_MODULE macro as helper until the - TAO_IDL compiler supports templated modules - -. Updated all DDS4CCM code/examples/tests to match beta 2 - -. Added Shapes sender/receiver for DDS4CCM - -. The configProperty edu.vanderbilt.dre.CIAO.ComponentServer.Executable - can be used in the deployment plan to set a different ciao component - server executable - -. The configProperty edu.vanderbilt.dre.CIAO.ComponentServer.Args - can be used in the deployment plan to specify a set of additional - commandline arguments that are than passed to the ciao component - server - -. Added support for the environment variable DDS4CCM_DEFAULT_DOMAIN_ID - This influences the default domain id which is set by the connector. - All test deployment plans don't set a domain id, which cause problems - during testing because everyone is in the same domain. Each developer - and build system on the same network should have its own unique id - to get an isolated test environment. - -. DDS4CCM qos_profile attribute has to be used as library#profile. If - this is not set, we use default qos - -. Removed DDS4CCM monolotic connector because it was not in the spec - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.3 and CIAO-0.7.4 -======================================================= - -. Added second prototype of DDS4CCM that uses the RTI - CORBA Compatibility kit and a monolitic connector - -. Extended AMI4CCM prototype - -. Update all examples and tests for the changes in the -Glem - TAO_IDL option. The behavior of this option has changed - dramatically, and will require that most user applications be - ported. Previously, -Glem would cause the IDL compiler to generate - a E.idl file containing local executor mapping for all interfaces - provided as ports by any components in the main translation unit. - Therefore, files with interfaces, but no components defined will - have empty E.idl files generated. Similarly, a file with no - interfaces defined, but with components defined would generate LEM - interfaces for interfaces provided by that component but not local - to the file in question. While this behavior simplified a - rudimentary use case where interfaces would be provided by only one - component, more complicated use cases were much more difficult to - achieve. - - The new behvior causes the IDL compiler to generate LEM IDL for all - interfaces within a given translation unit, regardless of whether or - not they are provided as ports by a component in the same - translation unit. Futhermore, if a component provides an interface - that is not defined with the translation unit of that compoment, it - is required that the user provide a #include directive to the - appropriate E.idl file which contains the required LEM interface for - the interfaces provided as facets. - - This new behavior is similar to the former behavior of -Glfa, and as - such the behavior of -Glfa has been changed to attempt to be - reflective of the old behavior of -Glem, and may be used as a - stopgap backwards compatibility measure. - -. In idl3_to_idl2 tool, replaced manual designation of IDL2-only - files and resulting generated include of undecorated filename - (using -x option) with a mechanism that does it - automatically. The -x option has been eliminated. - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.2 and CIAO-0.7.3 -======================================================= - -. Added a first prototype of DDS4CCM - -. Added a first prototype of AMI4CCM - -. Made CIAO compiling with unicode enabled - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.1 and CIAO-0.7.2 -======================================================= - -. CIDL compiler, and .cidl files, have been eliminated. All - CIAO code generation is now handled by the TAO IDL compiler. - See $TAO_ROOT/docs/compiler.html for details. - -. DAnCE has been refactored in separate libraries to reduce - footprint and dependencies - -. Logging has been improved - -. IDL has been updated to match the official specifications - -. CIAO now also compiles on HPUX - -. Unicode improvements - -. Updated Quoter tutorial for all recent changes including - the latest CosMIC releases - -. Use the new feature of the TAO_IDL compiler to generate all - export files as part of the build step - -. Extended CIAO and DAnCE tests - -USER VISIBLE CHANGES BETWEEN CIAO-0.7.0 and CIAO-0.7.1 -======================================================= - -. No user visible changes in this release. - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.9 and CIAO-0.7.0 -======================================================= - -. CIDLC compiler has new command line options: --suppress-lem which will suppress - generation of the local executor mapping, --suppress-svnt which will suppress - generation of the servant code, --lem-enclosing-module which will generate the - local executor mapping inside a given module. - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.8 and CIAO-0.6.9 -====================================================== - -. The CIAO refactoring branch has been merged to the main line of - development. This version of CIAO contains extensive refactoring of - the CIAO container code and includes a new version of DAnCE based on - code provided by PrismTech. - -. Porting hints may be found at CIAO_ROOT/docs/Porting_Hints.txt - -. CIAO no longer supports implicitly homed components. This means that - components must either be deployed using an explicity deployed and - nominated home, or must be deployed without the use of a home. - Unhomed components require new factory methods similar to those used - for homes. These can be obtained by issuing the --gen-exec-impl - operation to the CIDL compiler. - -. Extant deployment plans are no longer valid for this version of - DAnCE. Until CoSMIC support is available, - DANCE_ROOT/bin/generate_plan.py may be used to assist in the creation - of well-formed deployment plans. - -. Names for most DAnCE executables have changed. Please see the Quoter - tutorial found at CIAO_ROOT/docs/tutorials/Quoter for details. - -. DAnCE now supports connection endpoints realized by extra-plan - object references. - -. Support for shared components and ReDaC has been removed with no - immediate replacement planned. - -. Support for RTEC integration, RT-CCM, RepositoryManager, - TargetManager, and staticly linked depoyment has not yet been ported - to the new CIAO/DAnCE. - -. CIAO/DAnCE now supports by Xerces 3.X and 2.X. - -. Note that CoSMIC support is not currently available for this version - of CIAO/DAnCE. - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.7 and CIAO-0.6.8 -====================================================== - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.6 and CIAO-0.6.7 -====================================================== - -. Added the "CIAO" OCI Development Guide Examples under the directory - /DevGuideExamples. NOTE this is an ongoing port of the original - version x.5.x examples and some are not yet 100% compatiable with the - current version of CIAO. - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.5 and CIAO-0.6.6 -====================================================== - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.4 and CIAO-0.6.5 -====================================================== - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.3 and CIAO-0.6.4 -====================================================== - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.2 and CIAO-0.6.3 -====================================================== - -. None - -USER VISIBLE CHANGES BETWEEN CIAO-0.6.1 and CIAO-0.6.2 -====================================================== - -. Removed 24 unnecessary builds from the CIAO_TAO_DAnCE.mwc - MPC workspace file - -. Changes to the generate_component_mpc.pl Perl scrip, CIDL compiler - generation of empty executor implementation classes, and existing - tests and examples to make servant dependency on executor the - default, instead of vice versa as previously - -. Made the processing of IDL and CIDL files into separate build steps - for tests, examples, and for DAnCE's TargetManager - -. Added additional tests for CIAOEvents Integration, which executes - several scenarios for components using Real-time EventChannels - as event mechanism. - -USER VISIBLE CHANGES BETWEEN CIAO-0.6 and CIAO-0.6.1 -==================================================== - -. Fixed broken static deployment support - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.10 and CIAO-0.6.0 -======================================================= - -. Added support for building CIAO statically with Microsoft Visual C++ - -. Fixes to idl3_to_idl2 conversion tool, which - - handle the mapping of IDL identifiers that are - escaped (due to a clash with an IDL keyword) or - that clash with a C++ keyword - - handle the mapping of #includes of IDL files - that aren't themselves processed by the tool - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.9 and CIAO-0.5.10 -======================================================= - -. Extended IDL3_to_IDL2 - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.8 and CIAO-0.5.9 -====================================================== - -. Added a new deployment algorithm to DAnCE for optimization of large - scale deployment. In this algorithm, the number of threads spawned is - based on the deployment plan, i.e, by parsing the deployment plan - information, DAnCE decides how many threads to spawn (one thread per - node). This algorithm knows how to "initialize" each thread since - each thread will have different execution context, i.e., which - components to deploy to which node, component configuration, etc. - -. Added a NA component server callback wait strategy in NAM, which uses - conditional variable to signal the NA call back so it can work with - multi-threaded configuration, such as thread-per-connection mode. The - original implementation uses the main thread to run the ORB event - loop, which will not work for multi-threaded environment. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.7 and CIAO-0.5.8 -====================================================== - -. Improved the option handling of the Execution_Manager and plan_launcher. - -. Added a utility library to manipulate the deployment plan, such as - adding/removing instances, adding/removing connections, and pretty print. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.6 and CIAO-0.5.7 -====================================================== - -. Removed ACE_THROW_RETURN - -. Remove exception specifications from ORB mediated operations (C++ - mapping requirement) - -. All DAnCE core idl files are moved to DAnCE/Deployment - -. QoS4CCM IDL files are moved to ciao/extension - -. RACE has been fully removed from the distribution, a new version - is work in progress and will be added again to the distribution - when it is ready - -. MPC base projects that contained _dnc_ have been renamed to not - include that string. - -. DAnCE executables are now installed into $CIAO_ROOT/bin - -. Added a new TAO policy for specifying the DiffServ code points - (DSCP) to be added to request and reply IP packets of an - application. The policy can be added at the following levels: OBJECT, - THREAD, and ORB. - -. Extended the CIAOServerResources schema to allow the specification - of request and reply DSCPs to be added to the IP packets of an - application. Extended CIAO NodeApplication libraries, to read the - CIAOServerResources specification, to create DiffServ policies on the - objects, to allow automatic addition of DSCPs on the CCM port - objects. - -. Updated the Target Manager interface to comply with the latest OMG - specification. This includes the addition of a new entity, - ResourceCommitmentManager for the management of committed resources. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.5 and CIAO-0.5.6 -====================================================== -. Updated the Target Manager interface to comply with the latest OMG - specification. This includes the addition of a new entity, - ResourceCommitmentManager for the management of committed resources. - -. Removed all exception environment macros except ACE_THROW_RETURN - and ACE_THROW_SPEC - -. All CIAO libraries built on UNIX systems will now have the correct library - version numbers. Previously they had the same version numbers as TAO - libraries. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.4 and CIAO-0.5.5 -====================================================== - -. Fixed problems and added command line options to the - generate_component_mpc.pl Perl script. Also added an HTML - documentation file for this script. - -. All IDL has been refactored to get a smaller footprint - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.3 and CIAO-0.5.4 -====================================================== - -. Adding support to manage multiple interconnected assemblies, which will - involve the work through ExternalReferenceEndPoint idea. - -. Seamless integration of swapping into the main line programming model, - so that DAnCE can actually kickstart swapping. - -. Integrated real-time event service into CIAO and DAnCE. - -. Improved syntax error checking and reporting in the CIDL compiler. - -. Add Null Component to be able to measure footprint in detail - -. Added the naming service & the implementation of createPackage function - to RepoMan. - -. Added the code to save the state of the RepoMan at exit and load the - state of it at start. - -. Reimplemented the findNamesByType () and getAllTypes () operations of - RepoMan, which use the newly generated ACE_Hash_MultiMap_Manager class - and its corresponding classes. - -. Added Plan_Generator project. This project is used to retrieve information - from Repoman and generate/modify DeploymentPlans based on different demands. - -. A succesfull static deployment of the Hello example has been tested on - VxWorks 6.3 - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.2 and CIAO-0.5.3 -====================================================== - -. Improve documentation for CoSMiC Quoter tutorial to reflect the latest update - -. Reimplemented the findNamesByType () and getAllTypes () operations - of Repository Manager, which use the newly generated - ACE_Hash_MultiMap_Manager class and its corresponding classes. - -. Added the replace argument in installPackage () and createPackage () - functions to Repoman and extend the functionalities of these two - functions based on the latest D&C spec. - -. Added the Plan_Generator project. This project is used to retrieve - information from Repoman and generate/modify DeploymentPlans based - on different demands. Removed the planner project. - -. Added C++ keyword mangling to the CIDL compiler (bug#2427). - -. Fixed the CIDL compiler source code to build with Intel C++ (bug#2387). - -. Reimplemented the CIDL compiler command line handling to make use - of '--' to separate options from arguments unnecessary (bug#2426). - -. Added file and line number to the semantic errors printed by the CIDL - compiler. - -. Fixed a number of bugs in the CIDL compiler error handling and recovery - mechanisms. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.1 and CIAO-0.5.2 -====================================================== - -. Changed CIDL compiler code generation for facet servant classes - to enable reuse if the same interface is used as a facet more - than once in a single translation unit. - -. Fixed code that fetches component DLL entry points to be portable - across all supported compilers. - -. Fixed bugs in the recent implementation of component servant methods - get_all_receptacles() and get_all_publishers(). - -. Simplified template code in component servant and home servant - base classes. - -. Added the naming service & the implementation of createPackage function - to RepoMan. - -. Added the code to save the state of the RepoMan at exit and load the - state of it at start. - -. A new perl library has been added to the bin directory. PerlCIAO is - a wrapper around PerlACE with extensions to aid in scripting CIAO - tests. - -. DAnCE/Planner - a planner which contacts the RepositoryManager, gets a - PackageConfiguration by name, and builds a DeploymentPlan on - the fly. Note that the node information is currently not populated. - -. Added two RACE utilities, the LocationUpdater and PlanGenerator. - The LocationUpdater modifies the location field of artifacts in - flattened plans to correspond to HTTP URLs pointing at the - RepositoryManager. The PlanGenerator is the Planner utility - modified to work with RACE. Note that most RACE functionality is - still in development and is not included with this release. - -. Added support for parsing packaging descriptors to the - Config_Handlers, and improved support for IDL->XML serialization. - -. Added a Planner utility which, when given the name of a package, - will contact the RepositoryManager and construct a flattened - deployment plan on the fly. Note this utility currently does not - populate node assignments. - -. Several important bugfixes for ReDaC and shared components. - -. Changed Components.idl to include CCM_Component.idl instead of - CCM_Container.idl. This removes a dependancy on the container - library for stub projects. - -USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1 -====================================================== - -. Added the support of integrating real-time event service into the - CIAO core framework. Enhanced DAnCE to support declaratively configure - and deploy real-time event channels to mediate event communication - among components. - -. Fixed a bug in detecting External connection and Internal - connections when components are shared across different - deployment plans. Earlier when removing connections attached - to an external/shared component, not *all* connections - associated with this components are purged from the - to-be-removed connections list. - -. Fixed a bug when redeploying components using the same set - of NodeManagers, the destroy of applications results not - all internal components and external/shared components - are unbinded from the cached map, which sometimes causes - duplicate instance exception thrown. - -. Fixed bug in detecting name clashes between names of ports of the same - category (facet, event sink, etc.) in the same component. - -. Added support for attribute exceptions in code generated for executor - implementation classes. - -. Implemented spec-defined component methods get_all_receptacles(), - get_all_publishers(), and disconnect_consumer(). - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.10 and CIAO-0.5.0 -======================================================= - -. Changed MPC configuration of Config_Handlers to turn off hidden - visibility if applicable when compiling Config_Handlers or projects - that use Config_Handlers on linux.This change was to work around symbol - visibility inconsistencies in GNU standard C++ library when using g++ - 4.x's symbol visibility features. - -. Enhanced ReDaC service to enforce the correct - assembly redeployment and reconfiguration order. - -. Some bug fixes in ReDaC about removing components. - -. Fixed NodeApplication to unbind a component with naming service - when removing it from the container. - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.9 and CIAO-0.4.10 -======================================================= - -. Enhanced DAnCE ReDaC service to enforce the correct - assembly redeployment and reconfiguration order. - - The order that ReDaC currently enforces: - - (1) Install new components, - (2) Set up new connections, - (3) Activate new components, - (4) Passivate old components, - (5) Remove old connections - (6) Remove old components. - -. Enhanced DAnCE to create hierarchical naming context - path through XML descriptors. - -. Enhanced DAnCE to maintain a component state map in - the component server to manage component life cycle. - -. Some bug fixes in DAnCE. - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9 -====================================================== -. RTTI enabled versions of the Xerces library are no longer needed on - Windows platforms. - -. The CIDLC compiler now supports basic preprocessor directives: - #ifdef, #ifndef, #else, and #endif as well as the -D command- - line option. - -. The CIDLC compiler now supports incomplete struct and union - semantics which will appear in CORBA 3.1. - -. DAnCE now supports dynamically adding/removing components - to/from the existing running assembly without shutting down the - running appliation. This will allow the application developers to - evolve their applications on the fly without incuring service down - time. The service is called ReDaC (Redeployment and Reconfiguration) - - Basically ReDAC provides a whole range of redeployment and - reconfiguration granularity level, including: - - 1) Install/remove component instances of the existing component types. - 2) Install/remove component instances of a different type, i.e., a - totally new type of component. - 3) Install/remove component instances from an existing container. - 4) Install new component instances into a dynamically created brand - new container. - Move around existing components from one existing container to - another existing/new container. - 5) Install new component instances into another component server in - the same physical node. - 6) Install new component instances into another component server - into a remote host. - - To see how to use this feature, please see the ReDaC-Usage.html - under the $CIAO_ROOT/examples/Hello/ directory. - -. Removed the Old Config Handlers, which have been deprecated for some - time. Please see tools/Config_Handlers for the current version. - -. Added a step-by-step CoSMIC tutorial for modeling CIAO components - using PICML($CIAO_ROOT/docs/tutorials/CoSMIC). Using a simple Stock - Quoter system as example, this tutorial demonstrates all the steps - that needed to model Component-Based applications. - -. DAnCE now supports making connections among components across - different assemblies, and allow components to be "shared" - across assemblies seamlessly. - - Internally, DAnCE provides a reference counting mechanism when - deploying/destroying components, and a reference count table - is maintained on each NodeManager. - - From a deployer's point of view, if he/she chooses to deploy - a new assembly of component and simultaneously wants to reuse - previous deployed components in an existing running assembly, - then in the new deployment plan descriptor, he could refer - to an old component instance in the - XML tag. The "key" to identify the old component instance is - through the pair, if such a key is found - present in a previous deployed assembly, then DAnCE won't - install this component instance (specified by the ) - again, but instead it will increase the reference count of this - component instance. - - DAnCE also supports making connections from existing running - components to newly deployed components in another assembly, and - vice versa. - -. The RepositoryManager has been enhanced to support standards based - interfaces. A number of techniques have been used to ensure high - performance and scalability. - -. The RepositoryManager can now retrieve packages from remote locations via - HTTP. - -. The Target Manager is released with this CIAO release. It is an - infrastructure component which keeps track of resource usage in the - target domain. The initial domain configuration remains with the - Target Manager. A monitor framework has been built into Node Manager which - monitors the resources used within each host. This monitor reports its - data intermittently to the Target Manager which aggregates the data - received across all such hosts acroos the Target domain. The monitor - is implemented using a strategy pattern, thus enabling the plug-in of - new monitors which can monitor different resources in the domain. The - Target manager is a component thus it needs to be started using a - deployment plan. It is right now a optional component in the DAnCE - tool chain. - -. We added a skeleton implementation of the Resource Allocation and - Control Engine (RACE) which is a middleware framework built atop - CIAO/DAnCE that integrates multiple resource management algorithms for - (re)deploying and (re)configuring application components. We are in - the process of developing resource management algorithms (both - resource allocation and control algorithms) that will be a part of - future releases. - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.7 and CIAO-0.4.8 -====================================================== -. The deprecated RepositoryManager implementation, under - DAnCE/RepositoryManager, has been removed from this release. Please - use the Plan_Launcher and flattened deployment plans to deploy - component assemblies. - -. The CIDL compiler frontend now supports constants, const expressions, - bounded strings, bounded sequences, and arrays. - -. The CIDL compiler frontend now supports automatic indentation of - function arguments (both "new line" and "same line" styles are - supported). - -. Added backend CIDL compiler support for constants, arrays, bounded - strings, bounded sequences, and attribute exceptions, corresponding - to frontend support added by Boris Kolpackov . - -. Updated documentation to include instructions for building - the CIDL compiler using MakeProjectCreator (MPC). - -. Fixed a bug in the CIDL compiler's determination if an IDL - type is of fixed or variable size type, when it is declared - in the scope of an interface, valuetype or home. - -. Changes to generate servant code to support component - swapping. - -. Added capability to pass a base class event consumer to a - subscribe() operation generated for a derived event type. - -. Added support for .cdl file extension, which was belatedly - standardized by the OMG. - -. Added documentation on using Rational Purify with CIAO and - DAnCE. - -. Added tests and documentation for the IDL3-to-IDL2 converter tool. - -. RepositoryManager: - - enhanced the implementation to use various optimization techniques - - added HTTP support - - added PackageConfiguration visitor to update the locations of the - implementation artifacts with relevant HTTP URLs - - refactored some of the code and added a number of helpers functions - -. The XSC based config handlers have been heavily optimized, resulting - in greatly reduced parsing overhead for large deployments. - -. The DAnCE toolchain now supports initializing attributes which have - enumerated types. Support for other complex types is planned for the - future. Please see examples/Hello/descriptors/ - flattened_deploymentplan_without_ns.cdp for an example of how to - populate enumerated attributes. - -. Integrated Real-time QoS support into the DAnCE-based runtime and - deployment tools based on the new OMG Deployment and Configuration - (D&C) specification. Such effort allows application developers to - use real-time CORBA 1.0 features within their CCM appliation through - meta-programming (via XML metadata through DAnCE toolchain). The old - run-time and deployment tools based on original Packaging and Deployment - section of the CCM specification have been completely removed. This - work includes extensions to D&C schema, schema parsers, container and - NodeApplication. - -. Added functionality in XML parsing code to resolve schema in - $CIAO_ROOT/docs/schema instead of the local directory only. All - DeploymentPlans should use Deployment.xsd instead of - Modified_Deployment.xsd, which has been removed. - -. Fixed bug in CIDL code generation for some types of component and - home attributes. - -. Packaging and Deployment (P&D) tools have been completely removed - from this release. DAnCE is now the only supported method of - deploying components. - -. The CIAO directory structure has changed in support of the previous - item. The following important directory moves have been made: - - * $CIAO_ROOT/DAnCE/ciao => $CIAO_ROOT/ciao - * $CIAO_ROOT/DAnCE/examples => $CIAO_ROOT/examples - * $CIAO_ROOT/DAnCE/Config_Handlers => $CIAO_ROOT/tools/Config_Handlers - * Various obsolete examples/tutorials/tests have been removed. - -. Error reporting during component deployment has been greatly - improved. While debugging using CIAO_DEBUG_LEVEL is still - available, detailed error messages are now generated and propagated - to the Plan_Launcher using exceptions. - -. generate_component_mpc.pl has been updated to generate MPC files - useful by the modern CIAO infrastructure. This script now also - automatically generates export files. - -. DAnCE has been enhanced to support deploying multiple assemblies - with the same set of ExecutionManager and NodeMangers. - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.6 and CIAO-0.4.7 -====================================================== -. Added a component packaging tool to DAnCE. This tool will allow - component packagers to create from deployment plan archived - packages that wrap up all relevant component properties, - descriptors and implementation artifacts.The component packages - generated from this tool will be distributed to Repository - Manager. - -. Enhanced DAnCE to allow more than one NodeApplicationManagers within - a NodeManager. - -. Enhanced DAnCE to support configurable output of debugging information. - Support for debugging information will be added at the level of both the - DAnCE/CIAO infrastructure as well as individual component instances. - Support for tracing of the DAnCE/CIAO infrastructure will also be added. - Together, these efforts will help developers to understand the execution of - their component-based applications, as well as allowing customization of - the amount of debugging information logged - -. Added binding component to the Naming Service. A system deployer - could configure this through XML-based flattened deployment plan - descriptor. - See $CIAO_ROOT/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp - for details. Currently DAnCE only provides resolving naming service - reference through multicast, so be sure to initialize the naming service - with multicast port. - -. Added the first cut of the RepositoryManager implementation. - -. Changed scoping of code generated by the CIDL compiler to accommodate - cases where the composition declaration is enclosed in one or more - IDL modules, and/or when the composition declaration is in a different - scope than the associated component IDL declarations. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.5 and CIAO-0.4.6 -====================================================== - -. Added support for handle component activation/passivation in D&C - assemblies. - -. Added a test for the tool that converts IDL3 into equivalent IDL2. - -. Fixed CIDL compiler bug in code generation for sequence type - attributes of components. - -. Added more examples for CIAO, including a new Quoter example that is - similar to the one in TAO, as well as GUI-based example. - -. Added support for handle component activation/passivation in D&C - assemblies. - -. Added support for deactivating facets/event consumers when component - is getting deactivated. - -. Added support for destroying the component executors, when the - component is getting deactivated. - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.4 and CIAO-0.4.5 -====================================================== - -. Split the previous NodeApplication interface into NodeApplication - and Container interfaces to allow multi-container NodeApplication - support. This will be particularly useful to provide an optimized - CIAO container support for RT-CORBA features. - -. Enhanced CIAO to handle dynamic replacement of components. Please - see an example in $CIAO_ROOT/DAnCE/examples/Swapping - -. The Config Handlers have been modified to use XML parsing code - generated by the XML Schema Compiler (XSC). Binary releases of XSC can - currently be found at (http://www.dre.vanderbilt.edu/~boris/xsc), and a - recent snapshot of the CVS repository can be found at - (http://www.dre.vanderbilt.edu/~wotte/xsc.tbz2). - - Please direct all XSC inquiries/bug reports to wotte at - dre.vanderbilt.edu - -. Supported initializing attribute values on Component through XML - tags. Please refer to the $CIAO_ROOT/DAnCE/examples/Hello for - details, particularly the Hello.cid descriptor file. - -. Supported parsing component instance names and using them to generate - unique component port references, so that multiple instances of the - same component can be deployed in a single container and the client - requests could be properly designated to the appropriate ports. - -. Enhance CIAO to support establishing connections between derived - type ports and base type ports. For example, application deployer - could set up event connections between base event sink port type and - derived event source port type. - -. Enhanced the existing set of DAnCE tools to support flattened - Deployment Plan based deployment. Please refer an example in - $CIAO_ROOT/DAnCE/examples/BasicSP/flattened_deploymentplan.cdp - to see how the flattened deployment plan descriptor is used to - deploy the BasicSP example. - -. Develop regression/performance tests (similar to TAO - regression/performance tests) that will test/evaluate the - performance of various features of CIAO. - -. Added regression test script to the nightly build for DAnCE example. - This will make sure DAnCE tools could be ready to use out of - box in various platforms. - -. Improved documentation pages in various places. - -. Some bug fixes. - -. Added support for reception of eventtypes of a more derived type than - the type of the event sink. Subscription will succeed if the passed - event consumer is associated with an eventtype that is an ancestor of - the published eventtype. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.3 and CIAO-0.4.4 -====================================================== - -. Minor bugfixes. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.2 and CIAO-0.4.3 -====================================================== - -. CIDLC can generate empty executor implementations for a given - composition, which makes it easier to write executors. This can be - trigerred by passing --gen-exec-impl option while invoking CIDLC. - -. Generated container code has been refactored into base classes, - thereby reducing the amount of code generated by CIDLC. - -. A new tool for generating equivalent IDL2 declarations from IDL3 - declarations has been added. - -. Fixed a problem with DAnCE that prevented ports from getting activated - properly. - -. Added support for eventtype factories within CIDLC. - -. DAncE compiles clean and works with VC6 and Borland compilers. - -. Fixed compile errors and memory related errors on many platforms. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.4.1 and CIAO-0.4.2 -====================================================== - -. Overall - - Support for g++ 3.4.1. - - Support added for latest HP aCC compiler. - -. CCM Deployment and Configuration specification has largely been - implemented. The implementation is called "DAnCE", the Deployment - and Configuration Engine. For more information about DAnCE, and a - list of supported features, please refer to - $CIAO_ROOT/docs/releasenotes/dance.html. - -. CIDL compiler - . Added missing generation of servant code for operations and - attributes of ancestors of interfaces supported and used as ports. - . Added missing generation of factory operation(s) from inherited - home(s). - . Added support for "uses multiple" in generated code. - . Fixed bugs in generation of inherited: [Bug 1800] - home operations - attribute operations - port operations - home factory operations - supported operations - . Added automatic registration of value factories for event - consumers. - . Added support for emits-related navigation. - . Fixed bug with multiple facets that provide the same interface. - . Implemented get_all_facets() and get_all_consumers() navigation - methods. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.4 and CIAO-0.4.1 -==================================================== - -CIAO ----- - -. Added support for statically configuring an assembly. Please see - $CIAO_ROOT/docs/static_toc_ciao.html for details. - -CIDL: ------ -. Fixed incorrect generation of ACE environment macros in servant glue - code operations. - -. Fixed incorrect code generation in the body of a servant operation - that delegates to the executor class. - -. Added support for attributes in facets and supported - interfaces. - -. Fixed bug in code servant glue code generation when there are - multiple nested modules in the IDL and/or CIDL files. - -. Added missing code generation of enum type names. - -. Fixed a bug in the generation of the scoped name of a local variable - which is a _var of an executor interface for a facet. These types - are required by the CCM spec to be generated in the same scope as - the interface that underlies the facet. - -. Fixed a bug in the generation of *S.h file includes corresponding to - IDL files included in the CIDL file. - -. Added ACE style Makefiles. - -. Added support for bounded strings - -MPC -=== -. Removed all of the project type specific and unnecessary keywords. - -. Changed the defaulting rules for idl files (generated source files - will be automatically added even if idl files are explicitly - listed). - -. The makefiles generated by the gnuace type are now named GNUmakefile - instead of Makefile. - -. The IDL_Files section is no longer a built-in MPC type. It is a - custom build type defined in taoidldefaults.mpb. - -. Added support for Borland Makefiles that aren't tied to ACE_wrappers - (the bmake project type). - -. Added wild-cards to the default.rel file. Now, environment - variables that end in _ROOT are automatically considered as if they - were used with the -relative option. - -. Added an environment variable, - MPC_DEPENDENCY_COMBINED_STATIC_LIBRARY, to force MPC to put - inter-project dependencies in static vc6 and vc71 workspaces. - -. Added an html project type (originally by Justin Michel) to aid in - the debugging of mpc files. - -. Added a new keyword, pure_libs, that is put into a project - unmodified (unlike the libs and lit_libs keywords). - -. The behavior obtained through the use of the -hierarchy option is - now the default for all "make" based project types. This includes - borland, bmake, gnuace, make and nmake. - -. Added support for referencing workspace files (.mwc) from within - other workspaces. - -. Added an option, -genins, that causes MPC to generate .ins files - that can be used with prj_install.pl. This will help users install - portions of their projects into alternate directories. - -. Modified the gnuace workspace output to be based on directory - recursion instead of having inter-project dependencies built into - each workspace level GNUmakefile. - -. Added a new keyword, dependent, for use within a Define_Custom that - causes MPC to add a dependency to generated files upon the custom - command. - -. Assignments within a 'specific' section that are not recognized MPC - keywords are assumed to be template value overrides (similar to - using the -value_template option). - -. Partial support for Visual SlickEdit has been added. - -. Various bug fixes and optimizations have been added as well. - - -USER VISIBLE CHANGES BETWEEN CIAO-0.3.6 and CIAO-0.4 -==================================================== - -. Added Makefiles to build the ciao and tools subdirs by default. - -. The suport for the following IDL features have been added to the - CIDL since the last beta - - - exception (exception declaration and raises() specification) - - valuetype - - enum - - const declaration - - const expression and literals - - native - - home finder - - oneway operation - - readonly attribute - - type declaration inside interfaces, valuetypes - - union - - CIDL doesn't yet support the following features - - - Complete error detection and recovery - - Attribute exception specification - - Array - - Bounded sequence - - Fixed type - - Floating-point and Fixed-point constant expressions & literal. - - though we plan to add this support over the next several months, - depending on user/sponsor needs. diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM deleted file mode 100644 index b898604c2ed..00000000000 --- a/CIAO/PROBLEM-REPORT-FORM +++ /dev/null @@ -1,92 +0,0 @@ -[Please use the PRF form below to submit bug reports, problem - reports, etc., to the CIAO developers and interested users. - Send it to ciao-users@list.isis.vanderbilt.edu, you must be - subscribed to the list in order to be able to post to it. - If you are using OCI or PrismTech's versions of CIAO do not send bugs - to this mailing list, but instead contact those companies for support. - Please also send your PRF as plain ASCII text, _not_ uuencoded or as - an attachment. - - We prefer that all bug reports be submitted through our bug tracking - system. See $ACE_ROOT/docs/usage-bugzilla.html for more information - about how to do this. If you are unsure as to whether your problem - is a real bug or not then please submit your question to the mailing - list using the following form. Not using the problem report form - will make it harder or impossible to identify the problem, and in - many cases we will be unable to help at all. Also please try to - browse bugzilla and the ChangeLog files to find out if your problem - has been solved in a more recent version of CIAO. - - To subscribe to the list see - http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html - - Replace/remove all the explanatory text in brackets before mailing. - - Please send this form as ASCII text only. Do _not_ send it as an - attachment, or as tar'ed, compressed and/or uuencoded text. And - limit line lengths to less than 80 characters. - - PLEASE make your Subject: line as descriptive as possible. - Subjects like "CIAO bug" or "bug report" are not helpful! - Also, do _not_ include the word "help" in the Subject!] - - When including your config.h and platform_macros.GNU files as requested - below, only include the contents if you use the recommended method of - including the platform-specific file in your file. If you use a link - to the platform-specific file, simply state which one - DO NOT include - an entire platform-specific configuration file in the form. - -8<----------8<----------8<----------8<----------8<----------8<----------8<---- - -To: ciao-users@list.isis.vanderbilt.edu -Subject: [area]: [synopsis] - - CIAO VERSION: 1.3.3 - TAO VERSION : 2.3.3 - ACE VERSION : 6.3.3 - - HOST MACHINE and OPERATING SYSTEM: - If on Windows based OS's, which version of WINSOCK do you - use?: - - TARGET MACHINE and OPERATING SYSTEM, if different from HOST: - COMPILER NAME AND VERSION (AND PATCHLEVEL): - - THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform- - specific file, simply state which one]: - - THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you - use a link to a platform-specific file, simply state which one - (unless this isn't used in this case, e.g., with Microsoft Visual - C++)]: - - CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features - (used by MPC when you generate your own makefiles): - - AREA/CLASS/EXAMPLE AFFECTED: -[What example failed? What module failed to compile?] - - DOES THE PROBLEM AFFECT: - COMPILATION? - If so, what do your $ACE_ROOT/ace/config.h and - $ACE_ROOT/include/makeinclude/platform_macros.GNU contain? - LINKING? - On Unix systems, did you run make realclean first? - EXECUTION? - OTHER (please specify)? -[Please indicate whether ACE/TAO/CIAO, your application, or both are affected.] - - SYNOPSIS: -[Brief description of the problem] - - DESCRIPTION: -[Detailed description of problem. Don't just say " -doesn't work, here's a fix," explain what your program does -to get to the state. ] - - REPEAT BY: -[What you did to get the error; include test program or session -transcript if at all possible. ] - - SAMPLE FIX/WORKAROUND: -[If available ] diff --git a/CIAO/VERSION b/CIAO/VERSION deleted file mode 100644 index 92e619ce04c..00000000000 --- a/CIAO/VERSION +++ /dev/null @@ -1,8 +0,0 @@ -This is CIAO version 1.3.3, released Thu Sep 17 08:51:30 CEST 2015 - -If you have any problems with or questions about CIAO, please send -e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu), -using the form found in the file TAO/CIAO/PROBLEM-REPORT-FORM. In order -to post to the list you must subscribe to it. - -See http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html diff --git a/CIAO/bin/.gitignore b/CIAO/bin/.gitignore deleted file mode 100644 index 1ee59eb1677..00000000000 --- a/CIAO/bin/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/ciao_componentserver -/ciao_rtcomponentserver -/tao_idl3_to_idl2 -/tao_idl3_to_xmi diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst deleted file mode 100644 index 48ddbc4bb18..00000000000 --- a/CIAO/bin/ciao_tests.lst +++ /dev/null @@ -1,188 +0,0 @@ -# $Id$ -# -# This is the list of run_test.pl's that need to be run by -# auto_run_tests.pl. -# Each line has its own test, and a test can be followed by a -# list of configurations it does _not_ run on. -# -# Example: TAO\examples\foo\run_test.pl: -# -# All DDS4CCM tests are dependent on the DDS4CCM test config. Some tests are -# testing vendor specific features, these can use DDS4CCM_NDDS and -# DDS4CCM_OPENDDS -# -TAO/CIAO/examples/Hello/descriptors/run_test.pl -TAO/CIAO/examples/Hello_Event/descriptors/run_test.pl: !CCM_NOEVENT -TAO/CIAO/examples/Hello_Event/descriptors/run_test_shs.pl: !CCM_NOEVENT -TAO/CIAO/examples/Hello_Event/descriptors/run_test_PlanLocality_DifferentProcesses.pl: !CCM_NOEVENT -TAO/CIAO/examples/Hello_Event/descriptors/run_test_PlanLocality_SameProcess.pl: !CCM_NOEVENT -TAO/CIAO/examples/Hello_Event/descriptors/run_test_without_ns.pl: !CCM_NOEVENT -TAO/CIAO/examples/BasicSP/descriptors/run_test.pl: !CCM_NOEVENT -TAO/CIAO/examples/Null_Component/descriptors/run_test.pl: -TAO/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl: -TAO/CIAO/examples/Display/descriptors/run_all_in_one.pl: !CCM_NOEVENT -TAO/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/Collocation/descriptors/run_test.pl: CCM_DIRECTCOLL -TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl: -TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: -TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl: -TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl: -TAO/CIAO/tests/Thread/descriptors/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/Thread/descriptors/run_test_cdd.pl: !CCM_NOEVENT -TAO/CIAO/tests/CIF/descriptors/run_test.pl: ATIC -#TAO/CIAO/DevGuideExamples/Messenger/descriptors/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl: -TAO/CIAO/tests/IDL_Test/NonTopic_Connector/descriptors/run_test.pl: -TAO/CIAO/tests/IDL3/Connectors/run_test.pl !CCM_NOEVENT -TAO/CIAO/tests/Bug_3832_Regression/run_test.pl: -TAO/CIAO/tests/Bug_3936_Regression/run_test.pl -TAO/CIAO/tests/Bug_3937_Regression/run_test.pl -TAO/CIAO/tests/Bug_3944_Regression/run_test.pl -TAO/CIAO/tests/Bug_4086_Regression/descriptors/run_test.pl: -TAO/CIAO/tests/Bug_4086_Regression/descriptors/run_test_cdr.pl: -TAO/CIAO/tests/Bug_4087_Regression/run_test.pl: !NO_IDL3_TO_IDL2 -TAO/CIAO/tests/IDL_Test/Cornucopia/run_test.pl: DOXYGEN -TAO/CIAO/tests/Cookies/run_test.pl -TAO/CIAO/tests/TTSCTest/descriptors/run_test.pl: -TAO/CIAO/tests/TTSConnContext/descriptors/run_test.pl: -TAO/CIAO/connectors/tests/AMIDDS/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl: -TAO/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl: -TAO/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl: -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl: DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl: DDS4CCM DDS4CCM_NDDS -TAO/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl: DDS4CCM -TAO/CIAO/tests/DAnCE/NodeManager-Deployments/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl: !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_noevent.pl: -TAO/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr_noevent.pl: -TAO/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl: !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_noevent.pl: -TAO/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr_noevent.pl: -TAO/CIAO/tests/DAnCE/EM-Redeployment/run_test.pl: !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/EM-Redeployment/run_test_noevent.pl: -TAO/CIAO/tests/DAnCE/EM-Launch-Failures/run_test.pl: -TAO/CIAO/tests/DAnCE/EM-Shutdown-Failures/run_test.pl: -TAO/CIAO/tests/DAnCE/Executor-Destructor/run_test.pl: -TAO/CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl: -TAO/CIAO/tests/DAnCE/StoreReferences/run_test.pl: -TAO/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: !FIXED_BUGS_ONLY !NO_IDL3_TO_XMI !CCM_NOEVENT -TAO/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/run_test.pl: LINUX -TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test.pl: -TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl: !Win32 -TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl: -TAO/CIAO/tests/DAnCE/Threading/descriptors/run_test.pl: - diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl deleted file mode 100755 index 65cf5a88415..00000000000 --- a/CIAO/bin/generate_component_mpc.pl +++ /dev/null @@ -1,366 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# Create a MPC file content for a single component implementation. - -use Getopt::Std; - -############################################################################## -# Grab the options - -$flags = join (" ", @ARGV); - -sub VERSION_MESSAGE { - my ($output) = shift; - - print $output "generate_component_mpc.pl [-h] component_name\n"; - print $output "\n"; - print $output " -h print $output help message explaining various options\n"; - print $output " -p Dependent component name\n"; - print $output " -l Dependent component path (libpaths)\n"; - print $output " -o Component output path (libout)\n"; - print $output " -I Include path for all projects (IDL/cpp)\n"; - print $output " -n Suppress component make/project\n"; - print $output " -c Create a client makefile\n"; - print $output " -u Unique project name prefix (if not defined, name for -p flag will be used). \n"; - print $output " -b common base project(s) for all generated projects\n"; - print $output " -e Use events\n"; - print $output "\n"; - print $output "generate_component_mpc creates and save a minimum mpc file\n"; - print $output "called $com_name.mpc that is needed for a single component implementation\n"; -} - -%options=(); -$Getopt::Std::STANDARD_HELP_VERSION = true; - -if (!getopts ('henp:o:c:u:b:l:I:', \%options) || defined $options{h}) { - VERSION_MESSAGE (STDERR); - exit (1); -} - -if (defined $options{help}) { - exit (1); -} - -if ($#ARGV < 0) { - print STDERR "No component_name specified, use -h for help\n"; - exit (1); -} - -$com_name = shift @ARGV; -$UCOM_NAME = uc $com_name; - -############################################################################## -# Prologue - -if (defined $options{l}) { - $lib_paths = 'libpaths += ' . "$options{l}"; -} - -if (defined $options{o}) { - $lib_out = 'libout = ' . "$options{o}"; - $exe_out = 'exeout = ' . "$options{o}"; -} - -if (defined $options{I}) { - $include_paths_cpp = 'includes += ' . "$options{I}"; - $include_paths_idl = '-I ' . "$options{I}"; -} - -if (defined $options{b}) { - if (defined $options{e}){ - $base_projs = ", avoids_ccm_noevent, $options{b} "; - } else { - $base_projs = ", $options{b} "; - } -} else { - if (defined $options{e}) { - $base_projs = ", avoids_ccm_noevent "; - } else { - $base_projs = " "; - } -} - -if (defined $options{n}) { - $svr_suffix = "_skel"; -} -else { - $svr_suffix = "_svnt"; -} - -$USVR_SUFFIX = uc $svr_suffix; - -if (defined $options{p}) { - $stub_depend = "$options{p}".'_stub ' . "$options{p}".'_lem_stub'; - - $svr_plibs ='\ - '."$options{p}".'_skel \ - '."$options{p}".'_stub \ - '."$options{p}".'_lem_stub'; -} -else { - $svr_plibs = ""; -} - -$unique_prefix = ""; - -if (defined $options{u}) { - $unique_prefix = "$options{u}" . "_"; -} -elsif (defined $options{p}) { - $unique_prefix = "$options{p}" . "_"; -} - -$svr_p_after = ""; -if (defined $options{p}) { - $svr_p_after = "$options{p}".'_skel ' . "$options{p}" . '_lem_stub'; -} - -if (defined $options{c}) { - $client_def = -'project ('."$unique_prefix"."$options{c}".') : ccm_stub, valuetype' . "$base_projs" . ' { - exename = '."$options{c}".' - after += '."$unique_prefix"."$com_name".'_stub - libs += '."$com_name".'_stub '."$stub_depend"." - $include_paths_cpp"." - $lib_paths"." - $exe_out".' - IDL_Files { - } - - Source_Files { - '."$options{c}".'.cpp - } - - Header_Files { - } - - Inline_Files { - } -} -'; -} - - $lem_gen = -' -project('."$unique_prefix"."$com_name".'_lem_gen) : ciaoidldefaults' . "$base_projs" . '{ - after += '."$unique_prefix"."$com_name".'_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_LEM_STUB_Export \ - -Wb,stub_export_include='."$com_name".'_lem_stub_export.h \ - -SS -Gxhst '."$include_paths_idl".' - - IDL_Files {'." - $com_name".'E.idl - } -} -'.' -project('."$unique_prefix"."$com_name".'_lem_stub) : ccm_svnt' . "$base_projs" . '{ - after += '."$unique_prefix"."$com_name".'_lem_gen '."$unique_prefix"."$com_name".'_stub '."$stub_depend".' - libs += '."$stub_depend".' '."$com_name".'_stub'." - $include_paths_cpp"." - $lib_paths"." - $lib_out".' - sharedname = '."$com_name".'_lem_stub - dynamicflags += '."$UCOM_NAME".'_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - '."$com_name".'EC.cpp - } - - Header_Files { - '."$com_name".'EC.h - '."$com_name".'_lem_stub_export.h - } - - Inline_Files { - '."$com_name".'EC.inl - } -} -'; - -if (!defined $options{n}) { - $component_def = -' -project('."$unique_prefix"."$com_name".'_exec) : ciao_executor' . "$base_projs" . '{ - after += '. "$options{p}" . '_lem_stub ' . "$unique_prefix"."$com_name".'_lem_stub '."$unique_prefix"."$com_name".'_stub - sharedname = '."$com_name".'_exec - libs += '."$options{p}" . '_lem_stub ' . "$com_name".'_stub '."$com_name".'_lem_stub '."$stub_depend - $include_paths_cpp"." - $lib_paths"." - $lib_out".' - dynamicflags += '."$UCOM_NAME".'_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files {'." - $com_name".'_exec.cpp - } - - Header_Files {'." - $com_name".'_exec.h'." - $com_name".'_exec_export.h - } - - Inline_Files { - } -} -'; - $cli_idlflags = -' - idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export \ - -Wb,stub_export_include='."$com_name".'_stub_export.h \ - -Wb,skel_export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,skel_export_include='."$com_name"."$svr_suffix".'_export.h \ - -Wb,exec_export_macro='."$UCOM_NAME".'_EXEC_Export \ - -Wb,exec_export_include='."$com_name".'_exec_export.h \ - -Gxhex -Gxhsk -Gxhst' -; -} -else { - $cli_idlflags = -' - idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export \ - -Wb,stub_export_include='."$com_name".'_stub_export.h \ - -Wb,skel_export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,skel_export_include='."$com_name"."$svr_suffix".'_export.h \ - -Gxhex -Gxhsk -Gxhst' - ; -} - -$cli_base = "ccm_stub"; -$svr_base = "ciao_servant"; -$svr_after = ""; - -$svr_libs = "$com_name".'_stub '. "$com_name".'_lem_stub '; - -$svr_tmpl = ''; - -if (defined $options{n}) { - $svr_after = "$unique_prefix"."$com_name".'_stub'; - - $svr_libs = "$com_name".'_stub -'; - - $svr_src = -' - '."$com_name".'S.cpp -'; - - $svr_hdr = -' - '."$com_name".'S.h - '."$com_name".'_skel_export.h -'; - - $svr_base = "ciao_executor"; -} -else { - - $svr_idl = "$com_name".'E.idl'; - - $svr_src = -' - '."$com_name".'S.cpp - '."$com_name".'_svnt.cpp -'; - - $svr_hdr = -' - '."$com_name".'S.h - '."$com_name".'_svnt.h - '."$com_name".'_svnt_T.h - '."$com_name".'_svnt_export.h -'; - - $svr_tmpl = -' - '."$com_name".'_svnt_T.cpp -'; - -} - -$mpc_template = '// This file is generated with "'."generate_component_mpc.pl $flags".'" - -project('."$unique_prefix"."$com_name".'_idl_gen) : componentidldefaults' . "$base_projs" . '{ - custom_only = 1'." - $cli_idlflags $include_paths_idl".' - - IDL_Files { - '."$com_name".'.idl - } -} -'."$lem_gen".' -project('."$unique_prefix"."$com_name".'_stub) : '."$cli_base". "$base_projs" . '{ - after += '."$unique_prefix"."$com_name".'_idl_gen '."$stub_depend".' - libs += '."$stub_depend"." - $include_paths_cpp"." - $lib_paths"." - $lib_out".' - sharedname = '."$com_name".'_stub - dynamicflags += '."$UCOM_NAME".'_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - '."$com_name".'C.cpp - } - - Header_Files { - '."$com_name".'C.h - '."$com_name".'_stub_export.h - } - - Inline_Files { - '."$com_name".'C.inl - } -} -'."$component_def".' - -project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base". "$base_projs" . ' { - after += '."$svr_p_after "."$svr_after".' '."$unique_prefix"."$com_name".'_lem_stub'.' - sharedname = '."$com_name"."$svr_suffix".' - libs += '."$svr_libs $svr_plibs - $include_paths_cpp"." - $lib_paths"." - $lib_out".' - dynamicflags += '."$UCOM_NAME"."$USVR_SUFFIX".'_BUILD_DLL - '.' - IDL_Files { - } - - Source_Files {'."$svr_src".' } - - Header_Files {'."$svr_hdr".' } -'; - -if (!defined $options{n}) { - $mpc_template = $mpc_template.' - Template_Files {'."$svr_tmpl".' } -'; -} - -$mpc_template = $mpc_template.' - Inline_Files { - } -} - -'."$client_def -"; - -############################################################################## -# Static Stuff - -############################################################################## -# Print the stuff out - - -# MPC files -open (MPCFILE, ">", "$com_name".".mpc"); -print MPCFILE $mpc_template; diff --git a/CIAO/ccm/.gitignore b/CIAO/ccm/.gitignore deleted file mode 100644 index 1a1017d25ba..00000000000 --- a/CIAO/ccm/.gitignore +++ /dev/null @@ -1,118 +0,0 @@ -/CCM_BaseC.cpp -/CCM_BaseC.h -/CCM_BaseS.h -/CCM_CCMExceptionC.cpp -/CCM_CCMExceptionC.h -/CCM_CCMExceptionS.h -/CCM_ConfiguratorC.cpp -/CCM_ConfiguratorC.h -/CCM_ConfiguratorC.inl -/CCM_ConfiguratorS.cpp -/CCM_ConfiguratorS.h -/CCM_ContextC.cpp -/CCM_ContextC.h -/CCM_ContextS.h -/CCM_CookieC.cpp -/CCM_CookieC.h -/CCM_CookieC.inl -/CCM_CookieS.h -/CCM_EnterpriseComponentC.cpp -/CCM_EnterpriseComponentC.h -/CCM_EnterpriseComponentC.inl -/CCM_EnterpriseComponentS.h -/CCM_EnumerationC.cpp -/CCM_EnumerationC.h -/CCM_EnumerationC.inl -/CCM_EnumerationS.h -/CCM_EventBaseC.cpp -/CCM_EventBaseC.h -/CCM_EventBaseC.inl -/CCM_EventBaseS.h -/CCM_EventConsumerBaseC.cpp -/CCM_EventConsumerBaseC.h -/CCM_EventConsumerBaseC.inl -/CCM_EventConsumerBaseS.cpp -/CCM_EventConsumerBaseS.h -/CCM_EventsC.cpp -/CCM_EventsC.h -/CCM_EventsC.inl -/CCM_EventsS.cpp -/CCM_EventsS.h -/CCM_ExceptionsC.cpp -/CCM_ExceptionsC.h -/CCM_ExceptionsS.h -/CCM_ExecutorLocatorC.cpp -/CCM_ExecutorLocatorC.h -/CCM_ExecutorLocatorC.inl -/CCM_ExecutorLocatorS.h -/CCM_HomeC.cpp -/CCM_HomeC.h -/CCM_HomeC.inl -/CCM_HomeConfigurationC.cpp -/CCM_HomeConfigurationC.h -/CCM_HomeConfigurationC.inl -/CCM_HomeConfigurationS.cpp -/CCM_HomeConfigurationS.h -/CCM_HomeExecutorBaseC.cpp -/CCM_HomeExecutorBaseC.h -/CCM_HomeExecutorBaseC.inl -/CCM_HomeExecutorBaseS.h -/CCM_HomeFinderC.cpp -/CCM_HomeFinderC.h -/CCM_HomeFinderC.inl -/CCM_HomeFinderS.cpp -/CCM_HomeFinderS.h -/CCM_HomeS.cpp -/CCM_HomeS.h -/CCM_HomesC.cpp -/CCM_HomesC.h -/CCM_HomesC.inl -/CCM_HomesS.cpp -/CCM_HomesS.h -/CCM_KeylessCCMHomeC.cpp -/CCM_KeylessCCMHomeC.h -/CCM_KeylessCCMHomeC.inl -/CCM_KeylessCCMHomeS.cpp -/CCM_KeylessCCMHomeS.h -/CCM_LEM_Stub_Export.h -/CCM_NavigationC.cpp -/CCM_NavigationC.h -/CCM_NavigationC.inl -/CCM_NavigationS.cpp -/CCM_NavigationS.h -/CCM_ObjectC.cpp -/CCM_ObjectC.h -/CCM_ObjectC.inl -/CCM_ObjectS.cpp -/CCM_ObjectS.h -/CCM_PrimaryKeyBaseC.cpp -/CCM_PrimaryKeyBaseC.h -/CCM_PrimaryKeyBaseC.inl -/CCM_PrimaryKeyBaseS.cpp -/CCM_PrimaryKeyBaseS.h -/CCM_ReceptacleC.cpp -/CCM_ReceptacleC.h -/CCM_ReceptacleC.inl -/CCM_ReceptacleS.cpp -/CCM_ReceptacleS.h -/CCM_StandardConfiguratorC.cpp -/CCM_StandardConfiguratorC.h -/CCM_StandardConfiguratorC.inl -/CCM_StandardConfiguratorS.cpp -/CCM_StandardConfiguratorS.h -/CCM_Stub_Export.h -/CCM_Svnt_Export.h -/CCM_TransactionC.cpp -/CCM_TransactionC.h -/CCM_TransactionC.inl -/CCM_TransactionS.h -/ComponentsC.cpp -/ComponentsC.h -/ComponentsS.h -/CosPersistentStateC.cpp -/CosPersistentStateC.h -/CosPersistentStateC.inl -/CosPersistentStateS.h -/SecurityC.cpp -/SecurityC.h -/SecurityS.h diff --git a/CIAO/ccm/CCM_Base.idl b/CIAO/ccm/CCM_Base.idl deleted file mode 100644 index aae57b62235..00000000000 --- a/CIAO/ccm/CCM_Base.idl +++ /dev/null @@ -1,14 +0,0 @@ -// Compliant to OMG 06-04-01, section 6.6.8 - -#if !defined (CCM_BASE_IDL) -#define CCM_BASE_IDL - -module Components -{ - typeprefix Components "omg.org"; - - exception InvalidConnection {}; - exception AlreadyConnected {}; - exception NoConnection {}; -}; -#endif /* CCM_BASE_IDL */ diff --git a/CIAO/ccm/CCM_CCMException.idl b/CIAO/ccm/CCM_CCMException.idl deleted file mode 100644 index 5068f55cb90..00000000000 --- a/CIAO/ccm/CCM_CCMException.idl +++ /dev/null @@ -1,30 +0,0 @@ -// Compliant to OMG 06-04-01, section 9.3.3.2 - -#if !defined (CCM_CCMEXCEPTION_IDL) -#define CCM_CCMEXCEPTION_IDL - -module Components -{ - typeprefix Components "omg.org"; - - enum CCMExceptionReason - { - SYSTEM_ERROR, - CREATE_ERROR, - REMOVE_ERROR, - DUPLICATE_KEY, - FIND_ERROR, - OBJECT_NOT_FOUND, - NO_SUCH_ENTITY, - // Coming from QoS4CCM - QOS_ERROR, - REGISTRATION_ERROR, - SERVICE_INSTALLATION_ERROR - }; - - exception CCMException - { - CCMExceptionReason reason; - }; -}; -#endif /* CCM_CCMEXCEPTION_IDL */ diff --git a/CIAO/ccm/CCM_Configurator.idl b/CIAO/ccm/CCM_Configurator.idl deleted file mode 100644 index 0871a7c1a01..00000000000 --- a/CIAO/ccm/CCM_Configurator.idl +++ /dev/null @@ -1,25 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.10.1.1 - -#if !defined (CCM_CONFIGURATOR_IDL) -#define CCM_CONFIGURATOR_IDL - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - exception WrongComponentType {}; - - interface CCMObject; - - interface Configurator - { - void configure (in CCMObject comp) - raises (WrongComponentType); - }; -}; - -#endif - -#endif /* CCM_CONFIGURATOR_IDL */ diff --git a/CIAO/ccm/CCM_Context.idl b/CIAO/ccm/CCM_Context.idl deleted file mode 100644 index af2281299e6..00000000000 --- a/CIAO/ccm/CCM_Context.idl +++ /dev/null @@ -1,63 +0,0 @@ -// Compliant to OMG 06-04-01, section 9.3.2.1 - -#if !defined (CCM_CONTEXT_IDL) -#define CCM_CONTEXT_IDL - -#include "ccm/Security.idl" -#include "ccm/CCM_Transaction.idl" -#include "ccm/CCM_Home.idl" -#include "ccm/CCM_CCMException.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - -#if !defined (CCM_LW) - typedef SecurityLevel2::Credentials Principal; -#endif - - exception IllegalState {}; - - local interface CCMContext - { -#if !defined (CCM_LW) - Principal get_caller_principal(); -#endif - - CCMHome get_CCM_home(); - -#if !defined (CCM_LW) - boolean get_rollback_only() - raises (IllegalState); -#endif - -#if !defined (CCM_LW) - Transaction::UserTransaction get_user_transaction() - raises (IllegalState); -#endif - -#if !defined (CCM_LW) - boolean is_caller_in_role (in string role); -#endif - -#if !defined (CCM_LW) - void set_rollback_only() - raises (IllegalState); -#endif - - Object resolve_service_reference(in string service_id) - raises (CCMException); - - void - install_service_component_reference (in string service_id, - in Object objref); - - Object - uninstall_service_component_reference (in string service_id); - - - }; -}; -#endif /* CCM_CONTEXT_IDL */ diff --git a/CIAO/ccm/CCM_Cookie.idl b/CIAO/ccm/CCM_Cookie.idl deleted file mode 100644 index d462f8af9df..00000000000 --- a/CIAO/ccm/CCM_Cookie.idl +++ /dev/null @@ -1,17 +0,0 @@ -//// Compliant with OMG 06-04-01 Section 6.5.2.4 - -#if !defined (CCM_COOKIE_IDL) -#define CCM_COOKIE_IDL - -#include "tao/OctetSeq.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - valuetype Cookie - { - private CORBA::OctetSeq cookieValue; - }; -}; -#endif /* CCM_COOKIE_IDL */ diff --git a/CIAO/ccm/CCM_EnterpriseComponent.idl b/CIAO/ccm/CCM_EnterpriseComponent.idl deleted file mode 100644 index a30c33384ed..00000000000 --- a/CIAO/ccm/CCM_EnterpriseComponent.idl +++ /dev/null @@ -1,12 +0,0 @@ -// Compliant with OMG 06-04-01 Section 8.3.2 - -#if !defined (CCM_ENTERPRISECOMPONENT_IDL) -#define CCM_ENTERPRISECOMPONENT_IDL - -module Components -{ - typeprefix Components "omg.org"; - - local interface EnterpriseComponent {}; -}; -#endif /* CCM_CONTAINER_IDL */ diff --git a/CIAO/ccm/CCM_Enumeration.idl b/CIAO/ccm/CCM_Enumeration.idl deleted file mode 100644 index 00b7416e3a5..00000000000 --- a/CIAO/ccm/CCM_Enumeration.idl +++ /dev/null @@ -1,28 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 10.3.1.2 - -#if !defined (CCM_ENUMERATION_IDL) -#define CCM_ENUMERATION_IDL - -#if !defined (CCM_LW) - -#include "ccm/CCM_Object.idl" - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype Enumeration - { - boolean has_more_elements(); - CCMObject next_element(); - }; - - valuetype DefaultEnumeration : Enumeration - { - private CCMObjectSeq objects; - }; -}; - -#endif - -#endif /* CCM_ENUMERATION_IDL */ diff --git a/CIAO/ccm/CCM_EventBase.idl b/CIAO/ccm/CCM_EventBase.idl deleted file mode 100644 index 5fa3d1eb026..00000000000 --- a/CIAO/ccm/CCM_EventBase.idl +++ /dev/null @@ -1,14 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.6.1.2 - -#if !defined (CCM_EVENTBASE_IDL) -#define CCM_EVENTBASE_IDL - -#if !defined (CCM_NOEVENT) -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype EventBase {}; -}; -#endif -#endif /* CCM_EVENTBASE_IDL */ diff --git a/CIAO/ccm/CCM_EventConsumerBase.idl b/CIAO/ccm/CCM_EventConsumerBase.idl deleted file mode 100644 index cd59f4e0be9..00000000000 --- a/CIAO/ccm/CCM_EventConsumerBase.idl +++ /dev/null @@ -1,25 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.6.2 - -#if !defined (CCM_EVENTCONSUMERBASE_IDL) -#define CCM_EVENTCONSUMERBASE_IDL - -#include "ccm/CCM_EventBase.idl" -#include "tao/orb_types.pidl" - -#if !defined (CCM_NOEVENT) -module Components -{ - typeprefix Components "omg.org"; - - exception BadEventType - { - CORBA::RepositoryId expected_event_type; - }; - - interface EventConsumerBase - { - void push_event (in EventBase evt) raises (BadEventType); - }; -}; -#endif -#endif /* CCM_EVENTCONSUMERBASE_IDL */ diff --git a/CIAO/ccm/CCM_Events.idl b/CIAO/ccm/CCM_Events.idl deleted file mode 100644 index 4673ef9607c..00000000000 --- a/CIAO/ccm/CCM_Events.idl +++ /dev/null @@ -1,114 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.6.8 - -#if !defined (CCM_EVENTS_IDL) -#define CCM_EVENTS_IDL - -#include "ccm/CCM_Base.idl" -#include "ccm/CCM_Navigation.idl" -#include "ccm/CCM_Receptacle.idl" -#include "ccm/CCM_Cookie.idl" -#include "ccm/CCM_EventBase.idl" -#include "ccm/CCM_EventConsumerBase.idl" - -module Components -{ - typeprefix Components "omg.org"; - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - valuetype ConsumerDescription : PortDescription - { - public EventConsumerBase consumer; - }; - typedef sequence ConsumerDescriptions; -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - valuetype EmitterDescription : PortDescription - { - public EventConsumerBase consumer; - }; - typedef sequence EmitterDescriptions; -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - valuetype SubscriberDescription - { - public Cookie ck; - public EventConsumerBase consumer; - }; - typedef sequence SubscriberDescriptions; -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - valuetype PublisherDescription : PortDescription - { - public SubscriberDescriptions consumers; - }; - typedef sequence PublisherDescriptions; -#endif - - interface Events - { -#if !defined (CCM_NOEVENT) - EventConsumerBase get_consumer (in FeatureName sink_name) - raises (InvalidName); -#endif - -#if !defined (CCM_NOEVENT) - Cookie subscribe (in FeatureName publisher_name, - in EventConsumerBase subscriber) - raises (InvalidName, - InvalidConnection, - ExceededConnectionLimit); -#endif - -#if !defined (CCM_NOEVENT) - EventConsumerBase unsubscribe (in FeatureName publisher_name, - in Cookie ck) - raises (InvalidName, - InvalidConnection); -#endif - -#if !defined (CCM_NOEVENT) - void connect_consumer (in FeatureName emitter_name, - in EventConsumerBase consumer) - raises (InvalidName, - AlreadyConnected, - InvalidConnection); -#endif - -#if !defined (CCM_NOEVENT) - EventConsumerBase disconnect_consumer (in FeatureName source_name) - raises (InvalidName, - NoConnection); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ConsumerDescriptions get_all_consumers (); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ConsumerDescriptions get_named_consumers (in NameList names) - raises (InvalidName); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - EmitterDescriptions get_all_emitters (); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - EmitterDescriptions get_named_emitters (in NameList names) - raises (InvalidName); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - PublisherDescriptions get_all_publishers (); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - PublisherDescriptions get_named_publishers (in NameList names) - raises (InvalidName); -#endif - }; -}; -#endif /* CCM_EVENTS_IDL */ diff --git a/CIAO/ccm/CCM_Exceptions.idl b/CIAO/ccm/CCM_Exceptions.idl deleted file mode 100644 index d7feed0ddb5..00000000000 --- a/CIAO/ccm/CCM_Exceptions.idl +++ /dev/null @@ -1,25 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.7.6 - -#if !defined (CCM_EXCEPTIONS_IDL) -#define CCM_EXCEPTIONS_IDL - -module Components -{ - typeprefix Components "omg.org"; - - typedef unsigned long FailureReason; - - exception CreateFailure { - FailureReason reason; - }; - exception FinderFailure - { - FailureReason reason; - }; - exception RemoveFailure - { - FailureReason reason; - }; -}; - -#endif diff --git a/CIAO/ccm/CCM_ExecutorLocator.idl b/CIAO/ccm/CCM_ExecutorLocator.idl deleted file mode 100644 index 09ddeb620a7..00000000000 --- a/CIAO/ccm/CCM_ExecutorLocator.idl +++ /dev/null @@ -1,32 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 8.3.2 - -#if !defined (CCM_EXECUTORLOCATOR_IDL) -#define CCM_EXECUTORLOCATOR_IDL - -#include "ccm/CCM_EnterpriseComponent.idl" -#include "ccm/CCM_CCMException.idl" -#include "ccm/CCM_Object.idl" - -// *************** Extended Container Interfaces *************** - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface ExecutorLocator : EnterpriseComponent - { - Object obtain_executor (in string name) - raises (CCMException); - - void release_executor (in Object exc) - raises (CCMException); - - void configuration_complete() - raises (InvalidConfiguration); - }; -}; -#endif - -#endif /* CCM_EXECUTORLOCATOR_IDL */ diff --git a/CIAO/ccm/CCM_Home.idl b/CIAO/ccm/CCM_Home.idl deleted file mode 100644 index e1a4c7357a7..00000000000 --- a/CIAO/ccm/CCM_Home.idl +++ /dev/null @@ -1,37 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.7.6 - -#if !defined (CCM_HOME_IDL) -#define CCM_HOME_IDL - -#if !defined (CCM_LW) -#include "tao/IFR_Client/IFR_Base.pidl" -#endif - -#include "ccm/CCM_Exceptions.idl" - -module Components -{ - typeprefix Components "omg.org"; - -#if !defined (CCM_LW) - exception DuplicateKeyValue {}; - exception InvalidKey {}; - exception UnknownKeyValue {}; -#endif - - interface CCMObject; - - interface CCMHome - { -#if !defined (CCM_LW) - CORBA::IRObject get_component_def (); -#endif -#if !defined (CCM_LW) - CORBA::IRObject get_home_def (); -#endif - void remove_component (in CCMObject comp) - raises (RemoveFailure); - }; -}; - -#endif /* CCM_HOME_IDL */ diff --git a/CIAO/ccm/CCM_HomeConfiguration.idl b/CIAO/ccm/CCM_HomeConfiguration.idl deleted file mode 100644 index 231f46483ff..00000000000 --- a/CIAO/ccm/CCM_HomeConfiguration.idl +++ /dev/null @@ -1,26 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.10.2.1 - -#if !defined (CCM_HOMECONFIGURATION_IDL) -#define CCM_HOMECONFIGURATION_IDL - -#include "ccm/CCM_Configurator.idl" -#include "ccm/CCM_StandardConfigurator.idl" -#include "ccm/CCM_Home.idl" - -module Components -{ - typeprefix Components "omg.org"; - - interface HomeConfiguration : CCMHome - { -#if !defined (CCM_LW) - void set_configurator (in Configurator cfg); -#endif - void set_configuration_values (in ConfigValues config); -#if !defined (CCM_LW) - void complete_component_configuration (in boolean b); - void disable_home_configuration(); -#endif - }; -}; -#endif /* CCM_HOMECONFIGURATOR_IDL */ diff --git a/CIAO/ccm/CCM_HomeExecutorBase.idl b/CIAO/ccm/CCM_HomeExecutorBase.idl deleted file mode 100644 index 0890c2d8af0..00000000000 --- a/CIAO/ccm/CCM_HomeExecutorBase.idl +++ /dev/null @@ -1,12 +0,0 @@ -#if !defined (CCM_HOMEEXECUTORBASE_IDL) -#define CCM_HOMEEXECUTORBASE_IDL - -module Components -{ - typeprefix Components "omg.org"; - - local interface HomeExecutorBase - { - }; -}; -#endif /* CCM_HOMEEXECUTORBASE_IDL */ diff --git a/CIAO/ccm/CCM_HomeFinder.idl b/CIAO/ccm/CCM_HomeFinder.idl deleted file mode 100644 index ee7cd73c202..00000000000 --- a/CIAO/ccm/CCM_HomeFinder.idl +++ /dev/null @@ -1,32 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.8 - -#if !defined (CCM_HOMEFINDER_IDL) -#define CCM_HOMEFINDER_IDL - -#include "tao/orb_types.pidl" - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - exception HomeNotFound {}; - - interface CCMHome; - - interface HomeFinder - { - CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid) - raises (HomeNotFound); - - CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid) - raises (HomeNotFound); - - CCMHome find_home_by_name (in string home_name) - raises (HomeNotFound); - }; -}; -#endif - -#endif /* CCM_HOMEFINDER_IDL */ diff --git a/CIAO/ccm/CCM_Homes.idl b/CIAO/ccm/CCM_Homes.idl deleted file mode 100644 index a47dd2ab2a1..00000000000 --- a/CIAO/ccm/CCM_Homes.idl +++ /dev/null @@ -1,18 +0,0 @@ -/// NOT Compliant with OMG 06-04-01 Section 6.7.6 - -#if !defined (CCM_HOMES_IDL) -#define CCM_HOMES_IDL - -#include "ccm/CCM_Home.idl" - -module Components -{ - typeprefix Components "omg.org"; - - /** - * @@ Added by wotte for continued compatibility with OFCCM - */ - typedef sequence CCMHomes; -}; - -#endif /* CCM_HOMES_IDL */ diff --git a/CIAO/ccm/CCM_KeylessCCMHome.idl b/CIAO/ccm/CCM_KeylessCCMHome.idl deleted file mode 100644 index f45e5f91fef..00000000000 --- a/CIAO/ccm/CCM_KeylessCCMHome.idl +++ /dev/null @@ -1,18 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.7.7 - -#if !defined (CCM_KEYLESSCCMHOME_IDL) -#define CCM_KEYLESSCCMHOME_IDL - -#include "ccm/CCM_Object.idl" - -module Components -{ - typeprefix Components "omg.org"; - - interface KeylessCCMHome - { - CCMObject create_component() - raises (CreateFailure); - }; -}; -#endif /* CCM_KEYLESSCCMHOME_IDL */ diff --git a/CIAO/ccm/CCM_Navigation.idl b/CIAO/ccm/CCM_Navigation.idl deleted file mode 100644 index 4be578c8154..00000000000 --- a/CIAO/ccm/CCM_Navigation.idl +++ /dev/null @@ -1,52 +0,0 @@ -//// Compliant with OMG 06-04-01 Section 6.4.3.3 - -#if !defined (CCM_NAVIGATION_IDL) -#define CCM_NAVIGATION_IDL - -#include "tao/orb_types.pidl" -#include "tao/StringSeq.pidl" - -module Components -{ - typeprefix Components "omg.org"; - - typedef string FeatureName; - typedef sequence NameList; - -#if !defined (CCM_LW) - valuetype PortDescription - { - public FeatureName name; - public CORBA::RepositoryId type_id; - }; -#endif - -#if !defined (CCM_LW) - valuetype FacetDescription : PortDescription - { - public Object facet_ref; - }; - - typedef sequence FacetDescriptions; -#endif - - exception InvalidName {}; - interface Navigation - { - Object provide_facet (in FeatureName name) - raises (InvalidName); -#if !defined (CCM_LW) - FacetDescriptions get_all_facets(); -#endif - -#if !defined (CCM_LW) - FacetDescriptions get_named_facets (in NameList names) - raises (InvalidName); -#endif - -#if !defined (CCM_LW) - boolean same_component (in Object object_ref); -#endif - }; -}; -#endif /* CCM_NAVIGATION_IDL */ diff --git a/CIAO/ccm/CCM_Object.idl b/CIAO/ccm/CCM_Object.idl deleted file mode 100644 index bc7277aba5b..00000000000 --- a/CIAO/ccm/CCM_Object.idl +++ /dev/null @@ -1,57 +0,0 @@ -// Compliant with OMG 06-04-01 Section 6.11.1 - -#if !defined (CCM_OBJECT_IDL) -#define CCM_OBJECT_IDL - -#include "ccm/CCM_Events.idl" -#include "ccm/CCM_Navigation.idl" -#include "ccm/CCM_Home.idl" -#include "ccm/CCM_PrimaryKeyBase.idl" - -module Components -{ - typeprefix Components "omg.org"; - - exception InvalidConfiguration - { - }; - -#if !defined (CCM_LW) - valuetype ComponentPortDescription - { - public FacetDescriptions facets; - public ReceptacleDescriptions receptacles; -#if !defined (CCM_NOEVENT) - public ConsumerDescriptions consumers; - public EmitterDescriptions emitters; - public PublisherDescriptions publishers; -#endif - }; -#endif - -#if !defined (CCM_LW) - exception NoKeyAvailable {}; -#endif - - interface CCMObject : Navigation, Receptacles, Events - { -#if !defined (CCM_LW) - CORBA::IRObject get_component_def ( ); -#endif - CCMHome get_ccm_home( ); -#if !defined (CCM_LW) - PrimaryKeyBase get_primary_key( ) - raises (NoKeyAvailable); -#endif - void configuration_complete () - raises (InvalidConfiguration); - void remove() - raises (RemoveFailure); -#if !defined (CCM_LW) - ComponentPortDescription get_all_ports (); -#endif - }; - -typedef sequence CCMObjectSeq; -}; -#endif /* CCM_OBJECT_IDL */ diff --git a/CIAO/ccm/CCM_PrimaryKeyBase.idl b/CIAO/ccm/CCM_PrimaryKeyBase.idl deleted file mode 100644 index fc942b81375..00000000000 --- a/CIAO/ccm/CCM_PrimaryKeyBase.idl +++ /dev/null @@ -1,18 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.7.2.2 - -#if !defined (CCM_PRIMARYKEYBASE_IDL) -#define CCM_PRIMARYKEYBASE_IDL - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - abstract valuetype PrimaryKeyBase {}; - -}; - -#endif - -#endif /* CCM_PRIMARYKEYBASE_IDL */ diff --git a/CIAO/ccm/CCM_Receptacle.idl b/CIAO/ccm/CCM_Receptacle.idl deleted file mode 100644 index fce41d55af4..00000000000 --- a/CIAO/ccm/CCM_Receptacle.idl +++ /dev/null @@ -1,64 +0,0 @@ -//// Compliant with OMG 06-04-01 Section 6.5.3 - -#if !defined (CCM_RECEPTACLE_IDL) -#define CCM_RECEPTACLE_IDL - -#include "ccm/CCM_Base.idl" -#include "ccm/CCM_Navigation.idl" -#include "ccm/CCM_Cookie.idl" - -module Components -{ - typeprefix Components "omg.org"; - -#if !defined (CCM_LW) - valuetype ConnectionDescription - { - public Cookie ck; - public Object objref; - }; - typedef sequence ConnectionDescriptions; -#endif - -#if !defined (CCM_LW) - valuetype ReceptacleDescription : PortDescription - { - public boolean is_multiple; - public ConnectionDescriptions connections; - }; - typedef sequence ReceptacleDescriptions; -#endif - - exception ExceededConnectionLimit {}; - exception CookieRequired {}; - - interface Receptacles - { - Cookie connect (in FeatureName name, in Object connection) - raises (InvalidName, - InvalidConnection, - AlreadyConnected, - ExceededConnectionLimit); - - Object disconnect (in FeatureName name, in Cookie ck) - raises (InvalidName, - InvalidConnection, - CookieRequired, - NoConnection); - -#if !defined (CCM_LW) - ConnectionDescriptions get_connections (in FeatureName name) - raises (InvalidName); -#endif - -#if !defined (CCM_LW) - ReceptacleDescriptions get_all_receptacles (); -#endif - -#if !defined (CCM_LW) - ReceptacleDescriptions get_named_receptacles (in NameList names) - raises (InvalidName); -#endif - }; -}; -#endif /* CCM_RECEPTACLE_IDL */ diff --git a/CIAO/ccm/CCM_StandardConfigurator.idl b/CIAO/ccm/CCM_StandardConfigurator.idl deleted file mode 100644 index b25e3156677..00000000000 --- a/CIAO/ccm/CCM_StandardConfigurator.idl +++ /dev/null @@ -1,29 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 6.10.1.2 - -#if !defined (CCM_STANDARDCONFIGURATOR_IDL) -#define CCM_STANDARDCONFIGURATOR_IDL - -#include "ccm/CCM_Configurator.idl" -#include "ccm/CCM_Navigation.idl" - -module Components -{ - typeprefix Components "omg.org"; - - valuetype ConfigValue - { - public FeatureName name; - public any value; - }; - - typedef sequence ConfigValues; - -#if !defined (CCM_LW) - interface StandardConfigurator : Configurator - { - void set_configuration (in ConfigValues descr); - }; -#endif - -}; -#endif /* CCM_STANDARDCONFIGURATOR_IDL */ diff --git a/CIAO/ccm/CCM_Transaction.idl b/CIAO/ccm/CCM_Transaction.idl deleted file mode 100644 index 961793feb29..00000000000 --- a/CIAO/ccm/CCM_Transaction.idl +++ /dev/null @@ -1,80 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.3.2.3 - -#if !defined (CCM_TRANSACTION_IDL) -#define CCM_TRANSACTION_IDL - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - module Transaction - { - - typedef sequence TranToken; - - exception NoTransaction {}; - exception NotSupported {}; - exception SystemError {}; - exception RollbackError {}; - exception HeuristicMixed {}; - exception HeuristicRollback {}; - exception Security {}; - exception InvalidToken {}; - - enum Status - { - ACTIVE, - MARKED_ROLLBACK, - PREPARED, - COMMITTED, - ROLLED_BACK, - NO_TRANSACTION, - PREPARING, - COMMITTING, - ROLLING_BACK - }; - - local interface UserTransaction { - void begin () - raises (NotSupported, - SystemError); - - void commit () - raises (RollbackError, - NoTransaction, - HeuristicMixed, - HeuristicRollback, - Security, - SystemError); - - void rollback () - raises (NoTransaction, - Security, - SystemError); - - void set_rollback_only () - raises (NoTransaction, - SystemError); - - Status get_status() - raises (SystemError); - - void set_timeout (in long to) - raises (SystemError); - - TranToken suspend () - raises (NoTransaction, - SystemError); - - void resume (in TranToken txtoken) - raises (InvalidToken, - SystemError); - }; - }; -}; - -#endif - -#endif /* CCM_TRANSACTION_IDL */ diff --git a/CIAO/ccm/CCM_lem_stub.mpc b/CIAO/ccm/CCM_lem_stub.mpc deleted file mode 100644 index dbab62f5124..00000000000 --- a/CIAO/ccm/CCM_lem_stub.mpc +++ /dev/null @@ -1,64 +0,0 @@ -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 - - IDL_Files { - idlflags += -SS -Sci \ - -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL - idlflags += -Gxhst - Security.idl - } - - IDL_Files { - idlflags += -SS -Sci - CCM_CCMException.idl - CCM_Context.idl - } - - IDL_Files { - idlflags += -SS - CCM_EnterpriseComponent.idl - CCM_HomeExecutorBase.idl - } - -} - -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 - after += CCM_stub CCM_lem_stub_idl CCM_svnt_idl - libs += CCM_stub - IDL_Files { - } - - Header_Files { - CCM_LEM_Stub_Export.h - CCM_CCMExceptionC.h - CCM_ContextC.h - CCM_EnterpriseComponentC.h - CCM_HomeExecutorBaseC.h - SecurityC.h - CCM_CCMExceptionS.h - CCM_ContextS.h - CCM_EnterpriseComponentS.h - CCM_HomeExecutorBaseS.h - SecurityS.h - } - - Inline_Files { - CCM_HomeExecutorBaseC.inl - CCM_EnterpriseComponentC.inl - } - - Source_Files { - CCM_CCMExceptionC.cpp - CCM_ContextC.cpp - CCM_EnterpriseComponentC.cpp - CCM_HomeExecutorBaseC.cpp - SecurityC.cpp - } -} - diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc deleted file mode 100644 index 3622c7136bc..00000000000 --- a/CIAO/ccm/CCM_stub.mpc +++ /dev/null @@ -1,144 +0,0 @@ -project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype { - idlflags += -Wb,stub_export_include=CCM_Stub_Export.h \ - -Wb,stub_export_macro=CCM_STUB_Export \ - -Wb,skel_export_include=CCM_Svnt_Export.h \ - -Wb,skel_export_macro=CCM_SVNT_Export - custom_only = 1 - IDL_Files { - idlflags += -SS -Sci -Gxhst -Gxhsk - CCM_Base.idl - } - - IDL_Files { - idlflags += -SS -Sci - CCM_Exceptions.idl - } - - IDL_Files { - idlflags += -SS - CCM_Cookie.idl - CCM_Enumeration.idl - CCM_EventBase.idl - } - - IDL_Files { - idlflags += -SS -Sci - Components.idl - } - - IDL_Files { - CCM_HomeConfiguration.idl - CCM_StandardConfigurator.idl - CCM_Home.idl - CCM_Homes.idl - CCM_Object.idl - CCM_PrimaryKeyBase.idl - } - - IDL_Files { - CCM_HomeFinder.idl - CCM_Configurator.idl - CCM_KeylessCCMHome.idl - CCM_Navigation.idl - CCM_Receptacle.idl - CCM_Events.idl - CCM_EventConsumerBase.idl - } -} - -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 - after += CCM_stub_idl - IDL_Files { - } - - Header_Files { - CCM_Stub_Export.h - CCM_BaseC.h - CCM_ConfiguratorC.h - CCM_CookieC.h - CCM_EnumerationC.h - CCM_EventBaseC.h - CCM_EventConsumerBaseC.h - CCM_EventsC.h - CCM_ExceptionsC.h - CCM_HomeC.h - CCM_HomeConfigurationC.h - CCM_HomeFinderC.h - CCM_HomesC.h - CCM_KeylessCCMHomeC.h - CCM_NavigationC.h - CCM_ObjectC.h - CCM_PrimaryKeyBaseC.h - CCM_ReceptacleC.h - CCM_StandardConfiguratorC.h - ComponentsC.h - CCM_BaseS.h - CCM_ConfiguratorS.h - CCM_CookieS.h - CCM_EnumerationS.h - CCM_EventBaseS.h - CCM_EventConsumerBaseS.h - CCM_EventsS.h - CCM_ExceptionsS.h - CCM_HomeConfigurationS.h - CCM_HomeFinderS.h - CCM_HomeS.h - CCM_HomesS.h - CCM_KeylessCCMHomeS.h - CCM_NavigationS.h - CCM_ObjectS.h - CCM_PrimaryKeyBaseS.h - CCM_ReceptacleS.h - CCM_StandardConfiguratorS.h - ComponentsS.h - } - - Inline_Files { - CCM_ConfiguratorC.inl - CCM_EnumerationC.inl - CCM_EventBaseC.inl - CCM_EventConsumerBaseC.inl - CCM_EventsC.inl - CCM_HomeC.inl - CCM_HomeConfigurationC.inl - CCM_HomeFinderC.inl - CCM_HomesC.inl - CCM_KeylessCCMHomeC.inl - CCM_NavigationC.inl - CCM_ObjectC.inl - CCM_PrimaryKeyBaseC.inl - CCM_ReceptacleC.inl - CCM_StandardConfiguratorC.inl - CCM_CookieC.inl - } - - Source_Files { - CCM_BaseC.cpp - CCM_EventsC.cpp - CCM_EventBaseC.cpp - CCM_EventConsumerBaseC.cpp - CCM_EnumerationC.cpp - CCM_HomeC.cpp - CCM_HomesC.cpp - CCM_ConfiguratorC.cpp - CCM_HomeConfigurationC.cpp - CCM_KeylessCCMHomeC.cpp - CCM_StandardConfiguratorC.cpp - CCM_HomeFinderC.cpp - CCM_NavigationC.cpp - CCM_ReceptacleC.cpp - CCM_CookieC.cpp - CCM_ObjectC.cpp - CCM_PrimaryKeyBaseC.cpp - CCM_ExceptionsC.cpp - ComponentsC.cpp - } - - verbatim(gnuace, postinstall) { -" $(MKDIR) $(INSTALL_PREFIX)/share/ciao/ccm" -" ln -sf $(INSTALL_PREFIX)/include/ccm/Components.idl $(INSTALL_PREFIX)/share/ciao/ccm" - } -} diff --git a/CIAO/ccm/CCM_svnt.mpc b/CIAO/ccm/CCM_svnt.mpc deleted file mode 100644 index b68d851777d..00000000000 --- a/CIAO/ccm/CCM_svnt.mpc +++ /dev/null @@ -1,64 +0,0 @@ -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 - - IDL_Files { - idlflags += -SS - CCM_Transaction.idl - CosPersistentState.idl - CCM_ExecutorLocator.idl - } -} - -project(CCM_svnt) : install, orbsvcslib, orbsvcs_output \ - , portableserver \ - , valuetype \ - , ifr_client \ - , codecfactory \ - , pi \ - , ccm_lem_stub \ - , avoids_corba_e_compact \ - , avoids_corba_e_micro \ -{ - dynamicflags += CCM_SVNT_BUILD_DLL - after += CCM_svnt_idl - IDL_Files { - } - - Header_Files { - CCM_Svnt_Export.h - CCM_ExecutorLocatorC.h - CCM_TransactionC.h - CosPersistentStateC.h - CCM_ExecutorLocatorS.h - CCM_TransactionS.h - CosPersistentStateS.h - } - - Inline_Files { - CCM_TransactionC.inl - CosPersistentStateC.inl - CCM_ExecutorLocatorC.inl - } - - Source_Files { - CCM_TransactionC.cpp - CosPersistentStateC.cpp - CCM_ExecutorLocatorC.cpp - CCM_EventsS.cpp - CCM_EventConsumerBaseS.cpp - CCM_ConfiguratorS.cpp - CCM_HomeConfigurationS.cpp - CCM_KeylessCCMHomeS.cpp - CCM_StandardConfiguratorS.cpp - CCM_HomeS.cpp - CCM_HomesS.cpp - CCM_ObjectS.cpp - CCM_PrimaryKeyBaseS.cpp - CCM_HomeFinderS.cpp - CCM_NavigationS.cpp - CCM_ReceptacleS.cpp - } -} - diff --git a/CIAO/ccm/Components.idl b/CIAO/ccm/Components.idl deleted file mode 100644 index 8f20c692d21..00000000000 --- a/CIAO/ccm/Components.idl +++ /dev/null @@ -1,10 +0,0 @@ -#if !defined (CCM_COMPONENTS_IDL) -#define CCM_COMPONENTS_IDL - -#include "ccm/CCM_Events.idl" -#include "ccm/CCM_KeylessCCMHome.idl" -#include "ccm/CCM_Home.idl" -#include "ccm/CCM_Object.idl" - -#endif /* CCM_COMPONENTS_IDL */ - diff --git a/CIAO/ccm/CosPersistentState.idl b/CIAO/ccm/CosPersistentState.idl deleted file mode 100644 index df4545dbcfe..00000000000 --- a/CIAO/ccm/CosPersistentState.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @@ This is just a temporary file. Since TAO does not have - * CosPersistentState at all, we use this file to define - * types necessary to get ComponentBase.idl to compile. - */ - -#if !defined (CIAO_COSPERSISTENTSTATE_PIDL) -#define CIAO_COSPERSISTENTSTATE_PIDL - -#if !defined (CCM_LW) - -module CosPersistentState { - - local interface CatalogBase - { - }; - - typedef sequence _TypeId; - typedef string Pid; -}; - -#endif -#endif /* CIAO_COSPERSISTENTSTATE_PIDL */ diff --git a/CIAO/ccm/Entity/CCM_ComponentId.idl b/CIAO/ccm/Entity/CCM_ComponentId.idl deleted file mode 100644 index 9346c6a7c46..00000000000 --- a/CIAO/ccm/Entity/CCM_ComponentId.idl +++ /dev/null @@ -1,38 +0,0 @@ -// Compliant to OMG 06-04-01, section 9.4.3.1 - -#if !defined (CCM_COMPONENTID_IDL) -#define CCM_COMPONENTID_IDL - -#include "ccm/Entity/CCM_StateIdFactory.idl" - -// *************** Extended Container Interfaces *************** - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface ComponentId - { - FacetId get_target_facet(); - - SegmentId get_target_segment(); - - StateIdValue get_target_state_id (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - StateIdValue get_segment_state_id (in SegmentId seg, - in StateIdFactory sid_factory) - raises (InvalidStateIdData); - - ComponentId create_with_new_target (in FacetId new_target_facet, - in SegmentId new_target_segment); - - SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory) - raises (InvalidStateIdData); - }; -}; -#endif - -#endif /* CCM_COMPONENTID_IDL */ diff --git a/CIAO/ccm/Entity/CCM_Entity2Context.idl b/CIAO/ccm/Entity/CCM_Entity2Context.idl deleted file mode 100644 index 84cba271202..00000000000 --- a/CIAO/ccm/Entity/CCM_Entity2Context.idl +++ /dev/null @@ -1,40 +0,0 @@ -// Compliant with OMG 06-04-01 Section 9.4.3.7 - -#if !defined (CCM_ENTITY2CONTEXT_IDL) -#define CCM_ENTITY2CONTEXT_IDL - -#include "ccm/Entity/CCM_EntityContext.idl" -#include "ccm/Entity/CCM_ComponentId.idl" -#include "ccm/Extended/CCM_CCM2Context.idl" -#include "ccm/Extended/CCM_BadComponentReference.idl" - -// *************** Extended Container Interfaces *************** - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface Entity2Context : EntityContext, CCM2Context - { - ComponentId get_component_id () - raises (IllegalState); - - ComponentId create_component_id (in FacetId target_facet, - in SegmentId target_segment, - in SegmentDescrSeq seq_descrs); - - ComponentId create_monolithic_component_id (in FacetId target_facet, - in StateIdValue sid); - - Object create_ref_from_cid (in CORBA::RepositoryId repid, - in ComponentId cid); - - ComponentId get_cid_from_ref (in Object objref) - raises (BadComponentReference); - }; -}; -#endif - -#endif /* CCM_ENTITY2CONTEXT_IDL */ diff --git a/CIAO/ccm/Entity/CCM_EntityComponent.idl b/CIAO/ccm/Entity/CCM_EntityComponent.idl deleted file mode 100644 index 8943cff4169..00000000000 --- a/CIAO/ccm/Entity/CCM_EntityComponent.idl +++ /dev/null @@ -1,43 +0,0 @@ -// Compliant with OMG 06-04-01 Section 9.3.4.2 - -#if !defined (CCM_ENTITYCOMPONENT_IDL) -#define CCM_ENTITYCOMPONENT_IDL - -#include "ccm/CCM_CCMException.idl" -#include "ccm/CCM_EnterpriseComponent.idl" -#include "ccm/Entity/CCM_EntityContext.idl" - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface EntityComponent : EnterpriseComponent - { - void set_entity_context (in EntityContext ctx) - raises (CCMException); - - void unset_entity_context () - raises (CCMException); - - void ccm_activate () - raises (CCMException); - - void ccm_load () - raises (CCMException); - - void ccm_store () - raises (CCMException); - - void ccm_passivate () - raises (CCMException); - - void ccm_remove () - raises (CCMException); - }; -}; - -#endif - -#endif /* CCM_ENTITYCOMPONENT_IDL */ diff --git a/CIAO/ccm/Entity/CCM_EntityContext.idl b/CIAO/ccm/Entity/CCM_EntityContext.idl deleted file mode 100644 index ba0993d2df0..00000000000 --- a/CIAO/ccm/Entity/CCM_EntityContext.idl +++ /dev/null @@ -1,27 +0,0 @@ -// Compliant with OMG 06-04-01 Section 9.3.4.1 - -#if !defined (CCM_ENTITYCONTEXT_IDL) -#define CCM_ENTITYCONTEXT_IDL - -#include "ccm/CCM_Context.idl" -#include "ccm/CCM_Object.idl" - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface EntityContext : CCMContext - { - Object get_CCM_object () - raises (IllegalState); - - PrimaryKeyBase get_primary_key () - raises (IllegalState); - }; -}; - -#endif - -#endif /* CCM_ENTITYCONTEXT_IDL */ diff --git a/CIAO/ccm/Entity/CCM_StateIdFactory.idl b/CIAO/ccm/Entity/CCM_StateIdFactory.idl deleted file mode 100644 index 8fd6f81c235..00000000000 --- a/CIAO/ccm/Entity/CCM_StateIdFactory.idl +++ /dev/null @@ -1,62 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.4.3.1 - -#if !defined (CCM_STATEIDFACTORY) -#define CCM_STATEIDFACTORY - -#include - -#if !defined (CCM_LW) -module Components -{ - typeprefix Components "omg.org"; - - typedef short SegmentId; - const SegmentId COMPONENT_SEGMENT = 0; - - typedef short FacetId; - const FacetId COMPONENT_FACET = 0; - - typedef sequence IdData; - typedef CosPersistentState::Pid PersistentId; - - exception InvalidStateIdData {}; - - typedef short StateIdType; - const StateIdType PERSISTENT_ID = 0; - - abstract valuetype StateIdValue - { - StateIdType get_sid_type(); - IdData get_sid_data(); - }; - - local interface StateIdFactory - { - StateIdValue create (in IdData data) - raises (InvalidStateIdData); - }; - - valuetype PersistentIdValue : StateIdValue - { - private PersistentId pid; - PersistentId get_pid(); - factory init (in PersistentId pid); - }; - - valuetype SegmentDescr - { - private StateIdValue sid; - private SegmentId seg; - - StateIdValue get_sid(); - SegmentId get_seg_id(); - factory init (in StateIdValue sid, - in SegmentId seg); - }; - - typedef sequence SegmentDescrSeq; - -}; -#endif - -#endif /* CCM_STATEIDFACTORY */ diff --git a/CIAO/ccm/Entity/CCM_entity_svnt.mpc b/CIAO/ccm/Entity/CCM_entity_svnt.mpc deleted file mode 100644 index 4e0134aa3d6..00000000000 --- a/CIAO/ccm/Entity/CCM_entity_svnt.mpc +++ /dev/null @@ -1,65 +0,0 @@ -project(CCM_entity_svnt_idl) : install, ciaolib_with_idl, valuetype { - requires += dummy_label - idlflags += -Wb,export_include=CCM_Entity_Svnt_Export.h \ - -Wb,export_macro=CCM_Entity_Svnt_Export - custom_only = 1 - IDL_Files { - idlflags += -SS -Sci - CCM_EntityComponent.idl - CCM_EntityContext.idl - } - - IDL_Files { - idlflags += -SS - CCM_StateIdFactory.idl - CCM_Entity2Context.idl - CCM_ComponentId.idl - } -} - -project(CCM_entity_svnt) : install, orbsvcslib, orbsvcs_output \ - , portableserver \ - , valuetype \ - , ifr_client \ - , codecfactory \ - , pi \ - , ccm_lem_stub \ - , avoids_corba_e_compact \ - , avoids_corba_e_micro \ - , ccm_svnt { - requires += dummy_label - dynamicflags += CCM_ENTITY_SVNT_BUILD_DLL - after += CCM_entity_svnt_idl - IDL_Files { - } - - Header_Files { - CCM_Entity_Svnt_Export.h - CCM_ComponentIdC.h - CCM_Entity2ContextC.h - CCM_EntityComponentC.h - CCM_EntityContextC.h - CCM_StateIdFactoryC.h - CCM_ComponentIdS.h - CCM_Entity2ContextS.h - CCM_EntityComponentS.h - CCM_EntityContextS.h - CCM_StateIdFactoryS.h - } - - Inline_Files { - CCM_Session2ContextC.inl - CCM_StateIdFactoryC.inl - CCM_ComponentIdC.inl - CCM_Entity2ContextC.inl - } - - Source_Files { - CCM_StateIdFactoryC.cpp - CCM_ComponentIdC.cpp - CCM_Entity2ContextC.cpp - CCM_EntityContextC.cpp - CCM_EntityComponentC.cpp - } -} - diff --git a/CIAO/ccm/Extended/CCM_BadComponentReference.idl b/CIAO/ccm/Extended/CCM_BadComponentReference.idl deleted file mode 100644 index 4e40bd5319b..00000000000 --- a/CIAO/ccm/Extended/CCM_BadComponentReference.idl +++ /dev/null @@ -1,25 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.4.2.1 - -#if !defined (CCM_BADCOMPONENTREFERENCE_IDL) -#define CCM_BADCOMPONENTREFERENCE_IDL - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - enum BadComponentReferenceReason - { - NON_LOCAL_REFERENCE, - NON_COMPONENT_REFERENCE, - WRONG_CONTAINER - }; - exception BadComponentReference - { - BadComponentReferenceReason reason; - }; -}; -#endif - -#endif /* CCM_BADCOMPONENTREFERENCE_IDL */ diff --git a/CIAO/ccm/Extended/CCM_CCM2Context.idl b/CIAO/ccm/Extended/CCM_CCM2Context.idl deleted file mode 100644 index 15b741d1c23..00000000000 --- a/CIAO/ccm/Extended/CCM_CCM2Context.idl +++ /dev/null @@ -1,42 +0,0 @@ -// Compliant to OMG 06-04-01, section 9.4.1.1 - -#if !defined (CCM_2CONTEXT_IDL) -#define CCM_2CONTEXT_IDL - -#include "ccm/CCM_Context.idl" -#include "ccm/Extended/CCM_HomeRegistration.idl" -#include - -module Components -{ - typeprefix Components "omg.org"; - -#if !defined (CCM_LW) - typedef CosPersistentState::CatalogBase CatalogBase; -#endif -#if !defined (CCM_LW) - typedef CosPersistentState::_TypeId _TypeId; -#endif - - exception PolicyMismatch {}; -#if !defined (CCM_LW) - exception PersistenceNotAvailable {}; -#endif - - local interface CCM2Context : CCMContext - { -#if !defined (CCM_LW) - HomeRegistration get_home_registration (); -#endif - - void req_passivate () - raises (PolicyMismatch); - -#if !defined (CCM_LW) - CatalogBase get_persistence (in _TypeId catalog_type_id) - raises (PersistenceNotAvailable); -#endif - }; - -}; -#endif /* CCM_2CONTEXT_IDL */ diff --git a/CIAO/ccm/Extended/CCM_HomeRegistration.idl b/CIAO/ccm/Extended/CCM_HomeRegistration.idl deleted file mode 100644 index 50f239046b4..00000000000 --- a/CIAO/ccm/Extended/CCM_HomeRegistration.idl +++ /dev/null @@ -1,23 +0,0 @@ -#if !defined (CCM_HOMEREGISTRATION_IDL) -#define CCM_HOMEREGISTRATION_IDL - -#include "ccm/CCM_Home.idl" - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface HomeRegistration - { - void register_home (in CCMHome home_ref, - in string home_name); - - void unregister_home (in CCMHome home_ref); - }; -}; - -#endif - -#endif /* CCM_HOMEREGISTRATION_IDL */ diff --git a/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl b/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl deleted file mode 100644 index b0b58796a86..00000000000 --- a/CIAO/ccm/Extended/CCM_ProxyHomeRegistration.idl +++ /dev/null @@ -1,28 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.4.1.3 - -#if !defined (CCM_PROXYHOMEREGISTRATION_IDL) -#define CCM_PROXYHOMEREGISTRATION_IDL - -#include "ccm/CCM_HomeRegistration.idl" - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - exception UnknownActualHome {}; - exception ProxyHomeNotSupported {}; - - local interface ProxyHomeRegistration : HomeRegistration - { - void register_proxy_home (in CCMHome rhome, - in CCMHome ahome) - raises (UnknownActualHome, - ProxyHomeNotSupported); - }; -}; - -#endif - -#endif /* CCM_PROXYHOMEREGISTRATION_IDL */ diff --git a/CIAO/ccm/Security.idl b/CIAO/ccm/Security.idl deleted file mode 100644 index 5d4e5a2f18a..00000000000 --- a/CIAO/ccm/Security.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @@ This is just a temporary file. CIAO doesn't use the security - * service in its implementation but just using this local - * interface below from the real security service pulls in - * 250Kb of footprint - */ - -#if !defined (CIAO_SECURITY_IDL) -#define CIAO_SECURITY_IDL - -#if !defined (CCM_LW) - -#pragma prefix "omg.org" - -module SecurityLevel2 { - -# pragma version SecurityLevel2 1.8 - - local interface Credentials - { - }; -}; - -#endif - -#endif /* CIAO_SECURITY_IDL */ diff --git a/CIAO/ccm/Session/.gitignore b/CIAO/ccm/Session/.gitignore deleted file mode 100644 index 8bfc6a082a2..00000000000 --- a/CIAO/ccm/Session/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/CCM_Session_Stub_Export.h -/CCM_SessionComponentC.cpp -/CCM_SessionComponentC.h -/CCM_SessionComponentS.h -/CCM_SessionContextC.cpp -/CCM_SessionContextC.h -/CCM_SessionContextS.h -/CCM_SessionSynchronizationC.cpp -/CCM_SessionSynchronizationC.h -/CCM_SessionSynchronizationS.h diff --git a/CIAO/ccm/Session/CCM_Session2Context.idl b/CIAO/ccm/Session/CCM_Session2Context.idl deleted file mode 100644 index fc20f73e831..00000000000 --- a/CIAO/ccm/Session/CCM_Session2Context.idl +++ /dev/null @@ -1,33 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.4.2.1 - -#if !defined (CCM_SESSION2CONTEXT_IDL) -#define CCM_SESSION2CONTEXT_IDL - -#include "ccm/CCM_CCM2Context.idl" -#include "ccm/CCM_SessionContext.idl" -#include "ccm/CCM_BadComponentReference.idl" -#include "tao/OctetSeq.pidl" - -// *************** Extended Container Interfaces *************** - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface Session2Context : SessionContext, CCM2Context - { - Object create_ref (in CORBA::RepositoryId repid); - - Object create_ref_from_oid (in CORBA::OctetSeq oid, - in CORBA::RepositoryId repid); - - CORBA::OctetSeq get_oid_from_ref (in Object objref) - raises (IllegalState, - BadComponentReference); - }; -}; -#endif - -#endif /* CCM_SESSION2CONTEXT_IDL */ diff --git a/CIAO/ccm/Session/CCM_SessionComponent.idl b/CIAO/ccm/Session/CCM_SessionComponent.idl deleted file mode 100644 index 2dcc0b8d454..00000000000 --- a/CIAO/ccm/Session/CCM_SessionComponent.idl +++ /dev/null @@ -1,32 +0,0 @@ -#if !defined (CCM_SESSIONCOMPONENT_IDL) -#define CCM_SESSIONCOMPONENT_IDL - -#include "ccm/CCM_CCMException.idl" -#include "ccm/CCM_EnterpriseComponent.idl" -#include "ccm/Session/CCM_SessionContext.idl" - -// *************** Basic Container interfaces *************** - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionComponent : EnterpriseComponent - { - void set_session_context ( in SessionContext ctx) - raises (CCMException); - - void configuration_complete () - raises (CCMException); - - void ccm_activate() - raises (CCMException); - - void ccm_passivate() - raises (CCMException); - - void ccm_remove () - raises (CCMException); - }; -}; -#endif /* CCM_SESSIONCOMPONENT_IDL */ diff --git a/CIAO/ccm/Session/CCM_SessionContext.idl b/CIAO/ccm/Session/CCM_SessionContext.idl deleted file mode 100644 index b499eae209a..00000000000 --- a/CIAO/ccm/Session/CCM_SessionContext.idl +++ /dev/null @@ -1,16 +0,0 @@ -#if !defined (CCM_SESSIONCONTEXT_IDL) -#define CCM_SESSIONCONTEXT_IDL - -#include "ccm/CCM_Context.idl" - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionContext : CCMContext - { - Object get_CCM_object() - raises (IllegalState); - }; -}; -#endif /* CCM_SESSIONCONTEXT_IDL */ diff --git a/CIAO/ccm/Session/CCM_SessionSynchronization.idl b/CIAO/ccm/Session/CCM_SessionSynchronization.idl deleted file mode 100644 index f691ca40bc6..00000000000 --- a/CIAO/ccm/Session/CCM_SessionSynchronization.idl +++ /dev/null @@ -1,31 +0,0 @@ -/// Compliant with OMG 06-04-01 Section 9.3.3.3 - -#if !defined (CCM_SESSIONSYNCHRONIZATION_IDL) -#define CCM_SESSIONSYNCHRONIZATION_IDL - -#include "ccm/CCM_CCMException.idl" - -// *************** Basic Container interfaces *************** - -#if !defined (CCM_LW) - -module Components -{ - typeprefix Components "omg.org"; - - local interface SessionSynchronization - { - void after_begin () - raises (CCMException); - - void before_completion () - raises (CCMException); - - void after_completion (in boolean committed) - raises (CCMException); - }; -}; - -#endif - -#endif /* CCM_SESSIONSYNCHRONIZATION_IDL */ diff --git a/CIAO/ccm/Session/CCM_session.mpc b/CIAO/ccm/Session/CCM_session.mpc deleted file mode 100644 index 4ec8b37cfa8..00000000000 --- a/CIAO/ccm/Session/CCM_session.mpc +++ /dev/null @@ -1,54 +0,0 @@ -project(CCM_session_idl) : install, ciaolib_with_idl, valuetype { - idlflags += -Wb,stub_export_include=CCM_Session_Stub_Export.h \ - -Wb,stub_export_macro=CCM_SESSION_STUB_Export \ - -SS -Sci - custom_only = 1 - - IDL_Files { - idlflags += -Gxhst - CCM_SessionContext.idl - } - - IDL_Files { - CCM_SessionComponent.idl - CCM_SessionSynchronization.idl - } - - specific { - install_dir = ccm/Session - } -} - -project(CCM_session_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_client, ccm_lem_stub { - // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT) - dynamicflags += CCM_SESSION_STUB_BUILD_DLL - after += CCM_session_idl - - IDL_Files { - } - - Header_Files { - CCM_Session_Stub_Export.h - CCM_SessionComponentC.h - CCM_SessionContextC.h - CCM_SessionComponentS.h - CCM_SessionContextS.h - CCM_SessionSynchronizationC.h - CCM_SessionSynchronizationS.h - } - - Inline_Files { - } - - Source_Files { - CCM_SessionContextC.cpp - CCM_SessionComponentC.cpp - CCM_SessionSynchronizationC.cpp - } - - specific { - install_dir = ccm/Session - } -} - diff --git a/CIAO/ciao/Base/.gitignore b/CIAO/ciao/Base/.gitignore deleted file mode 100644 index 1ac774b2e20..00000000000 --- a/CIAO/ciao/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/CIAO_Base_stub_export.h -/CIAO_ExceptionsC.cpp -/CIAO_ExceptionsC.h -/CIAO_ExceptionsS.h -/CIAO_PropertiesC.cpp -/CIAO_PropertiesC.h -/CIAO_PropertiesS.h diff --git a/CIAO/ciao/Base/CIAO_Base.mpc b/CIAO/ciao/Base/CIAO_Base.mpc deleted file mode 100644 index 2eb77d75803..00000000000 --- a/CIAO/ciao/Base/CIAO_Base.mpc +++ /dev/null @@ -1,67 +0,0 @@ -project(CIAO_Base_IDL) : install, ciaoidldefaults, anytypecode { - idlflags += -Wb,stub_export_macro=CIAO_BASE_STUB_Export \ - -Wb,stub_export_include=CIAO_Base_stub_export.h \ - -SS -Sci - custom_only=1 - - IDL_Files { - CIAO_Properties.idl - idlflags += -Gxhst - } - - IDL_Files { - CIAO_Exceptions.idl - } - - specific { - install_dir = ciao/Base - } -} - -project(CIAO_Base_stub) : install, ciaolib_with_idl, ciao_output, \ - ciao_logger, ciao_lib, \ - ccm_cookie, ccm_configvalue { - dynamicflags += CIAO_BASE_STUB_BUILD_DLL - after += CIAO_Base_IDL - - IDL_Files { - } - Source_Files { - CIAO_PropertiesC.cpp - CIAO_ExceptionsC.cpp - Server_init.cpp - Client_init.cpp - } - Header_Files { - CIAO_PropertiesC.h - CIAO_ExceptionsC.h - Server_init.h - Client_init.h - CIAO_Base_stub_export.h - } - - specific { - install_dir = ciao/Base - } -} - -project(*_install) : install, install_data { - custom_only = 1 - specific { - install_dir = ciao - } - InstallData_Files { - gendir = . - ../../COPYING - ../../NEWS - ../../PROBLEM-REPORT-FORM - ../../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/ace/bin/tao_idl3_to_idl2\\nTAO_IDL3_TO_IDL2_DEP=\\$$(TAO_IDL3_TO_IDL2)\\$$(EXEEXT)\\n!}' -e'if (/ifndef TAO_IDL3_TO_XMI\\b/) {print qq!TAO_IDL3_TO_XMI=$(INSTALL_PREFIX)/share/ace/bin/tao_idl3_to_xmi\\nTAO_IDL3_TO_XMI_DEP=\\$$(TAO_IDL3_TO_XMI)\\$$(EXEEXT)\\n!}' $(INSTALL_PREFIX)/share/ciao/rules.ciao.GNU" -" echo export CIAO_ROOT=$(INSTALL_PREFIX)/share/ciao> $(INSTALL_PREFIX)/share/ciao/ciao-devel.sh" - } -} diff --git a/CIAO/ciao/Base/CIAO_Exceptions.idl b/CIAO/ciao/Base/CIAO_Exceptions.idl deleted file mode 100644 index 2c1df69378e..00000000000 --- a/CIAO/ciao/Base/CIAO_Exceptions.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file CIAO_Exceptions.idl - * @author William R. Otte - * - * Exceptions used by the CIAO Container. - */ - -module CIAO -{ - exception Installation_Failure - { - string name; - string reason; - }; - - exception InvalidComponent - { - string name; - string reason; - }; -}; diff --git a/CIAO/ciao/Base/CIAO_Properties.idl b/CIAO/ciao/Base/CIAO_Properties.idl deleted file mode 100644 index a0aa3ad735c..00000000000 --- a/CIAO/ciao/Base/CIAO_Properties.idl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file CIAO_Properties.idl - * @author William R. Otte - * - * Standardizes names of config values used by CIAO. - */ - -#ifndef CIAO_PROPERTIES_IDL -#define CIAO_PROPERTIES_IDL - -module CIAO -{ - module Deployment - { - const string SVNT_ENTRYPT = "edu.vanderbilt.dre.CIAO.ServantEntrypoint"; - const string SVNT_ARTIFACT = "edu.vanderbilt.dre.CIAO.ServantArtifact"; - const string EXEC_ARTIFACT = "edu.vanderbilt.dre.CIAO.ExecutorArtifact"; - const string OPEN_MODE = "edu.vanderbilt.dre.CIAO.OpenMode"; - const string COMPONENT_FACTORY = "component factory"; - const string HOME_FACTORY = "home factory"; - const string COMPONENT_HOME = "edu.vanderbilt.dre.CIAO.ComponentHomeId"; - const string CONTAINER_ID = "edu.vanderbilt.dre.CIAO.ContainerId"; - - const string CCM_CONTAINER = "edu.vanderbilt.dre.CCM.Container"; - const string CCM_HOME = "edu.vanderbilt.dre.CCM.Home"; - const string CCM_COMPONENT = "edu.vanderbilt.dre.CCM.Component"; - const string CCM_HOMEDCOMPONENT = "edu.vanderbilt.dre.CCM.HomedComponent"; - const string CCM_CONNECTOR = "edu.vanderbilt.dre.CCM.Connector"; - - const string SERVICE_REF = "edu.vanderbilt.dre.CIAO.ServiceReference"; - - }; -}; -#endif /* CIAO_PROPERTIES_IDL */ diff --git a/CIAO/ciao/Base/Client_init.cpp b/CIAO/ciao/Base/Client_init.cpp deleted file mode 100644 index 244a2f094eb..00000000000 --- a/CIAO/ciao/Base/Client_init.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "Client_init.h" -#include - -#if !defined (CCM_LW) -#include -#include -#include -#endif - -#include "ciao/Valuetype_Factories/ConfigValue.h" - -namespace CIAO -{ - int - Client_init (CORBA::ORB_ptr o) - { - CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, - Components::Cookie); -#if !defined (CCM_LW) - CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, - Components::PortDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, - Components::FacetDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init, - Components::ConnectionDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init, - Components::ReceptacleDescription); -#if !defined (CCM_NOEVENT) - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init, - Components::ConsumerDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init, - Components::EmitterDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init, - Components::SubscriberDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init, - Components::PublisherDescription); -#endif - CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init, - Components::ComponentPortDescription); -#endif - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init, - Components::ConfigValue); - return 0; - } -} diff --git a/CIAO/ciao/Base/Client_init.h b/CIAO/ciao/Base/Client_init.h deleted file mode 100644 index 4f22a717b2f..00000000000 --- a/CIAO/ciao/Base/Client_init.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- -/** - * @file Client_init.h - * - * Initializing CIAO client side ORB, if they need to. - * - * @author Nanbor Wang - */ - -#ifndef CIAO_CLIENT_INIT_H -#define CIAO_CLIENT_INIT_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Base/CIAO_Base_stub_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} -TAO_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - /** - * The initialize routine for any clients that need to access - * components. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_BASE_STUB_Export int Client_init (CORBA::ORB_ptr o); -} - -#define CIAO_REGISTER_VALUE_FACTORY(ORB,FACTORY,VALUETYPE) {\ - CORBA::ValueFactory factory = new FACTORY; \ - CORBA::ValueFactory prev_factory = \ - ORB->register_value_factory \ - (VALUETYPE::_tao_obv_static_repository_id (), \ - factory); \ - if (prev_factory) prev_factory->_remove_ref (); \ - factory->_remove_ref (); } - -#include /**/ "ace/post.h" - -#endif /* CIAO_CLIENT_INIT_H */ diff --git a/CIAO/ciao/Base/Server_init.cpp b/CIAO/ciao/Base/Server_init.cpp deleted file mode 100644 index 3f4802dd1de..00000000000 --- a/CIAO/ciao/Base/Server_init.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Server_init.h" - -#include "ciao/Base/Client_init.h" -#include "ciao/Valuetype_Factories/Cookies.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - int - Server_init (CORBA::ORB_ptr o) - { - Client_init (o); - CIAO_REGISTER_VALUE_FACTORY (o, - CIAO::Cookie_Impl_init, - Components::Cookie); - return 0; - } -} /* namespace CIAO */ diff --git a/CIAO/ciao/Base/Server_init.h b/CIAO/ciao/Base/Server_init.h deleted file mode 100644 index da8b847b800..00000000000 --- a/CIAO/ciao/Base/Server_init.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file Server_init.h - * - * Initializing CIAO Server side ORB, if they need to. - * I'm also putting some utilities functions here. - * - * @author Nanbor Wang - * @author Gan Deng - * @author William R. Otte - */ - -#ifndef CIAO_SERVER_INIT_H -#define CIAO_SERVER_INIT_H - -#include /**/ "ace/pre.h" - -#include "ciao/Base/CIAO_Base_stub_export.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include /**/ "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} -TAO_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - /** - * The initialize routine for any server that need to access - * component. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_BASE_STUB_Export int Server_init (CORBA::ORB_ptr o); -} - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVER_INIT_H */ diff --git a/CIAO/ciao/Containers/.gitignore b/CIAO/ciao/Containers/.gitignore deleted file mode 100644 index 5abb8d0e090..00000000000 --- a/CIAO/ciao/Containers/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/CIAO_Servant_Activator_export.h -/CIAO_Servant_Activator_stub_export.h -/Container_Base_export.h -/Container_BaseC.cpp -/Container_BaseC.h -/Container_BaseS.h diff --git a/CIAO/ciao/Containers/Container_Base.idl b/CIAO/ciao/Containers/Container_Base.idl deleted file mode 100644 index cf2a35e09d6..00000000000 --- a/CIAO/ciao/Containers/Container_Base.idl +++ /dev/null @@ -1,151 +0,0 @@ -/** - * @file Container_Base.idl - * @author William R. Otte - * - * Container local interface. - */ - -#include "tao/PortableServer/PortableServer_include.pidl" -#include "ccm/CCM_Home.idl" -#include "ccm/CCM_Cookie.idl" -#include "ccm/CCM_Base.idl" -#include "ccm/CCM_StandardConfigurator.idl" -#include "ccm/CCM_CCMException.idl" -#include "ciao/Base/CIAO_Exceptions.idl" -#include "ccm/CCM_Exceptions.idl" -#include "ccm/CCM_Navigation.idl" - -module Components -{ - typeprefix Components "omg.org"; - - module Deployment - { - typedef string UUID; - typedef string Location; - - typedef FailureReason InvalidConfigurationReason; - const InvalidConfigurationReason UnknownConfigValueName = 0; - const InvalidConfigurationReason InvalidConfigValueType = 1; - const InvalidConfigurationReason ConfigValueRequired = 2; - const InvalidConfigurationReason ConfigValueNotExpected = 3; - - exception UnknownImplId - { - }; - - exception InvalidLocation - { - }; - - exception ImplEntryPointNotFound - { - }; - - exception InstallationFailure - { - FailureReason reason; - }; - }; -}; - -module CIAO -{ - module Container_Types - { - enum OA_Type - { - COMPONENT_t, - HOME_t, - FACET_CONSUMER_t - }; - }; - - /** - * @interface Container - * @brief Internal container interfaces. - * - * This interface provides interfaces to two portions of the CIAO - * container architecture: The generic external container interface - * created by the component server, and the component specific container - * portions generated by the TAO_IDL compiler (the component servant) - */ - local interface Container - { - // **** Methods used by external container - Components::CCMHome install_home (in string primary_artifact, - in string entry_point, - in string servant_artifact, - in string servant_entrypoint, - in string name, - in long open_mode); - - void uninstall_home (in Components::CCMHome homeptr); - - Components::CCMObject install_component (in string primary_artifact, - in string entry_point, - in string servant_artifact, - in string servant_entrypoint, - in string name, - in long open_mode); - - void set_attributes (in Object name, - in Components::ConfigValues values); - - void activate_component (in Components::CCMObject name); - - void passivate_component (in Components::CCMObject name); - - void uninstall_component (in Components::CCMObject compptr); - - Components::Cookie connect_local_facet ( - in ::Components::CCMObject provider_ref, - in string provider_port, - in ::Components::CCMObject user_ref, - in string user_port) - raises (::Components::InvalidConnection, - ::Components::AlreadyConnected); - - void disconnect_local_facet ( - in Components::Cookie cookie, - in ::Components::CCMObject provider_ref, - in string provider_port, - in ::Components::CCMObject user_ref, - in string user_port) - raises (::Components::InvalidConnection); - - // *** Methods used by component specific container portions - Object install_servant (in PortableServer::Servant svnt, - in Container_Types::OA_Type type, - out PortableServer::ObjectId oid); - - void uninstall_servant (in PortableServer::Servant compptr, - in Container_Types::OA_Type type, - out PortableServer::ObjectId oid); - - Object generate_reference (in string obj_id, - in string repo_id, - in Container_Types::OA_Type type); - - Object get_objref (in PortableServer::Servant p); - - PortableServer::POA the_POA (); - - PortableServer::POA the_port_POA (); - - Object get_local_facet(in ::Components::CCMObject provider_ref, - in string provider_port); - - void install_service_component_reference (in string service_id, - in Object obj); - - Object uninstall_service_component_reference (in string service_id); - - Object resolve_service_reference(in string service_id) - raises (::Components::CCMException); - - void init (in string name); - - void fini (); - }; -}; diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp deleted file mode 100644 index 76aa9b152d9..00000000000 --- a/CIAO/ciao/Containers/Container_Base_T.cpp +++ /dev/null @@ -1,1222 +0,0 @@ -#ifndef CIAO_CONTAINERBASE_IMPL_T_C -#define CIAO_CONTAINERBASE_IMPL_T_C - -#include "ciao/Logger/Log_Macros.h" -#include "tao/Utils/PolicyList_Destroyer.h" -#include "ciao/Servants/Connector_Servant_Impl_Base.h" -#include "ciao/Base/CIAO_ExceptionsC.h" - -#include - -namespace CIAO -{ - template - Container_i::Container_i (CORBA::ORB_ptr o, - PortableServer::POA_ptr root_poa) - : orb_ (::CORBA::ORB::_duplicate (o)), - root_poa_ (::PortableServer::POA::_duplicate (root_poa)) - { - } - - template - Container_i::~Container_i (void) - { - } - - template - void - Container_i::fini (void) - { - ::PortableServer::POA_var comp_poa_safe = this->component_poa_._retn (); - - if (! CORBA::is_nil (comp_poa_safe.in ())) - { - comp_poa_safe->destroy (1, 1); - } - - ::PortableServer::POA_var facet_cons_poa_safe = - this->facet_cons_poa_._retn (); - - if (! CORBA::is_nil (facet_cons_poa_safe.in ())) - { - facet_cons_poa_safe->destroy (1, 1); - } - - this->root_poa_ = ::PortableServer::POA::_nil (); - this->orb_ = ::CORBA::ORB::_nil (); - } - - template - void - Container_i::init (const char* name) - { - CIAO_TRACE ("Container_i::init"); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::init - " - "Initializing a container with name <%C>\n", - name)); - - if (CORBA::is_nil (this->root_poa_.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "CIAO::Container_i: Unable " - "to initialize the POA.\n")); - - throw Components::CreateFailure (); - } - - ACE_CString component_poa_name (name); - component_poa_name += ":Component_POA"; - this->create_component_POA ( - component_poa_name.c_str (), this->root_poa_.in ()); - - ACE_CString port_poa_name (name); - port_poa_name += ":Port_POA"; - this->create_facet_consumer_POA ( - port_poa_name.c_str (), this->root_poa_.in ()); - } - - template - CORBA::Object_ptr - Container_i::install_servant (PortableServer::Servant p, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Container_i::install_servant"); - - PortableServer::POA_var poa_safe; - - switch (t) - { - case Container_Types::COMPONENT_t: - case Container_Types::HOME_t: - poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); - break; - default: - poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); - break; - } - - PortableServer::ObjectId_var tmp_id = poa_safe->activate_object (p); - CORBA::Object_var objref = poa_safe->id_to_reference (tmp_id.in ()); - oid = tmp_id._retn (); - - return objref._retn (); - } - - template - void - Container_i::uninstall (CORBA::Object_ptr objref, - Container_Types::OA_Type y) - { - CIAO_TRACE ("Container_i::uninstall"); - - PortableServer::POA_var poa_safe; - - switch (y) - { - case Container_Types::COMPONENT_t: - case Container_Types::HOME_t: - poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in()); - break; - default: - poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in()); - break; - } - - PortableServer::ServantBase_var svnt = - poa_safe->reference_to_servant (objref); - - PortableServer::ObjectId_var oid; - this->uninstall_servant (svnt.in (), y, oid.out ()); - } - - template - void - Container_i::prepare_installation (const char *entity, - const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - int open_mode, - ACE_DLL &executor_dll, - ACE_DLL &servant_dll) - { - CIAO_TRACE ("Container_i::prepare_installation"); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::prepare_installation <%C> - " - "Loading [%C] from shared libraries\n", - entity, name)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::prepare_installation <%C> - " - "Executor library [%C] with entrypoint [%C]\n", - entity, - primary_artifact, - entry_point)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::prepare_installation <%C> - " - "Servant library [%C] with entrypoint [%C]\n", - entity, - servant_artifact, - servant_entrypoint)); - - if (!primary_artifact) - { - std::ostringstream err; - err << "Component [" << name << "] has a nil component executor DLL name." ; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - - if (!servant_artifact) - { - std::ostringstream err; - err << "Component [" << name << "] has a nil component servant DLL name." ; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - - if (!entry_point) - { - std::ostringstream err; - err << "Component [" << name << "] has a nil executor entrypoint." ; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - - if (!servant_entrypoint) - { - std::ostringstream err; - err << "Component [" << name << "] has a nil servant entrypoint." ; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - - if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), - open_mode, - false) != 0) - { - std::ostringstream err; - const ACE_TCHAR* error = executor_dll.error (); - - err << "Unable to open executor DLL for component [" << name - << "]: " << error; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::prepare_installation <%C> - " - "Executor DLL [%C] successfully opened with mode <%d>\n", - entity, - primary_artifact, - open_mode - )); - } - - if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), - open_mode, - false) != 0) - { - std::ostringstream err; - const ACE_TCHAR* error = servant_dll.error (); - - err << "Unable to open servant DLL for component [" << name - << "]: " << error; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::prepare_installation <%C> - " - "ERROR: %C\n", - entity, - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, err.str ().c_str ()); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::prepare_installation <%C> - " - "Servant DLL [%C] successfully opened with mode <%d>\n", - entity, - servant_artifact, - open_mode)); - } - } - - template - void - Container_i::uninstall_home ( - Components::CCMHome_ptr homeref) - { - CIAO_TRACE ("Container_i::uninstall_home"); - - this->uninstall (homeref, Container_Types::HOME_t); - } - - template - void - Container_i::uninstall_component ( - Components::CCMObject_ptr homeref) - { - CIAO_TRACE ("Container_i::uninstall_component"); - - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - PortableServer::ServantBase_var srv_tmp = - poa_safe->reference_to_servant (homeref); - CIAO::Connector_Servant_Impl_Base * svnt = - dynamic_cast ( - srv_tmp.in ()); - - if (!svnt) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::uninstall_component - " - "Unable to convert provided servant " - "reference to servant implementation.")); - - throw ::Components::RemoveFailure (); - } - else - { - svnt->remove (); - } - } - - template - void - Container_i::uninstall_servant (PortableServer::Servant svnt, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Container_i::uninstall_servant"); - - PortableServer::POA_var poa_safe; - - if ((t == Container_Types::COMPONENT_t) || - (t == Container_Types::HOME_t)) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::uninstall_servant - " - "Removing component or home servant\n")); - - poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::uninstall_servant - " - "Removing facet or consumer servant\n")); - - poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); - } - - try - { - PortableServer::ObjectId_var tmp_id = poa_safe->servant_to_id (svnt); - poa_safe->deactivate_object (tmp_id); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::uninstall_servant - " - "Servant successfully removed, " - "reference count is %u\n", - svnt->_refcount_value () - 1)); - - oid = tmp_id._retn (); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::uninstall_servant - " - "Caught CORBA exception while " - "uninstalling servant: %C\n", - ex._info ().c_str ())); - - throw Components::RemoveFailure (); - } - } - - template - void - Container_i::activate_component ( - Components::CCMObject_ptr compref) - { - CIAO_TRACE("Container_i::activate_component"); - - try - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - CIAO::Connector_Servant_Impl_Base * svt = 0; - PortableServer::ServantBase_var servant_from_reference; - - try - { - servant_from_reference = - poa_safe->reference_to_servant (compref); - svt = - dynamic_cast ( - servant_from_reference.in ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_i::activate_component - " - "Caught unknown while retrieving servant\n")); - throw CIAO::InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::activate_component - " - "Invoking CCM activate on provided " - "component object reference.\n")); - - svt->activate_component (); - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::activate_component - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::activate_component - " - "Caught CORBA exception while activating " - "a component: %C\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::activate_component - " - "Caught unknown C++ exception while " - "activating a component.\n")); - - throw; - } - } - - template - void - Container_i::passivate_component (Components::CCMObject_ptr compref) - { - CIAO_TRACE ("Container_i::passivate_component"); - - try - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - CIAO::Connector_Servant_Impl_Base * svt = 0; - PortableServer::ServantBase_var servant_from_reference; - - try - { - servant_from_reference = - poa_safe->reference_to_servant (compref); - svt = - dynamic_cast ( - servant_from_reference.in ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_i::passivate_component - " - "Caught unknown while retrieving servant\n")); - throw InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::passivate_component - " - "Invoking CCM passivate on provided " - "component object reference.\n")); - - svt->passivate_component (); - } - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::passivate_component - " - "Caught CORBA exception while passivating " - "a component: %C\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::passivate_component - " - "Caught unknown C++ exception while " - "passivating a component.\n")); - - throw; - } - } - - template - void - Container_i::set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values) - { - CIAO_TRACE("Container_i::set_attributes"); - - try - { - PortableServer::ServantBase_var svt; - - try - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - svt = poa_safe->reference_to_servant (compref); - } - catch (const CORBA::Exception &ex) - { - std::ostringstream err; - err << "Internal Container Error: " - << "Caught CORBA Exception while retrieving servant: " - << ex._info ().c_str (); - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_i::set_attributes - %C\n", - err.str ().c_str ())); - throw CIAO::InvalidComponent (0, - err.str ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_EMERGENCY, CLINFO - "Container_i::set_attributes - %C\n" - "Internal Container Error: Unknown C++ exception " - "while retrieving servant.\n")); - throw CIAO::InvalidComponent (0, - "Internal Container Error: Unknown C++ " - "exception while retrieving servant."); - } - - if (CORBA::is_nil (svt.in ())) - { - CIAO_ERROR (1, (LM_EMERGENCY, CLINFO - "Container_i::set_attributes - %C\n" - "Internal Container Error: " - "Invalid servant reference from reference_to_servant\n")); - - throw CIAO::InvalidComponent (0, - "Internal Container Error: " - "Invalid servant reference from reference_to_servant"); - } - else - { - CIAO::Connector_Servant_Impl_Base * comp = 0; - CIAO::Home_Servant_Impl_Base *home = 0; - - if ((comp = dynamic_cast (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::set_attributes - " - "Configuring attribute values on " - "component object reference.\n")); - - comp->set_attributes (values); - } - else if ((home = dynamic_cast (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::set_attributes - " - "Configuring attribute values on " - "home object reference.\n")); - - home->set_attributes (values); - } - else - { - CIAO_ERROR (1, (LM_EMERGENCY, CLINFO - "Container_i::set_attributes - " - "Internal Container Error: Instance isn't a home or component\n")); - throw CIAO::InvalidComponent (0, - "Internal Container Error: " - "Instance isn't a home or component\n"); - } - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::set_attributes - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::BAD_PARAM &) - { - std::ostringstream err; - err << "Caught BAD_PARAM while setting attributes. Likely indicates incorrect " - << "data type in directive.\n"; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::set_attributes - " - "Error: %C\n", - err.str ().c_str ())); - - throw Installation_Failure (0, - err.str ().c_str ()); - } - catch (const CORBA::Exception &ex) - { - std::ostringstream err; - err << "Caught CORBA exception while configuring attributes: " - << ex._info ().c_str (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::set_attributes - %C\n", - err.str ().c_str ())); - throw Installation_Failure (0,err.str ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::set_attributes - " - "Caught unknown C++ exception while " - "configuring component attributes.\n")); - - throw Installation_Failure (0, - "Unknown C++ exception while configuring attributes\n"); - } - } - - template - void - Container_i::install_service_component_reference ( - const char * service_id, - CORBA::Object_ptr objref) - { - CIAO_TRACE ("Container_i::install_service_component_reference"); - if ((!service_id) || (ACE_OS::strlen(service_id) == 0)) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::install_service_component_reference - " - "service_id is NIL, throwing exception\n")); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - if (CORBA::is_nil(objref)) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::install_service_component_reference - " - "objref is NIL\n")); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - - if (this->installed_services_.find(service_id) != - this->installed_services_.end()) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::install_service_component_reference - " - "Service reference <%C> already exists.\n", service_id)); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - - CORBA::Object_var objvar = CORBA::Object::_duplicate(objref); - this->installed_services_[service_id] = objvar; - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::install_service_component_reference - " - "Service reference <%C> installed.\n", service_id)); - } - - template - CORBA::Object_ptr - Container_i::uninstall_service_component_reference ( - const char * service_id) - { - CIAO_TRACE ("Container_i::uninstall_service_component_reference"); - if ((service_id) && (ACE_OS::strlen(service_id) > 0)) - { - for (InstalledServices::iterator it = this->installed_services_.begin(); - it != this->installed_services_.end (); - ++it) - { - if (it->first == service_id) - { - CORBA::Object_var obj = it->second; - this->installed_services_.erase (it); - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::uninstall_service_component_reference - " - "Service reference <%C> uninstalled.\n", service_id)); - return obj._retn (); - } - } - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::uninstall_service_component_reference - " - "Service reference not found, throwing exception\n")); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - else - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::uninstall_service_component_reference - " - "Nil service_id provided to uninstall, " - "throwing exception\n")); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - } - - template - CORBA::Object_ptr - Container_i::resolve_service_reference (const char *service_id) - { - CIAO_TRACE ("Container_i::resolve_service_reference"); - - //ami4ccm uses this part of the code, - if (ACE_OS::strcmp (service_id, "POA") == 0) - { - return ::PortableServer::POA::_duplicate (this->component_poa_.in ()); - } - - //search - InstalledServices::iterator it = - this->installed_services_.find (service_id); - if (it != this->installed_services_.end ()) - { - return CORBA::Object::_duplicate(it->second); - } - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::resolve_service_reference - " - "service_i <%C> not found\n", service_id)); - // not found. - throw Components::CCMException (Components::OBJECT_NOT_FOUND); - } - - template - PortableServer::POA_ptr - Container_i::the_POA (void) - { - return ::PortableServer::POA::_duplicate (this->component_poa_.in ()); - } - - template - PortableServer::POA_ptr - Container_i::the_port_POA (void) - { - return ::PortableServer::POA::_duplicate (this->facet_cons_poa_.in ()); - } - - template - CORBA::ORB_ptr - Container_i::the_ORB (void) const - { - return this->orb_.in (); - } - - template - void - Container_i::create_component_POA (const char *name, - PortableServer::POA_ptr root) - { - CIAO_TRACE ("Container_i::create_component_POA"); - - PortableServer::POAManager_var poa_manager = - root->the_POAManager (); - - CORBA::PolicyList policies; - this->component_poa_ = - root->create_POA (name, poa_manager.in (), policies); - } - - template - void - Container_i::create_facet_consumer_POA (const char *name, - PortableServer::POA_ptr root) - { - CIAO_TRACE ("Container_i::create_facet_consumer_POA"); - - PortableServer::POAManager_var poa_manager = root->the_POAManager (); - - TAO::Utils::PolicyList_Destroyer policies (1); - policies.length (1); - - policies[0] = - root->create_id_assignment_policy (PortableServer::USER_ID); - - this->facet_cons_poa_ = - root->create_POA (name, - poa_manager.in (), - policies); - } - - template - ::CORBA::Object_ptr - Container_i::get_local_facet(::Components::CCMObject_ptr provider, - const char * provider_port) - { - if (!provider_port ) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::get_local_facet - " - "Nil port name provided to get local " - "facet, throwing exception\n")); - - throw ::Components::InvalidConnection (); - } - - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - - PortableServer::ServantBase_var provider_tmp = - poa_safe->reference_to_servant (provider); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::get_local_facet - " - "Successfully fetched provider servant" - " [%C] from POA\n", - provider_port)); - - CIAO::Connector_Servant_Impl_Base *prov_serv = - dynamic_cast (provider_tmp.in ()); - - if (!prov_serv) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::get_local_facet - " - "Unable to cast to provider servant " - "implementation\n")); - throw ::Components::InvalidConnection (); - } - - return prov_serv->get_facet_executor (provider_port); - - } - - - template - ::Components::Cookie * - Container_i::connect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Container_i::connect_local_facet"); - - if (!provider_port || !user_port) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Nil port name provided to connect local " - "facet, throwing exception\n")); - - throw ::Components::InvalidConnection (); - } - - try - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - - PortableServer::ServantBase_var user_tmp = - poa_safe->reference_to_servant (user); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO "Container_i::connect_local_facet - " - "Successfully fetched user servant [%C] from POA\n", user_port)); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast (user_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Unable to cast to user " - "servant implementation\n")); - - throw ::Components::InvalidConnection (); - } - - ::CORBA::Object_var exec = - this->get_local_facet(provider, provider_port); - - // Note: Spec says that facet executor provided by component MAY BE NIL - if (!::CORBA::is_nil (exec.in ())) - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::connect_local_facet - " - "Create connection between [%C]" - " and [%C]\n", - user_port, - provider_port)); - ::Components::Cookie_var cookie = - user_serv->connect (user_port, exec.in ()); - return cookie._retn (); - } - else - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::connect_local_facet - " - "Got nil facet executor for [%C]\n", - provider_port)); - } - } - catch (const ::Components::InvalidConnection &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Caught exception InvalidConnection while connecting " - "<%C> to <%C>\n", - provider_port, - user_port)); - - throw ex; - } - catch (const ::Components::InvalidName &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Caught exception InvalidName while connecting " - "<%C> to <%C>\n", - provider_port, - user_port)); - - throw ex; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::connect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - return 0; - } - - template - void - Container_i::disconnect_local_facet ( - ::Components::Cookie * cookie, - ::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Container_i::disconnect_local_facet"); - - try - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - PortableServer::ServantBase_var srv_tmp = - poa_safe->reference_to_servant (provider); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::disconnect_local_facet - " - "Successfully fetched provider servant from POA\n")); - - CIAO::Connector_Servant_Impl_Base *prov_serv = - dynamic_cast (srv_tmp.in ()); - - if (prov_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::disconnect_local_facet - " - "Unable to cast to provider servant " - "implementation\n")); - - throw ::Components::InvalidConnection (); - } - - srv_tmp = poa_safe->reference_to_servant (user); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Container_i::disconnect_local_facet - " - "Successfully fetched user servant from POA\n")); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast (srv_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::disconnect_local_facet - " - "Unable to cast to user servant " - "implementation\n")); - - throw ::Components::InvalidConnection (); - } - - ::CORBA::Object_var exec = - prov_serv->get_facet_executor (provider_port); - - // Note: Spec says that facet executor provided by component MAY BE NIL - if (!::CORBA::is_nil (exec.in ())) - { - ::CORBA::Object_var port = user_serv->disconnect (user_port, cookie); - } - else - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Container_i::disconnect_local_facet - " - "Got nil facet executor for [%C]\n", - provider_port)); - } - } - catch (const ::Components::InvalidName &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::disconnect_local_facet - " - "Caught exception InvalidName while connecting " - "<%C> to <%C>\n", - provider_port, - user_port)); - - throw ex; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::disconnect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Container_i::disconnect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - } - - template - ::CORBA::Object_ptr - Container_i::get_objref (PortableServer::Servant p) - { - PortableServer::POA_var poa_safe = - PortableServer::POA::_duplicate(this->component_poa_.in ()); - return poa_safe->servant_to_reference (p); - } - - template - CORBA::Object_ptr - Container_i::generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t) - { - CIAO_TRACE ("Container_i::generate_reference"); - - PortableServer::POA_var poa_safe; - - if (t == Container_Types::COMPONENT_t - || t == Container_Types::HOME_t) - { - poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); - } - else - { - poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); - } - - PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId (obj_id); - - CORBA::Object_var objref = - poa_safe->create_reference_with_id (oid.in (), repo_id); - - return objref._retn (); - } -} - -#endif /* CIAO_CONTAINERBASE_IMPL_T_C */ - diff --git a/CIAO/ciao/Containers/Container_Base_T.h b/CIAO/ciao/Containers/Container_Base_T.h deleted file mode 100644 index 015808adaf9..00000000000 --- a/CIAO/ciao/Containers/Container_Base_T.h +++ /dev/null @@ -1,207 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Container_Base_T.h - * - * Header file for CIAO's container implementations - * - * @author Nanbor Wang - * @author Gan Deng - */ -//============================================================================= - -#ifndef CIAO_CONTAINER_BASE_T_H -#define CIAO_CONTAINER_BASE_T_H - -#include /**/ "ace/pre.h" -#include - -#include "tao/LocalObject.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/PortableServer.h" -#include "ciao/Containers/Container_BaseC.h" -#include "tao/PortableServer/Servant_Base.h" - -namespace CIAO -{ - /** - * @class Container_i - * - * @brief Common container interface definition. - * - * Perhaps we can use local interface to define these interfaces as - * we will also get reference counting automatically. - */ - - template - class Container_i : - public virtual BASE, - public virtual ::CORBA::LocalObject - { - public: - Container_i (CORBA::ORB_ptr o, PortableServer::POA_ptr root_poa); - - virtual ~Container_i (void); - - /// Initialize the container with a name. - virtual void init (const char *name); - - /// Cleanup method - virtual void fini (void); - - /// Get component's POA. - virtual PortableServer::POA_ptr the_POA (void); - virtual PortableServer::POA_ptr the_port_POA (void); - - /// Install a new home - virtual Components::CCMHome_ptr install_home (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode) = 0; - - /// Uninstall a servant for component or home. - virtual void uninstall_home (Components::CCMHome_ptr homeref); - - virtual Components::CCMObject_ptr install_component (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode) = 0; - - virtual void set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values); - - /// Activate component - virtual void activate_component (Components::CCMObject_ptr compref); - - /// Passivate a component - virtual void passivate_component (Components::CCMObject_ptr compref); - - /// Uninstall a given component - virtual void uninstall_component (Components::CCMObject_ptr compref); - - /// Connect a local facet - virtual ::Components::Cookie * - connect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - /// Disconnect a local facet - virtual void - disconnect_local_facet (::Components::Cookie * cookie, - ::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - virtual CORBA::Object_ptr install_servant (PortableServer::Servant objref, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - /// Uninstall a servant for component. - virtual void uninstall_servant (PortableServer::Servant objref, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p); - - /// Analog of the POA method that creates an object reference from - /// an object id string. - virtual CORBA::Object_ptr generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t); - - /// Get a reference to the underlying ORB. - CORBA::ORB_ptr the_ORB (void) const; - - virtual - CORBA::Object_ptr get_local_facet(::Components::CCMObject_ptr provider_ref, - const char * provider_port); - - virtual void - install_service_component_reference (const char * service_id, - CORBA::Object_ptr objref); - - virtual CORBA::Object_ptr - uninstall_service_component_reference (const char * service_id); - - - virtual CORBA::Object_ptr resolve_service_reference (const char *service_id); - - protected: - /// Reference to the ORB - CORBA::ORB_var orb_; - - /// POA used as root - PortableServer::POA_var root_poa_; - - /// POA within which all the components in this container will be - /// activated. - PortableServer::POA_var component_poa_; - - /// POA within which all the facets and receptacles will be - /// activated. - /** - * Having two POA's allows us to associate different policies that - * are distinct from the component. - */ - PortableServer::POA_var facet_cons_poa_; - - /// Uninstall a servant for component or home. - void uninstall (CORBA::Object_ptr objref, Container_Types::OA_Type t); - - void prepare_installation (const char *entity, - const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - int open_mode, - ACE_DLL &executor_dll, - ACE_DLL &servant_dll); - - private: - /// Not allowed to be used - Container_i (void); - - /// Create POA for the component. - /** - * This is the POA that is returned to the component applications - * if they need one. - */ - void create_component_POA (const char *name, - PortableServer::POA_ptr root); - - /// Create POA for the facets and consumers alone. - void create_facet_consumer_POA (const char *name, - PortableServer::POA_ptr root); - - //Administration of installed service - typedef std::map InstalledServices; - InstalledServices installed_services_; - - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ciao/Containers/Container_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ciao/Containers/Container_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_CONTAINER_BASE_T_H */ diff --git a/CIAO/ciao/Containers/Containers.mpc b/CIAO/ciao/Containers/Containers.mpc deleted file mode 100644 index 1f877e5fac6..00000000000 --- a/CIAO/ciao/Containers/Containers.mpc +++ /dev/null @@ -1,36 +0,0 @@ -project(CIAO_Container_Base_idl) : install, taoidldefaults { - custom_only = 1 - - idlflags += -Wb,export_include=Container_Base_export.h \ - -Wb,export_macro=CIAO_CONTAINER_BASE_Export \ - -SS -Sci -Gxhst - - IDL_Files { - Container_Base.idl - } - specific { - install_dir = ciao/Containers - } -} -project(CIAO_Container_Base_stub) : install, ciao_lib, ccm_svnt { - after += CIAO_Container_Base_idl - dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL - - IDL_Files { - } - Source_Files { - Container_BaseC.cpp - } - Header_Files { - Container_Base_T.h - Container_Base_export.h - Container_BaseC.h - Container_BaseS.h - } - Template_Files { - Container_Base_T.cpp - } - specific { - install_dir = ciao/Containers - } -} diff --git a/CIAO/ciao/Containers/Session/.gitignore b/CIAO/ciao/Containers/Session/.gitignore deleted file mode 100644 index bba77e05a3b..00000000000 --- a/CIAO/ciao/Containers/Session/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Session_Container_export.h -/Session_Container_stub_export.h -/Session_ContainerC.cpp -/Session_ContainerC.h -/Session_ContainerS.h diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp deleted file mode 100644 index bf259140b77..00000000000 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ /dev/null @@ -1,335 +0,0 @@ -#include "Session_Container.h" - -#include "ciao/Servants/Servant_Impl_Base.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Base/CIAO_ExceptionsC.h" - -namespace CIAO -{ - /////////////////////////////////////////////////////////////// - - Session_Container_i::Session_Container_i (CORBA::ORB_ptr o, - PortableServer::POA_ptr poa) - : Container_i < ::CIAO::Session_Container> (o, poa) - { - } - - Session_Container_i::~Session_Container_i (void) - { - } - - void - Session_Container_i::init (const char *name) - { - Container_i < ::CIAO::Session_Container>::init (name); - } - - void - Session_Container_i::fini (void) - { - CIAO_TRACE ("Session_Container_i::fini"); - - Container_i < ::CIAO::Session_Container>::fini (); - } - - //@@ Apparently we need to be cautious when handling the exception - // thrown here. We should make sure that new DnC interfaces - // NodeApplication/NodeApplicationManager etc will cache the new - // exceptions--> rethrow of new exceptions is needed. - // --Tao - Components::CCMHome_ptr - Session_Container_i::install_home (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode) - { - CIAO_TRACE ("Session_Container_i::install_home"); - - ACE_DLL executor_dll; - ACE_DLL servant_dll; - - Container_i < ::CIAO::Session_Container>::prepare_installation ("Session Home", - primary_artifact, - entry_point, - servant_artifact, - servant_entrypoint, - name, - open_mode, - executor_dll, - servant_dll); - - void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - - ptrdiff_t tmp_ptr = reinterpret_cast (void_ptr_executor); - HomeFactory hcreator = reinterpret_cast (tmp_ptr); - - tmp_ptr = reinterpret_cast (void_ptr_servant); - HomeServantFactory screator = reinterpret_cast (tmp_ptr); - - if (hcreator == 0) - { - std::ostringstream err; - err << "Home executor factory function [" << entry_point << "] invalid in DLL [" - << primary_artifact; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home " - "- Error: %C\n", - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, - err.str ().c_str ()); - } - - if (screator == 0) - { - std::ostringstream err; - err << "Home servant factory function [" << servant_entrypoint << "] invalid in DLL [" - << servant_artifact; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home " - "- Error: %C\n", - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, - err.str ().c_str ()); - } - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home" - " - Loading home executor\n")); - - Components::HomeExecutorBase_var home_executor = hcreator (); - - if (CORBA::is_nil (home_executor.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "Home executor factory failed.\n")); - - throw CIAO::Installation_Failure (name, - "Home executor factory function failed\n"); - } - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home" - " - Loading home servant\n")); - - PortableServer::Servant home_servant = - screator (home_executor.in (), this, name); - - if (home_servant == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "Home servant factory failed.\n")); - - throw CIAO::Installation_Failure (name, - "Home servant factory function failed\n"); - } - - PortableServer::ServantBase_var safe (home_servant); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home " - "- Installing home servant\n")); - - PortableServer::ObjectId_var oid; - - CORBA::Object_var objref = - this->install_servant (home_servant, - Container_Types::HOME_t, - oid.out ()); - - Components::CCMHome_var homeref = - Components::CCMHome::_narrow (objref.in ()); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home - " - "Home successfully created with name\n")); - - return homeref._retn (); - } - - Components::CCMObject_ptr - Session_Container_i::install_component (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode) - { - CIAO_TRACE ("Session_Container_i::install_component"); - - ACE_DLL executor_dll; - ACE_DLL servant_dll; - - Container_i < ::CIAO::Session_Container>::prepare_installation ("Session Component", - primary_artifact, - entry_point, - servant_artifact, - servant_entrypoint, - name, - open_mode, - executor_dll, - servant_dll); - - void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - - ptrdiff_t tmp_ptr = reinterpret_cast (void_ptr_executor); - ComponentFactory ccreator = reinterpret_cast (tmp_ptr); - - tmp_ptr = reinterpret_cast (void_ptr_servant); - ComponentServantFactory screator = reinterpret_cast (tmp_ptr); - - if (ccreator == 0) - { - std::ostringstream err; - err << "Entry point [" << entry_point << "] invalid in DLL [" - << primary_artifact; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component " - "- Error: %C\n", - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, - err.str ().c_str ()); - } - - if (screator == 0) - { - std::ostringstream err; - err << "Entry point [" << servant_entrypoint << "] invalid in DLL [" - << servant_artifact; - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component " - "- Error: %C\n", - err.str ().c_str ())); - - throw CIAO::Installation_Failure (name, - err.str ().c_str ()); - } - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_component - " - "Loading component executor\n")); - - Components::EnterpriseComponent_var component_executor; - try - { - component_executor = ccreator (); - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, CLINFO - "Session_Container_i::install_component - " - "Caught unexpected exception from component factory.")); - throw CIAO::Installation_Failure (name, - "Component executor factory threw exception"); - } - - if (CORBA::is_nil (component_executor.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "Component executor factory failed.\n")); - - throw CIAO::Installation_Failure (name, - "Component executor factory failed"); - } - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_component - " - "Loading component servant\n")); - - PortableServer::Servant component_servant; - - try - { - component_servant = screator (component_executor.in (), - this, - name); - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, CLINFO - "Session_Container_i::install_component - " - "Caught unexpected exception from component servant factory.")); - throw CIAO::Installation_Failure (name, - "Component servant factory threw exception"); - } - - - if (component_servant == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "Component servant factory failed.\n")); - - throw CIAO::Installation_Failure (name, - "Component servant factory failed"); - } - - PortableServer::ServantBase_var safe (component_servant); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_component - " - "Installing component servant\n")); - - PortableServer::ObjectId_var oid; - - CORBA::Object_var objref = - this->install_servant (component_servant, - Container_Types::COMPONENT_t, - oid.out ()); - - Components::CCMObject_var componentref = - Components::CCMObject::_narrow (objref.in ()); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Session_Container_i::install_component - " - "Component successfully created\n")); - - return componentref._retn (); - } -} - diff --git a/CIAO/ciao/Containers/Session/Session_Container.h b/CIAO/ciao/Containers/Session/Session_Container.h deleted file mode 100644 index fc58feb39e2..00000000000 --- a/CIAO/ciao/Containers/Session/Session_Container.h +++ /dev/null @@ -1,91 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Session_Container.h - * - * Header file for CIAO's container implementations - * - * @author Nanbor Wang - * @author Gan Deng - */ -//============================================================================= - -#ifndef CIAO_SESSION_CONTAINER_H -#define CIAO_SESSION_CONTAINER_H - -#include /**/ "ace/pre.h" - -#include "ciao/Containers/Session/Session_Container_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Containers/Container_Base_T.h" -#include "ciao/Containers/Session/Session_ContainerC.h" -#include "ccm/CCM_HomeExecutorBaseC.h" -#include "ccm/CCM_EnterpriseComponentC.h" - -namespace CIAO -{ - typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void); - typedef ::PortableServer::Servant (*HomeServantFactory) (::Components::HomeExecutorBase_ptr p, - ::CIAO::Session_Container_ptr c, - const char *ins_name); - typedef ::Components::EnterpriseComponent_ptr (*ComponentFactory) (void); - typedef ::PortableServer::Servant (*ComponentServantFactory) (::Components::EnterpriseComponent_ptr, - ::CIAO::Session_Container_ptr, - const char *); - - class SESSION_CONTAINER_Export Session_Container_i : - public Container_i < ::CIAO::Session_Container> - { - public: - Session_Container_i (CORBA::ORB_ptr o, - PortableServer::POA_ptr poa); - - virtual ~Session_Container_i (void); - - /// Initialize the container with a name. - virtual void init (const char *name); - - virtual void fini (void); - - /** - * @brief Simply installing a home executor into the component. - * - * This operation install a home executor into the component. It - * requires the name of the DLLs to executor and the servant glue - * code, and the entry points to the respective DLLs. Currently, - * we don't try to manage the lifetime of DLL objects, but we - * should at some later point. - * - * @retval Home objref of the installed home. - */ - /// Install a new home - virtual Components::CCMHome_ptr install_home (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode); - - /// Install a new component - virtual Components::CCMObject_ptr install_component (const char *primary_artifact, - const char *entry_point, - const char *servant_artifact, - const char *servant_entrypoint, - const char *name, - CORBA::Long open_mode); - - private: - /// Not allowed to be - Session_Container_i (void); - - }; -} - -#include /**/ "ace/post.h" - -#endif /* CIAO_SESSION_CONTAINER_H */ diff --git a/CIAO/ciao/Containers/Session/Session_Container.idl b/CIAO/ciao/Containers/Session/Session_Container.idl deleted file mode 100644 index 7663a61bf15..00000000000 --- a/CIAO/ciao/Containers/Session/Session_Container.idl +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @file Session_Container.idl - * @author William R. Otte - * - * Extends the basic container interface for session capabilities. - */ - -#include "ciao/Containers/Container_Base.idl" - -module CIAO -{ - local interface Session_Container : Container - { - }; -}; diff --git a/CIAO/ciao/Containers/Session/Session_Container.mpc b/CIAO/ciao/Containers/Session/Session_Container.mpc deleted file mode 100644 index 58cef015a14..00000000000 --- a/CIAO/ciao/Containers/Session/Session_Container.mpc +++ /dev/null @@ -1,59 +0,0 @@ -// -*- MPC -*- -project(CIAO_Session_Container_idl) : install, ciaoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_include=Session_Container_stub_export.h \ - -Wb,stub_export_macro=SESSION_CONTAINER_STUB_Export \ - -Wb,skel_export_include=Session_Container_export.h \ - -Wb,skel_export_macro=SESSION_CONTAINER_Export \ - -Gxhst -Gxhsk -SS -Sci - IDL_Files { - Session_Container.idl - } - specific { - install_dir = ciao/Containers/Session - } -} -project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, \ - ciao_base { - - after += CIAO_Session_Container_idl - dynamicflags += SESSION_CONTAINER_STUB_BUILD_DLL - - IDL_Files { - } - Source_Files { - Session_ContainerC.cpp - } - Inline_Files { - } - Header_Files { - Session_ContainerC.h - Session_ContainerS.h - Session_Container_stub_export.h - } - specific { - install_dir = ciao/Containers/Session - } -} - -project(CIAO_Session_Container) : install, ccm_svnt, ciao_lib, utils, ciao_base, \ - ciao_servant, ciao_session_container_stub { - - after += CIAO_Session_Container_idl - dynamicflags += SESSION_CONTAINER_BUILD_DLL - - IDL_Files { - } - Source_Files { - Session_Container.cpp - } - Inline_Files { - } - Header_Files { - Session_Container.h - Session_Container_export.h - } - specific { - install_dir = ciao/Containers/Session - } -} diff --git a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp b/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp deleted file mode 100644 index 2ff9e7e29dd..00000000000 --- a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp +++ /dev/null @@ -1,144 +0,0 @@ -#ifndef CIAO_CONTEXT_IMPL_BASE_T_C -#define CIAO_CONTEXT_IMPL_BASE_T_C - -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - template - Context_Impl_Base_T::Context_Impl_Base_T ( - ::Components::CCMHome_ptr home, - typename CONTAINER_TYPE::_ptr_type c, - const char *instance_id) - : container_ (CONTAINER_TYPE::_duplicate (c)), - home_ (::Components::CCMHome::_duplicate (home)), - ciao_instance_id_ (instance_id) - { - } - - template - Context_Impl_Base_T::~Context_Impl_Base_T (void) - { - } - - // Operations from ::Components::CCMContext. -#if !defined (CCM_LW) - template - Components::Principal_ptr - Context_Impl_Base_T::get_caller_principal (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - - template - Components::CCMHome_ptr - Context_Impl_Base_T::get_CCM_home (void) - { - return Components::CCMHome::_duplicate (this->home_.in ()); - } - -#if !defined (CCM_LW) - template - CORBA::Boolean - Context_Impl_Base_T::get_rollback_only (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - -#if !defined (CCM_LW) - template - Components::Transaction::UserTransaction_ptr - Context_Impl_Base_T::get_user_transaction (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - -#if !defined (CCM_LW) - template - CORBA::Boolean - Context_Impl_Base_T::is_caller_in_role (const char * /* role */) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - -#if !defined (CCM_LW) - template - void - Context_Impl_Base_T::set_rollback_only (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - - template - CORBA::Object_ptr - Context_Impl_Base_T::resolve_service_reference(const char *service_id) - { - typename CONTAINER_TYPE::_var_type cnt_safe = - CONTAINER_TYPE::_duplicate (this->container_.in ()); - if (::CORBA::is_nil (cnt_safe.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Context_Impl_Base_T::resolve_service_reference - " - "Error: Container is nil\n")); - throw ::CORBA::INV_OBJREF (); - } - return cnt_safe->resolve_service_reference (service_id); - } - - template - void - Context_Impl_Base_T::install_service_component_reference ( - const char * service_id, - CORBA::Object_ptr objref) - { - typename CONTAINER_TYPE::_var_type cnt_safe = - CONTAINER_TYPE::_duplicate (this->container_.in ()); - if (::CORBA::is_nil (cnt_safe.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Context_Impl_Base_T::install_service_component_reference - " - "Error: Container is nil\n")); - throw ::CORBA::INV_OBJREF (); - } - return cnt_safe->install_service_component_reference (service_id, objref); - - } - - template - CORBA::Object_ptr - Context_Impl_Base_T::uninstall_service_component_reference ( - const char * service_id) - { - typename CONTAINER_TYPE::_var_type cnt_safe = - CONTAINER_TYPE::_duplicate (this->container_.in ()); - if (::CORBA::is_nil (cnt_safe.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Context_Impl_Base_T::uninstall_service_component_reference - " - "Error: Container is nil\n")); - throw ::CORBA::INV_OBJREF (); - } - return cnt_safe->uninstall_service_component_reference (service_id); - } - - template - const char * - Context_Impl_Base_T::_ciao_instance_id (void) const - { - return this->ciao_instance_id_.in (); - } -} - -#endif /* CIAO_CONTEXT_IMPL_BASE_T_C */ - diff --git a/CIAO/ciao/Contexts/Context_Impl_Base_T.h b/CIAO/ciao/Contexts/Context_Impl_Base_T.h deleted file mode 100644 index 5c0d0271426..00000000000 --- a/CIAO/ciao/Contexts/Context_Impl_Base_T.h +++ /dev/null @@ -1,101 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Context_Impl_Base_T.h - * - * This file contains the non-template declaration of a base class for - * the template mixin for the generated context class. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_CONTEXT_IMPL_BASE_H -#define CIAO_CONTEXT_IMPL_BASE_H - -#include /**/ "ace/pre.h" - -#include "ccm/CCM_ContextC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace CIAO -{ - /** - * @class Context_Impl_Base_T - * - * @brief Template base class for Context_Impl. - * - * Holds the non-template parts of its child class - * Context_Impl. - */ - template - class Context_Impl_Base_T - : public virtual Components::CCMContext - { - public: - Context_Impl_Base_T (::Components::CCMHome_ptr home, - typename CONTAINER_TYPE::_ptr_type c, - const char *instance_id); - - virtual ~Context_Impl_Base_T (void); - - // Operations from ::Components::CCMContext. -#if !defined (CCM_LW) - virtual ::Components::Principal_ptr get_caller_principal (); -#endif - - virtual ::Components::CCMHome_ptr get_CCM_home (); - -#if !defined (CCM_LW) - virtual ::CORBA::Boolean get_rollback_only (); -#endif - -#if !defined (CCM_LW) - virtual Components::Transaction::UserTransaction_ptr - get_user_transaction (); -#endif - -#if !defined (CCM_LW) - virtual CORBA::Boolean is_caller_in_role (const char *role); -#endif - -#if !defined (CCM_LW) - virtual void set_rollback_only (); -#endif - - virtual CORBA::Object_ptr resolve_service_reference(const char *service_id); - - virtual void - install_service_component_reference (const char * service_id, - CORBA::Object_ptr objref); - - virtual CORBA::Object_ptr - uninstall_service_component_reference (const char * service_id); - - /// Temporarily added back for a sponsor, this will be removed at some - /// moment in favor of a resolve_service_reference() call - const char *_ciao_instance_id (void) const; - - protected: - typename CONTAINER_TYPE::_var_type container_; - private: - ::Components::CCMHome_var home_; - ::CORBA::String_var ciao_instance_id_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ciao/Contexts/Context_Impl_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ciao/Contexts/Context_Impl_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_CONTEXT_IMPL_BASE_H */ diff --git a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp b/CIAO/ciao/Contexts/Session/Session_Context_T.cpp deleted file mode 100644 index 37fff51c554..00000000000 --- a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef CIAO_SESSION_CONTEXT_IMPL_T_C -#define CIAO_SESSION_CONTEXT_IMPL_T_C - -namespace CIAO -{ - template - Session_Context_Impl_T::Session_Context_Impl_T ( - Components::CCMHome_ptr the_home, - ::CIAO::Session_Container_ptr c, - PortableServer::Servant sv, - const char* id) - : Context_Impl_Base_T < ::CIAO::Session_Container> (the_home, c, id), - servant_ (sv) - { - } - - template - Session_Context_Impl_T::~Session_Context_Impl_T (void) - { - } - - template - ::CORBA::Object_ptr - Session_Context_Impl_T::get_CCM_object (void) - { - ::CORBA::Object_var obj; - - try - { - ::CIAO::Session_Container_var cnt_safe = - ::CIAO::Session_Container::_duplicate (this->container_.in ()); - if (::CORBA::is_nil (cnt_safe.in ())) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Context_Impl_T::get_CCM_object - " - "Error: Container is nil\n")); - throw ::CORBA::INV_OBJREF (); - } - obj = cnt_safe->get_objref (this->servant_); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Caught Exception\n"); - } - - typename COMP::_var_type component = COMP::_narrow (obj.in ()); - - if (::CORBA::is_nil (component.in ())) - { - throw ::CORBA::INTERNAL (); - } - - return component._retn (); - } -} - -#endif /* CIAO_SESSION_CONTEXT_IMPL_T_C */ diff --git a/CIAO/ciao/Contexts/Session/Session_Context_T.h b/CIAO/ciao/Contexts/Session/Session_Context_T.h deleted file mode 100644 index 9c0951432bd..00000000000 --- a/CIAO/ciao/Contexts/Session/Session_Context_T.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Session_Context_T.h - * - * This file contains the declaration of a mixin base class for - * the generated context class. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_SESSION_CONTEXT_IMPL_T_H -#define CIAO_SESSION_CONTEXT_IMPL_T_H - -#include /**/ "ace/pre.h" - -#include "ciao/Contexts/Context_Impl_Base_T.h" -#include "ciao/Containers/Session/Session_ContainerC.h" -#include "tao/LocalObject.h" -#include "tao/PortableServer/PS_ForwardC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace CIAO -{ - /** - * @class Session_Context_Impl_T - * - * @brief Mixin base class for generated context. - * - * This class implements operations and contains parameterized - * members common to all generated servants. - */ - template - class Session_Context_Impl_T : public virtual BASE_CTX, - public virtual Context_Impl_Base_T< ::CIAO::Session_Container>, - public virtual ::CORBA::LocalObject - { - public: - /// Type definition of the context type. - typedef BASE_CTX context_type; - - /// Type definition of the var type for the context. - typedef typename context_type::_var_type _var_type; - - /// Type definition of the component type. - typedef COMP component_type; - - Session_Context_Impl_T (Components::CCMHome_ptr the_home, - ::CIAO::Session_Container_ptr c, - PortableServer::Servant sv, - const char* id); - - virtual ~Session_Context_Impl_T (void); - - /// Operation from ::Components::SessionContext. - virtual CORBA::Object_ptr get_CCM_object (); - - private: - PortableServer::Servant servant_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ciao/Contexts/Session/Session_Context_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ciao/Contexts/Session/Session_Context_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_SESSION_CONTEXT_IMPL_T_H */ diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc b/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc deleted file mode 100644 index f6e0449093f..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Deployment_Handlers.mpc +++ /dev/null @@ -1,28 +0,0 @@ -project (CIAO_Deployment_Handlers) : install, dance_stub, ciao_base, ciao_lib, \ - ciao_output, ciao_session_container, \ - ciao_logger, dance_logger, dance_deployment_scheduler { - dynamicflags += CIAO_LOCALITY_HANDLER_BUILD_DLL - - Source_Files { - Component_Handler.cpp - Container_Handler.cpp - Home_Handler.cpp - Homed_Component_Handler.cpp - CIAO_State.cpp - CIAO_Handler_Common.cpp - Connection_Handler.cpp - } - - Header_Files { - Component_Handler.h - Container_Handler.h - Home_Handler.h - Homed_Component_Handler.h - CIAO_State.h - CIAO_Locality_Handler_Export.h - } - - specific { - install_dir = ciao/Deployment/Handlers - } -} diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp deleted file mode 100644 index 878e8e0ec56..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "CIAO_Handler_Common.h" - -#include "dance/Deployment/Deployment_PlanErrorC.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Valuetype_Factories/ConfigValue.h" - -namespace CIAO -{ - const char * - Deployment_Common::get_implementation (const char *name, - const ::Deployment::DeploymentPlan &plan) - { - if (name == 0) - { - throw ::Deployment::PlanError (name, - "No such artifact"); - } - - for (CORBA::ULong i = 0; - i < plan.artifact.length (); - ++i) - { - if (ACE_OS::strcmp (plan.artifact[i].name.in (), - name) == 0) - { - if (plan.artifact[i].location.length () >= 1 && - plan.artifact[i].location[0] != 0) - { - return plan.artifact[i].location[0].in (); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Deployment_Common::get_implementation - " - "No valid location for artifact <%C>\n", - name)); - throw ::Deployment::PlanError (name, - "No valid location field\n"); - } - } - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Deployment_Common::get_implementation - " - "Unable to locate artifact <%C>\n", - name)); - - throw ::Deployment::PlanError (name, - "Nonexistent artifact"); - } - - void - Deployment_Common::create_attribute_configuration (const ::Deployment::Properties &props, - ::Components::ConfigValues & values) - { - values.length (props.length ()); - - for (CORBA::ULong i = 0; - i < props.length (); - ++i) - { - values[i] = new CIAO::ConfigValue_impl (props[i].name.in (), - props[i].value); - } - } -} diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h deleted file mode 100644 index b7a83926a02..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file CIAO_Handler_Common.h - * @author William R. Otte - * - * Operations common to all CIAO handlers. - */ -#ifndef CIAO_HANDLER_COMMON_H -#define CIAO_HANDLER_COMMON_H - -#include -#include - -#include "ccm/CCM_StandardConfiguratorC.h" -#include "dance/Deployment/Deployment_DeploymentPlanC.h" -#include "dance/DAnCE_Utility.h" - -namespace CIAO -{ - class Deployment_Common - { - public: - // Temporary hack until Martin's artifact installation work can - // be implemented. - static const char * get_implementation (const char *name, - const ::Deployment::DeploymentPlan &plan); - - static void create_attribute_configuration (const ::Deployment::Properties &props, - ::Components::ConfigValues & values); - struct Instance_Info - { - std::string name; - ::DAnCE::Utility::PMAP_PTR pmap; - }; - - typedef std::map < std::string, Instance_Info > INSTANCES; - - }; -} - -#endif diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h b/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h deleted file mode 100644 index cf3cbfcc1cc..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_Locality_Handler -// ------------------------------ -#ifndef CIAO_LOCALITY_HANDLER_EXPORT_H -#define CIAO_LOCALITY_HANDLER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_LOCALITY_HANDLER_HAS_DLL) -# define CIAO_LOCALITY_HANDLER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_LOCALITY_HANDLER_HAS_DLL */ - -#if !defined (CIAO_LOCALITY_HANDLER_HAS_DLL) -# define CIAO_LOCALITY_HANDLER_HAS_DLL 1 -#endif /* ! CIAO_LOCALITY_HANDLER_HAS_DLL */ - -#if defined (CIAO_LOCALITY_HANDLER_HAS_DLL) && (CIAO_LOCALITY_HANDLER_HAS_DLL == 1) -# if defined (CIAO_LOCALITY_HANDLER_BUILD_DLL) -# define CIAO_Locality_Handler_Export ACE_Proper_Export_Flag -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_LOCALITY_HANDLER_BUILD_DLL */ -# define CIAO_Locality_Handler_Export ACE_Proper_Import_Flag -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_LOCALITY_HANDLER_BUILD_DLL */ -#else /* CIAO_LOCALITY_HANDLER_HAS_DLL == 1 */ -# define CIAO_Locality_Handler_Export -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARATION(T) -# define CIAO_LOCALITY_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_LOCALITY_HANDLER_HAS_DLL == 1 */ - -// Set CIAO_LOCALITY_HANDLER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_LOCALITY_HANDLER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_LOCALITY_HANDLER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_LOCALITY_HANDLER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_LOCALITY_HANDLER_NTRACE */ - -#if (CIAO_LOCALITY_HANDLER_NTRACE == 1) -# define CIAO_LOCALITY_HANDLER_TRACE(X) -#else /* (CIAO_LOCALITY_HANDLER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_LOCALITY_HANDLER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_LOCALITY_HANDLER_NTRACE == 1) */ - -#endif /* CIAO_LOCALITY_HANDLER_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp deleted file mode 100644 index 245a5ca3eae..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp +++ /dev/null @@ -1,267 +0,0 @@ -#include "CIAO_State.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - void - Deployment_State::close (void) - { - this->containers_.clear (); - this->instance_container_.clear (); - this->homes_.clear (); - this->components_.clear (); - } - - void - Deployment_State::add_container (const char *id, - CIAO::Container_ptr container) - { - CIAO_TRACE ("Deployment_State::add_container"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->container_mutex_, - CORBA::NO_RESOURCES ()); - - if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. - this->containers_.find (id) != this->containers_.end ()) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Deployment_State::add_container - " - "Warning: Attempting to add duplicate container reference\n")); - } - - this->containers_[id] = CIAO::Container::_duplicate (container); - } - - void - Deployment_State::remove_container (const char *id) - { - CIAO_TRACE ("Deployment_State::remove_container"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->container_mutex_, - CORBA::NO_RESOURCES ()); - - CONTAINERS::iterator pos = this->containers_.find (id); - - if (pos != this->containers_.end ()) - { - this->containers_.erase (pos); - } - } - - CIAO::Container_ptr - Deployment_State::fetch_container (const char *id) - { - CIAO_TRACE ("Deployment_State::fetch_container"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->container_mutex_, - CORBA::NO_RESOURCES ()); - - CONTAINERS::iterator pos = this->containers_.find (id); - - if (pos == this->containers_.end ()) - { - return CIAO::Container::_nil (); - } - - return CIAO::Container::_duplicate (pos->second.in ()); - } - - void - Deployment_State::add_home (const char *id, - const char *cont_id, - Components::CCMHome_ptr home) - { - CIAO_TRACE ("Deployment_State::add_home"); - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->home_mutex_, - CORBA::NO_RESOURCES ()); - - if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. - this->homes_.find (id) != this->homes_.end ()) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Deployment_State::add_home - " - "Warning: Attempting to add duplicate home reference\n")); - } - this->homes_[id] = Components::CCMHome::_duplicate (home); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instance_container_mutex_, - CORBA::NO_RESOURCES ()); - this->instance_container_[id] = cont_id; - } - } - - void - Deployment_State::remove_home (const char *id) - { - CIAO_TRACE ("Deployment_State::remove_home"); - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->home_mutex_, - CORBA::NO_RESOURCES ()); - - HOMES::iterator pos = this->homes_.find (id); - - if (pos != this->homes_.end ()) - { - this->homes_.erase (pos); - } - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instance_container_mutex_, - CORBA::NO_RESOURCES ()); - INSTANCE_CONTAINER::iterator cont = - this->instance_container_.find (id); - - if (cont != this->instance_container_.end ()) - { - this->instance_container_.erase (cont); - } - } - } - - Components::CCMHome_ptr - Deployment_State::fetch_home (const char *id) - { - CIAO_TRACE ("Deployment_State::fetch_home"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->home_mutex_, - CORBA::NO_RESOURCES ()); - - HOMES::iterator pos = this->homes_.find (id); - - if (pos == this->homes_.end ()) - { - return Components::CCMHome::_nil (); - } - - return Components::CCMHome::_duplicate (pos->second.in ()); - } - - void - Deployment_State::add_component (const char *id, - const char *cont_id, - Components::CCMObject_ptr component) - { - CIAO_TRACE ("Deployment_State::add_component"); - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->component_mutex_, - CORBA::NO_RESOURCES ()); - - if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. - this->components_.find (id) != this->components_.end ()) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Deployment_State::add_component - " - "Warning: Attempting to add duplicate component reference\n")); - } - this->components_[id] = Components::CCMObject::_duplicate (component); - } - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instance_container_mutex_, - CORBA::NO_RESOURCES ()); - this->instance_container_[id] = cont_id; - } - } - - void - Deployment_State::remove_component (const char *id) - { - CIAO_TRACE ("Deployment_State::remove_component"); - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->component_mutex_, - CORBA::NO_RESOURCES ()); - COMPONENTS::iterator pos = this->components_.find (id); - - if (pos != this->components_.end ()) - { - this->components_.erase (pos); - } - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instance_container_mutex_, - CORBA::NO_RESOURCES ()); - INSTANCE_CONTAINER::iterator cont = - this->instance_container_.find (id); - - if (cont != this->instance_container_.end ()) - { - this->instance_container_.erase (cont); - } - } - } - - Components::CCMObject_ptr - Deployment_State::fetch_component (const char *id) - { - CIAO_TRACE ("Deployment_State::fetch_component"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->component_mutex_, - CORBA::NO_RESOURCES ()); - - COMPONENTS::iterator pos = this->components_.find (id); - - if (pos == this->components_.end ()) - { - return Components::CCMObject::_nil (); - } - - return Components::CCMObject::_duplicate (pos->second.in ()); - } - - const char * - Deployment_State::instance_to_container (const char *id) - { - CIAO_TRACE ("Deployment_State::instance_to_container"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instance_container_mutex_, - CORBA::NO_RESOURCES ()); - INSTANCE_CONTAINER::const_iterator cont = - this->instance_container_.find (id); - - if (cont != this->instance_container_.end ()) - { - return cont->second.c_str (); - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Deployment_State::instance_to_container - " - "Error: Unknown instance ID <%C>\n", - id)); - return 0; - } -} diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.h b/CIAO/ciao/Deployment/Handlers/CIAO_State.h deleted file mode 100644 index d52e2367608..00000000000 --- a/CIAO/ciao/Deployment/Handlers/CIAO_State.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - * @file CIAO_State.h - * @author William R. Otte - */ - -#ifndef CIAO_STATE_H -#define CIAO_STATE_H - -#include -#include - -#include "ace/Singleton.h" -#include "ciao/Containers/Container_BaseC.h" -#include "ccm/CCM_HomeC.h" -#include "ccm/CCM_ObjectC.h" -#include "CIAO_Locality_Handler_Export.h" -#include "ciao/Deployment/Handlers/Connection_Handler.h" - -namespace CIAO -{ - /** - * @class Deployment_State - * @brief Singleton collecting state for the instance handlers. - * - */ - class CIAO_Locality_Handler_Export Deployment_State - { - public: - void close (void); - - void add_container (const char *id, - CIAO::Container_ptr container); - - void remove_container (const char *id); - - CIAO::Container_ptr fetch_container (const char *id); - - const char * instance_to_container (const char *id); - - void add_home (const char *id, const char *container_id, - Components::CCMHome_ptr home); - - void remove_home (const char *id); - - Components::CCMHome_ptr fetch_home (const char *id); - - void add_component (const char *id, const char *container_id, - Components::CCMObject_ptr component); - - void remove_component (const char *id); - - Components::CCMObject_ptr fetch_component (const char *id); - - Connection_Handler connection_handler; - - private: - /// Container administration - typedef std::map < std::string, - CIAO::Container_var > CONTAINERS; - - CONTAINERS containers_; - - TAO_SYNCH_MUTEX container_mutex_; - - typedef std::map < std::string, std::string > INSTANCE_CONTAINER; - - /// maps instance ids to containers. - INSTANCE_CONTAINER instance_container_; - - TAO_SYNCH_MUTEX instance_container_mutex_; - - /// Homes administration - typedef std::map < std::string, - Components::CCMHome_var > HOMES; - - HOMES homes_; - - TAO_SYNCH_MUTEX home_mutex_; - - /// Components administration - typedef std::map < std::string, - Components::CCMObject_var > COMPONENTS; - - COMPONENTS components_; - - TAO_SYNCH_MUTEX component_mutex_; - }; - - typedef ACE_Singleton DEPLOYMENT_STATE; -} - -CIAO_LOCALITY_HANDLER_SINGLETON_DECLARE (ACE_Singleton, - CIAO::Deployment_State, - TAO_SYNCH_MUTEX) - -#endif diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp deleted file mode 100644 index 9be8807c567..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ /dev/null @@ -1,652 +0,0 @@ -#include "Component_Handler.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Base/CIAO_PropertiesC.h" -#include "ciao/Base/CIAO_ExceptionsC.h" -#include "ciao/Containers/Container_BaseC.h" -#include "ccm/CCM_ObjectC.h" -#include "CIAO_State.h" - -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" - -namespace CIAO -{ - - Component_Handler_i::Component_Handler_i (void) - { - CIAO_TRACE ("Component_Handler_i::Component_Handler_i"); - } - - // Destructor - Component_Handler_i::~Component_Handler_i (void) - { - CIAO_TRACE ("Component_Handler_i::~Component_Handler_i"); - } - - void - Component_Handler_i::close (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_.clear (); - } - - ::CORBA::StringSeq * - Component_Handler_i::dependencies (void) - { - ::CORBA::StringSeq *retval (0); - ACE_NEW_THROW_EX (retval, - ::CORBA::StringSeq (1), - CORBA::NO_MEMORY ()); - - retval->length (1); - (*retval)[0] = CIAO::Deployment::CCM_CONTAINER; - - return retval; - } - - char * - Component_Handler_i::instance_type (void) - { - CIAO_TRACE ("Component_Handler_i::instance_type"); - return CORBA::string_dup (CIAO::Deployment::CCM_COMPONENT); - } - - void - Component_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference) - { - CORBA::Any *retval = 0; - ACE_NEW_THROW_EX (retval, - CORBA::Any (), - CORBA::NO_MEMORY ()); - - instance_reference = retval; - - CIAO_TRACE ("Component_Handler_i::install_instance"); - - const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); - const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - - DAnCE::Utility::PROPERTY_MAP *pmap = 0; - - ACE_NEW_THROW_EX (pmap, - DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + - mdd.execParameter.length ()), - CORBA::NO_MEMORY ()); - - Deployment_Common::Instance_Info info; - info.name = idd.name.in (); - info.pmap.reset (pmap); - - DAnCE::Utility::build_property_map (*pmap, - mdd.execParameter); - DAnCE::Utility::build_property_map (*pmap, - idd.configProperty); - - CORBA::String_var exec_art, exec_entry, svnt_art, svnt_entry, cont_id; - - CORBA::Any val; - const char *tmp = 0; - int open_mode = ACE_DEFAULT_SHLIB_MODE; - - if (pmap->find (CIAO::Deployment::SVNT_ENTRYPT, val) == 0) - { - val >>= tmp; - svnt_entry = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found Servant entrypoint <%C>\n", svnt_entry.in ())); - } - - if (pmap->find (CIAO::Deployment::OPEN_MODE, val) == 0) - { - val >>= open_mode; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found open mode <%d>\n", open_mode)); - } - - if (pmap->find (CIAO::Deployment::SVNT_ARTIFACT, val) == 0) - { - val >>= tmp; - svnt_art = Deployment_Common::get_implementation (tmp, plan); - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found Servant artifact <%C>\n", svnt_art.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Error: No Servant artifact provided, aborting installation\n")); - throw ::Deployment::PlanError (idd.name.in (), - "No servant artifact identified."); - } - - - if (pmap->find (CIAO::Deployment::EXEC_ARTIFACT, val) == 0) - { - val >>= tmp; - exec_art = Deployment_Common::get_implementation (tmp, plan); - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found executor artifact: <%C>\n", exec_art.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Error: No Executor artifact provided, aborting installation\n")); - throw ::Deployment::PlanError (idd.name.in (), - "No executory artifact identified.\n"); - } - - if (pmap->find (CIAO::Deployment::COMPONENT_FACTORY, val) == 0) - { - val >>= tmp; - exec_entry = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found executor entrypoint: <%C>\n", exec_entry.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Error: No Executor artifact provided, aborting installation\n")); - throw ::Deployment::PlanError (idd.name.in (), - "No executor entrypoint provided\n"); - } - - if (pmap->find (CIAO::Deployment::CONTAINER_ID, val) == 0) - { - val >>= tmp; - cont_id = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found container: <%C>\n", cont_id.in ())); - } - else - { - CIAO_DEBUG (4, (LM_INFO, CLINFO - "Component_Handler_i::install_instance - " - "No container provided, using default container\n")); - cont_id = ""; - } - - ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - - if (CORBA::is_nil (container)) - { - CIAO_ERROR (1, (LM_INFO, CLINFO - "Component_Handler_i::install_instance - " - "Container with Id <%C> not installed, aborting.\n", - cont_id.in ())); - throw ::Deployment::PlanError (idd.name.in (), - "Invalid container\n"); - } - - Components::CCMObject_var comp_ref; - - try - { - comp_ref = container->install_component (exec_art, - exec_entry, - svnt_art, - svnt_entry, - idd.name.in (), - open_mode); - - // for installing the service reference, we need a service id - // and the port name belonging to that service id - if (pmap->find (CIAO::Deployment::SERVICE_REF, val) == 0) - { - val >>= tmp; - CORBA::String_var service_id = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found ServiceRef <%C>\n",service_id.in ())); - - //now search for port_name belonging to the service id - char port_search[256]; - ACE_OS::sprintf(port_search, "%s.%s",CIAO::Deployment::SERVICE_REF, service_id.in ()); - - if (pmap->find (port_search, val) == 0) - { - val >>= tmp; - CORBA::String_var port_name = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::install_instance - " - "Found ServiceRef port_name <%C>\n",port_name.in ())); - ::CORBA::Object_var facet_exec_ref = - container->get_local_facet(comp_ref.in (), port_name.in ()); - - if (CORBA::is_nil(facet_exec_ref.in())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "facet_exec_ref is NIL\n")); - - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - - container->install_service_component_reference ( - service_id.in (), - facet_exec_ref.in ()); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "found service_id, but no port_name.\n")); - throw Components::CCMException ( - ::Components::SERVICE_INSTALLATION_ERROR); - } - } - - ::Components::ConfigValues attr_config; - Deployment_Common::create_attribute_configuration (idd.configProperty, - attr_config); - - container->set_attributes (comp_ref.in (), attr_config); - } - catch (::CIAO::InvalidComponent &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler::install_instance - " - "Caught InvalidComponent exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (::CIAO::Installation_Failure &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler::install_instance - " - "Caught Installation_Failure exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Caught CORBA exception <%C>\n", - ex._info ().c_str ())); - throw ::Deployment::StartError (idd.name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Caught unknown C++ exception\n")); - throw ::Deployment::StartError (idd.name.in (), - "Unknown C++ exception\n"); - } - - if (CORBA::is_nil (comp_ref)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::install_instance - " - "Container provided nil object reference for component.\n")); - throw ::Deployment::StartError (idd.name.in (), - "Container provided nil object reference"); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_[idd.name.in ()] = info; - } - - DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), - cont_id, - comp_ref.in ()); - - *instance_reference <<= comp_ref; - } - - void - Component_Handler_i::activate_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Component_Handler_i::activate_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - - const char *container = - DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (container); - - Components::CCMObject_var comp = - DEPLOYMENT_STATE::instance ()->fetch_component (name); - - if (CORBA::is_nil (cont)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::activate_instance - " - "Object reference for container of instance <%C> is nil!\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - "Unable to activate due to nil container reference"); - } - - if (CORBA::is_nil (comp)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::activate_instance - " - "Object reference for instance <%C> is nil!\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - "Unable to activate due to nil reference"); - } - - try - { - cont->activate_component (comp.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::activate_instance - " - "Caught CORBA Exception while activating instance <%C>: %C\n", - name, - ex._info ().c_str ())); - throw ::Deployment::StartError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::activate_instance - " - "Caught C++ Exception while activating instance <%C>\n", - name)); - throw ::Deployment::StartError (name, - "Unknown C++ exception during activation"); - } - } - - void - Component_Handler_i::passivate_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Component_Handler_i::passivate_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - - const char *container = - DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (container); - - Components::CCMObject_var comp = - DEPLOYMENT_STATE::instance ()->fetch_component (name); - - if (CORBA::is_nil (cont)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::passivate_instance - " - "Object reference for container of instance <%C> is nil!\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), - "Unable to activate due to nil container reference"); - } - - if (CORBA::is_nil (comp)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::passivate_instance - " - "Object reference for instance <%C> is nil!\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), - "Unable to activate due to nil reference"); - } - - try - { - cont->passivate_component (comp.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::passivate_instance - " - "Caught CORBA Exception while passivating instance <%C>: %C\n", - name, - ex._info ().c_str ())); - throw ::Deployment::StopError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::passivate_instance - " - "Caught C++ Exception while passivating instance <%C>\n", - name)); - throw ::Deployment::StartError (name, - "Unknown C++ exception during passivation"); - } - } - - void - Component_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Component_Handler_i::remove_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - Deployment_Common::INSTANCES::iterator instance; - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - instance = this->instances_.find (name); - - if (instance == this->instances_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::remove_instance - " - "Instructed to remove unknown component instance <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Wrong instance handler for component instance\n"); - } - } - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Component_Handler_i::remove_instance - " - "Attempting removal of component instance <%C>\n", - name)); - - CORBA::Any val; - const char *cont_id = 0; - - if (instance->second.pmap->find (Deployment::CONTAINER_ID, val) == 0) - { - val >>= cont_id; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Component_Handler_i::remove_instance - " - "Found component container: %C\n", cont_id)); - } - else - { - CIAO_ERROR (4, (LM_INFO, CLINFO - "Component_Handler_i::remove_instance - " - "No container provided, using default container for instance <%C>\n", - name)); - cont_id = ""; - } - - ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - - if (CORBA::is_nil (container.in ())) - { - CIAO_ERROR (1, (LM_INFO, CLINFO - "Component_Handler_i::remove_instance - " - "Container with Id <%C> not installed, aborting.\n", - cont_id)); - throw ::Deployment::StopError (name, - "Invalid container\n"); - } - - try - { - Components::CCMObject_var ref - = DEPLOYMENT_STATE::instance ()->fetch_component (name); - - if (!CORBA::is_nil (ref.in ())) - { - container->uninstall_component (ref.in ()); - } - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::remove_instance - " - "Caught CORBA exception <%C>\n", - ex._info ().c_str ())); - throw ::Deployment::StopError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::remove_instance - " - "Caught unknown C++ exception\n")); - throw ::Deployment::StopError (name, - "Unknown C++ exception\n"); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_.erase (instance); - } - DEPLOYMENT_STATE::instance ()->remove_component (name); - - CIAO_DEBUG (4, (LM_INFO, CLINFO - "Component_Handler_i::remove_instance - " - "Instance <%C> successfully removed\n", - name)); - } - - void - Component_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference) - { - CIAO_TRACE ("Component_Handler_i::provide_endpoint_reference"); - - DEPLOYMENT_STATE::instance ()->connection_handler.provide_endpoint_reference (plan, - connectionRef, - endpoint_reference); - } - - void - Component_Handler_i::connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Component_Handler_i::connect_instance"); - - DEPLOYMENT_STATE::instance ()->connection_handler.connect_instance (plan, - connectionRef, - provided_reference); - } - - void - Component_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef) - { - CIAO_TRACE ("Component_Handler_i::disconnect_instance"); - DEPLOYMENT_STATE::instance ()->connection_handler.disconnect_instance (plan, - connectionRef); - - } - - void - Component_Handler_i::instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef) - { - CIAO_TRACE ("Component_Handler_i::instance_configured"); - - Components::CCMObject_var ref = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[instanceRef].name.in ()); - - if (CORBA::is_nil (ref)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " - "Object reference for instance <%C> is nil!\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - "Unable to configure due to nil reference"); - } - - try - { - ref->configuration_complete (); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " - "Caught CORBA Exception: %C for instance <%C>\n", - ex._info ().c_str (), - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::instance_configured - " - "Caught C++ Exception for instance <%C>\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - "Unknown C++ exception"); - - } - } - - void - Component_Handler_i::configure (const ::Deployment::Properties & ) - { - } -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Component_Handler (void) - { - return new CIAO::Component_Handler_i (); - } -} diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Component_Handler.h deleted file mode 100644 index af6b6e88991..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.h +++ /dev/null @@ -1,99 +0,0 @@ - -// -*- C++ -*- -/** - * @file Component_Handler.h - * @author William R. Otte - * - * Installation handler implementation for spawning LocalityManagers. - */ - -#ifndef CIAO_COMPONENT_HANDLER_H -#define CIAO_COMPONENT_HANDLER_H - -#include "dance/DAnCE_LocalityManagerC.h" -#include "dance/DAnCE_Utility.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h" -#include "ciao/Deployment/Handlers/CIAO_Handler_Common.h" - -namespace CIAO -{ - class CIAO_LocalityActivator_i; - - class CIAO_Locality_Handler_Export Component_Handler_i - : public virtual DAnCE::InstanceDeploymentHandler, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - Component_Handler_i (void); - - // Destructor - virtual ~Component_Handler_i (void); - - virtual - ::CORBA::StringSeq * dependencies (void); - - virtual - char * instance_type (void); - - virtual - void install_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference); - - virtual - void remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & instance_reference); - - virtual - void activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - virtual - void passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - - virtual - void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); - - virtual - void connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference); - - virtual - void disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef); - - virtual - void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); - - virtual - void configure(const Deployment::Properties&); - - virtual void close (void); - - private: - Deployment_Common::INSTANCES instances_; - TAO_SYNCH_MUTEX instances_mutex_; - }; -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Component_Handler (void); -} - -#endif diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp deleted file mode 100644 index c08860fd370..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ /dev/null @@ -1,1296 +0,0 @@ -#include "Connection_Handler.h" -#include "ciao/Logger/Log_Macros.h" -#include "dance/Deployment/Deployment_InvalidConnectionC.h" -#include "CIAO_State.h" - -namespace CIAO -{ - const char * kind_as_string (const ::Deployment::CCMComponentPortKind & kind) - { -#define DEPLOYMENT_KIND_AS_STRING(X) case X: return #X - switch (kind) - { - DEPLOYMENT_KIND_AS_STRING (Deployment::Facet); - DEPLOYMENT_KIND_AS_STRING (Deployment::SimplexReceptacle); - DEPLOYMENT_KIND_AS_STRING (Deployment::MultiplexReceptacle); - DEPLOYMENT_KIND_AS_STRING (Deployment::EventEmitter); - DEPLOYMENT_KIND_AS_STRING (Deployment::EventPublisher); - DEPLOYMENT_KIND_AS_STRING (Deployment::EventConsumer); - DEPLOYMENT_KIND_AS_STRING (Deployment::ExtendedPort); - DEPLOYMENT_KIND_AS_STRING (Deployment::MirrorPort); - } - return "***Unknown enum value, deployment kind as string"; -#undef DEPLOYMENT_KIND_AS_STRING - } - - void - Connection_Handler::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference) - { - CIAO_TRACE ("Component_Handler_i::provide_endpoint_reference"); - - const ::Deployment::PlanConnectionDescription &conn = - plan.connection[connectionRef]; - - try - { - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Connection_Handler::provide_endpoint_reference - " - "Called for connection <%C>\n", - conn.name.in ())); - - for (CORBA::ULong i = 0; - i < conn.internalEndpoint.length (); - ++i) - { - if (conn.internalEndpoint[i].provider) - { - CORBA::Any *out; - CORBA::Object_var ref; - CORBA::ULong instanceRef = conn.internalEndpoint[i].instanceRef; - Components::CCMObject_var comp = - DEPLOYMENT_STATE::instance ()-> - fetch_component (plan.instance[instanceRef].name.in ()); - - if (CORBA::is_nil (comp.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::provide_endpoint_reference - " - "Nil component reference from CIAO_State for <%C>\n", - plan.instance[instanceRef].name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Component instance not deployed when " - "gathering connections."); - } - - ACE_NEW_THROW_EX (out, - CORBA::Any (), - CORBA::NO_MEMORY ()); - - endpoint_reference = out; - - if (this->is_local_connection (conn)) - { - (*out) <<= comp.in (); - } - else - { - switch (conn.internalEndpoint[i].kind) - { - case ::Deployment::Facet: - ref = - comp->provide_facet (conn.internalEndpoint[i].portName.in ()); - (*out) <<= ref.in (); - break; -#if !defined (CCM_NOEVENT) - case ::Deployment::EventConsumer: - ref = - comp->get_consumer (conn.internalEndpoint[i].portName.in ()); - (*out) <<= ref.in (); - break; -#endif - default: - throw ::Deployment::InvalidConnection (conn.name.in (), - "Invalid provider port type."); - }; - } - return; - } - } - } - catch (const ::Deployment::InvalidConnection &) - { - // pass through - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::provide_endpoint_reference - " - "Caught CORBA Exception <%C> while fetching reference for " - "connection <%C>\n", - ex._info ().c_str (), - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::provide_endpoint_reference - " - "Caught unknown C++ exception on instance %C", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unknown C++ exception whilst establishing " - "connection"); - } - - } - - void - Connection_Handler::connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong c_id, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Connection_Handler::connect_instance"); - - const ::Deployment::PlanConnectionDescription &conn = - plan.connection[c_id]; - - CORBA::ULong endpointRef = this->retrieve_endpoint (conn); - - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = - conn.internalEndpoint[endpointRef]; - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::connect_instance - " - "Connecting %C connection <%C> on instance <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - try - { - switch (conn.internalEndpoint[endpointRef].kind) - { - - case Deployment::Facet: - - if (this->is_local_connection (conn)) - { - this->connect_local_port (plan, conn, endpointRef, endpoint); - } - else - { - this->connect_non_local_facet (plan, - conn, - endpoint, - provided_reference); - } - break; - - case Deployment::SimplexReceptacle: - case Deployment::MultiplexReceptacle: - - if (this->is_local_connection (conn)) - { - this->connect_local_port (plan, conn, endpointRef, endpoint); - } - else - { - this->connect_non_local_receptacle (plan, - conn, - endpoint, - provided_reference); - } - break; - -#if !defined (CCM_NOEVENT) - case Deployment::EventConsumer: - this->connect_consumer (plan, conn, endpoint, provided_reference); - break; - - case Deployment::EventEmitter: - this->connect_emitter (plan, conn, endpoint, provided_reference); - break; - - case Deployment::EventPublisher: - this->connect_publisher (plan, conn, endpoint, provided_reference); - break; -#endif - default: - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_instance - " - "Unsupported port type.\n")); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unsupported port type"); - - } - } - catch (const ::Deployment::InvalidConnection &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_instance - " - "Caught InvalidConnection exception whilst " - "connecting %C connection <%C>: %C. Reason: %C\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in (), - ex.name.in (), - ex.reason.in ())); - - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_instance - " - "Caught CORBA exception whilst connecting %C connection <%C>: %C\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in (), - ex._info ().c_str ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_instance - " - "Caught C++ exception whilst connecting %C connection <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unknown C++ Exception"); - } - } - - void - Connection_Handler::disconnect_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong c_id) - { - CIAO_TRACE ("Connection_Handler::disconnect_instance"); - - const ::Deployment::PlanConnectionDescription &conn = - plan.connection[c_id]; - - CORBA::ULong endpointRef = this->retrieve_endpoint (conn); - - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = - conn.internalEndpoint[endpointRef]; - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::disconnect_instance - " - "Disconnecting %C connection <%C> on instance <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - - try - { - switch (conn.internalEndpoint[endpointRef].kind) - { - case Deployment::Facet: - - if (this->is_local_connection (conn)) - { - this->disconnect_local_port (plan, conn, endpointRef, endpoint); - } - else - { - //only because the receptacle is an external endpoint - this->disconnect_non_local (conn, conn.externalReference[0].portName.in ()); - } - break; - - case Deployment::SimplexReceptacle: - case Deployment::MultiplexReceptacle: - - if (this->is_local_connection (conn)) - { - this->disconnect_local_port (plan, conn, endpointRef, endpoint); - } - else - { - this->disconnect_non_local (conn, endpoint.portName.in ()); - } - break; -#if !defined (CCM_NOEVENT) - case Deployment::EventConsumer: - this->disconnect_consumer (conn, endpoint); - break; - - case Deployment::EventEmitter: - this->disconnect_emitter (conn, endpoint); - break; - - case Deployment::EventPublisher: - this->disconnect_publisher (conn, endpoint); - break; -#endif - default: - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::disconnect_instance - " - "Unsupported port type.\n")); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unsupported port type"); - - } - } - catch (const ::Deployment::InvalidConnection &) - { - // pass through - throw; - } - // Since DANCE shuts down the Locality managers simultaneously, - // it could be that one locality manager is shutdown while the - // other wants to disconnect from this locality manager. Therefor - // we catch an OBJECT_NOT_EXIST, TRANSIENT and a COMM_FAILURE at this point - // Once DANCE has been fixed in that manner, these catches can be removed. - catch (const CORBA::COMM_FAILURE &ex) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_instance - " - "Caught COMM_FAILURE exception whilst disconnecting %C connection <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - } - catch (const CORBA::OBJECT_NOT_EXIST &ex) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_instance - " - "Caught OBJECT_NOT_EXIST exception whilst disconnecting %C connection <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - } - catch (const CORBA::TRANSIENT &ex) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_instance - " - "Caught TRANSIENT exception whilst disconnecting %C connection <%C>\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::disconnect_instance - " - "Caught CORBA exception whilst disconnecting %C connection <%C>: %C\n", - CIAO::kind_as_string (conn.internalEndpoint[endpointRef].kind), - conn.name.in (), - ex._info ().c_str ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::disconnect_instance - " - "Caught C++ exception whilst disconnecting <%C>\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unknown C++ Exception"); - } - } - - void - Connection_Handler::connect_non_local_facet (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Connection_Handler::connect_non_local_facet"); - - - // provided_reference is a receptacle. We need to call 'connect' on this reference - // and pass the facet. - if (conn.externalReference.length () == 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_facet - " - "Error: Expected external reference endpoint for connection <%C>", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Expected external reference connection."); - } - - ::CORBA::Object_var obj; - provided_reference >>= CORBA::Any::to_object (obj); - - ::Components::CCMObject_var provided = ::Components::CCMObject::_narrow (obj.in ()); - - if (CORBA::is_nil (provided)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_facet - " - "While connecting <%C>:" - "Provided reference for connection where primary is Facet must be " - "non-nil.\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Provided reference for connection where primary is Facet must " - "be non-nil."); - - } - - ::Components::CCMObject_var facet_provider = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - - if (CORBA::is_nil (facet_provider)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_facet - " - "While connecting <%C>:" - "Providing component not deployed.", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Providing component not deployed."); - } - - CORBA::Object_var facet = - facet_provider->provide_facet (endpoint.portName.in ()); - - ::Components::Cookie_var cookie = provided->connect (conn.externalReference[0].portName.in (), - facet.in ()); -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), facet.in ()); -#endif - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_non_local_facet - " - "Connection <%C> successfully established.\n", - conn.name.in ())); - - CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), - ::Components::CCMObject::_duplicate (provided.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } - - void - Connection_Handler::connect_non_local_receptacle (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Component_Handler_i::connect_non_local_receptacle"); - - //provided_reference is a facet. We need to pass this reference to the receptacle, using the connect method - - ::CORBA::Object_var provided; - - if (!(provided_reference >>= CORBA::Any::to_object (provided))) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_receptacle - " - "Unable to extract provided reference to CORBA::Object\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to CORBA Object."); - } - - if (conn.externalReference.length () != 0) - { - if (ACE_OS::strlen (conn.externalReference[0].portName.in ()) > 0) - { - ::Components::CCMObject_var facet_provider = - ::Components::CCMObject::_narrow (provided.in ()); - - if (CORBA::is_nil (facet_provider.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_receptacle - " - "Unable to narrow provided external reference " - "to CCMObject in connection <%C> for port <%C>\n", - conn.name.in (), - conn.externalReference[0].portName.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to narrow external reference to CCMObject\n"); - } - - provided = - facet_provider->provide_facet (conn.externalReference[0].portName.in ()); - } - } - - ::Components::CCMObject_var receptacle = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - - if (CORBA::is_nil (receptacle.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_non_local_receptacle - " - "While connecting <%C>:" - "Receptacle component <%C> not deployed.\n", - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Receptacle component not deployed."); - } - - ::Components::Cookie_var cookie = receptacle->connect (endpoint.portName.in (), - provided.in ()); -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), provided.in ()); -#endif - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_non_local_receptacle - " - "Connection <%C> successfully established.\n", - conn.name.in ())); - - CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), - ::Components::CCMObject::_duplicate (receptacle.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::connect_publisher (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Connection_Handler::connect_publisher"); - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::connect_publisher - " - "Connecting connection <%C> on instance <%C>\n", - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - - ::CORBA::Object_var provided; - - if (!(provided_reference >>= CORBA::Any::to_object (provided)) || - CORBA::is_nil (provided.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_publisher - " - "Unable to extract provided reference to CORBA::Object\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to CORBA Object."); - } - - Components::EventConsumerBase_var event; - if (conn.externalReference.length () == 0) - { - event = Components::EventConsumerBase::_unchecked_narrow (provided); - } - else - { - ::Components::CCMObject_var consumer = ::Components::CCMObject::_narrow (provided.in ()); - - if (CORBA::is_nil (consumer.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_publisher - " - "Unable to extract provided reference to Components::CCMObject\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to " - "Components::CCMObject."); - } - ::CORBA::Object_var event_obj = consumer->get_consumer (conn.externalReference[0].portName.in ()); - event = ::Components::EventConsumerBase::_narrow (event_obj.in ()); - } - - if (CORBA::is_nil (event.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_publisher - " - "Unable to extract provided reference to " - "Components::EventConsumerBase\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to " - "Components::EventConsumerBase."); - } - - ::Components::CCMObject_var publisher = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - - if (CORBA::is_nil (publisher)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_publisher - " - "While connecting <%C>:" - "Publishing component not deployed.", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Publisher component not deployed."); - } - Components::Cookie_var cookie = publisher->subscribe (endpoint.portName.in (), - event.in ()); -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), publisher.in()); -#endif - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_publisher - " - "Connection <%C> successfully established.\n", - conn.name.in ())); - - CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), - ::Components::CCMObject::_duplicate (publisher.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } -#endif - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::connect_consumer (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Connection_Handler::connect_consumer"); - - // provided_reference is an emitter or a publisher. - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::connect_consumer - " - "Connecting connection <%C> on instance <%C>\n", - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - - if (conn.externalReference.length () == 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_consumer - " - "Error: Expected external reference endpoint for connection <%C>", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Expected external reference connection."); - } - - ::CORBA::Object_var obj; - - if (!(provided_reference >>= CORBA::Any::to_object (obj)) || - CORBA::is_nil (obj.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_consumer - " - "Unable to extract provided reference to CORBA::Object\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to CORBA Object."); - } - - ::Components::CCMObject_var other_endpoint = - ::Components::CCMObject::_narrow (obj.in ()); - - if (::CORBA::is_nil (other_endpoint.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_consumer - " - "Error: Unable to fetch emitter component for connection <%C>\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to get reference to the emitter."); - } - - //find the consumer. - ::Components::CCMObject_var consumer_provider = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - - if (CORBA::is_nil (consumer_provider)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_consumer - " - "While connecting <%C>:" - "Providing component not deployed.", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Providing component not deployed."); - } - - CORBA::Object_var consumer = - consumer_provider->get_consumer (endpoint.portName.in ()); - - ::Components::EventConsumerBase_var event = ::Components::EventConsumerBase::_narrow (consumer.in ()); - - //assume it's an emitter. - ::Components::Cookie_var cookie; - try - { - other_endpoint->connect_consumer (conn.externalReference[0].portName.in (), - event.in ()); - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::connect_consumer - " - "Succesfully connected to %C\n", - conn.externalReference[0].portName.in ())); - } - catch (const ::Components::InvalidName &) - { - // we now assume it's a publisher - cookie = other_endpoint->subscribe (conn.externalReference[0].portName.in (), - event.in ()); - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::connect_consumer - " - "Succesfully subscribed to %C\n", - conn.externalReference[0].portName.in ())); - } - -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), event.in()); -#endif - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_consumer - " - "Connection <%C> successfully established.\n", - conn.name.in ())); - - CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), - ::Components::CCMObject::_duplicate (other_endpoint.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } -#endif - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::connect_emitter (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Connection_Handler::connect_emitter"); - - // provided_reference is a consumer. - // We need to pass this to the emitter, using the connect_consumer - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::connect_emitter - " - "Connecting connection <%C> on instance <%C>\n", - conn.name.in (), - plan.instance[endpoint.instanceRef].name.in ())); - - ::CORBA::Object_var consumer; - - if (!(provided_reference >>= CORBA::Any::to_object (consumer)) || - CORBA::is_nil (consumer.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_emitter - " - "Unable to extract provided reference to CORBA::Object\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Unable to extract provided reference to CORBA Object."); - } - Components::EventConsumerBase_var event = - Components::EventConsumerBase::_unchecked_narrow (consumer); - - ::Components::CCMObject_var emitter = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - - if (CORBA::is_nil (emitter)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_emitter - " - "While connecting <%C>:" - "Emitting component not deployed.", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Emitting component not deployed."); - } - - if (CORBA::is_nil (event)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_emitter - " - "While connecting <%C>:" - "Consuming component not deployed.", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "Consumer component not deployed."); - } - - emitter->connect_consumer (endpoint.portName.in (), - event.in ()); -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), emitter.in()); -#endif - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_emitter - " - "Connection <%C> successfully established.\n", - conn.name.in ())); - - ::Components::Cookie_var nil_cookie; - - CONNECTION_INFO conn_info = CONNECTION_INFO (nil_cookie._retn (), - ::Components::CCMObject::_duplicate (emitter.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } -#endif - - void - Connection_Handler::disconnect_non_local (const ::Deployment::PlanConnectionDescription &conn, - const char * port_name) - { - CIAO_TRACE ("Connection_Handler::disconnect_non_local"); - - ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::disconnect_non_local - " - "About to disconnect <%C>\n", - conn.name.in())); - ::CORBA::Object_var safe_tmp = - obj->disconnect (port_name, - this->get_cookie (conn.name.in ())); - - this->remove_cookie (conn.name.in ()); - } - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::disconnect_publisher (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint) - - { - CIAO_TRACE ("Connection_Handler::disconnect_publisher"); - - ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); - - ::Components::EventConsumerBase_var safe_temp = - obj->unsubscribe (endpoint.portName.in (), - this->get_cookie (conn.name.in ())); - this->remove_cookie (conn.name.in ()); - } -#endif - - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::disconnect_consumer (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint) - - { - CIAO_TRACE ("Connection_Handler::disconnect_consumer"); - - ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); - - ::Components::EventConsumerBase_var safe_temp; - try - { - const char * name (0); - if (conn.externalReference[0].provider) - { // determine the port name of the publisher or emitter. - name = endpoint.portName.in (); - } - else - { - name = conn.externalReference[0].portName.in (); - } - if (this->get_cookie (conn.name.in ()) == 0) - { //emitter - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::disconnect_consumer - " - "Disconnecting %C on the emitter.\n", - name)); - safe_temp = obj->disconnect_consumer (name); - } - else - { //publisher - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::disconnect_consumer - " - "Disconnecting %C on the publisher.\n", - name)); - safe_temp = obj->unsubscribe (name, this->get_cookie (conn.name.in ())); - } - } - // it could be that the emmitter or publisher is already shut down. In that - // case we got a COMM_FAILURE or a TRANSIENT exception. - catch (const ::CORBA::OBJECT_NOT_EXIST &) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_consumer - " - "Caught OBJECT_NOT_EXIST exception during disconnecting %C\n", - conn.name.in ())); - } - catch (const ::CORBA::COMM_FAILURE &) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_consumer - " - "Caught COMM_FAILURE exception during disconnecting %C\n", - conn.name.in ())); - } - catch (const ::CORBA::TRANSIENT &) - { - CIAO_DEBUG (2, (LM_WARNING, CLINFO - "Connection_Handler::disconnect_consumer - " - "Caught TRANSIENT exception during disconnecting %C\n", - conn.name.in ())); - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception ("Connection_Handler::disconnect_consumer"); - } - // still need to remove the cookie. - this->remove_cookie (conn.name.in ()); - } -#endif - -#if !defined (CCM_NOEVENT) - void - Connection_Handler::disconnect_emitter (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint) - - { - CIAO_TRACE ("Connection_Handler::disconnect_emitter"); - ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); - obj->disconnect_consumer (endpoint.portName.in ()); - this->remove_cookie (conn.name.in ()); - } -#endif - - void - Connection_Handler::connect_local_port (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - ::CORBA::ULong endpointRef, - const ::Deployment::PlanSubcomponentPortEndpoint &receptacle_endpoint) - { - CIAO_TRACE ("Connection_Handler::connect_local_port"); - - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Connection_Handler::connect_local_port - " - "Connecting connection <%C> on instance <%C>\n", - conn.name.in (), - plan.instance[receptacle_endpoint.instanceRef].name.in ())); - - CORBA::ULong facet_endpointRef = (endpointRef + 1) % 2; - if (conn.internalEndpoint.length () != 2 || - conn.internalEndpoint[facet_endpointRef].kind != ::Deployment::Facet) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_local_port - " - "Error: Wrong number of internal endpoints for local connection: " - "expected <2> - found <%d>\n", - conn.internalEndpoint.length ())); - - throw ::Deployment::InvalidConnection (conn.name.in (), - " Local connections require exactly 2 internalEndpoints"); - } - - const ::Deployment::PlanSubcomponentPortEndpoint &facet_endpoint = - conn.internalEndpoint[facet_endpointRef]; - - const char *facet_cont = - DEPLOYMENT_STATE::instance ()->instance_to_container ( - plan.instance[facet_endpoint.instanceRef].name.in ()); - const char *recep_cont = - DEPLOYMENT_STATE::instance ()->instance_to_container ( - plan.instance[receptacle_endpoint.instanceRef].name.in ()); - - if (facet_cont && recep_cont && - ACE_OS::strcmp (facet_cont, recep_cont) != 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_local_port - " - "Ports <%C> and <%C> participate in local connection, " - "but are installed in differing containers <%C> and <%C>\n", - plan.instance[facet_endpoint.instanceRef].name.in (), - plan.instance[receptacle_endpoint.instanceRef].name.in (), - facet_cont, - recep_cont)); - throw ::Deployment::InvalidConnection (plan.instance[facet_endpoint.instanceRef].name.in (), - "Component instance participates in a local connection with " - "a non-local entity."); - } - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (facet_cont); - - Components::CCMObject_var - facet = DEPLOYMENT_STATE::instance ()->fetch_component ( - plan.instance[facet_endpoint.instanceRef].name.in ()), - receptacle = DEPLOYMENT_STATE::instance ()->fetch_component ( - plan.instance[receptacle_endpoint.instanceRef].name.in ()); - - ::Components::Cookie_var cookie = cont->connect_local_facet (facet, - facet_endpoint.portName.in (), - receptacle, - receptacle_endpoint.portName.in ()); -#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) - this->validate_connection(conn.name.in (), facet); -#endif - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_local_port - " - "Connected local port <%C>:<%C> to <%C>:<%C>\n", - plan.instance[facet_endpoint.instanceRef].name.in (), - facet_endpoint.portName.in (), - plan.instance[receptacle_endpoint.instanceRef].name.in (), - receptacle_endpoint.portName.in ())); - - CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), - ::Components::CCMObject::_duplicate (receptacle.in ())); - this->insert_cookie (conn.name.in (), conn_info); - } - - void - Connection_Handler::disconnect_local_port (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - ::CORBA::ULong endpointRef, - const ::Deployment::PlanSubcomponentPortEndpoint &receptacle_endpoint) - { - CIAO_TRACE ("Connection_Handler::disconnect_local_port"); - - - CORBA::ULong facet_endpointRef = (endpointRef + 1) % 2; - if (conn.internalEndpoint.length () != 2 || - conn.internalEndpoint[facet_endpointRef].kind != ::Deployment::Facet) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::disconnect_local_port - " - "Error: Wrong number of internal endpoints for local " - "connection: expected <2> - found <%d>\n", - conn.internalEndpoint.length ())); - - throw ::Deployment::InvalidConnection (conn.name.in (), - "Local connections require exactly 2 " - "internalEndpoints"); - - } - const ::Deployment::PlanSubcomponentPortEndpoint &facet_endpoint = - conn.internalEndpoint[facet_endpointRef]; - - const char *facet_cont = - DEPLOYMENT_STATE::instance ()->instance_to_container ( - plan.instance[facet_endpoint.instanceRef].name.in ()); - const char *recep_cont = - DEPLOYMENT_STATE::instance ()->instance_to_container ( - plan.instance[receptacle_endpoint.instanceRef].name.in ()); - - if (facet_cont && recep_cont && - ACE_OS::strcmp (facet_cont, recep_cont) != 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::disconnect_local_port - " - "Ports <%C> and <%C> participate in local connection, " - "but are installed in differing containers <%C> and <%C>\n", - plan.instance[facet_endpoint.instanceRef].name.in (), - plan.instance[receptacle_endpoint.instanceRef].name.in (), - facet_cont, - recep_cont)); - throw ::Deployment::InvalidConnection (plan.instance[facet_endpoint.instanceRef].name.in (), - "Component instance participates in a local connection with " - "a non-local entity."); - } - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (facet_cont); - - Components::CCMObject_var - facet = DEPLOYMENT_STATE::instance ()->fetch_component ( - plan.instance[facet_endpoint.instanceRef].name.in ()), - receptacle = DEPLOYMENT_STATE::instance ()->fetch_component ( - plan.instance[receptacle_endpoint.instanceRef].name.in ()); - - cont->disconnect_local_facet ( - this->get_cookie (conn.name.in ()), - facet, - facet_endpoint.portName.in (), - receptacle, - receptacle_endpoint.portName.in ()); - - this->remove_cookie (conn.name.in ()); - - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::disconnect_local_port - " - "Disconnected local port <%C>:<%C> to <%C>:<%C>\n", - plan.instance[facet_endpoint.instanceRef].name.in (), - facet_endpoint.portName.in (), - plan.instance[receptacle_endpoint.instanceRef].name.in (), - receptacle_endpoint.portName.in ())); - } - - void - Connection_Handler::validate_connection (const char * conn, - ::CORBA::Object_ptr obj) - { - CIAO_TRACE ("Connection_Handler::validate_connection"); - try - { - if (!::CORBA::is_nil (obj)) - { - ::CORBA::PolicyList_var pl; - if (obj->_validate_connection (pl.out ())) - { - CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::validate_connection - " - "Succesfully validated connection <%C>. Connection has been pre-established.\n", - conn)); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::validate_connection - " - "Failed to pre-establish a connection <%C>.\n", - conn)); - } - } - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("Connection_Handler::validate_connection"); - } - } - - bool - Connection_Handler::is_local_connection (const ::Deployment::PlanConnectionDescription &conn) - { - CIAO_TRACE ("Connection_Handler::is_local_connection"); - - Deployment::Requirements const& deploy_req = conn.deployRequirement; - for (CORBA::ULong i = 0; i < deploy_req.length (); i++) - { - if (ACE_OS::strcmp (deploy_req[i].name, "edu.dre.vanderbilt.DAnCE.ConnectionType") == 0 && - ACE_OS::strcmp (deploy_req[i].resourceType, "Local_Interface") == 0) - { - return true; - } - } - return false; - } - - void - Connection_Handler::insert_cookie (const char * connection_name, - const CONNECTION_INFO conn_info) - { - CIAO_TRACE ("Connection_Handler::insert_cookie"); - - std::pair result; - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->cookies_mutex_, - CORBA::NO_RESOURCES ()); - - std::pair value_to_insert (connection_name, - conn_info); - result = this->cookies_.insert (value_to_insert); - } - if (!result.second) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::insert_cookie - " - "Error inserting new cookie\n")); - conn_info.first->_remove_ref (); - conn_info.second->_remove_ref (); - throw ::Deployment::InvalidConnection (connection_name, - "Unable to insert cookie."); - } - else - { - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::insert_cookie - " - "Inserted cookie for [%C].\n", - connection_name)); - } - } - - void - Connection_Handler::remove_cookie (const char* connection_name) - { - CIAO_TRACE ("Connection_Handler::remove_cookie"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->cookies_mutex_, - CORBA::NO_RESOURCES ()); - - COOKIES::iterator it = this->cookies_.find (connection_name); - if (it == this->cookies_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::remove_cookie - " - "Unable to delete cookie for connection <%C>\n", - connection_name)); - return; - } - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::remove_cookie - " - "About to remove cookie for [%C].\n", - connection_name)); - it->second.second = ::Components::CCMObject::_nil (); - this->cookies_.erase (it); - } - - ::Components::Cookie * - Connection_Handler::get_cookie (const char * connection_name) - { - CIAO_TRACE ("Connection_Handler::get_cookie"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->cookies_mutex_, - CORBA::NO_RESOURCES ()); - - COOKIES::iterator it = this->cookies_.find (connection_name); - if (it == this->cookies_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::get_cookie - " - "Cookie for <%C> not found\n", - connection_name)); - throw ::Deployment::InvalidConnection (connection_name, - "Unable to find correct cookie"); - } - else - { - CIAO_DEBUG (5, (LM_DEBUG, CLINFO - "Connection_Handler::get_cookie - " - "Found cookie for [%C]\n", - connection_name)); - } - return it->second.first.in (); - } - - ::Components::CCMObject_ptr - Connection_Handler::get_ccm_object (const char * connection_name) - { - CIAO_TRACE ("Connection_Handler::get_ccm_object"); - COOKIES::iterator it; - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->cookies_mutex_, - CORBA::NO_RESOURCES ()); - it = this->cookies_.find (connection_name); - if (it == this->cookies_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::get_ccm_object - " - "Cookie for <%C> not found\n", - connection_name)); - throw ::Deployment::InvalidConnection (connection_name, - "Unable to find correct cookie"); - } - } - ::Components::CCMObject_var ret = it->second.second; - if (::CORBA::is_nil (ret.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::get_ccm_object - " - "Error: Stored CCM object seems to be nil.\n", - connection_name)); - throw ::Deployment::InvalidConnection (connection_name, - "Stored CCM object seems nil"); - } - return ::Components::CCMObject::_duplicate (ret.in ()); - } - - ::CORBA::ULong - Connection_Handler::retrieve_endpoint (const ::Deployment::PlanConnectionDescription &conn) - { - CIAO_TRACE ("Connection_Handler::retrieve_endpoint"); - - if (conn.internalEndpoint.length () == 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::retrieve_endpoint - " - "Connection <%C> lacks an internalEndpoint.\n", - conn.name.in ())); - throw ::Deployment::InvalidConnection (conn.name.in (), - "No internal endpoint for connection\n"); - } - // When two internal endpoints defined, get the 'consuming' endpoint - // (Publisher, Emitter, Receptacle). - // In case the the 'consuming' endpoint is external, we need to connect, - // using the providing endpoint. Therfor returning nil. - if (conn.internalEndpoint.length () > 1) - { - for (CORBA::ULong i = 0; - i < conn.internalEndpoint.length (); - ++i) - { - if (!conn.internalEndpoint[i].provider) - return i; - } - } - return 0; - } -} diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h deleted file mode 100644 index 510b7c257d0..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h +++ /dev/null @@ -1,122 +0,0 @@ -/** - * @file Connection_Handler.h - * @author William R. Otte - * - * Common connection handling logic for components. - */ - -#ifndef CONNECTION_HANDLER_H -#define CONNECTION_HANDLER_H - -#include "dance/Deployment/Deployment_DeploymentPlanC.h" -#include "ciao/Containers/Container_BaseC.h" -#include "ccm/CCM_ObjectC.h" - -#include -#include - -namespace CIAO -{ - class Connection_Handler - { - public: - void - provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); - - void connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong c_id, - const ::CORBA::Any & provided_reference); - - void disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong c_id); - - private: - -#if !defined (CCM_NOEVENT) - void connect_publisher (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference); -#endif - -#if !defined (CCM_NOEVENT) - void connect_consumer (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference); -#endif - -#if !defined (CCM_NOEVENT) - void connect_emitter (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference); -#endif - -#if !defined (CCM_NOEVENT) - void disconnect_publisher (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint); -#endif - -#if !defined (CCM_NOEVENT) - void disconnect_consumer (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint); -#endif - -#if !defined (CCM_NOEVENT) - void disconnect_emitter (const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint); -#endif - - void connect_local_port (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - ::CORBA::ULong endpointRef, - const ::Deployment::PlanSubcomponentPortEndpoint &receptacle_endpoint); - - void disconnect_local_port (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - ::CORBA::ULong endpointRef, - const ::Deployment::PlanSubcomponentPortEndpoint &receptacle_endpoint); - - void connect_non_local_receptacle (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference); - - void connect_non_local_facet (const ::Deployment::DeploymentPlan & plan, - const ::Deployment::PlanConnectionDescription &conn, - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint, - const ::CORBA::Any & provided_reference); - - void disconnect_non_local (const ::Deployment::PlanConnectionDescription &conn, - const char * port_name); - - bool is_local_connection (const ::Deployment::PlanConnectionDescription &conn); - - void validate_connection (const char * conn, - ::CORBA::Object_ptr obj); - - ::CORBA::ULong retrieve_endpoint (const ::Deployment::PlanConnectionDescription &conn); - - typedef std::pair < ::Components::Cookie_var, - ::Components::CCMObject_var> CONNECTION_INFO; - typedef std::map COOKIES; - - void insert_cookie (const char * connection_name, - const CONNECTION_INFO conn_info); - - ::Components::Cookie * get_cookie (const char * connection_name); - - void remove_cookie (const char * connection_name); - - ::Components::CCMObject_ptr get_ccm_object (const char * connection_name); - - COOKIES cookies_; - - TAO_SYNCH_MUTEX cookies_mutex_; - }; -} -#endif diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp deleted file mode 100644 index d6f50dd8147..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp +++ /dev/null @@ -1,283 +0,0 @@ -#include "Container_Handler.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Logger/Logger_Service.h" -#include "ciao/Base/CIAO_PropertiesC.h" -#include "ciao/Containers/Session/Session_Container.h" -#include "ciao/Base/Server_init.h" -#include "dance/DAnCE_Utility.h" -#include "dance/DAnCE_PropertiesC.h" -#include "dance/LocalityManager/Scheduler/Plugin_Manager.h" -#include "CIAO_State.h" - -namespace CIAO -{ - Container_Handler_i::Container_Handler_i (void) - { - // Also initialize CIAO logger since we reuse parts of CIAO in the locality manager - CIAO::Logger_Service - * clf = ACE_Dynamic_Service::instance ("CIAO_Logger"); - - int argc = 0; - ACE_TCHAR **argv = 0; - - if (clf) - { - clf->init (argc, argv); - } - - CIAO_TRACE ("Container_Handler_i::Container_Handler_i"); - } - - // Destructor - Container_Handler_i::~Container_Handler_i (void) - { - CIAO_TRACE ("Container_Handler_i::~Container_Handler_i"); - } - - void - Container_Handler_i::close (void) - { - try - { - // For the time being, we are going to go ahead and delete - // the default container - ::Deployment::DeploymentPlan plan; - plan.instance.length (1); - plan.instance[0].name = ""; - - CORBA::Any any; - this->remove_instance (plan, 0, any); - } - catch (...) - { //swallow - } - - DEPLOYMENT_STATE::instance ()->close (); - DEPLOYMENT_STATE::close (); - - this->orb_ = CORBA::ORB::_nil (); - this->poa_ = PortableServer::POA::_nil (); - } - - ::CORBA::StringSeq * - Container_Handler_i::dependencies (void) - { - ::CORBA::StringSeq *retval (0); - ACE_NEW_THROW_EX (retval, - ::CORBA::StringSeq (0), - CORBA::NO_MEMORY ()); - - return retval; - } - - char * - Container_Handler_i::instance_type (void) - { - CIAO_TRACE ("Container_Handler_i::instance_type"); - return CORBA::string_dup (CIAO::Deployment::CCM_CONTAINER); - } - - void - Container_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference) - { - CIAO_TRACE ("Container_Handler_i::install_instance"); - - ACE_NEW_THROW_EX (instance_reference, - ::CORBA::Any (), - CORBA::NO_MEMORY ()); - - const char *name (plan.instance[instanceRef].name.in ()); - CIAO::Session_Container *cont (0); - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Container_Handler_i::install_instance - " - "Creating session container with id <%C>\n", - name)); - ACE_NEW_THROW_EX (cont, - CIAO::Session_Container_i (this->orb_, - this->poa_), - CORBA::NO_MEMORY ()); - - CIAO::Container_var container_ref (cont); - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Container_Handler_i::install_instance - " - "Container <%C> successfully created\n", - name)); - - container_ref->init (name); - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Container_Handler_i::install_instance - " - "Container <%C> successfully initialized\n", - name)); - - DEPLOYMENT_STATE::instance ()->add_container (name, container_ref.in ()); - - *instance_reference <<= container_ref; - } - - void - Container_Handler_i::activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &) - { - CIAO_TRACE ("Container_Handler_i::activate_instance"); - // no activation needed. - } - - void - Container_Handler_i::passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &) - { - CIAO_TRACE ("Container_Handler_i::passivate_instance"); - // no passivation needed. - } - - void - Container_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::Any_out) - { - CIAO_TRACE ("Container_Handler_i::provide_endpoint_reference"); - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::provide_endpoint_reference - " - "Unable to provide any endpoints.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - void - Container_Handler_i::remove_instance ( - const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Container_Handler_i::remove_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - - ::CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (name); - - if (::CORBA::is_nil (cont.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::remove_instance - " - "Error, no container with id <%C>\n", - name)); - throw ::Deployment::StopError (name, - "No container with ID"); - } - - CIAO_DEBUG (8, (LM_TRACE, CLINFO - "Container_Handler_i::remove_instance - " - "Finalizing container with Id <%C>\n", - name)); - - // Instructing container to cleanup its state - cont->fini (); - - CIAO_DEBUG (8, (LM_TRACE, CLINFO - "Container_Handler_i::remove_instance - " - "Removing container with Id <%C>\n", - name)); - - DEPLOYMENT_STATE::instance ()->remove_container (name); - - CIAO_DEBUG (5, (LM_TRACE, CLINFO - "Container_Handler_i::remove_instance - " - "Container with Id <%C> removed.\n", - name)); - } - - void - Container_Handler_i::connect_instance (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - const ::CORBA::Any &) - { - CIAO_TRACE ("Container_Handler_i::connect_instance"); - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::connect_instance - ", - "No connections allowed for containers.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - - void - Container_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) - { - CIAO_TRACE ("Container_Handler_i::disconnect_instance"); - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::disconnect_instance - ", - "No connections allowed for containers.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - void - Container_Handler_i::instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) - { - CIAO_TRACE ("Container_Handler_i::instance_configured"); - // nothing to be done - } - - void - Container_Handler_i::configure (const ::Deployment::Properties &props) - { - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Container_Handler_i::configure - " - "Received %u properties for configuration\n", - props.length ())); - - this->orb_ = DAnCE::PLUGIN_MANAGER::instance ()->get_orb (); - - if (CORBA::is_nil (this->orb_)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::configure - " - "Unable to locate ORB.\n")); - throw ::Deployment::StartError ("CIAO Container Handler ", - "Unable to locate ORB"); - } - - CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA"); - - this->poa_ = - PortableServer::POA::_narrow (object.in ()); - - if (CORBA::is_nil (this->poa_)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Container_Handler_i::configure - " - "Unable to locate POA.\n")); - throw ::Deployment::StartError ("CIAO Container Handler ", - "Unable to locate POA"); - } - - CIAO::Server_init (this->orb_); - - // For the time being, we are going to go ahead and construct a container. - ::Deployment::DeploymentPlan plan; - plan.instance.length (1); - plan.instance[0].name = ""; - - ::CORBA::Any_var any; - this->install_instance (plan, 0, any.out ()); - } -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Container_Handler (void) - { - return new CIAO::Container_Handler_i (); - } -} diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.h b/CIAO/ciao/Deployment/Handlers/Container_Handler.h deleted file mode 100644 index d6a09df71ca..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.h +++ /dev/null @@ -1,97 +0,0 @@ - -// -*- C++ -*- -/** - * @file Container_Handler.h - * @author William R. Otte - * - * Installation handler implementation for spawning LocalityManagers. - */ - -#ifndef CIAO_CONTAINER_HANDLER_H -#define CIAO_CONTAINER_HANDLER_H - -#include "tao/ORB.h" -#include "tao/PortableServer/POAC.h" -#include "dance/DAnCE_LocalityManagerC.h" -#include "dance/DAnCE_Utility.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h" -#include "tao/LocalObject.h" - -namespace CIAO -{ - class CIAO_Locality_Handler_Export Container_Handler_i - : public virtual DAnCE::InstanceDeploymentHandler, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - Container_Handler_i (void); - - // Destructor - virtual ~Container_Handler_i (void); - - virtual - char * instance_type (void); - - virtual - ::CORBA::StringSeq * dependencies (void); - - virtual - void install_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference); - - virtual - void activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - virtual - void passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - - virtual - void remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & instance_reference); - - virtual - void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); - virtual - void connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference); - - virtual - void disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef); - - virtual - void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); - - virtual - void configure(const Deployment::Properties&); - - virtual void close (void); - - private: - CORBA::ORB_var orb_; - PortableServer::POA_var poa_; - }; -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Container_Handler (void); -} - -#endif diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp deleted file mode 100644 index e49df82e92b..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp +++ /dev/null @@ -1,461 +0,0 @@ -#include "Home_Handler.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Base/CIAO_PropertiesC.h" -#include "ciao/Base/CIAO_ExceptionsC.h" -#include "ciao/Containers/Container_BaseC.h" -#include "CIAO_State.h" - -namespace CIAO -{ - Home_Handler_i::Home_Handler_i (void) - { - CIAO_TRACE ("Home_Handler_i::Home_Handler_i"); - } - - // Destructor - Home_Handler_i::~Home_Handler_i (void) - { - CIAO_TRACE ("Home_Handler_i::~Home_Handler_i"); - } - - void Home_Handler_i::close (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_.clear (); - } - - ::CORBA::StringSeq * - Home_Handler_i::dependencies (void) - { - ::CORBA::StringSeq *retval (0); - ACE_NEW_THROW_EX (retval, - ::CORBA::StringSeq (1), - CORBA::NO_MEMORY ()); - - retval->length (1); - (*retval)[0] = CIAO::Deployment::CCM_CONTAINER; - - return retval; - } - - char * - Home_Handler_i::instance_type (void) - { - CIAO_TRACE ("Home_Handler_i::instance_type"); - return CORBA::string_dup (CIAO::Deployment::CCM_HOME); - } - - void - Home_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference) - { - CIAO_TRACE ("Home_Handler_i::install_instance"); - - ::CORBA::Any *retval_tmp = 0; - ACE_NEW_THROW_EX (retval_tmp, - CORBA::Any (), - CORBA::NO_MEMORY ()); - instance_reference = retval_tmp; - - const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); - const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - - DAnCE::Utility::PROPERTY_MAP *pmap = 0; - - ACE_NEW_THROW_EX (pmap, - DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + - mdd.execParameter.length ()), - CORBA::NO_MEMORY ()); - - Deployment_Common::Instance_Info info; - info.name = idd.name.in (); - info.pmap.reset (pmap); - - DAnCE::Utility::build_property_map (*pmap, - mdd.execParameter); - DAnCE::Utility::build_property_map (*pmap, - idd.configProperty); - - CORBA::String_var exec_art, exec_entry, svnt_art, svnt_entry, cont_id; - - CORBA::Any val; - const char *tmp = 0; - int open_mode = ACE_DEFAULT_SHLIB_MODE; - - if (pmap->find (CIAO::Deployment::OPEN_MODE, val) == 0) - { - val >>= open_mode; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found open mode <%d>\n", open_mode)); - } - - if ((pmap->find (CIAO::Deployment::SVNT_ENTRYPT, val)) == 0) - { - val >>= tmp; - svnt_entry = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found Servant entrypoint %C\n", svnt_entry.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Error: No Servant entrypoint <%C> provided, aborting installation\n", - CIAO::Deployment::SVNT_ENTRYPT)); - throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), - "No servant entrypoint identified."); - } - - if (pmap->find (CIAO::Deployment::SVNT_ARTIFACT, val) == 0) - { - val >>= tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found Servant artifact <%C>\n", tmp)); - svnt_art = Deployment_Common::get_implementation (tmp, plan); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Error: No Servant artifact provided, aborting installation\n")); - throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), - "No servant artifact identified."); - } - - - if (pmap->find (CIAO::Deployment::EXEC_ARTIFACT, val) == 0) - { - val >>= tmp; - exec_art = Deployment_Common::get_implementation (tmp, plan); - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found executor artifact: <%C>\n", exec_art.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Error: No Executor artifact provided, aborting installation\n")); - throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), - "No executory artifact identified.\n"); - } - - if (pmap->find (CIAO::Deployment::HOME_FACTORY, val) == 0) - { - val >>= tmp; - exec_entry = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found executor entrypoint: <%C>\n", exec_entry.in ())); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Error: No Executor artifact provided, aborting installation\n")); - throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), - "No executor entrypoint provided\n"); - } - - if (pmap->find (CIAO::Deployment::CONTAINER_ID, val) == 0) - { - val >>= tmp; - cont_id = tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::install_instance - " - "Found container: <%C>\n", cont_id.in ())); - } - else - { - CIAO_ERROR (4, (LM_INFO, CLINFO - "Home_Handler_i::install_instance - " - "No container provided, using default container\n")); - cont_id = ""; - } - - ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - - if (CORBA::is_nil (container.in ())) - { - CIAO_ERROR (1, (LM_INFO, CLINFO - "Home_Handler_i::install_instance - " - "Container with Id <%C> not installed, aborting.\n", - cont_id.in ())); - throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), - "Invalid container\n"); - } - - Components::CCMHome_var home_ref; - - try - { - home_ref = container->install_home (exec_art, - exec_entry, - svnt_art, - svnt_entry, - idd.name.in (), - open_mode); - - ::Components::ConfigValues attr_config; - Deployment_Common::create_attribute_configuration (idd.configProperty, - attr_config); - - container->set_attributes (home_ref.in (), attr_config); - } - catch (::CIAO::InvalidComponent &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler::install_instance - " - "Caught InvalidComponent exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (::CIAO::Installation_Failure &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler::install_instance - " - "Caught Installation_Failure exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (::CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Caught CORBA exception <%C>\n", - ex._info ().c_str ())); - throw ::Deployment::StartError (idd.name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Caught unknown C++ exception\n")); - throw ::Deployment::StartError (idd.name.in (), - "Unknown C++ exception\n"); - } - - if (CORBA::is_nil (home_ref)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::install_instance - " - "Container provided nil object reference for home.\n")); - throw ::Deployment::StartError (idd.name.in (), - "Container provided nil object reference"); - } - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_[idd.name.in ()] = info; - } - - DEPLOYMENT_STATE::instance ()->add_home (idd.name.in (), cont_id, home_ref.in ()); - - - *instance_reference <<= home_ref; - } - - - void - Home_Handler_i::activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &) - { - CIAO_TRACE ("Home_Handler_i::activate_instance"); - // no activation needed. - } - - void - Home_Handler_i::passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &) - { - CIAO_TRACE ("Home_Handler_i::passivate_instance"); - // no passivation needed. - } - - void - Home_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Home_Handler_i::remove_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - Deployment_Common::INSTANCES::iterator instance; - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - instance = this->instances_.find (name); - - if (instance == this->instances_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::remove_instance - " - "Instructed to remove unknown home instance <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Wrong instance handler for home instance\n"); - } - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Home_Handler_i::remove_instance - " - "Attempting removal of home instance <%C>\n", - name)); - } - - CORBA::Any val; - const char *cont_id = 0; - - if (instance->second.pmap->find (Deployment::CONTAINER_ID, val) == 0) - { - val >>= cont_id; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Home_Handler_i::remove_instance - " - "Found home container: %C\n", cont_id)); - } - else - { - CIAO_ERROR (4, (LM_INFO, CLINFO - "Home_Handler_i::remove_instance - " - "No container provided, using default container for instance <%C>\n", - name)); - cont_id = ""; - } - - ::CIAO::Container_var container = - DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - - if (CORBA::is_nil (container)) - { - CIAO_ERROR (1, (LM_INFO, CLINFO - "Home_Handler_i::remove_instance - " - "Container with Id <%C> not installed, aborting.\n", - cont_id)); - throw ::Deployment::StopError (name, - "Invalid container\n"); - } - - Components::CCMHome_var ref - = DEPLOYMENT_STATE::instance ()->fetch_home (name); - - try - { - container->uninstall_home (ref); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::remove_instance - " - "Caught CORBA exception <%C>\n", - ex._info ().c_str ())); - throw ::Deployment::StopError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::remove_instance - " - "Caught unknown C++ exception\n")); - throw ::Deployment::StopError (name, - "Unknown C++ exception\n"); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->instances_mutex_, - CORBA::NO_RESOURCES ()); - this->instances_.erase (instance); - } - - CIAO_DEBUG (4, (LM_INFO, CLINFO - "Home_Handler_i::remove_instance - " - "Instance <%C> successfully removed\n", - name)); - } - - void - Home_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::Any_out) - { - CIAO_TRACE ("Home_Handler_i::provide_endpoint_reference"); - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::provide_endpoint_reference - " - "Unable to provide any endpoints.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - void - Home_Handler_i::connect_instance (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - const ::CORBA::Any &) - { - CIAO_TRACE ("Home_Handler_i::connect_instance"); - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::connect_instance - ", - "No connections allowed for homes.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - - void - Home_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) - { - CIAO_TRACE ("Home_Handler_i::disconnect_instance"); - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::disconnect_instance - ", - "No connections allowed for homes.\n")); - throw CORBA::NO_IMPLEMENT (); - } - - - void - Home_Handler_i::instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) - { - CIAO_TRACE ("Home_Handler_i::instance_configured"); - // nothing to be done - } - - void - Home_Handler_i::configure ( const ::Deployment::Properties&) - { - - } -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Home_Handler (void) - { - return new CIAO::Home_Handler_i (); - } -} diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.h b/CIAO/ciao/Deployment/Handlers/Home_Handler.h deleted file mode 100644 index 2a6aa8f113a..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.h +++ /dev/null @@ -1,98 +0,0 @@ - -// -*- C++ -*- -/** - * @file Home_Handler.h - * @author William R. Otte - * - * Installation handler implementation for spawning LocalityManagers. - */ - -#ifndef CIAO_HOME_HANDLER_H -#define CIAO_HOME_HANDLER_H - -#include "dance/DAnCE_LocalityManagerC.h" -#include "dance/DAnCE_Utility.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h" -#include "tao/LocalObject.h" - -#include "ciao/Deployment/Handlers/CIAO_Handler_Common.h" - -namespace CIAO -{ - class CIAO_Locality_Handler_Export Home_Handler_i - : public virtual DAnCE::InstanceDeploymentHandler, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - Home_Handler_i (void); - - // Destructor - virtual ~Home_Handler_i (void); - - virtual - ::CORBA::StringSeq * dependencies (void); - - virtual - char * instance_type (void); - - virtual - void install_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference); - - virtual - void activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - virtual - void passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - - virtual - void remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & instance_reference); - - virtual - void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); - - virtual - void connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference); - - virtual - void disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef); - - virtual - void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); - - virtual - void configure(const Deployment::Properties&); - - virtual void close (void); - - private: - Deployment_Common::INSTANCES instances_; - TAO_SYNCH_MUTEX instances_mutex_; - }; -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Home_Handler (void); -} - -#endif diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp deleted file mode 100644 index dc9168c8204..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp +++ /dev/null @@ -1,478 +0,0 @@ -#include "Homed_Component_Handler.h" -#include "ccm/CCM_KeylessCCMHomeC.h" -#include "ciao/Logger/Log_Macros.h" -#include "ciao/Base/CIAO_PropertiesC.h" -#include "dance/Deployment/Deployment_StartErrorC.h" -#include "CIAO_Handler_Common.h" -#include "CIAO_State.h" - -namespace CIAO -{ - Homed_Component_Handler_i::Homed_Component_Handler_i () - { - CIAO_TRACE ("Homed_Component_Handler_i::Homed_Component_Handler_i"); - } - - // Destructor - Homed_Component_Handler_i::~Homed_Component_Handler_i (void) - { - CIAO_TRACE ("Homed_Component_Handler_i::~Homed_Component_Handler_i"); - } - - void - Homed_Component_Handler_i::close (void) - { - this->instances_.clear (); - } - - ::CORBA::StringSeq * - Homed_Component_Handler_i::dependencies (void) - { - ::CORBA::StringSeq *retval (0); - ACE_NEW_THROW_EX (retval, - ::CORBA::StringSeq (1), - CORBA::NO_MEMORY ()); - - retval->length (1); - (*retval)[0] = CIAO::Deployment::CCM_HOME; - - return retval; - } - - char * - Homed_Component_Handler_i::instance_type (void) - { - CIAO_TRACE ("Homed_Component_Handler_i::instance_type"); - return CORBA::string_dup (CIAO::Deployment::CCM_HOMEDCOMPONENT); - } - - void - Homed_Component_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference) - { - CIAO_TRACE ("Homed_Component_Handler_i::install_instance"); - - CORBA::Any *any = 0; - ACE_NEW_THROW_EX (any, - CORBA::Any (), - CORBA::NO_MEMORY ()); - - instance_reference = any; - - const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); - const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - - CIAO_DEBUG (7, (LM_DEBUG, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Starting deployment of <%C>\n", - plan.instance[instanceRef].name.in ())); - DAnCE::Utility::PROPERTY_MAP *pmap; - - ACE_NEW_THROW_EX (pmap, - DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + - mdd.execParameter.length ()), - CORBA::NO_MEMORY ()); - - Deployment_Common::Instance_Info info; - info.name = idd.name.in (); - info.pmap.reset (pmap); - - DAnCE::Utility::build_property_map (*pmap, - mdd.execParameter); - DAnCE::Utility::build_property_map (*pmap, - idd.configProperty); - - using namespace CIAO::Deployment; - CORBA::Any val; - const char *tmp = 0; - - if (pmap->find (COMPONENT_HOME, val) == 0) - { - val >>= tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Found component home ID %C\n", tmp)); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Error: No home ID provided, aborting installation\n")); - throw ::Deployment::StartError (idd.name.in (), - "No Home identified."); - } - - Components::CCMHome_var tmp_home = DEPLOYMENT_STATE::instance ()->fetch_home (tmp); - - Components::KeylessCCMHome_var home = Components::KeylessCCMHome::_narrow (tmp_home); - if (::CORBA::is_nil (home.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Object reference for Home <%C> is not available for component <%C>\n", - tmp, idd.name.in ())); - throw ::Deployment::StartError (idd.name.in (), - "Home ID is not available"); - } - - const char *cont_id = - DEPLOYMENT_STATE::instance ()->instance_to_container (tmp); - - ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - - Components::CCMObject_var ref; - try - { - ref = home->create_component (); - - ::Components::ConfigValues attr_config; - Deployment_Common::create_attribute_configuration (idd.configProperty, - attr_config); - - container->set_attributes (ref.in (), attr_config); - } - catch (::CIAO::InvalidComponent &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler::install_instance - " - "Caught InvalidComponent exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (::CIAO::Installation_Failure &ex) - { - if (ex.name.in () == 0) - { - ex.name = idd.name; - } - - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler::install_instance - " - "Caught Installation_Failure exception: %C:%C\n", - ex.name.in (), ex.reason.in ())); - throw ::Deployment::StartError (ex.name.in (), - ex.reason.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Caught CORBA exception while installing component <%C>: %C\n", - idd.name.in (), - ex._info ().c_str ())); - throw ::Deployment::StartError (idd.name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Caught C++ exception while installing component <%C>\n", - idd.name.in ())); - throw ::Deployment::StartError (idd.name.in (), - "Unknown C++ exception"); - } - - if (CORBA::is_nil (ref.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Received nil object reference from create on Home <%C> " - "while creating component <%C>\n", - tmp, - idd.name.in ())); - throw ::Deployment::StartError (idd.name.in (), - "Nil reference from home on create"); - } - - - CIAO_DEBUG (4, (LM_INFO, CLINFO - "Homed_Component_Handler_i::install_instance - " - "Successfully created component <%C>\n", - idd.name.in ())); - - this->instances_[idd.name.in ()] = info; - - DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), - cont_id, - ref.in ()); - (*instance_reference) <<= ref; - } - - void - Homed_Component_Handler_i::activate_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Homed_Component_Handler_i::activate_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - - CIAO_DEBUG (8, (LM_TRACE, CLINFO - "Homed_Component_Handler_i::activate_instance - " - "Starting activation of component instance <%C>\n", - name)); - const char *container = - DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (container); - - Components::CCMObject_var comp = - DEPLOYMENT_STATE::instance ()->fetch_component (name); - - try - { - cont->activate_component (comp.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::activate_instance - " - "Caught CORBA Exception while activating instance <%C>: %C\n", - name, - ex._info ().c_str ())); - throw ::Deployment::StartError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::activate_instance - " - "Caught C++ Exception while activating instance <%C>\n", - name)); - throw ::Deployment::StartError (name, - "Unknown C++ exception during activation"); - } - } - - void - Homed_Component_Handler_i::passivate_instance (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Homed_Component_Handler_i::passivate_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - - CIAO_DEBUG (8, (LM_TRACE, CLINFO - "Homed_Component_Handler_i::passivate_instance - " - "Starting passivation of component instance <%C>\n", - name)); - const char *container = - DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = - DEPLOYMENT_STATE::instance ()->fetch_container (container); - - Components::CCMObject_var comp = - DEPLOYMENT_STATE::instance ()->fetch_component (name); - - try - { - cont->passivate_component (comp.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::passivate_instance - " - "Caught CORBA Exception while passivating instance <%C>: %C\n", - name, - ex._info ().c_str ())); - throw ::Deployment::StopError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::passivate_instance - " - "Caught C++ Exception while passivating instance <%C>\n", - name)); - throw ::Deployment::StartError (name, - "Unknown C++ exception during passivation"); - } - } - - void - Homed_Component_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any &) - { - CIAO_TRACE ("Homed_Component_Handler_i::remove_instance"); - - const char *name = plan.instance[instanceRef].name.in (); - Deployment_Common::INSTANCES::iterator instance - = this->instances_.find (name); - - if (instance == this->instances_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Instructed to remove unknown homed component instance <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Wrong instance handler for homed component instance\n"); - } - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Attempting removal of homed component instance <%C>\n", - name)); - - using namespace CIAO::Deployment; - CORBA::Any val; - const char *tmp = 0; - - if (instance->second.pmap->find (COMPONENT_HOME, val) == 0) - { - val >>= tmp; - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Found component home ID %C\n", tmp)); - } - else - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Error: No home ID provided, aborting removal\n")); - throw ::Deployment::StopError (name, - "No Home identified."); - } - - Components::CCMHome_var home = DEPLOYMENT_STATE::instance ()->fetch_home (tmp); - - if (CORBA::is_nil (home)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Object reference for Home <%C> is not available for component <%C>\n", - tmp, name)); - throw ::Deployment::StopError (name, - "Home ID is not available"); - } - - Components::CCMObject_var ref - = DEPLOYMENT_STATE::instance ()->fetch_component (name); - - try - { - home->remove_component (ref.in ()); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Caught CORBA exception while removing component <%C>: %C\n", - name, - ex._info ().c_str ())); - throw ::Deployment::StopError (name, - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Caught C++ exception while removing component <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Unknown C++ exception"); - } - - CIAO_DEBUG (4, (LM_INFO, CLINFO - "Homed_Component_Handler_i::remove_instance - " - "Component <%C> successfully removed\n", name)); - - this->instances_.erase (instance); - - DEPLOYMENT_STATE::instance ()->remove_component (name); - } - - void - Homed_Component_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference) - { - CIAO_TRACE ("Homed_Component_Handler_i::provide_endpoint_reference"); - - DEPLOYMENT_STATE::instance ()->connection_handler.provide_endpoint_reference (plan, - connectionRef, - endpoint_reference); - } - - void - Homed_Component_Handler_i::connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference) - { - CIAO_TRACE ("Homed_Component_Handler_i::connect_instance"); - - DEPLOYMENT_STATE::instance ()->connection_handler.connect_instance (plan, - connectionRef, - provided_reference); - } - - - void - Homed_Component_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef) - { - CIAO_TRACE ("Homed_Component_Handler_i::disconnect_instance"); - DEPLOYMENT_STATE::instance ()->connection_handler.disconnect_instance (plan, - connectionRef); - } - - void - Homed_Component_Handler_i::instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef) - { - CIAO_TRACE ("Homed_Component_Handler_i::instance_configured"); - - Components::CCMObject_var ref = - DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[instanceRef].name.in ()); - - try - { - ref->configuration_complete (); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::instance_configured - " - "Caught CORBA Exception: %C\n", - ex._info ().c_str ())); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - ex._info ().c_str ()); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Homed_Component_Handler_i::instance_configured - " - "Caught C++ Exception\n")); - throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), - "Unknown C++ exception\n"); - - } - } - - void - Homed_Component_Handler_i::configure (const ::Deployment::Properties&) - { - - } -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Homed_Component_Handler (void) - { - return new CIAO::Homed_Component_Handler_i (); - } -} diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h deleted file mode 100644 index b34f7b74e7a..00000000000 --- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h +++ /dev/null @@ -1,98 +0,0 @@ - -// -*- C++ -*- -/** - * @file Homed_Component_Handler.h - * @author William R. Otte - * - * Installation handler implementation for spawning LocalityManagers. - */ - -#ifndef CIAO_HOMED_COMPONENT_HANDLER_H -#define CIAO_HOMED_COMPONENT_HANDLER_H - -#include "dance/DAnCE_LocalityManagerC.h" -#include "dance/DAnCE_Utility.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Deployment/Handlers/CIAO_Locality_Handler_Export.h" -#include "tao/LocalObject.h" -#include "ciao/Deployment/Handlers/CIAO_Handler_Common.h" - -namespace CIAO -{ - class CIAO_LocalityActivator_i; - - class CIAO_Locality_Handler_Export Homed_Component_Handler_i - : public virtual DAnCE::InstanceDeploymentHandler, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - Homed_Component_Handler_i (); - - // Destructor - virtual ~Homed_Component_Handler_i (void); - - virtual - ::CORBA::StringSeq * dependencies (void); - - virtual - char * instance_type (void); - - virtual - void install_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - ::CORBA::Any_out instance_reference); - - virtual - void activate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - virtual - void passivate_instance (const ::Deployment::DeploymentPlan & , - ::CORBA::ULong , - const ::CORBA::Any &); - - virtual - void remove_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & instance_reference); - - virtual - void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); - - virtual - void connect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & provided_reference); - - virtual - void disconnect_instance (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef); - - virtual - void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); - - virtual - void configure(const Deployment::Properties&); - - virtual void close (void); - - private: - Deployment_Common::INSTANCES instances_; - }; -} - -extern "C" -{ - ::DAnCE::InstanceDeploymentHandler_ptr - CIAO_Locality_Handler_Export create_Homed_Component_Handler (void); -} - -#endif diff --git a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc deleted file mode 100644 index f1fe5e0dabb..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc +++ /dev/null @@ -1,18 +0,0 @@ -project (CIAO_Deployment_Interceptors) : install, ciao_base, ciao_lib, ciao_output, \ - naming, ciao_logger, dance_stub, dance_deployment_scheduler { - dynamicflags += CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL - - Source_Files { - Deployment_Interceptors.cpp - Name_Utilities.cpp - } - - Header_Files { - Deployment_Interceptors.h - Name_Utilities.h - } - - specific { - install_dir = ciao/Deployment/Interceptors - } -} diff --git a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h deleted file mode 100644 index c3e56f8c848..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors_export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. - -// ------------------------------ -#ifndef CIAO_DEPLOYMENT_INTERCEPTORS_EXPORT_H -#define CIAO_DEPLOYMENT_INTERCEPTORS_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL) -# define CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL */ - -#if !defined (CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL) -# define CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL 1 -#endif /* ! CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL */ - -#if defined (CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL) && (CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1) -# if defined (CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL) -# define CIAO_Deployment_Interceptors_Export ACE_Proper_Export_Flag -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */ -# define CIAO_Deployment_Interceptors_Export ACE_Proper_Import_Flag -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */ -#else /* CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1 */ -# define CIAO_Deployment_Interceptors_Export -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) -# define CIAO_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1 */ - -// Set CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE */ - -#if (CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) -# define CIAO_DEPLOYMENT_INTERCEPTORS_TRACE(X) -#else /* (CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_DEPLOYMENT_INTERCEPTORS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) */ - -#endif /* CIAO_DEPLOYMENT_INTERCEPTORS_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp deleted file mode 100644 index 4538d1a32a6..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ /dev/null @@ -1,272 +0,0 @@ -#include "Deployment_Interceptors.h" -#include "tao/ORB_Core.h" -#include "Name_Utilities.h" -#include "dance/Deployment/Deployment_StartErrorC.h" -#include "dance/DAnCE_PropertiesC.h" -#include "dance/DAnCE_Utility.h" -#include "dance/LocalityManager/Scheduler/Plugin_Manager.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - /// Implementation skeleton constructor - CIAO_StoreReferences_i::CIAO_StoreReferences_i (void) - { - this->orb_ = DAnCE::PLUGIN_MANAGER::instance ()->get_orb (); - - if (CORBA::is_nil (this->orb_)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "CIAO_StoreReferences_i::CIAO_StoreReferences_i -" - "Unable to locate ORB.\n")); - throw ::Deployment::StartError ("CIAO_StoreReferences_i", - "Unable to locate ORB"); - } - } - - /// Implementation skeleton destructor - CIAO_StoreReferences_i::~CIAO_StoreReferences_i (void) - { - } - - void CIAO_StoreReferences_i::pre_install (::Deployment::DeploymentPlan &, - ::CORBA::ULong) - { - // no-op - } - - void CIAO_StoreReferences_i::post_install (const ::Deployment::DeploymentPlan &plan, - ::CORBA::ULong index, - const ::CORBA::Any &reference, - const ::CORBA::Any &) - { - const ::Deployment::InstanceDeploymentDescription &inst = - plan.instance[index]; - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "CIAO_StoreReferences_i::post_install - " - "Interceptor post install for instance %C\n", - plan.instance[index].name.in ())); - - if (reference.type() == ::CORBA::_tc_null) - { - CIAO_ERROR (3, (LM_WARNING, CLINFO - "CIAO_StoreReferences_i::post_install - " - "Got a nil reference, unable to store reference " - "for instance <%C>\n", - inst.name.in ())); - return; - } - - for (CORBA::ULong i = 0; - i < inst.configProperty.length (); - ++i) - { - if (ACE_OS::strcmp (inst.configProperty[i].name.in (), - DAnCE::REGISTER_NAMING) == 0) - { - CORBA::Object_var obj; - - if (!(reference >>= CORBA::Any::to_object (obj))) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "CIAO_StoreReferences_i::post_install - " - "Unable to extract instance reference from Any\n")); - } - - const char * name = 0; - inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "CIAO_StoreReferences_i::post_install - " - "Registering name %C for instance %C\n", - name, - plan.instance[index].name.in ())); - - ::CosNaming::NamingContext_var ctx_safe = - ::CosNaming::NamingContext::_duplicate (this->ctx_.in ()); - Name_Utilities::bind_object (name, - obj.in (), - ctx_safe.in ()); - } - else if (ACE_OS::strcmp (inst.configProperty[i].name.in (), - DAnCE::INSTANCE_IOR_FILE) == 0) - { - CORBA::Object_var obj; - reference >>= CORBA::Any::to_object (obj); - - const char * name = 0; - inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0); - - ::CORBA::ORB_var orb_safe = - ::CORBA::ORB::_duplicate(this->orb_.in ()); - CORBA::String_var ior = orb_safe->object_to_string (obj.in ()); - - CIAO::Name_Utilities::write_ior (ACE_TEXT_CHAR_TO_TCHAR (name), ior.in ()); - } - } - } - - void CIAO_StoreReferences_i::post_remove (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & exception_thrown) - { - const ::Deployment::InstanceDeploymentDescription &inst = plan.instance[instanceRef]; - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "CIAO_StoreReferences_i::post_remove - " - "Interceptor post remove for instance %C\n", - plan.instance[instanceRef].name.in ())); - - if (exception_thrown.type() != ::CORBA::_tc_null) - { - std::string result; - DAnCE::Utility::stringify_exception_from_any (exception_thrown, - result); - CIAO_ERROR (3 , (LM_ERROR, CLINFO - "CIAO_StoreReferences_i::post_remove - " - "Received exception while unregistering " - "for instance " - "<%C>:<%C>\n", - plan.instance[instanceRef].name.in (), - result.c_str ())); - return; - } - - for (CORBA::ULong i = 0; i < inst.configProperty.length (); ++i) - { - if (ACE_OS::strcmp (inst.configProperty[i].name.in (), - DAnCE::REGISTER_NAMING) == 0) - { - const char * name = 0; - inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "CIAO_StoreReferences_i::post_remove - " - "Unregistering name %C for instance %C\n", - name, - plan.instance[instanceRef].name.in ())); - - ::CosNaming::NamingContext_var ctx_safe = - ::CosNaming::NamingContext::_duplicate (this->ctx_.in ()); - Name_Utilities::unbind_object (name, ctx_safe.in ()); - } - } - } - - void - CIAO_StoreReferences_i::configure (const ::Deployment::Properties &props ) - { - for (CORBA::ULong i = 0; i < props.length (); ++i) - { - if (ACE_OS::strcmp (props[i].name.in (), - DAnCE::LOCALITY_NAMINGCONTEXT) == 0) - { - CORBA::Object_var obj; - props[i].value >>= CORBA::Any::to_object (obj); - - this->ctx_ = CosNaming::NamingContext::_narrow (obj.in ()); - } - } - } - - /// Implementation skeleton constructor - CIAO_ReferenceLookup_i::CIAO_ReferenceLookup_i (void) - { - this->orb_ = DAnCE::PLUGIN_MANAGER::instance ()->get_orb (); - - if (CORBA::is_nil (this->orb_)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "CIAO_ReferenceLookup_i::CIAO_ReferenceLookup_i -" - "Unable to locate ORB.\n")); - throw ::Deployment::StartError ("CIAO_ReferenceLookup_i", - "Unable to locate ORB"); - } - } - - /// Implementation skeleton destructor - CIAO_ReferenceLookup_i::~CIAO_ReferenceLookup_i (void) - { - } - - void - CIAO_ReferenceLookup_i::pre_connect (::Deployment::DeploymentPlan &plan, - ::CORBA::ULong connRef, - ::CORBA::Any &providedRef) - { - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "CIAO_ReferenceLookup_i::pre_connect - " - "Interceptor pre connect for connection %C\n", - plan.connection[connRef].name.in ())); - - // attempt to resolve CORBA IOR type external references - if (plan.connection[connRef].externalReference.length () > 0) - { - ::CORBA::Object_var obj; - providedRef >>= CORBA::Any::to_object (obj); - if (CORBA::is_nil (obj)) - { - try - { - obj = - this->orb_->string_to_object(plan.connection[connRef].externalReference[0].location.in()); - providedRef <<= obj; - } - catch (const CORBA::INV_OBJREF&) - { - CIAO_ERROR (6, (LM_INFO, CLINFO - "CIAO_ReferenceLookup_i::pre_connect - " - "Unable to resolve external reference for connection %C\n", - plan.connection[connRef].name.in ())); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "CIAO_ReferenceLookup_i::pre_connect - " - "Caught CORBA Exception while resolving external" - "reference for connection %C: %C\n", - plan.connection[connRef].name.in (), - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "CIAO_ReferenceLookup_i::pre_connect - " - "Caught C Exception while resolving external reference" - "for connection %C\n", - plan.connection[connRef].name.in ())); - throw; - } - } - } - - } - - void CIAO_ReferenceLookup_i::post_connect (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - const ::CORBA::Any &) - { - } - - void - CIAO_ReferenceLookup_i::configure (const ::Deployment::Properties & ) - { - } -} - -extern "C" -{ - ::DAnCE::DeploymentInterceptor_ptr - CIAO_Deployment_Interceptors_Export create_CIAO_StoreReferences (void) - { - return new CIAO::CIAO_StoreReferences_i (); - } - - ::DAnCE::DeploymentInterceptor_ptr - CIAO_Deployment_Interceptors_Export create_CIAO_ReferenceLookup (void) - { - return new CIAO::CIAO_ReferenceLookup_i (); - } -} diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h deleted file mode 100644 index 6dac3083fc9..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h +++ /dev/null @@ -1,88 +0,0 @@ -/** - * @file Deployment_Interceptors.h - * @author William R. Otte - * - * Initial deployment interceptors for use in DAnCE. - */ -#ifndef DEPLOYMENT_INTERCEPTORS_H -#define DEPLOYMENT_INTERCEPTORS_H - -#include "dance/DAnCE_DeploymentInterceptors_Base_Impl.h" -#include "orbsvcs/CosNamingC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "CIAO_Deployment_Interceptors_export.h" - -namespace CIAO -{ - class CIAO_Deployment_Interceptors_Export CIAO_StoreReferences_i - : public virtual DAnCE::DeploymentInterceptor_Base - { - public: - /// Constructor - CIAO_StoreReferences_i (void); - - /// Destructor - virtual ~CIAO_StoreReferences_i (void); - - virtual void pre_install (::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); - - virtual void post_install (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong index, - const ::CORBA::Any & reference, - const ::CORBA::Any & exception_thrown); - - virtual void post_remove (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef, - const ::CORBA::Any & exception_thrown); - - virtual void configure(const Deployment::Properties&); - - CORBA::ORB_var orb_; - private: - CosNaming::NamingContext_var ctx_; - }; - - class CIAO_ReferenceLookup_i - : public virtual DAnCE::DeploymentInterceptor_Base - { - public: - /// Constructor - CIAO_ReferenceLookup_i (void); - - /// Destructor - virtual ~CIAO_ReferenceLookup_i (void); - - virtual - void pre_connect (::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connection_index, - ::CORBA::Any & provided_reference); - - virtual - void post_connect (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong connectionRef, - const ::CORBA::Any & exceptionThrown); - - virtual - void configure(const Deployment::Properties&); - - protected: - CORBA::ORB_var orb_; - }; -} - -extern "C" -{ - ::DAnCE::DeploymentInterceptor_ptr - CIAO_Deployment_Interceptors_Export create_CIAO_StoreReferences (void); - - ::DAnCE::DeploymentInterceptor_ptr - CIAO_Deployment_Interceptors_Export create_CIAO_ReferenceLookup (void); -} - -#endif diff --git a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp deleted file mode 100644 index b7ad8cd82f8..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#include "Name_Utilities.h" - -#include "ace/Auto_Ptr.h" -#include "ace/SString.h" -#include "ace/Tokenizer_T.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - namespace Name_Utilities { - bool - write_ior (const ACE_TCHAR *file, const char *ior) - { - FILE* ior_output_file_ = ACE_OS::fopen (file, "w"); - if (ior_output_file_) - { - ACE_OS::fprintf (ior_output_file_, - "%s", - ior); - ACE_OS::fclose (ior_output_file_); - return true; - } - return false; - } - - bool - bind_object (const char *name, - CORBA::Object_ptr obj, - CosNaming::NamingContext_ptr ctx) - { - CIAO_TRACE ("Name_Utilities::bind_object"); - - if (CORBA::is_nil (ctx)) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO "Name_Utilities::bind_object - " - "Provided naming context is nil, component <%C> will not be registered.", - name)); - return false; - } - - try - { - CosNaming::Name nm; - - Name_Utilities::build_name (name, nm); - - if (nm.length () == 0) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Name_Utilities::bind_object - " - "build_name resulted in an invalid name for string <%C>\n", - name)); - return false; - } - - Name_Utilities::bind_context (nm, ctx); - - try - { - ctx->bind (nm, obj); - } - catch (const CosNaming::NamingContext::AlreadyBound &) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO "Name_Utilities::bind_object - " - "Name <%C> already bound, rebinding....\n", - name)); - ctx->rebind (nm, obj); - } - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Name_Utilities::bind_object - " - "Caught CORBA exception while attempting to bind name <%C>: <%C>\n", - name, ex._info ().c_str ())); - return false; - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Name_Utilities::bind_object - " - "Caught unknown C++ exception while attemptint to bind name <%C>\n", - name)); - return false; - } - - return true; - } - - void - bind_context (CosNaming::Name &nm, - CosNaming::NamingContext_ptr ctx) - { - CIAO_TRACE ("Name_Utilities::bind_context"); - - if (CORBA::is_nil (ctx)) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Name_Utilities::bind_context - " - "Provided naming context is nil, the naming context will not be bound.")); - return; - } - - CosNaming::Name newname (nm.length ()); - - for (CORBA::ULong i = 0; - i < (nm.length () - 1); ++i) - { - newname.length (i + 1); - newname[i] = nm[i]; - - try - { - ctx->bind_new_context (newname); - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Name_Utilities::bind_context - " - "Bound new context <%C>\n", - newname[i].id.in ())); - } - catch (CosNaming::NamingContext::AlreadyBound &) - { - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Name_Utilities::bind_context - " - "Context <%C> already bound.\n", - newname[i].id.in ())); - } - } - } - - bool - unbind_object (const char *name, - CosNaming::NamingContext_ptr ctx) - { - CIAO_TRACE ("Name_Utilities::unbind_object"); - - if (CORBA::is_nil (ctx)) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Name_Utilities::unbind_object - " - "Provided naming context is nil, instance <%C> will not be unbound\n", - name)); - return false; - } - - CosNaming::Name nm; - Name_Utilities::build_name (name, nm); - - try - { - ctx->unbind (nm); - } - catch (const CORBA::Exception &e) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Name_Utilities::unbind_object - " - "Caught CORBA exception whilst unbinding name <%C>: <%C>\n", - name, e._info ().c_str ())); - return false; - } - return true; - } - - void - build_name (const char *name, CosNaming::Name &nm) - { - CIAO_TRACE ("Name_Utilities::build_name"); - - char* buf = ACE_OS::strdup (name); - - ACE_Tokenizer_T parser (buf); - parser.delimiter ('/'); - - for (char *next = parser.next (); next; next = parser.next ()) - { - CORBA::ULong const i = nm.length (); - nm.length (i + 1); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO - "Name_Utilities::build_name - " - "Found name component <%C>\n", - next)); - - nm[i].id = CORBA::string_dup (next); - } - ACE_OS::free (buf); - } - } -} diff --git a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h deleted file mode 100644 index e1db60406b3..00000000000 --- a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file Name_Utilities.h - * @author William R. Otte - * - * A set of utility methods to manages references. - */ - -#ifndef NAME_UTILITIES_H -#define NAME_UTILITIES_H - -#include "orbsvcs/CosNamingC.h" - -namespace CIAO -{ - namespace Name_Utilities - { - /// Write IOR to named file. Will overwrite file if present. - bool write_ior (const ACE_TCHAR *file, const char *ior); - - /// Binds object to provided name, which may be formatted with / to indicate - /// naming contexts, e.g. A/B/C. - bool bind_object (const char *name, - CORBA::Object_ptr obj, - CosNaming::NamingContext_ptr); - - /// Will unbind the provided name. - bool unbind_object (const char *name, - CosNaming::NamingContext_ptr); - - void bind_context (CosNaming::Name &nm, - CosNaming::NamingContext_ptr); - - void build_name (const char *nm, - CosNaming::Name &); - - } -} - -#endif /* NAME_UTILITIES_H */ diff --git a/CIAO/ciao/Logger/CIAO_Logger_Export.h b/CIAO/ciao/Logger/CIAO_Logger_Export.h deleted file mode 100644 index 7e32ea6a676..00000000000 --- a/CIAO/ciao/Logger/CIAO_Logger_Export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_Logger -// ------------------------------ -#ifndef CIAO_LOGGER_EXPORT_H -#define CIAO_LOGGER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_LOGGER_HAS_DLL) -# define CIAO_LOGGER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_LOGGER_HAS_DLL */ - -#if !defined (CIAO_LOGGER_HAS_DLL) -# define CIAO_LOGGER_HAS_DLL 1 -#endif /* ! CIAO_LOGGER_HAS_DLL */ - -#if defined (CIAO_LOGGER_HAS_DLL) && (CIAO_LOGGER_HAS_DLL == 1) -# if defined (CIAO_LOGGER_BUILD_DLL) -# define CIAO_Logger_Export ACE_Proper_Export_Flag -# define CIAO_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_LOGGER_BUILD_DLL */ -# define CIAO_Logger_Export ACE_Proper_Import_Flag -# define CIAO_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_LOGGER_BUILD_DLL */ -#else /* CIAO_LOGGER_HAS_DLL == 1 */ -# define CIAO_Logger_Export -# define CIAO_LOGGER_SINGLETON_DECLARATION(T) -# define CIAO_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_LOGGER_HAS_DLL == 1 */ - -// Set CIAO_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_LOGGER_NTRACE */ - -#if (CIAO_LOGGER_NTRACE == 1) -# define CIAO_LOGGER_TRACE(X) -#else /* (CIAO_LOGGER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_LOGGER_NTRACE == 1) */ - -#endif /* CIAO_LOGGER_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Logger/Log_Macros.cpp b/CIAO/ciao/Logger/Log_Macros.cpp deleted file mode 100644 index 1d63ac6018e..00000000000 --- a/CIAO/ciao/Logger/Log_Macros.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Log_Macros.h" - -CIAO_Logger_Export unsigned int CIAO_debug_level = 0; - -CIAO_Logger_Export ACE_Log_Category CIAO_log_category ("CIAO"); diff --git a/CIAO/ciao/Logger/Log_Macros.h b/CIAO/ciao/Logger/Log_Macros.h deleted file mode 100644 index f94950acb98..00000000000 --- a/CIAO/ciao/Logger/Log_Macros.h +++ /dev/null @@ -1,108 +0,0 @@ -/** - * @file Log_Macros.h - * @author William R. Otte - * - * Macros used for logging in CIAO. - */ - -#ifndef CIAO_LOG_MACROS_H_ -#define CIAO_LOG_MACROS_H_ - -#include "ace/Log_Category.h" - -// default information printed with CIAO logging messages. - -#include "CIAO_Logger_Export.h" - -#if !defined (CLINFO) -# define CLINFO "(%P|%t) [%M] - %T - " -#endif - -extern CIAO_Logger_Export unsigned int CIAO_debug_level; - -extern CIAO_Logger_Export ACE_Log_Category CIAO_log_category; - -// By default tracing is turned off. -#if !defined (CIAO_NTRACE) -# define CIAO_NTRACE 1 -#endif /* CIAO_NTRACE */ - -#if (CIAO_NTRACE == 1) -# if !defined (ACE_NTRACE) -# define CIAO_TRACE(X) do {} while (0) -# define CIAO_ENABLE_TRACE() do {} while (0) -# define CIAO_DISABLE_TRACE() do {} while (0) -# else -# if (ACE_NTRACE == 0) -# error CIAO_TRACE cannot be disabled if ACE_TRACE is enabled -# else -# define CIAO_TRACE(X) do {} while (0) -# define CIAO_ENABLE_TRACE() do {} while (0) -# define CIAO_DISABLE_TRACE() do {} while (0) -# endif -# endif -#else -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_TRACE(X) ACE_TRACE_IMPL(X) -# define CIAO_ENABLE_TRACE() ACE_Trace::start_tracing () -# define CIAO_DISABLE_TRACE() ACE_Trace::stop_tracing () -# undef CLINFO // Make log messages indent with tracing. -# define CLINFO "%I(%P|%t) [%M] - %T - " -# include "ace/Trace.h" -#endif /* CIAO_NTRACE */ - -#if defined (CIAO_NLOGGING) -# define CIAO_ERROR(L, X) do {} while (0) -# define CIAO_DEBUG(L, X) do {} while (0) -# define CIAO_ERROR_RETURN(L, X, Y) return (Y) -# define CIAO_ERROR_BREAK(L, X) { break; } -#else -# if !defined (CIAO_ERROR) -# define CIAO_ERROR(L, X) \ - do { \ - if (CIAO_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = CIAO_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \ - ace___->log X; \ - } \ - } while (0) -# endif -# if !defined (CIAO_DEBUG) -# define CIAO_DEBUG(L, X) \ - do { \ - if (CIAO_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = CIAO_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ - ace___->log X; \ - } \ - } while (0) -# endif -# if !defined (CIAO_ERROR_RETURN) -# define CIAO_ERROR_RETURN(L, X, Y) \ - do { \ - if (CIAO_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = CIAO_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \ - ace___->log X; \ - } \ - return Y; \ - } while (0) -# endif -# if !defined (CIAO_ERROR_BREAK) -# define CIAO_ERROR_BREAK(L, X) { CIAO_ERROR (L, X); break; } -# endif -#endif - - -#endif diff --git a/CIAO/ciao/Logger/Logger.mpc b/CIAO/ciao/Logger/Logger.mpc deleted file mode 100644 index 2170cde5ac4..00000000000 --- a/CIAO/ciao/Logger/Logger.mpc +++ /dev/null @@ -1,19 +0,0 @@ -// -*- MPC -*- -project(CIAO_Logger): install, ciao_lib, taolib, acelib { - sharedname = CIAO_Logger - dynamicflags += CIAO_LOGGER_BUILD_DLL - - Source_Files { - Logger_Service.cpp - Log_Macros.cpp - } - - Header_Files { - CIAO_Logger_Export.h - } - - specific { - install_dir = ciao/Logger - } -} - diff --git a/CIAO/ciao/Logger/Logger_Service.cpp b/CIAO/ciao/Logger/Logger_Service.cpp deleted file mode 100644 index 2a59f543320..00000000000 --- a/CIAO/ciao/Logger/Logger_Service.cpp +++ /dev/null @@ -1,166 +0,0 @@ -#include "Logger_Service.h" -#include "Log_Macros.h" -#include "ace/Get_Opt.h" -#include "ace/CORBA_macros.h" -#include "ace/Env_Value_T.h" -#include "tao/SystemException.h" -#include "ace/Service_Config.h" -#include "ace/Arg_Shifter.h" -#include "ace/Log_Msg_Backend.h" -#include "ace/Dynamic_Service.h" - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -// Needed to set ACE_LOG_MSG::msg_ostream() -// FUZZ: disable check_for_streams_include -# include "ace/streams.h" -#endif /* !ACE_LACKS_IOSTREAM_TOTALLY */ - -CIAO::Logger_Service::Logger_Service (void) - : filename_ (ACE_TEXT("")), - trace_ (false) -{ -} - -int -CIAO::Logger_Service::init (int argc, ACE_TCHAR * argv[]) -{ - // Get prospective values from the environment first, those given on - // command line can override - ACE_Env_Value log (ACE_TEXT("CIAO_LOG_LEVEL"), CIAO_debug_level); - CIAO_debug_level = log; - - ACE_Env_Value trace (ACE_TEXT("CIAO_TRACE_ENABLE"), 0); - this->trace_ = (trace != 0); - - ACE_Env_Value filename (ACE_TEXT("CIAO_LOG_FILE"), this->filename_.c_str ()); - this->filename_ = filename; - - ACE_Env_Value backend (ACE_TEXT("CIAO_LOG_BACKEND"), this->backend_.c_str ()); - this->backend_ = backend; - - this->parse_args (argc, argv); - - if (this->trace_) - { - CIAO_ENABLE_TRACE (); - } - else - { - CIAO_DISABLE_TRACE (); - } - - if (this->filename_.length () > 0) - { -#if defined (ACE_LACKS_IOSTREAM_TOTALLY) - - FILE* output_stream = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT ("a")); - - ACE_LOG_MSG->msg_ostream (output_stream, 1); -#else /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - ofstream* output_stream = 0; - - ACE_NEW_THROW_EX (output_stream, - ofstream (), - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - 0, - ENOMEM), - CORBA::COMPLETED_NO)); - - output_stream->open (ACE_TEXT_ALWAYS_CHAR (this->filename_.c_str ()), - ios::out | ios::app); - - if (!output_stream->bad ()) - { - ACE_LOG_MSG->msg_ostream (output_stream, 1); - } -#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - } - - if (this->backend_.length () > 0) - { - - ACE_Log_Msg_Backend* logger_be = - ACE_Dynamic_Service::instance(this->backend_.c_str ()); - - // backend->open (""); - - if (logger_be == 0) - { - CIAO_ERROR (1, - (LM_EMERGENCY, CLINFO - "Logger_Service::init - " - "Unable to load backend %s\n", - this->backend_.c_str ())); - return -1; - } - - ACE_Log_Msg::msg_backend (logger_be); - - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::CUSTOM); - } - - return 0; -} - -void -CIAO::Logger_Service::parse_args (int argc, ACE_TCHAR **argv) -{ - CIAO_TRACE ("CIAO::Logger_Service::parse_args"); - - ACE_Arg_Shifter arg_shifter (argc, argv); - - while (arg_shifter.is_anything_left ()) - { - const ACE_TCHAR *current_arg = 0; - if (0 != (current_arg = - arg_shifter.get_the_parameter - (ACE_TEXT ("-CIAOLogLevel")))) - { - CIAO_debug_level = ACE_OS::atoi (current_arg); - - arg_shifter.consume_arg (); - } - else if (0 == arg_shifter.cur_arg_strncasecmp - (ACE_TEXT ("-CIAOTraceEnable"))) - { - this->trace_ = true; - - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = - arg_shifter.get_the_parameter - (ACE_TEXT ("-CIAOLogFile")))) - { - this->filename_ = current_arg; - - arg_shifter.consume_arg (); - } - else - { - // Can't interpret this argument. Move on to the next - // argument. Any arguments that don't match are ignored - // so that the caller can still use them. - arg_shifter.ignore_arg (); - } - } -} - -int -CIAO::Logger_Service::Initializer (void) -{ - return ACE_Service_Config::process_directive (ace_svc_desc_CIAO_LOGGER_SERVICE); -} - -ACE_STATIC_SVC_DEFINE (CIAO_LOGGER_SERVICE, - ACE_TEXT ("CIAO_Logger"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (CIAO_LOGGER_SERVICE), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) -ACE_FACTORY_DEFINE (CIAO_Logger, CIAO_LOGGER_SERVICE) - diff --git a/CIAO/ciao/Logger/Logger_Service.h b/CIAO/ciao/Logger/Logger_Service.h deleted file mode 100644 index 10d64c32795..00000000000 --- a/CIAO/ciao/Logger/Logger_Service.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CIAO_LOGGER_SERVICE_H_ -#define CIAO_LOGGER_SERVICE_H_ - -#include "CIAO_Logger_Export.h" -#include "ace/Service_Object.h" - -namespace CIAO - { - class CIAO_Logger_Export Logger_Service : public ACE_Service_Object - { - public: - Logger_Service (void); - virtual int init (int argc, ACE_TCHAR * argv[]); - - static int Initializer (void); - private: - void parse_args (int argc, ACE_TCHAR **argv); - - ACE_TString filename_; - ACE_TString backend_; - bool trace_; - }; - } - -static int TAO_Requires_CIAO_Logger_Service_Initializer = - CIAO::Logger_Service::Initializer (); - -typedef CIAO::Logger_Service CIAO_LOGGER_SERVICE; - -ACE_STATIC_SVC_DECLARE (CIAO_LOGGER_SERVICE) -ACE_FACTORY_DECLARE (CIAO_Logger, CIAO_LOGGER_SERVICE) - -#endif /*LOGGER_SERVICE_H_*/ diff --git a/CIAO/ciao/Servants/.gitignore b/CIAO/ciao/Servants/.gitignore deleted file mode 100644 index fc6382dc56b..00000000000 --- a/CIAO/ciao/Servants/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/CIAO_Port_Activator_export.h diff --git a/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h b/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h deleted file mode 100644 index 3ab7f281b5b..00000000000 --- a/CIAO/ciao/Servants/CIAO_Servant_Impl_export.h +++ /dev/null @@ -1,56 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// ------------------------------ -#ifndef CIAO_SERVANT_IMPL_EXPORT_H -#define CIAO_SERVANT_IMPL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_SERVANT_IMPL_HAS_DLL) -# define CIAO_SERVANT_IMPL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_SERVANT_IMPL_HAS_DLL */ - -#if !defined (CIAO_SERVANT_IMPL_HAS_DLL) -# define CIAO_SERVANT_IMPL_HAS_DLL 1 -#endif /* ! CIAO_SERVANT_IMPL_HAS_DLL */ - -#if defined (CIAO_SERVANT_IMPL_HAS_DLL) && (CIAO_SERVANT_IMPL_HAS_DLL == 1) -# if defined (CIAO_SERVANT_IMPL_BUILD_DLL) -# define CIAO_Servant_Impl_Export ACE_Proper_Export_Flag -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_SERVANT_IMPL_BUILD_DLL */ -# define CIAO_Servant_Impl_Export ACE_Proper_Import_Flag -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_SERVANT_IMPL_BUILD_DLL */ -#else /* CIAO_SERVANT_IMPL_HAS_DLL == 1 */ -# define CIAO_Servant_Impl_Export -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARATION(T) -# define CIAO_SERVANT_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_SERVANT_IMPL_HAS_DLL == 1 */ - -// Set CIAO_SERVANT_IMPL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_SERVANT_IMPL_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_SERVANT_IMPL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_SERVANT_IMPL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_SERVANT_IMPL_NTRACE */ - -#if (CIAO_SERVANT_IMPL_NTRACE == 1) -# define CIAO_SERVANT_IMPL_TRACE(X) -#else /* (CIAO_SERVANT_IMPL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_SERVANT_IMPL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_SERVANT_IMPL_NTRACE == 1) */ - -#endif /* CIAO_SERVANT_IMPL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp deleted file mode 100644 index 03242ea1f26..00000000000 --- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp +++ /dev/null @@ -1,619 +0,0 @@ -#include "Connector_Servant_Impl_Base.h" -#include "StandardConfigurator_Impl.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - Connector_Servant_Impl_Base::Connector_Servant_Impl_Base ( - Components::CCMHome_ptr home, - Home_Servant_Impl_Base *home_servant, - Container_ptr c) - : container_ (Container::_duplicate (c)), - home_ (Components::CCMHome::_duplicate (home)), - home_servant_ (home_servant) - { - if (home_servant_ != 0) - { - home_servant_->_add_ref (); - } - } - - Connector_Servant_Impl_Base::~Connector_Servant_Impl_Base (void) - { - } - - // Operations for CCMObject interface. - void - Connector_Servant_Impl_Base::remove (void) - { - CIAO_TRACE("Connector_Servant_Impl_Base::remove (void)"); - - try - { - Container_var cnt_safe = Container::_duplicate(this->container_.in ()); - PortableServer::POA_var port_poa = cnt_safe->the_port_POA (); - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - // Removing Facets - for (FacetTable::const_iterator iter = - this->facet_table_.begin (); - iter != this->facet_table_.end (); - ++iter) - { - PortableServer::ObjectId_var facet_id = - port_poa->reference_to_id (iter->second); - - port_poa->deactivate_object (facet_id); - } - } - - this->ccm_remove (); - - PortableServer::ObjectId_var oid; - cnt_safe->uninstall_servant (this, - Container_Types::COMPONENT_t, - oid.out ()); - - if (this->home_servant_) - { - this->home_servant_->update_component_map (oid); - this->home_servant_->_remove_ref (); - this->home_servant_ = 0; - } - } - catch (const CORBA::Exception& ex) - { - // log error and propagate so error gets reported to deployment framework - CIAO_ERROR (1, (LM_ERROR, CLINFO "Connector_Servant_Impl_Base::remove - CORBA exception : %C\n", ex._info ().c_str ())); - ex._raise (); // propagate - } - } - -#if !defined (CCM_LW) - CORBA::IRObject_ptr - Connector_Servant_Impl_Base::get_component_def (void) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_component_def"); - throw ::CORBA::NO_IMPLEMENT (); - } -#endif - -#if !defined (CCM_LW) - ::Components::ConnectionDescriptions * - Connector_Servant_Impl_Base::get_connections ( - const char * name) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_connections"); - - ::Components::ReceptacleDescription_var receptacle_desc = - this->lookup_receptacle_description (name); - if (::CORBA::is_nil (receptacle_desc.in ())) - { - throw ::Components::InvalidName (); - } - ::Components::ConnectionDescriptions_var retval; - ACE_NEW_THROW_EX (retval, - ::Components::ConnectionDescriptions, - ::CORBA::NO_MEMORY ()); - - ::Components::ConnectionDescription * cd = 0; - ACE_NEW_THROW_EX (cd, - ::OBV_Components::ConnectionDescription, - ::CORBA::NO_MEMORY ()); - CORBA::Object_var obj = dynamic_cast < ::CORBA::Object_ptr > (receptacle_desc.in ()); - cd->objref (::CORBA::Object::_duplicate (obj.in ())); - - ::CORBA::ULong i = 0UL; - retval->length (1); - retval[i] = cd; - - return retval._retn (); - } -#endif - - ::CORBA::Object_ptr - Connector_Servant_Impl_Base::provide_facet (const char *name) - { - CIAO_TRACE("Connector_Servant_Impl_Base::provide_facet (const char *name)"); - - if (0 == name) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Connector_Servant_Impl_Base::provide_facet - Got nil name")); - - throw ::Components::InvalidName (); - } - - CORBA::Object_var retval = this->lookup_facet (name); - - if ( ::CORBA::is_nil (retval. in())) - { - throw ::Components::InvalidName (); - } - - return retval._retn (); - } - -#if !defined (CCM_LW) - Components::FacetDescriptions * - Connector_Servant_Impl_Base::get_named_facets ( - const ::Components::NameList & names) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_named_facets"); - - Components::FacetDescriptions *retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::FacetDescriptions, - CORBA::NO_MEMORY ()); - - Components::FacetDescriptions_var safe_retval = retval; - CORBA::ULong const len = names.length (); - safe_retval->length (len); - - for (CORBA::ULong i = 0UL; i < len; ++i) - { - ::Components::FacetDescription *tmp = - this->lookup_facet_description (names[i]); - - if (tmp == 0) - { - throw Components::InvalidName (); - } - - safe_retval[i] = tmp; - } - - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) - ::Components::FacetDescriptions * - Connector_Servant_Impl_Base::get_all_facets (void) - { - CIAO_TRACE ("Connector_Servant_Impl_Base::get_all_facets (void)"); - - ::Components::FacetDescriptions_var retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::FacetDescriptions, - CORBA::NO_MEMORY ()); - retval->length (this->facet_table_.size ()); - CORBA::ULong i = 0UL; - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - for (FacetTable::const_iterator iter = - this->facet_table_.begin (); - iter != this->facet_table_.end (); - ++iter, ++i) - { - ::Components::FacetDescription *fd = 0; - ACE_NEW_THROW_EX (fd, - ::OBV_Components::FacetDescription (iter->first.c_str (), - iter->second->_interface_repository_id (), - iter->second), - CORBA::NO_MEMORY ()); - retval[i] = fd; - } - } - - return retval._retn (); - } -#endif - -#if !defined (CCM_LW) - ::Components::ReceptacleDescriptions * - Connector_Servant_Impl_Base::get_all_receptacles (void) - { - CIAO_TRACE ("Connector_Servant_Impl_Base::get_all_receptacles (void)"); - - ::Components::ReceptacleDescriptions * retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::ReceptacleDescriptions, - ::CORBA::NO_MEMORY ()); - ::Components::ReceptacleDescriptions_var safe_retval = retval; - safe_retval->length (0UL); - - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) - ::Components::PrimaryKeyBase * - Connector_Servant_Impl_Base::get_primary_key (void) - { - return 0; - } -#endif - -#if !defined (CCM_LW) - ::Components::ComponentPortDescription * - Connector_Servant_Impl_Base::get_all_ports (void) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_all_ports (void)"); - - OBV_Components::ComponentPortDescription *cps = 0; - ACE_NEW_THROW_EX (cps, - OBV_Components::ComponentPortDescription, - CORBA::NO_MEMORY ()); - ::Components::ComponentPortDescription_var retv = cps; - - ::Components::FacetDescriptions_var facets_desc = - this->get_all_facets (); - - ::Components::ReceptacleDescriptions_var receptacle_desc = - this->get_all_receptacles (); - - retv->facets (facets_desc.in ()); - retv->receptacles (receptacle_desc.in ()); - - return retv._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::ConsumerDescriptions * - Connector_Servant_Impl_Base::get_all_consumers (void) - { - return 0; - } -#endif - -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr - Connector_Servant_Impl_Base::get_consumer ( - const char * /* name */) - { - return ::Components::EventConsumerBase::_nil (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - - ::Components::ConsumerDescriptions * - Connector_Servant_Impl_Base::get_named_consumers ( - const ::Components::NameList & /* names */) - { - return 0; - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::EmitterDescriptions * - Connector_Servant_Impl_Base::get_all_emitters (void) - { - ::Components::EmitterDescriptions *retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::EmitterDescriptions, - ::CORBA::NO_MEMORY ()); - - ::Components::EmitterDescriptions_var safe_retval = retval; - safe_retval->length (0UL); - - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::EmitterDescriptions * - Connector_Servant_Impl_Base::get_named_emitters ( - const ::Components::NameList & /* names */) - { - return 0; - } -#endif - -#if !defined (CCM_LW) - ::Components::ReceptacleDescriptions * - Connector_Servant_Impl_Base::get_named_receptacles ( - const ::Components::NameList & names) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_named_receptacles"); - - - ::Components::ReceptacleDescriptions_var retval; - ACE_NEW_THROW_EX (retval, - ::Components::ReceptacleDescriptions, - ::CORBA::NO_MEMORY ()); - - retval->length (names.length ()); - ::CORBA::ULong count = 0; - - for (::CORBA::ULong name = 0; - name < names.length (); - ++name) - { - ::Components::ReceptacleDescription * desc = - this->lookup_receptacle_description (names[name].in ()); - if (desc) - { - retval[count++] = desc; - } - else - { - throw ::Components::InvalidName (); - } - } - ::Components::ReceptacleDescriptions_var safe_retval = retval; - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::PublisherDescriptions * - Connector_Servant_Impl_Base::get_all_publishers (void) - { - ::Components::PublisherDescriptions *retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::PublisherDescriptions, - ::CORBA::NO_MEMORY ()); - - ::Components::PublisherDescriptions_var safe_retval = retval; - safe_retval->length (0UL); - - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::PublisherDescriptions * - Connector_Servant_Impl_Base::get_named_publishers ( - const ::Components::NameList & /* names */) - { - return 0; - } -#endif - -#if !defined (CCM_NOEVENT) - ::Components::Cookie * - Connector_Servant_Impl_Base::subscribe ( - const char * /* publisher_name */, - ::Components::EventConsumerBase_ptr /* subscriber */) - { - throw ::Components::InvalidName (); - } -#endif - -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr - Connector_Servant_Impl_Base::unsubscribe ( - const char * /* publisher_name */, - ::Components::Cookie * /* ck */) - { - throw ::Components::InvalidName (); - } -#endif - -#if !defined (CCM_NOEVENT) - void - Connector_Servant_Impl_Base::connect_consumer ( - const char * emitter_name, - ::Components::EventConsumerBase_ptr /* consumer */) - { - if (emitter_name == 0) - { - throw ::CORBA::BAD_PARAM (); - } - - throw ::Components::InvalidName (); - } -#endif - -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr - Connector_Servant_Impl_Base::disconnect_consumer ( - const char * source_name) - { - if (source_name == 0) - { - throw ::CORBA::BAD_PARAM (); - } - - throw ::Components::InvalidName (); - } -#endif - - ::Components::Cookie * - Connector_Servant_Impl_Base::connect ( - const char * name, - ::CORBA::Object_ptr /* connection */) - { - if (name == 0) - { - throw ::CORBA::BAD_PARAM (); - } - - throw ::Components::InvalidName (); - } - - ::CORBA::Object_ptr - Connector_Servant_Impl_Base::disconnect ( - const char * name, - ::Components::Cookie * /* ck */) - { - if (name == 0) - { - throw ::CORBA::BAD_PARAM (); - } - - throw ::Components::InvalidName (); - } - - /// CIAO-specific public methods. - - void - Connector_Servant_Impl_Base::set_attributes ( - const Components::ConfigValues & /* descr */) - { - } - -#if !defined (CCM_LW) - ::Components::StandardConfigurator_ptr - Connector_Servant_Impl_Base::get_standard_configurator (void) - { - CIAO_TRACE("Connector_Servant_Impl_Base::get_standard_configurator (void)"); - - // Create the configurator servant. - StandardConfigurator_Impl *config_impl = 0; - - ACE_NEW_THROW_EX (config_impl, - StandardConfigurator_Impl (this), - CORBA::NO_MEMORY ()); - - - Components::StandardConfigurator_var configurator = - config_impl->_this (); - - return configurator._retn (); - } -#endif - - PortableServer::POA_ptr - Connector_Servant_Impl_Base::_default_POA (void) - { - CIAO_TRACE("Connector_Servant_Impl_Base::_default_POA (void)"); - - Container_var cnt_safe = - Container::_duplicate(this->container_.in ()); - return cnt_safe->the_POA (); - } - - ::CORBA::Object_ptr - Connector_Servant_Impl_Base::get_facet_executor ( - const char * /* name */) - { - throw ::Components::InvalidName (); - } - - /// Protected operations. - void - Connector_Servant_Impl_Base::add_facet ( - const char *port_name, - ::CORBA::Object_ptr port_ref) - { - CIAO_TRACE("Connector_Servant_Impl_Base::add_facet"); - - if (0 == port_name || ::CORBA::is_nil (port_ref)) - { - throw ::CORBA::BAD_PARAM (); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - - this->facet_table_[port_name] = ::CORBA::Object::_duplicate (port_ref); - } - } - - CORBA::Object_ptr - Connector_Servant_Impl_Base::lookup_facet (const char *port_name) - { - CIAO_TRACE("Connector_Servant_Impl_Base::lookup_facet"); - if (!port_name) - { - return CORBA::Object::_nil (); - } - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - - FacetTable::const_iterator iter = this->facet_table_.find (port_name); - - if (iter == this->facet_table_.end ()) - { - return CORBA::Object::_nil (); - } - - return CORBA::Object::_duplicate (iter->second); - } - -#if !defined (CCM_LW) - ::Components::ReceptacleDescription * - Connector_Servant_Impl_Base::lookup_receptacle_description ( - const char * receptacle_name) - { - CIAO_TRACE ("Connector_Servant_Impl_Base::lookup_receptacle_description"); - - ::Components::ReceptacleDescriptions_var all_receptacles = - this->get_all_receptacles (); - - if (!receptacle_name || all_receptacles->length () == 0) - { - // Calling function will throw InvalidName after getting this. - return 0; - } - for (::CORBA::ULong receptacle = 0; - receptacle < all_receptacles->length (); - ++receptacle) - { - ::Components::ReceptacleDescription *receptacle_desc = - all_receptacles[receptacle]; - if (::ACE_OS::strcmp (receptacle_name, receptacle_desc->name ()) == 0) - { - ::Components::ReceptacleDescription *rd = 0; - - ACE_NEW_THROW_EX (rd, - ::OBV_Components::ReceptacleDescription ( - receptacle_desc->name (), - receptacle_desc->type_id (), - receptacle_desc->is_multiple (), - receptacle_desc->connections ()), - CORBA::NO_MEMORY ()); - ::Components::ReceptacleDescription_var safe = rd; - return safe._retn (); - } - } - return 0; - } -#endif - -#if !defined (CCM_LW) - ::Components::FacetDescription * - Connector_Servant_Impl_Base::lookup_facet_description (const char *port_name) - { - CIAO_TRACE ("Connector_Servant_Impl_Base::lookup_facet_description"); - - if (!port_name) - { - // Calling function will throw InvalidName after getting this. - return 0; - } - - ::Components::FacetDescription_var safe; - - { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, - mon, - this->lock_, - 0); - FacetTable::const_iterator iter = - this->facet_table_.find (port_name); - - if (iter != this->facet_table_.end ()) - { - ::Components::FacetDescription *fd = 0; - ACE_NEW_THROW_EX (fd, - ::OBV_Components::FacetDescription (iter->first.c_str (), - iter->second->_interface_repository_id (), - iter->second), - CORBA::NO_MEMORY ()); - safe = fd; - } - } - - return safe._retn (); - } -#endif -} - diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h deleted file mode 100644 index f50c8b55594..00000000000 --- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h +++ /dev/null @@ -1,244 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Connector_Servant_Impl_Base.h - * - * This file contains the non-template declaration of a base class for - * the template mixin for the generated connector servant class. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_CONNECTOR_SERVANT_IMPL_BASE_H -#define CIAO_CONNECTOR_SERVANT_IMPL_BASE_H - -#include /**/ "ace/pre.h" - -#include "CIAO_Servant_Impl_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "Home_Servant_Impl_Base.h" - -#include "ccm/CCM_ObjectS.h" -#include "ccm/CCM_StandardConfiguratorC.h" -#include "ccm/CCM_EnterpriseComponentC.h" -#include "ciao/Containers/Container_BaseC.h" - -#include - -namespace CIAO -{ -#if !defined (CCM_LW) - namespace Servant - { - template - void describe_simplex_receptacle ( - const char *port_name, - const char *port_type_repo_id, - typename T::_ptr_type connection, - ::Components::ReceptacleDescriptions_var &descriptions, - CORBA::ULong slot); - - template - void describe_multiplex_receptacle ( - const char *port_name, - const char *port_type_repo_id, - const T &objrefs, - ::Components::ReceptacleDescriptions_var &descriptions, - CORBA::ULong slot); - } /* Servant */ -#endif - - /** - * @class Connector_Servant_Impl_Base - * - * @brief Non-template base class for Connector_Servant_Impl. - * - * Holds the non-template parts of its child class - * Connector_Servant_Impl. - */ - class CIAO_Servant_Impl_Export Connector_Servant_Impl_Base - : public virtual POA_Components::CCMObject - { - protected: - Connector_Servant_Impl_Base ( - Components::CCMHome_ptr home, - Home_Servant_Impl_Base *home_servant, - Container_ptr c); - - public: - virtual ~Connector_Servant_Impl_Base (void); - - /// Operations for CCMObject interface. - virtual void remove (void); - -#if !defined (CCM_LW) - virtual CORBA::IRObject_ptr get_component_def (void); -#endif - - virtual Components::EnterpriseComponent_ptr get_executor () = 0; - -#if !defined (CCM_LW) - virtual ::Components::ConnectionDescriptions * - get_connections (const char *name); -#endif - - virtual CORBA::Object_ptr provide_facet (const char *name); - -#if !defined (CCM_LW) - virtual ::Components::FacetDescriptions * - get_named_facets (const ::Components::NameList & names); -#endif - -#if !defined (CCM_LW) - virtual ::Components::FacetDescriptions * get_all_facets (void); -#endif - -#if !defined (CCM_LW) - virtual ::Components::ReceptacleDescriptions * get_all_receptacles (void); -#endif - -#if !defined (CCM_LW) - virtual ::Components::PrimaryKeyBase * get_primary_key (void); -#endif - -#if !defined (CCM_LW) - virtual ::Components::ComponentPortDescription * get_all_ports (void); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::ConsumerDescriptions * get_all_consumers (void); -#endif - -#if !defined (CCM_NOEVENT) - virtual ::Components::EventConsumerBase_ptr - get_consumer (const char *sink_name); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::ConsumerDescriptions * - get_named_consumers (const ::Components::NameList & names); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::EmitterDescriptions * - get_all_emitters (void); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::EmitterDescriptions * - get_named_emitters (const ::Components::NameList & names); -#endif - - #if !defined (CCM_LW) - virtual ::Components::ReceptacleDescriptions * - get_named_receptacles (const ::Components::NameList & names); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::PublisherDescriptions * - get_all_publishers (void); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::PublisherDescriptions * - get_named_publishers (const ::Components::NameList & names); -#endif - -#if !defined (CCM_NOEVENT) - virtual ::Components::Cookie * - subscribe (const char * publisher_name, - ::Components::EventConsumerBase_ptr subscriber); -#endif - -#if !defined (CCM_NOEVENT) - virtual ::Components::EventConsumerBase_ptr - unsubscribe (const char * publisher_name, - ::Components::Cookie * ck); -#endif - -#if !defined (CCM_NOEVENT) - virtual void - connect_consumer (const char * emitter_name, - ::Components::EventConsumerBase_ptr consumer); -#endif - -#if !defined (CCM_NOEVENT) - virtual ::Components::EventConsumerBase_ptr - disconnect_consumer (const char * source_name); -#endif - - virtual ::Components::Cookie * - connect (const char * name, - ::CORBA::Object_ptr connection); - - virtual ::CORBA::Object_ptr - disconnect (const char * name, - ::Components::Cookie * ck); - - /// Operation to set attributes on the component. - virtual void set_attributes (const Components::ConfigValues &descr); - -#if !defined (CCM_LW) - // Creates and returns the StandardConfigurator for the component. - virtual ::Components::StandardConfigurator_ptr - get_standard_configurator (void); -#endif - - /// Override that returns the (passed-in) default POA of our member - /// component's container, to ensure that we get registered - /// to that POA when _this() is called. - virtual PortableServer::POA_ptr _default_POA (void); - - virtual ::CORBA::Object_ptr get_facet_executor (const char *name); - - virtual void activate_component (void) = 0; - virtual void passivate_component (void) = 0; - - protected: - virtual void ccm_remove (void) = 0; - - void add_facet (const char *port_name, - ::CORBA::Object_ptr port_ref); - - CORBA::Object_ptr lookup_facet (const char *port_name); - -#if !defined (CCM_LW) - ::Components::FacetDescription *lookup_facet_description ( - const char *port_name); -#endif - -#if !defined (CCM_LW) - ::Components::ReceptacleDescription *lookup_receptacle_description ( - const char * receptacle_name); -#endif - - protected: - typedef std::map FacetTable; - - FacetTable facet_table_; - Container_var container_; - Components::CCMHome_var home_; - Home_Servant_Impl_Base *home_servant_; - - /// For internal locking of table reads and writes. - TAO_SYNCH_MUTEX lock_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Connector_Servant_Impl_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector_Servant_Impl_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_CONNECTOR_SERVANT_IMPL_BASE_H */ diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp deleted file mode 100644 index 18aabb56221..00000000000 --- a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef CIAO_CONNECTOR_SERVANT_IMPL_UTILS_T_C -#define CIAO_CONNECTOR_SERVANT_IMPL_UTILS_T_C - -#include "ciao/Servants/Connector_Servant_Impl_Base.h" -#include "ciao/Valuetype_Factories/Cookies.h" -#include "ciao/Logger/Log_Macros.h" - -#if !defined (CCM_LW) - -namespace CIAO -{ - template - void - Servant::describe_simplex_receptacle ( - const char *port_name, - const char *port_type_repo_id, - typename T::_ptr_type connection, - ::Components::ReceptacleDescriptions_var &descriptions, - CORBA::ULong slot) - { - CIAO_TRACE ("Servant::describe_simplex_receptacle"); - - ::Components::ReceptacleDescription *elem = 0; - ACE_NEW_THROW_EX (elem, - ::OBV_Components::ReceptacleDescription, - CORBA::NO_MEMORY ()); - - ::Components::ReceptacleDescription_var safe_elem = elem; - - elem->name (port_name); - elem->type_id (port_type_repo_id); - elem->is_multiple (false); - elem->connections ().length (1UL); - - ::Components::ConnectionDescription *conn = 0; - ACE_NEW (conn, ::OBV_Components::ConnectionDescription); - ::Components::ConnectionDescription_var safe_conn = conn; - - conn->ck (0); - conn->objref (connection); - - elem->connections ()[0UL] = safe_conn._retn (); - descriptions[slot] = safe_elem._retn (); - } - - template - void - Servant::describe_multiplex_receptacle ( - const char *port_name, - const char *port_type_repo_id, - const T &objrefs, - ::Components::ReceptacleDescriptions_var &descriptions, - CORBA::ULong slot) - { - CIAO_TRACE ("Servant::describe_multiplex_receptacle"); - - ::Components::ReceptacleDescription *elem = 0; - ACE_NEW_THROW_EX (elem, - ::OBV_Components::ReceptacleDescription, - CORBA::NO_MEMORY ()); - - ::Components::ReceptacleDescription_var safe_elem = elem; - - elem->name (port_name); - elem->type_id (port_type_repo_id); - elem->is_multiple (true); - elem->connections ().length (objrefs.length ()); - - for (CORBA::ULong i = 0UL; i < objrefs.length (); ++i) - { - ::Components::ConnectionDescription *conn = 0; - ACE_NEW_THROW_EX (conn, - ::OBV_Components::ConnectionDescription, - CORBA::NO_MEMORY ()); - ::Components::ConnectionDescription_var safe_conn = conn; - - safe_conn->ck (objrefs[i].ck.in ()); - safe_conn->objref (objrefs[i].objref); - elem->connections ()[i] = safe_conn._retn (); - } - - descriptions[slot] = safe_elem._retn (); - } -} -#endif - -#endif /* CIAO_CONNECTOR_SERVANT_IMPL_UTILS_T_C */ diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp deleted file mode 100644 index d197ab7e285..00000000000 --- a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef CIAO_FACET_INTERFACE_BASE_T_C -#define CIAO_FACET_INTERFACE_BASE_T_C - -#include "Facet_Servant_Base_T.h" -#include "ccm/CCM_ObjectC.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - template - Facet_Servant_Base_T::Facet_Servant_Base_T ( - typename EXEC::_ptr_type exec, - ::Components::CCMContext_ptr ctx) - : executor_ (EXEC::_duplicate (exec)), - ctx_ (::Components::CCMContext::_duplicate (ctx)) - { - CIAO_TRACE ("Facet_Servant_Base_T::Facet_Servant_Base_T"); - } - - template - Facet_Servant_Base_T::~Facet_Servant_Base_T (void) - { - } - - template - ::CORBA::Object_ptr - Facet_Servant_Base_T::_get_component (void) - { - typename CONTEXT::_var_type sc = CONTEXT::_narrow (this->ctx_.in ()); - - if (::CORBA::is_nil (sc.in ())) - { - throw ::CORBA::INTERNAL (); - } - - return sc->get_CCM_object (); - } -}; - -#endif /* CIAO_FACET_INTERFACE_BASE_T_C */ diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.h b/CIAO/ciao/Servants/Facet_Servant_Base_T.h deleted file mode 100644 index 66f20ebfa91..00000000000 --- a/CIAO/ciao/Servants/Facet_Servant_Base_T.h +++ /dev/null @@ -1,59 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Facet_Servant_Base_T.h - * - * This file contains the declaration of a mixin base class for - * the generated interface servant class. - * - * @authors Marcel Smit (msmit@remedy.nl) - */ -//============================================================================= - -#ifndef CIAO_FACET_INTERFACE_BASE_T_H -#define CIAO_FACET_INTERFACE_BASE_T_H - -#include /**/ "ace/pre.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Contexts/Context_Impl_Base_T.h" - -namespace CIAO -{ - template - class Facet_Servant_Base_T - : public virtual BASE - { - public: - Facet_Servant_Base_T (typename EXEC::_ptr_type exec, - ::Components::CCMContext_ptr ctx); - - virtual ~Facet_Servant_Base_T (void); - - /// Get component implementation. - virtual CORBA::Object_ptr _get_component (void); - - protected: - typename EXEC::_var_type executor_; - - /// Context object. - ::Components::CCMContext_var ctx_; - }; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Facet_Servant_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Facet_Servant_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - - -#endif /* CIAO_FACET_INTERFACE_BASE_T_H */ diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp deleted file mode 100644 index 8710e2c392c..00000000000 --- a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "Home_Servant_Impl_Base.h" - -namespace CIAO -{ - Home_Servant_Impl_Base::Home_Servant_Impl_Base (void) - { - } - - Home_Servant_Impl_Base::~Home_Servant_Impl_Base (void) - { - } - -#if !defined (CCM_LW) - CORBA::IRObject_ptr - Home_Servant_Impl_Base::get_component_def (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - -#if !defined (CCM_LW) - CORBA::IRObject_ptr - Home_Servant_Impl_Base::get_home_def (void) - { - throw CORBA::NO_IMPLEMENT (); - } -#endif - - void - Home_Servant_Impl_Base::set_attributes ( - const Components::ConfigValues & /* descr */) - { - } -} - diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_Base.h b/CIAO/ciao/Servants/Home_Servant_Impl_Base.h deleted file mode 100644 index 942a43b3d66..00000000000 --- a/CIAO/ciao/Servants/Home_Servant_Impl_Base.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Home_Servant_Impl_Base.h - * - * This file contains the non-template declaration of a base class for - * the template mixin for the generated home servant class. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_HOME_SERVANT_IMPL_BASE_H -#define CIAO_HOME_SERVANT_IMPL_BASE_H - -#include /**/ "ace/pre.h" - -#include "CIAO_Servant_Impl_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ccm/CCM_HomeS.h" -#include "ccm/CCM_StandardConfiguratorC.h" - -namespace CIAO -{ - /** - * @class Home_Servant_Impl_Base - * - * @brief Non-template base class for Home_Servant_Impl. - * - * Holds the non-template parts of its child class - * Home_Servant_Impl. - */ - class CIAO_Servant_Impl_Export Home_Servant_Impl_Base - : public virtual POA_Components::CCMHome - { - public: - Home_Servant_Impl_Base (void); - - virtual ~Home_Servant_Impl_Base (void); - - // Operations for CCMHome interface. - -#if !defined (CCM_LW) - virtual ::CORBA::IRObject_ptr get_component_def (void); -#endif - -#if !defined (CCM_LW) - virtual ::CORBA::IRObject_ptr get_home_def (void); -#endif - - /// Operation to set attributes on the home. - virtual void set_attributes (const Components::ConfigValues &descr); - - virtual void update_component_map (PortableServer::ObjectId &oid) = 0; - }; -} - -#include /**/ "ace/post.h" - -#endif /* CIAO_HOME_SERVANT_IMPL_BASE_H */ diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp deleted file mode 100644 index 07cfe4e9e04..00000000000 --- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp +++ /dev/null @@ -1,266 +0,0 @@ -#ifndef CIAO_HOME_SERVANT_IMPL_T_C -#define CIAO_HOME_SERVANT_IMPL_T_C - -#include "Home_Servant_Impl_T.h" -#include "ccm/CCM_ObjectC.h" -#include "ccm/CCM_EnterpriseComponentC.h" -#include "ciao/Containers/Container_BaseC.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - template - Home_Servant_Impl::Home_Servant_Impl ( - typename EXEC::_ptr_type exe, - typename CONTAINER::_ptr_type c, - const char *ins_name) - : Home_Servant_Impl_Base (), - ins_name_ (ins_name), - executor_ (EXEC::_duplicate (exe)), - serial_number_ (0), - container_ (CONTAINER::_duplicate(c)) - { - CIAO_DEBUG (9, (LM_TRACE, CLINFO "Home_Servant_Impl<>::Home_Servant_Impl - " - "Creating servant for home with ID %C\n", - ins_name)); - } - - template - Home_Servant_Impl::~Home_Servant_Impl (void) - { - CIAO_TRACE ("Home_Servant_Impl<>::destructor"); - - this->remove_components (); - } - - template - void - Home_Servant_Impl::remove_components (void) - { - while (this->objref_map_.current_size () > 0) - { - OBJ_ITERATOR const first = this->objref_map_.begin (); - this->remove_component (((*first).int_id_).in ()); - if (this->objref_map_.unbind (first) != 0) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Home_Servant_Impl<>::remove_components - " - "Failed to unbind component\n")); - throw Components::RemoveFailure (); - } - } - } - - // Operations for CCMHome interface. - - template - void - Home_Servant_Impl::remove_component ( - ::Components::CCMObject_ptr comp) - { - CIAO_TRACE ("Home_Servant_Impl<>::remove_component"); - - typename CONTAINER::_var_type cnt_safe = - CONTAINER::_duplicate (this->container_.in()); - PortableServer::POA_var poa = cnt_safe->the_POA (); - PortableServer::ObjectId_var oid = poa->reference_to_id (comp); - - Components::CCMObject_var ccm_obj_var; - if (objref_map_.find (oid.in (), ccm_obj_var) != 0) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Home_Servant_Impl<>::remove_component - " - "Invalid component object reference\n")); - throw Components::RemoveFailure (); - } - - typedef typename COMP_SVNT::_stub_type stub_type; - typename COMP_SVNT::_stub_var_type _ciao_comp = - stub_type::_narrow (ccm_obj_var.in ()); - - if (::CORBA::is_nil (_ciao_comp.in ())) - { - throw Components::RemoveFailure (); - } - else - { - _ciao_comp->remove (); - } - - CIAO_DEBUG (6, (LM_INFO, CLINFO - "Home_Servant_Impl<>::remove_component - " - "Removed the component\n")); - } - - template - void - Home_Servant_Impl::update_component_map ( - PortableServer::ObjectId &oid) - { - CIAO_TRACE ("Home_Servant_Impl<>::update_component_map"); - - Components::CCMObject_var ccm_obj_ptr; - if (objref_map_.unbind (oid, ccm_obj_ptr) != 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Servant_Impl<>::update_component_map - " - "Invalid component object reference\n")); - } - } - - // Operations for keyless home interface. - template - Components::CCMObject_ptr - Home_Servant_Impl::create_component (void) - { - CIAO_TRACE ("Home_Servant_Impl<>::create_component"); - - return this->create (); - } - - template - typename COMP_SVNT::_stub_ptr_type - Home_Servant_Impl::create (void) - { - CIAO_TRACE ("Home_Servant_Impl<>::create"); - - if (::CORBA::is_nil (this->executor_.in ())) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Servant_Impl<>:create - " - "nil executor reference\n")); - throw CORBA::INTERNAL (); - } - - typename EXEC::_var_type exec_safe = - EXEC::_duplicate (this->executor_.in()); - - ::Components::EnterpriseComponent_var _ciao_ec = exec_safe->create (); - - typedef typename COMP_SVNT::_exec_type exec_type; - typename COMP_SVNT::_exec_type::_var_type _ciao_comp = - exec_type::_narrow (_ciao_ec.in ()); - - return this->_ciao_activate_component (_ciao_comp.in ()); - } - - template - typename COMP_SVNT::_stub_ptr_type - Home_Servant_Impl::_ciao_activate_component ( - typename COMP_SVNT::_exec_type::_ptr_type exe) - { - CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component"); - - typename CONTAINER::_var_type cnt_safe = - CONTAINER::_duplicate (this->container_.in()); - - CORBA::Object_var hobj = cnt_safe->get_objref (this); - - Components::CCMHome_var home = - Components::CCMHome::_narrow (hobj.in ()); - - char buffer[256]; - unsigned long const serial = this->serial_number_++; - if (ACE_OS::sprintf (buffer, "%ld", serial) < 0) - { - throw CORBA::INTERNAL (); - } - - typedef typename COMP_SVNT::_stub_type stub_type; - COMP_SVNT *svt = 0; - ACE_NEW_THROW_EX (svt, - COMP_SVNT (exe, - home.in (), - (this->ins_name_ + buffer).c_str (), - this, - cnt_safe), - CORBA::NO_MEMORY ()); - - PortableServer::ServantBase_var safe (svt); - PortableServer::ObjectId_var oid; - - CORBA::Object_var objref = - cnt_safe->install_servant (svt, - Container_Types::COMPONENT_t, - oid.out ()); - typedef typename COMP_SVNT::_stub_type stub_type; - typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ()); - - Components::CCMObject_var ccmobjref = - Components::CCMObject::_narrow (objref.in ()); - - this->objref_map_.bind ( - oid.in (), - Components::CCMObject::_duplicate (ccmobjref.in ())); - return ho._retn (); - } - - template - void - Home_Servant_Impl::_ciao_passivate_component ( - typename COMP_SVNT::_stub_ptr_type comp) - { - CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component"); - - typename CONTAINER::_var_type cnt_safe = - CONTAINER::_duplicate (this->container_.in()); - - cnt_safe->uninstall_component (comp); - } -} - -#endif /* CIAO_HOME_SERVANT_IMPL_T_C */ diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.h b/CIAO/ciao/Servants/Home_Servant_Impl_T.h deleted file mode 100644 index b65c9584839..00000000000 --- a/CIAO/ciao/Servants/Home_Servant_Impl_T.h +++ /dev/null @@ -1,106 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Home_Servant_Impl_T.h - * - * This file contains the declaration of a mixin base class for - * the generated home servant class. - * - * @authors Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_HOME_SERVANT_IMPL_T_H -#define CIAO_HOME_SERVANT_IMPL_T_H - -#include /**/ "ace/pre.h" - -#include "Home_Servant_Impl_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Hash_Map_Manager_T.h" -#include "tao/PortableServer/Key_Adapters.h" -#include "ciao/Containers/Container_BaseC.h" - -namespace CIAO -{ - /** - * @class Home_Servant_Impl - * - * @brief Mixin base class for generated home servant. - * - * This class implements operations - * common to all generated home servants. - */ - template - class Home_Servant_Impl - : public virtual BASE_SKEL, - public virtual Home_Servant_Impl_Base - { - public: - Home_Servant_Impl (typename EXEC::_ptr_type exe, - typename CONTAINER::_ptr_type c, - const char *ins_name); - - virtual ~Home_Servant_Impl (void); - - /// Operations for CCMHome interface. - virtual void remove_component (Components::CCMObject_ptr comp); - - /// Operations for keyless home interface. - virtual ::Components::CCMObject_ptr create_component (void); - - /// Operations for implicit home interface. - virtual typename COMP_SVNT::_stub_ptr_type create (void); - - virtual void update_component_map (PortableServer::ObjectId &oid); - - void remove_components (void); - - protected: - /// CIAO-specific operations. - typename COMP_SVNT::_stub_ptr_type - _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe); - - void - _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp); - - protected: - ACE_CString ins_name_; - typename EXEC::_var_type executor_; - - typedef ACE_Hash_Map_Manager_Ex, - TAO_SYNCH_MUTEX> - OBJREF_MAP; - - typedef OBJREF_MAP::iterator OBJ_ITERATOR; - - OBJREF_MAP objref_map_; - - ACE_Atomic_Op serial_number_; - - typename CONTAINER::_var_type container_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Home_Servant_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Home_Servant_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_HOME_SERVANT_IMPL_T_H */ diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp deleted file mode 100644 index e7d6f4ade67..00000000000 --- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ /dev/null @@ -1,430 +0,0 @@ -#include "Servant_Impl_Base.h" - -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - Servant_Impl_Base::Servant_Impl_Base (Components::CCMHome_ptr home, - Home_Servant_Impl_Base *home_servant, - Container_ptr c) - : Connector_Servant_Impl_Base (home, home_servant, c) - { - } - - Servant_Impl_Base::~Servant_Impl_Base (void) - { - } - - void - Servant_Impl_Base::remove (void) - { - CIAO_TRACE("Servant_Impl_Base::remove (void)"); -#if !defined (CCM_NOEVENT) - - try - { - Container_var cnt_safe = - Container::_duplicate(this->container_.in ()); - PortableServer::POA_var port_poa = - this->container_->the_port_POA (); - - for (ConsumerTable::const_iterator iter = - this->consumer_table_.begin (); - iter != this->consumer_table_.end (); - ++iter) - { - PortableServer::ObjectId_var cons_id = - port_poa->reference_to_id (iter->second); - - port_poa->deactivate_object (cons_id); - } - } - catch (const CORBA::Exception& ex) - { - // log error and propagate so error gets reported to deployment framework - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Impl_Base::remove - CORBA exception : %C\n", ex._info ().c_str ())); - ex._raise (); // propagate - } -#endif - - /// This call deactivates facets, removes executor and home - /// servant (if any), and uninstalls us from the container. - /// It has its own try/catch blocks. - this->Connector_Servant_Impl_Base::remove (); - } - -#if !defined (CCM_LW) - ::Components::ComponentPortDescription * - Servant_Impl_Base::get_all_ports (void) - { - CIAO_TRACE("Servant_Impl_Base::get_all_ports (void)"); - - ::Components::ComponentPortDescription_var retv = - this->Connector_Servant_Impl_Base::get_all_ports (); -#if !defined (CCM_NOEVENT) - ::Components::ConsumerDescriptions_var consumer_desc = - this->get_all_consumers (); - - ::Components::EmitterDescriptions_var emitter_desc = - this->get_all_emitters (); - - ::Components::PublisherDescriptions_var publisher_desc = - this->get_all_publishers (); - - retv->consumers (consumer_desc.in ()); - retv->emitters (emitter_desc.in ()); - retv->publishers (publisher_desc.in ()); -#endif - return retv._retn (); - } -#endif - -#if !defined (CCM_LW) - ::Components::PrimaryKeyBase * - Servant_Impl_Base::get_primary_key (void) - { - CIAO_TRACE("Servant_Impl_Base::get_primary_key"); - throw ::Components::NoKeyAvailable (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::ConsumerDescriptions * - Servant_Impl_Base::get_all_consumers (void) - { - CIAO_TRACE("Servant_Impl_Base::get_all_consumers (void)"); - - ::Components::ConsumerDescriptions *tmp = 0; - ACE_NEW_THROW_EX (tmp, - ::Components::ConsumerDescriptions ( - this->consumer_table_.size ()), - CORBA::NO_MEMORY ()); - - ::Components::ConsumerDescriptions_var retval = tmp; - - retval->length (this->consumer_table_.size ()); - CORBA::ULong i = 0UL; - - for (ConsumerTable::const_iterator iter = - this->consumer_table_.begin (); - iter != this->consumer_table_.end (); - ++iter, ++i) - { - ::Components::ConsumerDescription *cd = 0; - ACE_NEW_THROW_EX (cd, - ::OBV_Components::ConsumerDescription, - CORBA::NO_MEMORY ()); - - cd->name (iter->first.c_str ()); - cd->type_id (iter->second->_interface_repository_id ()); - cd->consumer (iter->second); - - retval[i] = cd; - } - - return retval._retn (); - } -#endif -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr - Servant_Impl_Base::get_consumer (const char *sink_name) - { - CIAO_TRACE("Servant_Impl_Base::get_consumer (const char *sink_name)"); - - if (sink_name == 0) - { - throw ::CORBA::BAD_PARAM (); - } - - ::Components::EventConsumerBase_ptr retval = - this->lookup_consumer (sink_name); - - if (::CORBA::is_nil (retval)) - { - throw ::Components::InvalidName (); - } - - return retval; - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::ConsumerDescriptions * - Servant_Impl_Base::get_named_consumers ( - const ::Components::NameList & names) - { - CIAO_TRACE("Servant_Impl_Base::get_named_consumers"); - - Components::ConsumerDescriptions *retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::ConsumerDescriptions, - CORBA::NO_MEMORY ()); - - Components::ConsumerDescriptions_var safe_retval = retval; - CORBA::ULong const len = names.length (); - safe_retval->length (len); - - for (CORBA::ULong i = 0; i < len; ++i) - { - ::Components::ConsumerDescription *tmp = - this->lookup_consumer_description (names[i]); - - if (tmp == 0) - { - throw ::Components::InvalidName (); - } - - safe_retval[i] = tmp; - } - - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::EmitterDescriptions * - Servant_Impl_Base::get_named_emitters ( - const ::Components::NameList & names) - { - CIAO_TRACE("Servant_Impl_Base::get_named_emitters"); - ::Components::EmitterDescriptions *retval = 0; - ACE_NEW_THROW_EX (retval, - ::Components::EmitterDescriptions, - ::CORBA::NO_MEMORY ()); - - ::Components::EmitterDescriptions_var safe_retval = retval; - const ::CORBA::ULong len = names.length (); - safe_retval->length (len); - - for (::CORBA::ULong i = 0UL; i < len; ++i) - { - ::Components::EmitterDescription * desc = - this->lookup_emitter_description (names[i].in ()); - if (desc) - { - safe_retval[i] = desc; - } - else - { - throw ::Components::InvalidName (); - } - } - return safe_retval._retn (); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::PublisherDescriptions * - Servant_Impl_Base::get_named_publishers ( - const ::Components::NameList & names) - { - CIAO_TRACE("Servant_Impl_Base::get_named_publishers"); - ::Components::PublisherDescriptions_var retval; - ACE_NEW_THROW_EX (retval, - ::Components::PublisherDescriptions, - ::CORBA::NO_MEMORY ()); - - retval->length (names.length ()); - ::CORBA::ULong count = 0UL; - - for (::CORBA::ULong name = 0UL; - name < names.length (); - ++name) - { - ::Components::PublisherDescription * desc = - this->lookup_publisher_description (names[name].in ()); - if (desc) - { - retval[count++] = desc; - } - else - { - throw ::Components::InvalidName (); - } - } - ::Components::PublisherDescriptions_var safe_retval = retval; - return safe_retval._retn (); - } -#endif - - /// Protected operations. -#if !defined (CCM_NOEVENT) - void - Servant_Impl_Base::add_consumer (const char *port_name, - ::Components::EventConsumerBase_ptr port_ref) - { - CIAO_TRACE("Servant_Impl_Base::add_consumer"); - - if (0 == port_name || ::CORBA::is_nil (port_ref)) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Servant_Impl_Base::add_consumer - Bad port name [%C] or bad objref\n", - port_name)); - - throw ::CORBA::BAD_PARAM (); - } - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - - this->consumer_table_[port_name] = ::Components::EventConsumerBase::_duplicate (port_ref); - } - } -#endif - -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr - Servant_Impl_Base::lookup_consumer (const char *port_name) - { - CIAO_TRACE("Servant_Impl_Base::lookup_consumer"); - - if (0 == port_name) - { - return ::Components::EventConsumerBase::_nil (); - } - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - - ConsumerTable::const_iterator iter = - this->consumer_table_.find (port_name); - - if (iter == this->consumer_table_.end ()) - { - return ::Components::EventConsumerBase::_nil (); - } - - return ::Components::EventConsumerBase::_duplicate (iter->second); - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::ConsumerDescription * - Servant_Impl_Base::lookup_consumer_description ( - const char *port_name) - { - CIAO_TRACE("Servant_Impl_Base::lookup_consumer_description"); - - if (0 == port_name) - { - /// Calling function will throw InvalidName after getting this. - return 0; - } - - ::Components::ConsumerDescription_var cd; - ConsumerTable::const_iterator iter; - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); - - iter = this->consumer_table_.find (port_name); - - if (iter != this->consumer_table_.end ()) - { - ::Components::ConsumerDescription *cdp = 0; - ACE_NEW_THROW_EX (cdp, - ::OBV_Components::ConsumerDescription, - CORBA::NO_MEMORY ()); - - cdp->name (iter->first.c_str ()); - cdp->type_id (iter->second->_interface_repository_id ()); - cdp->consumer (iter->second); - cd = cdp; - } - } - - return cd._retn (); - } -#endif - - /// Private operations. -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::PublisherDescription * - Servant_Impl_Base::lookup_publisher_description (const char *publisher_name) - { - CIAO_TRACE("Servant_Impl_Base::lookup_publisher_description"); - - ::Components::PublisherDescriptions_var all_publishers = - this->get_all_publishers (); - - if (!publisher_name || all_publishers->length () == 0) - { - // Calling function will throw InvalidName after getting this. - return 0; - } - for (::CORBA::ULong publisher = 0; - publisher < all_publishers->length (); - ++publisher) - { - ::Components::PublisherDescription *publisher_desc = - all_publishers[publisher]; - if (::ACE_OS::strcmp (publisher_name, publisher_desc->name ()) == 0) - { - ::Components::PublisherDescription *pd = 0; - ACE_NEW_THROW_EX (pd, - ::OBV_Components::PublisherDescription (), - CORBA::NO_MEMORY ()); - pd->name (publisher_desc->name ()); - pd->type_id (publisher_desc->type_id ()); - pd->consumers (publisher_desc->consumers ()); - ::Components::PublisherDescription_var safe = pd; - return safe._retn (); - } - } - return 0; - } -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::EmitterDescription * - Servant_Impl_Base::lookup_emitter_description (const char *emitter_name) - { - CIAO_TRACE("Servant_Impl_Base::lookup_emitter_description"); - - ::Components::EmitterDescriptions_var all_emitters = - this->get_all_emitters (); - - if (!emitter_name || all_emitters->length () == 0) - { - // Calling function will throw InvalidName after getting this. - return 0; - } - for (::CORBA::ULong emitter = 0; - emitter < all_emitters->length (); - ++emitter) - { - ::Components::EmitterDescription *emitter_desc = - all_emitters[emitter]; - if (::ACE_OS::strcmp (emitter_name, emitter_desc->name ()) == 0) - { - ::Components::EmitterDescription *ed = 0; - - ACE_NEW_THROW_EX (ed, - ::OBV_Components::EmitterDescription (), - CORBA::NO_MEMORY ()); - - ed->name (emitter_desc->name ()); - ed->type_id (emitter_desc->type_id ()); - ed->consumer (emitter_desc->consumer()); - - ::Components::EmitterDescription_var safe = ed; - - return safe._retn (); - } - } - return 0; - } -#endif - -} - diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.h b/CIAO/ciao/Servants/Servant_Impl_Base.h deleted file mode 100644 index 686fa2ea40b..00000000000 --- a/CIAO/ciao/Servants/Servant_Impl_Base.h +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Servant_Impl_Base.h - * - * This file contains the non-template declaration of a base class for - * the template mixin for the generated component servant class. - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_SERVANT_IMPL_BASE_H -#define CIAO_SERVANT_IMPL_BASE_H - -#include /**/ "ace/pre.h" - -#include "Connector_Servant_Impl_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace CIAO -{ -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - namespace Servant - { - template - void describe_pub_event_source ( - const char *port_name, - const char *port_type_repo_id, - std::map &consumers, - ::Components::PublisherDescriptions_var &descriptions, - CORBA::ULong slot); - - template - void describe_emit_event_source ( - const char *port_name, - const char *port_type_repo_id, - T_var &consumer_ref, - ::Components::EmitterDescriptions_var &descriptions, - CORBA::ULong slot); - } /* Servant */ -#endif - /** - * @class Servant_Impl_Base - * - * @brief Non-template base class for Servant_Impl. - * - * Holds the non-template parts of its child class - * Servant_Impl. Inherits from Connector_Servant_Impl_Base, - * which contains the facet and receptacle functionality that - * Connectors are limited to. - */ - class CIAO_Servant_Impl_Export Servant_Impl_Base - : public Connector_Servant_Impl_Base - { - protected: - Servant_Impl_Base (Components::CCMHome_ptr home, - Home_Servant_Impl_Base *home_servant, - Container_ptr c); - - public: - virtual ~Servant_Impl_Base (void); - - /// Operations for CCMObject interface. - virtual void remove (void); - -#if !defined (CCM_LW) - virtual ::Components::ComponentPortDescription * get_all_ports (void); -#endif - -#if !defined (CCM_LW) - virtual ::Components::PrimaryKeyBase * get_primary_key (void); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::ConsumerDescriptions * get_all_consumers (void); -#endif - -#if !defined (CCM_NOEVENT) - virtual ::Components::EventConsumerBase_ptr - get_consumer (const char *sink_name); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::ConsumerDescriptions * - get_named_consumers (const ::Components::NameList & names); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::EmitterDescriptions * - get_named_emitters (const ::Components::NameList & names); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - virtual ::Components::PublisherDescriptions * - get_named_publishers (const ::Components::NameList & names); -#endif - - protected: -#if !defined (CCM_NOEVENT) - void add_consumer (const char *port_name, - ::Components::EventConsumerBase_ptr port_ref); -#endif - -#if !defined (CCM_NOEVENT) - ::Components::EventConsumerBase_ptr lookup_consumer ( - const char *port_name); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::ConsumerDescription *lookup_consumer_description ( - const char *port_name); -#endif - - private: - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::PublisherDescription * - lookup_publisher_description (const char *publisher_name); -#endif - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) - ::Components::EmitterDescription * - lookup_emitter_description(const char* emitter_name); -#endif - - protected: -#if !defined (CCM_NOEVENT) - typedef std::map - ConsumerTable; - - ConsumerTable consumer_table_; -#endif - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Servant_Impl_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Servant_Impl_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVANT_IMPL_BASE_H */ diff --git a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp deleted file mode 100644 index 9db3dad4026..00000000000 --- a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef CIAO_SERVANT_IMPL_UTILS_T_C -#define CIAO_SERVANT_IMPL_UTILS_T_C - -#include "ciao/Servants/Servant_Impl_Base.h" -#include "ciao/Valuetype_Factories/Cookies.h" -#include "ciao/Logger/Log_Macros.h" - -#if !defined (CCM_LW) && !defined (CCM_NOEVENT) -namespace CIAO -{ - template - void - Servant::describe_pub_event_source ( - const char *port_name, - const char *port_type_repo_id, - std::map &consumers, - ::Components::PublisherDescriptions_var &descriptions, - CORBA::ULong slot) - { - CIAO_TRACE ("Servant::describe_pub_event_source"); - - ::Components::PublisherDescription *elem = 0; - ACE_NEW_THROW_EX (elem, - ::OBV_Components::PublisherDescription, - CORBA::NO_MEMORY ()); - - ::Components::PublisherDescription_var safe_elem = elem; - - elem->name (port_name); - elem->type_id (port_type_repo_id); - elem->consumers ().length (consumers.size ()); - - ptrdiff_t map_slot = 0UL; - ::Components::SubscriberDescription *sub = 0; - - typedef typename std::map::const_iterator - CONST_ITERATOR; - - for (CONST_ITERATOR iter = consumers.begin (); - iter != consumers.end (); - ++iter, ++map_slot) - { - ACE_NEW_THROW_EX (sub, - ::OBV_Components::SubscriberDescription, - CORBA::NO_MEMORY ()); - ::Components::SubscriberDescription_var safe_sub = sub; - - ::Components::Cookie_var key_cookie; - ACE_NEW (key_cookie, - CIAO::Cookie_Impl (iter->first)); - - sub->ck (key_cookie.in ()); - - sub->consumer (iter->second.in ()); - - elem->consumers ()[map_slot] = safe_sub._retn (); - } - - descriptions[slot] = safe_elem._retn (); - } - - template - void - Servant::describe_emit_event_source ( - const char *port_name, - const char *port_type_repo_id, - T_var &consumer_ref, - ::Components::EmitterDescriptions_var &descriptions, - CORBA::ULong slot) - { - CIAO_TRACE ("Servant::describe_emit_event_source"); - ::Components::EmitterDescription *elem = 0; - ACE_NEW_THROW_EX (elem, - ::OBV_Components::EmitterDescription, - CORBA::NO_MEMORY ()); - ::Components::EmitterDescription_var safe_elem = elem; - - elem->name (port_name); - elem->type_id (port_type_repo_id); - - // Valuetype 'set' call increments the reference count. - elem->consumer (consumer_ref.in ()); - - descriptions[slot] = safe_elem._retn (); - } -} -#endif - -#endif /* CIAO_SERVANT_IMPL_UTILS_T_C */ diff --git a/CIAO/ciao/Servants/Servants.mpc b/CIAO/ciao/Servants/Servants.mpc deleted file mode 100644 index 321c77a7f4d..00000000000 --- a/CIAO/ciao/Servants/Servants.mpc +++ /dev/null @@ -1,33 +0,0 @@ -project(CIAO_Servant_Impl) : install, ciao_container_base_stub, ccm_svnt, ccm_session_stub, ciao_output, ciao_logger, ccm_direct_collocation { - dynamicflags += CIAO_SERVANT_IMPL_BUILD_DLL - IDL_Files { - } - - Source_Files { - Connector_Servant_Impl_Base.cpp - Home_Servant_Impl_Base.cpp - Servant_Impl_Base.cpp - StandardConfigurator_Impl.cpp - } - - Template_Files { - Home_Servant_Impl_T.cpp - Connector_Servant_Impl_Utils_T.cpp - Servant_Impl_Utils_T.cpp - Facet_Servant_Base_T.cpp - } - - Header_Files { - CIAO_Servant_Impl_export.h - Connector_Servant_Impl_Base.h - Home_Servant_Impl_Base.h - Home_Servant_Impl_T.h - Servant_Impl_Base.h - StandardConfigurator_Impl.h - Facet_Servant_Base_T.h - } - - specific { - install_dir = ciao/Servants - } -} diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp deleted file mode 100644 index 2d24e03aecf..00000000000 --- a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp +++ /dev/null @@ -1,197 +0,0 @@ -#ifndef CIAO_SERVANT_IMPL_T_C -#define CIAO_SERVANT_IMPL_T_C - -namespace CIAO -{ - template - Session_Servant_Impl_T::Session_Servant_Impl_T ( - EXEC * exe, - Components::CCMHome_ptr home, - const char * ins_name, - Home_Servant_Impl_Base *home_servant, - ::CIAO::Session_Container_ptr c) - : CONTEXT::svnt_base_type (home, home_servant, c), - activated_ (false), - configuration_completed_ (false), - executor_ (EXEC::_duplicate (exe)), - context_ (0), - ins_name_ (ins_name) - { - ACE_NEW (this->context_, - CONTEXT (home, c, this, ins_name)); - - ::Components::SessionComponent_var scom = - ::Components::SessionComponent::_narrow (exe); - - if (! ::CORBA::is_nil (scom.in ())) - { - scom->set_session_context (this->context_); - } - else - { - CIAO_DEBUG (6, - (LM_DEBUG, CLINFO - "Session_Servant_Impl_T_T::Session_Servant_Impl_T_T - " - "Couldn't set session context for %C\n", - ins_name)); - } - } - - template - Session_Servant_Impl_T::~Session_Servant_Impl_T (void) - { - if (this->executor_->_refcount_value () > 1) - { - CIAO_ERROR (1, - (LM_ERROR, CLINFO - "Session_Servant_Impl_T_T::~Session_Servant_Impl_T_T - " - "Executor object reference count is %u\n", - this->executor_->_refcount_value ())); - } - - this->context_->_remove_ref (); - } - - // Operations for CCMObject interface. - template - CORBA::Boolean - Session_Servant_Impl_T::same_component ( - CORBA::Object_ptr object_ref) - { - if (::CORBA::is_nil (object_ref)) - { - throw ::CORBA::BAD_PARAM (); - } - - ::CORBA::Object_var me = this->context_->get_CCM_object (); - - if (::CORBA::is_nil (me.in ())) - { - throw ::CORBA::INTERNAL (); - } - - ::CORBA::Object_var the_other = object_ref->_get_component (); - - return me->_is_equivalent (the_other.in ()); - - } - - template - ::Components::CCMHome_ptr - Session_Servant_Impl_T::get_ccm_home (void) - { - return this->context_->get_CCM_home (); - } - - template - Components::EnterpriseComponent_ptr - Session_Servant_Impl_T::get_executor (void) - { - return ::Components::EnterpriseComponent::_duplicate (this->executor_.in ()); - } - - template - CORBA::Object_ptr - Session_Servant_Impl_T::_get_component (void) - { - ::Components::SessionContext_var sc = - ::Components::SessionContext::_narrow (this->context_); - - if (::CORBA::is_nil (sc.in ())) - { - throw ::CORBA::INTERNAL (); - } - - return sc->get_CCM_object (); - } - - // CIAO-specific operations. - - template - void - Session_Servant_Impl_T::activate_component (void) - { - if (this->configuration_completed_ && !this->activated_) - { - ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in ()); - - if (! ::CORBA::is_nil (temp.in ())) - { - temp->ccm_activate (); - this->activated_ = true; - } - } - } - - template - void - Session_Servant_Impl_T::passivate_component (void) - { - if (this->activated_) - { - ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in ()); - - if (! ::CORBA::is_nil (temp.in ())) - { - temp->ccm_passivate (); - this->activated_ = false; - } - } - } - - template - void - Session_Servant_Impl_T::configuration_complete (void) - { - if (!this->configuration_completed_) - { - ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in ()); - - if (! ::CORBA::is_nil (temp.in ())) - { - temp->configuration_complete (); - this->configuration_completed_ = true; - } - } - } - - template - void - Session_Servant_Impl_T::ccm_remove (void) - { - ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in ()); - - if (::CORBA::is_nil (temp.in ())) - { - throw ::CORBA::INTERNAL (); - } - - temp->ccm_remove (); - } -} - -#endif /* CIAO_SERVANT_IMPL_T_C */ diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.h b/CIAO/ciao/Servants/Session/Servant_Impl_T.h deleted file mode 100644 index bcbbb48cf5a..00000000000 --- a/CIAO/ciao/Servants/Session/Servant_Impl_T.h +++ /dev/null @@ -1,97 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Servant_Impl_T.h - * - * This file contains the declaration of a mixin base class for - * the generated servant class. - * - * @authors Boris Kolpackov - * Jeff Parsons - */ -//============================================================================= - -#ifndef CIAO_SERVANT_IMPL_T_H -#define CIAO_SERVANT_IMPL_T_H - -#include /**/ "ace/pre.h" - -#include "ciao/Servants/Servant_Impl_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ccm/Session/CCM_SessionComponentC.h" -#include "ciao/Containers/Session/Session_Container.h" - -namespace CIAO -{ - /** - * @class Session_Servant_Impl_T - * - * @brief Mixin base class for generated servant. - * - * This class implements navigation and other operations - * common to all generated servants. - */ - template - class Session_Servant_Impl_T - : public virtual BASE_SKEL, - public virtual CONTEXT::svnt_base_type - { - public: - Session_Servant_Impl_T (EXEC * exe, - Components::CCMHome_ptr home, - const char * ins_name, - Home_Servant_Impl_Base *home_servant, - ::CIAO::Session_Container_ptr c); - - virtual ~Session_Servant_Impl_T (void); - - // Operations for CCMObject interface. - - virtual CORBA::Boolean same_component (CORBA::Object_ptr object_ref); - - virtual ::Components::CCMHome_ptr get_ccm_home (); - - virtual CORBA::Object_ptr _get_component (); - - virtual Components::EnterpriseComponent_ptr get_executor (); - - void configuration_complete (); - - virtual void activate_component (); - - virtual void passivate_component (); - - protected: - virtual void ccm_remove (void); - - CORBA::Boolean activated_; - CORBA::Boolean configuration_completed_; - - /// Initialized in this constructor. - typename EXEC::_var_type executor_; - - /// Initialized in this constructor. - CONTEXT* context_; - - const char * ins_name_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ciao/Servants/Session/Servant_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ciao/Servants/Session/Servant_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVANT_IMPL_T_H */ diff --git a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp b/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp deleted file mode 100644 index 359959d3634..00000000000 --- a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "StandardConfigurator_Impl.h" -#include "Servant_Impl_Base.h" - -#if !defined (CCM_LW) - -namespace CIAO -{ - StandardConfigurator_Impl::StandardConfigurator_Impl ( - Connector_Servant_Impl_Base* servant) - : component_ (servant) - { - } - - StandardConfigurator_Impl::~StandardConfigurator_Impl (void) - { - } - - void - StandardConfigurator_Impl::set_configuration ( - const Components::ConfigValues &descr) - { - this->component_->set_attributes (descr); - } - - void - StandardConfigurator_Impl::configure (Components::CCMObject_ptr) - { - } -} - -#endif - diff --git a/CIAO/ciao/Servants/StandardConfigurator_Impl.h b/CIAO/ciao/Servants/StandardConfigurator_Impl.h deleted file mode 100644 index 14e47a46a0b..00000000000 --- a/CIAO/ciao/Servants/StandardConfigurator_Impl.h +++ /dev/null @@ -1,74 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file StandardConfigurator_Impl.h - * - * This file contains implementation for the servant of - * Components::StandardConfigurator interface. - * - * @author Jules White - */ -//============================================================================= - -#ifndef CIAO_STANDARDCONFIGURATOR_IMPL_H -#define CIAO_STANDARDCONFIGURATOR_IMPL_H - -# include /**/ "ace/pre.h" - -#include "CIAO_Servant_Impl_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ccm/CCM_StandardConfiguratorS.h" - -namespace CIAO -{ - class Connector_Servant_Impl_Base; -} - -#if !defined (CCM_LW) - -namespace CIAO -{ - /** - * @class StandardConfigurator_Impl - * - * @brief Servant implementation for Components::StandardConfigurator - * - * This class implements the Components::StandardConfigurator - * interface as defined by the CCM specification. This class aids - * in setting the initial values of component attributes that are - * defined in the meta data. - */ - class CIAO_Servant_Impl_Export StandardConfigurator_Impl - : public virtual POA_Components::StandardConfigurator - { - public: - /// Constructor - StandardConfigurator_Impl ( - Connector_Servant_Impl_Base* toconfigure); - - /// Destructor - virtual ~StandardConfigurator_Impl (void); - - /// This method will call set_attributes on the component that is - /// being configured, i.e, the template method from - /// StandardConfigurator interface. - virtual void set_configuration (const Components::ConfigValues & descr); - - void configure (Components::CCMObject_ptr comp); - - private: - /// The component whose attributes are going to be configured via - /// set_attributes - Connector_Servant_Impl_Base* const component_; - }; -} -#endif - -#include /**/ "ace/post.h" - -#endif /* CIAO_STANDARDCONFIGURATOR_IMPL_H */ diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp deleted file mode 100644 index c00a9aaf693..00000000000 --- a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "ConfigValue.h" - -namespace CIAO -{ - ConfigValue_impl::ConfigValue_impl() - { - CORBA::Any any; - any <<= CORBA::Short(0); - name((const char*)""); - value(any); - } - - - ConfigValue_impl::ConfigValue_impl(const char* the_name, - const CORBA::Any& the_value) - : OBV_Components::ConfigValue(the_name, the_value) - { - } - - CORBA::ValueBase* ConfigValue_impl::_copy_value() - { - return new ConfigValue_impl(name(),value()); - } - - ConfigValue_impl::~ConfigValue_impl() - throw () - { - } - - CORBA::ValueBase * - ConfigValueFactory::create_for_unmarshal () - { - return new ConfigValue_impl(); - } -} diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.h b/CIAO/ciao/Valuetype_Factories/ConfigValue.h deleted file mode 100644 index 5336a24a9f8..00000000000 --- a/CIAO/ciao/Valuetype_Factories/ConfigValue.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CIAO_CONFIG_VALUE_H -#define CIAO_CONFIG_VALUE_H -#include /**/ "ace/pre.h" - -#include "ccm/CCM_StandardConfiguratorC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ConfigValue_Export.h" - -namespace CIAO -{ - class ConfigValue_Factory_Export ConfigValue_impl - : public virtual OBV_Components::ConfigValue, - public virtual CORBA::DefaultValueRefCountBase - { - public: - ConfigValue_impl(); - ConfigValue_impl(const char* the_name, const CORBA::Any& the_value); - virtual ~ConfigValue_impl() throw(); - virtual CORBA::ValueBase* _copy_value(); - }; - - class ConfigValueFactory : virtual public Components::ConfigValue_init - { - public: - CORBA::ValueBase * create_for_unmarshal (); - }; -} - -#include /**/ "ace/post.h" -#endif /* CIAO_CONFIG_VALUE_H */ diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h b/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h deleted file mode 100644 index 96c26a2eb39..00000000000 --- a/CIAO/ciao/Valuetype_Factories/ConfigValue_Export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ConfigValue_Factory -// ------------------------------ -#ifndef CONFIGVALUE_FACTORY_EXPORT_H -#define CONFIGVALUE_FACTORY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIGVALUE_FACTORY_HAS_DLL) -# define CONFIGVALUE_FACTORY_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CONFIGVALUE_FACTORY_HAS_DLL */ - -#if !defined (CONFIGVALUE_FACTORY_HAS_DLL) -# define CONFIGVALUE_FACTORY_HAS_DLL 1 -#endif /* ! CONFIGVALUE_FACTORY_HAS_DLL */ - -#if defined (CONFIGVALUE_FACTORY_HAS_DLL) && (CONFIGVALUE_FACTORY_HAS_DLL == 1) -# if defined (CONFIGVALUE_FACTORY_BUILD_DLL) -# define ConfigValue_Factory_Export ACE_Proper_Export_Flag -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CONFIGVALUE_FACTORY_BUILD_DLL */ -# define ConfigValue_Factory_Export ACE_Proper_Import_Flag -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CONFIGVALUE_FACTORY_BUILD_DLL */ -#else /* CONFIGVALUE_FACTORY_HAS_DLL == 1 */ -# define ConfigValue_Factory_Export -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARATION(T) -# define CONFIGVALUE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CONFIGVALUE_FACTORY_HAS_DLL == 1 */ - -// Set CONFIGVALUE_FACTORY_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CONFIGVALUE_FACTORY_NTRACE) -# if (ACE_NTRACE == 1) -# define CONFIGVALUE_FACTORY_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CONFIGVALUE_FACTORY_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CONFIGVALUE_FACTORY_NTRACE */ - -#if (CONFIGVALUE_FACTORY_NTRACE == 1) -# define CONFIGVALUE_FACTORY_TRACE(X) -#else /* (CONFIGVALUE_FACTORY_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CONFIGVALUE_FACTORY_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CONFIGVALUE_FACTORY_NTRACE == 1) */ - -#endif /* CONFIGVALUE_FACTORY_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Valuetype_Factories/Cookie_Export.h b/CIAO/ciao/Valuetype_Factories/Cookie_Export.h deleted file mode 100644 index 603e623aef8..00000000000 --- a/CIAO/ciao/Valuetype_Factories/Cookie_Export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl Cookie_Factory -// ------------------------------ -#ifndef COOKIE_FACTORY_EXPORT_H -#define COOKIE_FACTORY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (COOKIE_FACTORY_HAS_DLL) -# define COOKIE_FACTORY_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && COOKIE_FACTORY_HAS_DLL */ - -#if !defined (COOKIE_FACTORY_HAS_DLL) -# define COOKIE_FACTORY_HAS_DLL 1 -#endif /* ! COOKIE_FACTORY_HAS_DLL */ - -#if defined (COOKIE_FACTORY_HAS_DLL) && (COOKIE_FACTORY_HAS_DLL == 1) -# if defined (COOKIE_FACTORY_BUILD_DLL) -# define Cookie_Factory_Export ACE_Proper_Export_Flag -# define COOKIE_FACTORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define COOKIE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* COOKIE_FACTORY_BUILD_DLL */ -# define Cookie_Factory_Export ACE_Proper_Import_Flag -# define COOKIE_FACTORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define COOKIE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* COOKIE_FACTORY_BUILD_DLL */ -#else /* COOKIE_FACTORY_HAS_DLL == 1 */ -# define Cookie_Factory_Export -# define COOKIE_FACTORY_SINGLETON_DECLARATION(T) -# define COOKIE_FACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* COOKIE_FACTORY_HAS_DLL == 1 */ - -// Set COOKIE_FACTORY_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (COOKIE_FACTORY_NTRACE) -# if (ACE_NTRACE == 1) -# define COOKIE_FACTORY_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define COOKIE_FACTORY_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !COOKIE_FACTORY_NTRACE */ - -#if (COOKIE_FACTORY_NTRACE == 1) -# define COOKIE_FACTORY_TRACE(X) -#else /* (COOKIE_FACTORY_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define COOKIE_FACTORY_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (COOKIE_FACTORY_NTRACE == 1) */ - -#endif /* COOKIE_FACTORY_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.cpp b/CIAO/ciao/Valuetype_Factories/Cookies.cpp deleted file mode 100644 index 5266128cada..00000000000 --- a/CIAO/ciao/Valuetype_Factories/Cookies.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "Cookies.h" - -#if !defined (__ACE_INLINE__) -#include "Cookies.inl" -#endif /* !defined INLINE */ - -namespace CIAO -{ - Cookie_Impl::Cookie_Impl (ptrdiff_t const &key) - { - this->cookieValue ().length (sizeof (ptrdiff_t)); - ACE_OS::memcpy (this->cookieValue ().get_buffer (false), - &key, - sizeof (ptrdiff_t)); - } - - Cookie_Impl::~Cookie_Impl (void) - { - } - - bool - Cookie_Impl::extract (Components::Cookie const * const ck, - ptrdiff_t &key) - { - Cookie_Impl const * const c = - dynamic_cast (ck); - - if (c == 0) - { - return false; - } - - CORBA::OctetSeq const &x = c->cookieValue (); - - if (x.length () != sizeof (ptrdiff_t)) - { - return false; - } - - key = *reinterpret_cast (x.get_buffer ()); - - return true; - } - - //======================================================== - - CORBA::ValueBase * - Cookie_Impl_init::create_for_unmarshal (void) - { - CORBA::ValueBase *ret_val = 0; - - ACE_NEW_THROW_EX (ret_val, - CIAO::Cookie_Impl, - CORBA::NO_MEMORY ()); - - return ret_val; - } - - Cookie_Impl_init::~Cookie_Impl_init (void) - { - } -} diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.h b/CIAO/ciao/Valuetype_Factories/Cookies.h deleted file mode 100644 index 9fe6f163ee5..00000000000 --- a/CIAO/ciao/Valuetype_Factories/Cookies.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @file Cookies.h - * - * A CIAO implementation of Cookie valuetype. - * - * @author Nanbor Wang - */ - -#ifndef CIAO_COOKIES_H -#define CIAO_COOKIES_H - -#include /**/ "ace/pre.h" - -#include "Cookie_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ccm/CCM_CookieC.h" - -namespace CIAO -{ - /** - * @class Cookie_Impl - * - * @brief A cookie implementation using an unsigned integer - * big enough to hold an address, even on a 64-bit machine. - */ - class Cookie_Factory_Export Cookie_Impl - : public virtual OBV_Components::Cookie, - public virtual CORBA::DefaultValueRefCountBase - { - public: - Cookie_Impl (void); - virtual ~Cookie_Impl (void); - - /// Initialize a @c Cookie with a @c ptrdiff_t - Cookie_Impl (ptrdiff_t const &key); - - /// Extract the @c CORBA::ULong - static bool extract (Components::Cookie const * const c, ptrdiff_t &key); - }; - - /** - * @class Cookie_Impl_init - * - * @brief Valuefactory implementation for Cookie_Impl. - */ - class Cookie_Factory_Export Cookie_Impl_init - : public virtual Components::Cookie_init - { - public: - virtual ~Cookie_Impl_init (void); - - virtual CORBA::ValueBase *create_for_unmarshal (void); - }; -} - -#if defined (__ACE_INLINE__) -#include "Cookies.inl" -#endif /* defined INLINE */ - -#include /**/ "ace/post.h" - -#endif /* CIAO_COOKIES_H */ diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.inl b/CIAO/ciao/Valuetype_Factories/Cookies.inl deleted file mode 100644 index 36ed932a85f..00000000000 --- a/CIAO/ciao/Valuetype_Factories/Cookies.inl +++ /dev/null @@ -1,8 +0,0 @@ -/* -*- C++ -*- */ -namespace CIAO -{ - ACE_INLINE - Cookie_Impl::Cookie_Impl (void) - { - } -} diff --git a/CIAO/ciao/Valuetype_Factories/Factories.mpc b/CIAO/ciao/Valuetype_Factories/Factories.mpc deleted file mode 100644 index ed2966099b4..00000000000 --- a/CIAO/ciao/Valuetype_Factories/Factories.mpc +++ /dev/null @@ -1,30 +0,0 @@ -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) : 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/CIAO/ciao/Version.h b/CIAO/ciao/Version.h deleted file mode 100644 index ce552564ae9..00000000000 --- a/CIAO/ciao/Version.h +++ /dev/null @@ -1,8 +0,0 @@ - -// -*- C++ -*- -// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py - -#define CIAO_MAJOR_VERSION 1 -#define CIAO_MINOR_VERSION 3 -#define CIAO_BETA_VERSION 3 -#define CIAO_VERSION "1.3.3" diff --git a/CIAO/ciao/install_ciao_headers.mpc b/CIAO/ciao/install_ciao_headers.mpc deleted file mode 100644 index c126324a5bb..00000000000 --- a/CIAO/ciao/install_ciao_headers.mpc +++ /dev/null @@ -1,17 +0,0 @@ -project : install { - custom_only = 1 - Define_Custom(InstallHeader) { - inputext = .h, _T.cpp - } - InstallHeader_Files { - Version.h - // The following directories contain header-only code (*.h, *_T.cpp) and - // are not already installed by other .mpc files: - Contexts - Contexts/Session - Servants/Session - } - specific { - custom_inst_tags = installheader_files - } -} diff --git a/CIAO/connectors/ami4ccm/ami4ccm/.gitignore b/CIAO/connectors/ami4ccm/ami4ccm/.gitignore deleted file mode 100644 index fda80bd44e2..00000000000 --- a/CIAO/connectors/ami4ccm/ami4ccm/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -/ami4ccm_lem_stub_export.h -/ami4ccm_stub_export.h -/ami4ccm_svnt.cpp -/ami4ccm_svnt.h -/ami4ccm_svnt_export.h -/ami4ccm_svnt_T.cpp -/ami4ccm_svnt_T.h -/ami4ccmC.cpp -/ami4ccmC.h -/ami4ccmC.inl -/ami4ccmE.idl -/ami4ccmEC.cpp -/ami4ccmEC.h -/ami4ccmES.h -/ami4ccmS.cpp -/ami4ccmS.h diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp deleted file mode 100644 index 64802e0d1ab..00000000000 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// -*- C++ -*- -#include "ami4ccm/ami4ccm.h" -#include "tao/debug.h" - -CCM_AMI::ExceptionHolder_i::ExceptionHolder_i ( - ::Messaging::ExceptionHolder* holder) - : holder_ (holder) -{ -} - -void -CCM_AMI::ExceptionHolder_i::raise_exception (void) -{ - if (holder_) - { - holder_->raise_exception (); - } - else - { - throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES); - } -} diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h deleted file mode 100644 index 5d02b6cb096..00000000000 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h +++ /dev/null @@ -1,40 +0,0 @@ -// -*- C++ -*- - -// ================================================================ -/** - * @file ami4ccm.h - * - * Include all the required headers to use CCM AMI easily. - * - * @author Johnny Willemsen - */ -// ================================================================ - -#ifndef CIAO_AMI4CCM_H -#define CIAO_AMI4CCM_H - -#include /**/ "ace/pre.h" - -#include "connectors/ami4ccm/ami4ccm/ami4ccmC.h" -#include "tao/LocalObject.h" -#include "tao/Messaging/Messaging.h" - -namespace CCM_AMI -{ - class AMI4CCM_STUB_Export ExceptionHolder_i - : public virtual ::CCM_AMI::ExceptionHolder, - public virtual ::CORBA::LocalObject - { - public: - ExceptionHolder_i (::Messaging::ExceptionHolder* holder); - - /// Rethrow the original exception - virtual void raise_exception (void); - - private: - ::Messaging::ExceptionHolder* holder_; - }; -} - -#include /**/ "ace/post.h" -#endif /* CIAO_AMI4CCM_H */ diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl deleted file mode 100644 index b54063ed4f3..00000000000 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl +++ /dev/null @@ -1,49 +0,0 @@ -#if !defined (AMI4CCM_IDL_H) -#define AMI4CCM_IDL_H - -#include - -#pragma ciao lem "connectors/ami4ccm/ami4ccm/ami4ccmE.idl" - -module CCM_AMI -{ - native UserExceptionBase; - - /// Exception holder to rethrow the original exception - local interface ExceptionHolder - { - void raise_exception() raises (UserExceptionBase); - }; - - /// Base interface for the Callback model - local interface ReplyHandler - { - }; - - /// Base class for all AMI4CCM connectors - connector AMI4CCM_Base - { - }; - - /** - * Templated Connector module for AMI4CCM. Expects - * two template arguments, the original interface and - * its AMI4CCM counterpart - */ - module Connector_T - { - porttype AMI4CCM_Port_Type - { - provides AMI4CCM_T ami4ccm_provides; - provides T ami4ccm_sync_provides; - uses T ami4ccm_uses; - }; - - connector AMI4CCM_Connector : AMI4CCM_Base - { - port AMI4CCM_Port_Type ami4ccm_port; - }; - }; -}; - -#endif /* AMI4CCM_IDL_H */ diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc deleted file mode 100644 index d589179d658..00000000000 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc +++ /dev/null @@ -1,125 +0,0 @@ -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 \ - -Wb,svnt_export_macro=AMI4CCM_SVNT_Export \ - -Wb,svnt_export_include=ami4ccm_svnt_export.h \ - -Wb,skel_export_macro=AMI4CCM_SVNT_Export \ - -Wb,skel_export_include=ami4ccm_svnt_export.h - - IDL_Files { - ami4ccm.idl - } - - specific { - install_dir = connectors/ami4ccm/ami4ccm - } -} - -project (AMI4CCM_lem_gen) : install, ciaoidldefaults { - custom_only = 1 - after += AMI4CCM_idl_gen - idlflags += -I$(CIAO_ROOT)/connectors \ - -Wb,stub_export_macro=AMI4CCM_LEM_STUB_Export \ - -Wb,stub_export_include=ami4ccm_lem_stub_export.h -SS - - IDL_Files { - idlflags += -Gxhst -Sci - ami4ccmE.idl - } - - specific { - install_dir = connectors/ami4ccm/ami4ccm - } -} - -project(AMI4CCM_stub) : install, ciao_lib, messaging, ccm_stub { - after += AMI4CCM_idl_gen - sharedname = AMI4CCM_stub - dynamicflags += AMI4CCM_STUB_BUILD_DLL - includes += $(CIAO_ROOT)/connectors/ami4ccm - - Source_Files { - ami4ccmC.cpp - ami4ccm.cpp - } - - Header_Files { - ami4ccm.h - ami4ccmC.h - ami4ccm_stub_export.h - } - - Inline_Files { - ami4ccmC.inl - } - - IDL_Files { - } - - specific { - install_dir = connectors/ami4ccm/ami4ccm - } -} - -project (AMI4CCM_lem_stub) : install, ccm_session_stub, ciao_lib, ciao_output, taolib, valuetype, ifr_client { - after += AMI4CCM_stub AMI4CCM_lem_gen - libs += AMI4CCM_stub - includes += $(CIAO_ROOT)/connectors - sharedname = AMI4CCM_lem_stub - dynamicflags += AMI4CCM_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ami4ccmEC.cpp - } - - Header_Files { - ami4ccmEC.h - ami4ccmES.h - ami4ccm_lem_stub_export.h - } - - Inline_Files { - } - - specific { - install_dir = connectors/ami4ccm/ami4ccm - } -} - -project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib { - after += AMI4CCM_lem_stub - libs += AMI4CCM_lem_stub AMI4CCM_stub - includes += $(CIAO_ROOT)/connectors - sharedname = AMI4CCM_svnt - dynamicflags += AMI4CCM_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ami4ccmS.cpp - ami4ccm_svnt.cpp - } - - Header_Files { - ami4ccmS.h - ami4ccm_svnt.h - ami4ccm_svnt_T.h - ami4ccm_svnt_export.h - } - - Template_Files { - ami4ccm_svnt_T.cpp - } - - Inline_Files { - } - - specific { - install_dir = connectors/ami4ccm/ami4ccm - } -} diff --git a/CIAO/connectors/ami4ccm/docs/TestCoverage.odt b/CIAO/connectors/ami4ccm/docs/TestCoverage.odt deleted file mode 100644 index ddcce30706b..00000000000 Binary files a/CIAO/connectors/ami4ccm/docs/TestCoverage.odt and /dev/null differ diff --git a/CIAO/connectors/ami4ccm/examples/Hello/.gitignore b/CIAO/connectors/ami4ccm/examples/Hello/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/.gitignore b/CIAO/connectors/ami4ccm/examples/Hello/Base/.gitignore deleted file mode 100644 index 4cc2b4bbeb7..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/HelloA.idl -/HelloAE.idl -/HelloA_conn.cpp -/HelloA_conn.h -/HelloE.idl -/Hello_conn_export.h -/Hello_exec_export.h -/Hello_lem_stub_export.h -/Hello_skel_export.h -/Hello_stub_export.h -/Hello_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl deleted file mode 100644 index d8c3a1c77d0..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef HELLO_IDL -#define HELLO_IDL - -#pragma ciao lem "Base/HelloE.idl" -#pragma ciao ami4ccm interface "Hello::MyFoo" -#pragma ciao lem "Base/HelloAE.idl" -#pragma ciao ami4ccm idl "Base/HelloA.idl" - -module Hello -{ - 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/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc deleted file mode 100644 index 59303e97302..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc +++ /dev/null @@ -1,190 +0,0 @@ -project(AMI_Hello_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,skel_export_macro=HELLO_SKEL_Export \ - -Wb,skel_export_include=Hello_skel_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,exec_export_macro=HELLO_EXEC_Export \ - -Wb,exec_export_include=Hello_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - Hello.idl - } -} - -project(AMI_Hello_lem_gen) : ciaoidldefaults { - after += AMI_Hello_idl_gen AMI_Hello_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=HELLO_LEM_STUB_Export \ - -Wb,export_include=Hello_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - HelloE.idl - } -} - -project(AMI_Hello_lema_gen) : ciaoidldefaults { - after += AMI_Hello_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,svnt_export_macro=HELLO_SVNT_Export \ - -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 - - IDL_Files { - HelloA.idl - } -} - -project(AMI_Hello_lemae_gen) : ciaoidldefaults { - after += AMI_Hello_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - HelloAE.idl - } -} - -project(AMI_Hello_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_Hello_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Hello_stub - dynamicflags += HELLO_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloC.cpp - HelloAC.cpp - } - - Header_Files { - HelloC.h - Hello_stub_export.h -} - - Inline_Files { - HelloC.inl - } -} - -project(AMI_Hello_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_Hello_lem_gen AMI_Hello_stub AMI_Hello_lemae_gen AMI_Hello_skel - libs += Hello_stub Hello_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Hello_lem_stub - dynamicflags += HELLO_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloEC.cpp - HelloAEC.cpp - } - - Header_Files { - HelloEC.h - Hello_lem_stub_export.h -} - - Inline_Files { - HelloEC.inl - } -} - -project(AMI_Hello_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_Hello_stub - sharedname = Hello_skel - libs += Hello_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += HELLO_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloS.cpp - HelloAS.cpp - } - - Header_Files { - HelloS.h - Hello_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_Hello_lem_stub Hello_Base_AMI_stub AMI_Hello_skel AMI_Hello_lema_gen AMI_Hello_lemae_gen - sharedname = Hello_conn - libs += Hello_stub Hello_skel Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloA_conn.cpp - } - - Header_Files { - HelloA_conn.h - Hello_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_Hello_lem_stub Hello_Base_AMI_stub AMI_Hello_skel AMI_Hello_lema_gen AMI_Hello_lemae_gen AMI_Hello_conn - sharedname = Hello_svnt - libs += Hello_stub Hello_skel Hello_lem_stub Hello_conn - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloA_svnt.cpp - } - - Header_Files { - HelloA_svnt.h - HelloA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/.gitignore b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/.gitignore deleted file mode 100644 index 26c6a301de5..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Hello_ReceiverE.idl -/Hello_Receiver_exec_export.h -/Hello_Receiver_lem_stub_export.h -/Hello_Receiver_stub_export.h -/Hello_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl deleted file mode 100644 index f7f1ff0006b..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef HELLO_RECEIVER_IDL -#define HELLO_RECEIVER_IDL - -#include - -#include "Base/Hello.idl" - -module Hello -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc deleted file mode 100644 index b8260ee63c8..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver" - -project(AMI_Hello_Base_Hello_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_Hello_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_stub_export.h \ - -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Hello_Receiver_svnt_export.h \ - -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Hello_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - Hello_Receiver.idl - } -} - -project(AMI_Hello_Base_Hello_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_Hello_Base_Hello_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_ReceiverE.idl - } -} - -project(AMI_Hello_Base_Hello_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_Hello_Base_Hello_Receiver_lem_gen AMI_Hello_Base_Hello_Receiver_stub AMI_Hello_stub - libs += Hello_stub Hello_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Receiver_lem_stub - dynamicflags += HELLO_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverEC.cpp - } - - Header_Files { - Hello_ReceiverEC.h - Hello_Receiver_lem_stub_export.h - } - - Inline_Files { - Hello_ReceiverEC.inl - } -} - -project(AMI_Hello_Base_Hello_Receiver_stub) : ccm_stub, messaging { - after += AMI_Hello_Base_Hello_Receiver_idl_gen AMI_Hello_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Receiver_stub - dynamicflags += HELLO_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverC.cpp - } - - Header_Files { - Hello_ReceiverC.h - Hello_Receiver_stub_export.h - } - - Inline_Files { - Hello_ReceiverC.inl - } -} - -project(AMI_Hello_Base_Hello_Receiver_exec) : ciao_executor, messaging { - after += AMI_Hello_Base_Hello_Receiver_l_stub AMI_Hello_Base_Hello_Receiver_stub AMI_Hello_stub AMI_Hello_lem_stub - sharedname = Hello_Receiver_exec - libs += Hello_Receiver_stub Hello_Receiver_lem_stub Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_Receiver_exec.cpp - } - - Header_Files { - Hello_Receiver_exec.h - Hello_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Base_Hello_Receiver_svnt) : ciao_servant, messaging { - after += AMI_Hello_Base_skel AMI_Hello_Base_Hello_Receiver_l_stub AMI_Hello_stub AMI_Hello_skel AMI_Hello_lem_stub - sharedname = Hello_Receiver_svnt - libs += Hello_Receiver_stub Hello_Receiver_lem_stub \ - Hello_skel \ - Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverS.cpp - Hello_Receiver_svnt.cpp - } - - Header_Files { - Hello_ReceiverS.h - Hello_Receiver_svnt.h - Hello_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp deleted file mode 100644 index 801d62cacdd..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- -#include "Hello_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Receiver_Impl -{ - MyFoo_exec_i::MyFoo_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_Context::_duplicate (ctx)), - get_rw_ (false), - get_ro_ (false) - { - } - - 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) - { - Hello::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 ACE_OS::rand () % 100; - } - } - - void - MyFoo_exec_i::hello (::CORBA::Long_out answer) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - } - - ::CORBA::Short - MyFoo_exec_i::rw_attrib () - { - if (this->get_rw_) - { - this->get_rw_ = false; - Hello::InternalError ex (42, "Hello world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - this->get_rw_ = true; - } - return ACE_OS::rand () % 100; - } - - void - MyFoo_exec_i::rw_attrib (::CORBA::Short new_value) - { - if (new_value == 0) - { - Hello::InternalError ex (42, "Hello world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - } - - CORBA::Short - MyFoo_exec_i::ro_attrib () - { - if (this->get_ro_) - { - this->get_ro_ = false; - Hello::InternalError ex (42, "Hello world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - this->get_ro_ = true; - } - return ACE_OS::rand () % 100; - } - - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - ::Hello::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - MyFoo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - MyFoo_exec_i ( - this->context_.in ()), - ::Hello::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::Hello::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::Hello::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_Hello_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/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h deleted file mode 100644 index 92bdbbb08bf..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ /dev/null @@ -1,67 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_HELLO_RECEIVER_EXEC_H_ -#define CIAO_HELLO_RECEIVER_EXEC_H_ - -#include "Hello_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "Hello_Receiver_exec_export.h" - -namespace CIAO_Hello_Receiver_Impl -{ - class MyFoo_exec_i - : public virtual ::Hello::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - MyFoo_exec_i (::Hello::CCM_Receiver_Context_ptr ctx); - virtual ~MyFoo_exec_i (void); - - virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer); - - virtual void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (); - - virtual void rw_attrib (::CORBA::Short new_value); - - virtual CORBA::Short ro_attrib (); - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - bool get_rw_; - bool get_ro_; - }; - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - virtual ::Hello::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: - ::Hello::CCM_Receiver_Context_var context_; - ::Hello::CCM_MyFoo_var ciao_do_my_foo_; - }; - - extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_AMI_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/.gitignore b/CIAO/connectors/ami4ccm/examples/Hello/Sender/.gitignore deleted file mode 100644 index 3377ff98630..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/Hello_SenderE.idl -/Hello_Sender_exec_export.h -/Hello_Sender_stub_export.h -/Hello_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl deleted file mode 100644 index d30c50afca0..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef HELLO_SENDER_IDL -#define HELLO_SENDER_IDL - -#include - -#include "Base/Hello.idl" - -#pragma ciao ami4ccm receptacle "Hello::Sender::run_my_foo" - -module Hello -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc deleted file mode 100644 index 6bbf45f423f..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender" - -project(AMI_Hello_Base_Hello_Sender_idl_gen) : componentidldefaults { - after += AMI_Hello_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,skel_export_include=Hello_Sender_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \ - -Wb,exec_export_include=Hello_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - Hello_Sender.idl - } -} - -project(AMI_Hello_Base_Hello_Sender_lem_gen) : ciaoidldefaults { - after += AMI_Hello_Base_Hello_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_SenderE.idl - } -} - -project(AMI_Hello_Base_Hello_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_Hello_Base_Hello_Sender_lem_gen AMI_Hello_stub Conn_Hello_Base_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Sender_lem_stub - dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderEC.cpp - } - - Header_Files { - Hello_SenderEC.h - Hello_Sender_lem_stub_export.h - } - - Inline_Files { - Hello_SenderEC.inl - } -} - -project(AMI_Hello_Base_Hello_Sender_stub) : ccm_stub, ami { - after += AMI_Hello_Base_Hello_Sender_idl_gen AMI_Hello_Base_stub AMI_Hello_stub Conn_Hello_Base_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Sender_stub - dynamicflags += HELLO_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderC.cpp - } - - Header_Files { - Hello_SenderC.h - Hello_Sender_stub_export.h - } - - Inline_Files { - Hello_SenderC.inl - } -} - -project(AMI_Hello_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_Hello_Base_Hello_Sender_lem_stub AMI_Hello_Base_Hello_Sender_stub AMI_Hello_Base_exec Conn_Hello_Base_stub AMI_Hello_lem_stub - sharedname = Hello_Sender_exec - libs += Hello_Sender_stub Hello_Sender_lem_stub Hello_stub Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_Sender_exec.cpp - } - - Header_Files { - Hello_Sender_exec.h - Hello_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Base_Hello_Sender_svnt) : ciao_servant, ami { - after += AMI_Hello_Base_skel AMI_Hello_Base_Hello_Sender_lem_stub AMI_Hello_Base_Hello_Sender_stub AMI_Hello_Base_exec AMI_Hello_skel - sharedname = Hello_Sender_svnt - libs += Hello_Sender_stub Hello_Sender_lem_stub \ - Hello_skel \ - Hello_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderS.cpp - Hello_Sender_svnt.cpp - } - - Header_Files { - Hello_SenderS.h - Hello_Sender_svnt.h - Hello_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp deleted file mode 100644 index 57edb2f8b3a..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp +++ /dev/null @@ -1,400 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Sender_exec.h" - -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Sender_Impl -{ - void HandleException ( - long id, - const char* error_string, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"), - func)); - if (id != 42) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received") - ACE_TEXT(" in except handler.\n"), - func)); - return; - } - if (ACE_OS::strcmp (error_string, "Hello world") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected error string") - ACE_TEXT(" received in except handler.\n"), - func)); - return; - } - } - - void HandleException ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func)); - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender: Caught the correct except type") - ACE_TEXT(" <%u> <%C>\n"), - ex.id, ex.error_string.in ())); - HandleException (ex.id, ex.error_string.in (), func); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - } - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::Hello::CCM_Sender_Context_ptr context) - : ciao_context_(::Hello::CCM_Sender_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::Hello::AMI4CCM_MyFoo_var my_foo_ami_ = - ciao_context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Sender (ASYNCH) :") - ACE_TEXT("\tfoo_ami is NIL !!!\n"))); - return 1; - } - ::Hello::CCM_AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); - - for (int i = 0; i < 5; ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - my_foo_ami_->sendc_foo (cb.in (), - "Do something asynchronous"); - my_foo_ami_->sendc_hello (cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n"))); - } - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") - ACE_TEXT("to test except handling\n"))); - my_foo_ami_->sendc_foo (cb.in (), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n"))); - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::Hello::CCM_Sender_Context_ptr context) - : ciao_context_(::Hello::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::Hello::MyFoo_var my_foo_ami_ = - ciao_context_->get_connection_run_my_foo (); - - //run synch calls - CORBA::String_var out_str; - for (int i = 0; i < 5; ++i) - { - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)") - ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ())); - - CORBA::Long answer; - my_foo_ami_->hello (answer); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(HELLO) answer <%u>\n"), answer)); - - try - { - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib)); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - my_foo_ami_->rw_attrib (15); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(SET_RW_ATTRIB) to <15>\n"))); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib)); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - } - try - { - CORBA::Long result = my_foo_ami_->foo ("", out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call result ") - ACE_TEXT("<%u> answer <%C>\n"), result, out_str.in ())); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ") - ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - try - { - my_foo_ami_->rw_attrib (0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n"))); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen_ (0), - synch_foo_gen_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes. - - // Port operations. - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Sender_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen_ = - new asynch_foo_generator (this->ciao_context_.in ()); - this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - this->synch_foo_gen_ = - new synch_foo_generator (this->ciao_context_.in()); - this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - delete this->asynch_foo_gen_; - this->asynch_foo_gen_ = 0; - delete this->synch_foo_gen_; - this->synch_foo_gen_ = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ") - ACE_TEXT("answer <%C>\n"), ami_return_val, answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "FOO"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI (HELLO) :") - ACE_TEXT(" answer <%u>\n"), answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "HELLO"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short ami_return_val) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):") - ACE_TEXT(" answer <%u>\n"), ami_return_val)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "GET RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ") - ACE_TEXT("AMI (RW_ATTRIB)\n"))); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "SET_RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short ro_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ") - ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "RO_ATTRIB"); - } - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h deleted file mode 100644 index 84dc17cbc5e..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ /dev/null @@ -1,187 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_ -#define CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Hello_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_Hello_Sender_Impl -{ - /// Common exception handlers - void HandleException ( - long id, - const char* error_string, - const char* func); - - void HandleException ( - ::Messaging::ExceptionHolder * excep_holder, - const char* func); - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::Hello::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_Context_var ciao_context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::Hello::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Hello::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - private: - asynch_foo_generator* asynch_foo_gen_; - synch_foo_generator* synch_foo_gen_; - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::Hello::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp deleted file mode 100644 index bb205837a3c..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp +++ /dev/null @@ -1,399 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - Hello_Receiver_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp deleted file mode 100644 index 916d4c5805c..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp +++ /dev/null @@ -1,447 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - ComponentServer1Instance - Receiver - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Client_Strategy_Factory '-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked'" -ORBSvcConfDirective "static Resource_Factory '-ORBFlushingStrategy blocking'" - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - ComponentServer2Instance - Sender - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Client_Strategy_Factory '-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked'" -ORBSvcConfDirective "static Resource_Factory '-ORBFlushingStrategy blocking'" - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - Hello_Receiver_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - - SameProcess - - - - - - SameProcess - - - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp deleted file mode 100644 index 80aa9a1a594..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp +++ /dev/null @@ -1,401 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - - - - - - - synch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - Hello_Receiver_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl deleted file mode 100755 index 19a6cdf8e0e..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60000, 60001 ); -@iorbases = ( "Sender.ior", "Receiver.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 = "PlanFullBlock.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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 90 seconds to allow task to complete\n"; -sleep (90); - -# 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\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/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl deleted file mode 100755 index 0c5bba1abda..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl +++ /dev/null @@ -1,259 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60000, 60001 ); -@iorbases = ( "Sender.ior", "Receiver.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 (); - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -foreach $file (@files) { - print "=============================\nStarting test for deployment $file\n================================\n"; - - # Invoke naming service - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - - print STDERR "Starting Naming Service with -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 $file -k file://$ior_emfile\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - - $pl_status = $E->SpawnWaitKill (2 * $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 90 seconds to allow task to complete\n"; - sleep (90); - - # 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 $file\n"; - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $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; - } - delete_ior_files (); - kill_open_processes (); - # Sleep for a couple seconds to make sure everything has a chance to shut down. - sleep 5; -} -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/ami4ccm/examples/Hello/models/Hello-complete.xme b/CIAO/connectors/ami4ccm/examples/Hello/models/Hello-complete.xme deleted file mode 100644 index 701424519d1..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/models/Hello-complete.xme +++ /dev/null @@ -1,2352 +0,0 @@ - - - - - Hello - - - - Hello - - MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/ami4ccm/models/ami4mga.xme - - InterfaceDefinitions - - ami4ccm - - connectors/ami4ccm/ami4ccm - - - - - - - - - - - - CCM_AMI - - - - - - - - - - - - - - - - - ExceptionHolder - - - - - - 181,48 - - - - - local - - - - - - - - - - - - - - - - - - raise_exception - - - - - - 60,60 - - - - - - - - - - - - - ReplyHandler - - - - - - 125,167 - - - - - local - - - - - - - - - - - - - - - - - - - AMI4CCM_Base - - - - - - 306,124 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DCF-000C2958D27B - - - - - - - Connector_T - - - - - - 94,241 - - - - - - - - - - - - - - - - - - - - AMI4CCM_Port_Type - - - - - - 11,11 - - - - - - - - - - - - - - - - - ami4ccm_provides - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - false - - - - ami4ccm_uses - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - AMI4CCM_Connector - - - - - - 126,238 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DD0-000C2958D27B - - - - - - ami4ccm_port - - - ConnectorInherits - - - - T - - - - - - 60,60 - - - - - Object - - - - AMI4CCM_T - - - - - - 160,60 - - - - - Object - - - - - UserExceptionBase - - - - - - 8,13 - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - - InterfaceDefinitions - - Hello - - Base - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - InternalError - - - - - - - - - - - - - - id - - - error_string - - - - MyFoo - - standard - - - - - - - - - - - - - - - - - - foo - - - - - - 60,60 - - - - - - - - - - - - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - in_str - - - - - - 160,60 - - - - - - answer - - - - - - 260,60 - - - - - - - hello - - - - - - 60,160 - - - - - - - - - - - - - - - - - 160,60 - - - - - - answer - - - - - - 60,60 - - - - - - - rw_attrib - - - - - - 60,260 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 60,60 - - - - - - - ro_attrib - - - - - - 60,360 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - - - - HelloA - - Base - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - AMI4CCM_MyFooReplyHandler - - local - - - - - - - - - - - - - - - - - - foo - - - - - - 60,60 - - - - - - - - - - - ami_return_val - - - - - - 60,60 - - - - - - answer - - - - - - 160,60 - - - - - - - foo_excep - - - - - - 60,160 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - hello - - - - - - 60,260 - - - - - - - - - - - answer - - - - - - 60,60 - - - - - - - hello_excep - - - - - - 60,360 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - get_rw_attrib - - - - - - 60,460 - - - - - - - - - - - rw_attrib - - - - - - 60,60 - - - - - - - get_rw_attrib_excep - - - - - - 60,560 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - set_rw_attrib - - - - - - 60,660 - - - - - - - - - - - - set_rw_attrib_excep - - - - - - 60,760 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - get_ro_attrib - - - - - - 60,860 - - - - - - - - - - - ro_attrib - - - - - - 60,60 - - - - - - - get_ro_attrib_excep - - - - - - 60,960 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - - AMI4CCM_MyFoo - - local - - - - - - - - - - - - - - - - - - sendc_foo - - - - - - 60,60 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - in_str - - - - - - 160,60 - - - - - - - sendc_hello - - - - - - 60,160 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - sendc_set_rw_attrib - - - - - - 60,260 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - rw_attrib - - - - - - 160,60 - - - - - - - sendc_get_rw_attrib - - - - - - 60,360 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - sendc_get_ro_attrib - - - - - - 60,460 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - - AMI4CCM_MyFoo_Connector - - PackageType - - - - - - 60,60 - - - - - - TemplateParameterValue - - - - - - 160,60 - - - - - - TemplateParameterValue - - - - - - 260,60 - - - - - - - - - Hello_Receiver - - Receiver - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - Receiver - - - - - - - - - - - BDFE7DFC-9EA3-11DF-8DCF-000C2958D27B - - - - - - - - - do_my_foo - - - - - - - - false - - - false - - - false - - - - - - - Hello_Sender - - Sender - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - Sender - - - - - - - - - - - BDFE7DFC-9EA3-11DF-8DD0-000C2958D27B - - - - - - - - - run_my_foo - - false - - - - - - - - - false - - - false - - - false - - - false - - - - - - - - ImplementationArtifacts - - Hello_ReceiverArtifacts - - Hello_Receiver_svnt - - - - - - 150,150 - - - - - BDFE7DFC-9EA3-11DF-8DD1-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Receiver_svnt - - - - - - - Hello_Receiver_exec - - - - - - 450,150 - - - - - BDFE7DFC-9EA3-11DF-8DD2-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Receiver_exec - - - - - - - - Hello_SenderArtifacts - - Hello_Sender_svnt - - - - - - 150,150 - - - - - BDFE7DFC-9EA3-11DF-8DD3-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Sender_svnt - - - - - - - Hello_Sender_exec - - - - - - 450,150 - - - - - BDFE7DFC-9EA3-11DF-8DD4-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Sender_exec - - - - - - - - Hello_AMI4CCM_Connector - - Hello_svnt - - - - - - 370,90 - - - - - E328B02E-9EA4-11DF-8000-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_svnt - - - - - - - Hello_conn - - - - - - 370,216 - - - - - E487241E-9EA4-11DF-8000-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_conn - - - - - - - - - ComponentImplementations - - Hello_ReceiverImpl - - Hello_ReceiverImpl - - - - - - 250,250 - - - - - BE0342A6-9EA3-11DF-8000-000C2958D27B - - - 0.0.0.0 - - - - - - - Receiver - - - - - - 187,75 - - - - - - Hello_Receiver_svnt - - - - - - 506,347 - - - - - create_Hello_Receiver_Servant - - - - Hello_Receiver_exec - - - - - - 506,151 - - - - - create_Hello_AMI_Receiver_Impl - - - - - - - - - - - - - - - - - - - - Hello_SenderImpl - - Hello_SenderImpl - - - - - - 250,250 - - - - - BE0342A6-9EA3-11DF-8001-000C2958D27B - - - 0.0.0.0 - - - - - - - Sender - - - - - - 187,75 - - - - - - Hello_Sender_svnt - - - - - - 506,347 - - - - - create_Hello_Sender_Servant - - - - Hello_Sender_exec - - - - - - 506,151 - - - - - create_Hello_AMI_Sender_Impl - - - - - - - - - - - - - - - - - - - - HelloImpl - - HelloImpl - - - - - - 306,243 - - - - - 2E7D30FE-9EA5-11DF-8000-000C2958D27B - - - - - - ReceiverInstance - - - - - - 566,183 - - - - - 327E5822-9EA5-11DF-8000-000C2958D27B - - - Hello_ReceiverImpl - - - - - - 326,165 - - - - - - do_my_foo - - - - SenderInstance - - - - - - 181,183 - - - - - 3481584A-9EA5-11DF-8000-000C2958D27B - - - Hello_SenderImpl - - - - - - 277,158 - - - - - - run_my_foo - - - - - - 539,28 - - - - - - - ConnectorInstance - - - - - - 434,224 - - - - - 36BFF3B4-9EA5-11DF-8000-000C2958D27B - - - Hello_AMI4CCM_Connector_Impl - - - - - - 192,213 - - - - - - - InstanceIOR - - - - - - 706,356 - - - - - - - - InstanceIOR - - - - - - 225,176 - - - - - Receiver.ior - - - - - InstanceIOR - - - - - - 216,349 - - - - - - - - InstanceIOR - - - - - - 225,176 - - - - - Sender.ior - - - - - InstanceIOR - - - - - - 426,342 - - - - - - - - InstanceIOR - - - - - - 176,43 - - - - - AMI.ior - - - - - ConnectorToReceptacle - - w - - - - - - - - - ConnectorToFacet - - E - - - - - - - - - Invoke - - - - - AssemblyConfigProperty - - Ww - - - - - - AssemblyConfigProperty - - Ee - - - - - - AssemblyConfigProperty - - Sn - - - - - - - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - ConnectorImplementations - - Hello_AMI4CCM_Connector - - Hello_AMI4CCM_Connector_Impl - - - - - - 306,264 - - - - - 7C9BD96C-9EA4-11DF-8DCF-000C2958D27B - - - - - - - ConnectorType - - - - - - 271,68 - - - - - - Hello_conn - - - - - - 562,207 - - - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - Hello_svnt - - - - - - 562,340 - - - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - ConnectorImplements - - N - - - - - - MonolithprimaryArtifact - - Ew - - - - - - MonolithprimaryArtifact - - Ew - - - - - - - - Targets - - Domain - - DA91E04C-9EA5-11DF-8000-000C2958D27B - - - - - - Sender - - - - - - 251,146 - - - - - - - - - - - - - - - Receiver - - - - - - 489,146 - - - - - - - - - - - - - - - - - DeploymentPlans - - DeploymentPlan - - EDFA1F0A-9EA5-11DF-8000-000C2958D27B - - - - - - Receiver - - - - - - 438,60 - - - - - - Sender - - - - - - 214,60 - - - - - - ReceiverInstance - - - - - - 397,334 - - - - - - SenderInstance - - - - - - 159,334 - - - - - - - - - - - - - - - - DefaultGroup - - - - - - 440,188 - - - - - - DefaultGroup - - - - - - 216,188 - - - - - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Hello/models/Hello.xme b/CIAO/connectors/ami4ccm/examples/Hello/models/Hello.xme deleted file mode 100644 index 588cf357179..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Hello/models/Hello.xme +++ /dev/null @@ -1,1787 +0,0 @@ - - - - - Hello - - - - Hello - - MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/ami4ccm/models/ami4mga.xme - - InterfaceDefinitions - - ami4ccm - - connectors/ami4ccm/ami4ccm - - - - - - - - - - - - CCM_AMI - - - - - - - - - - - - - - - - - ExceptionHolder - - - - - - 181,48 - - - - - local - - - - - - - - - - - - - - - - - - raise_exception - - - - - - 60,60 - - - - - - - - - - - - - ReplyHandler - - - - - - 125,167 - - - - - local - - - - - - - - - - - - - - - - - - - AMI4CCM_Base - - - - - - 306,124 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DCF-000C2958D27B - - - - - - - Connector_T - - - - - - 94,241 - - - - - - - - - - - - - - - - - - - - AMI4CCM_Port_Type - - - - - - 11,11 - - - - - - - - - - - - - - - - - ami4ccm_provides - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - false - - - - ami4ccm_uses - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - AMI4CCM_Connector - - - - - - 126,238 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DD0-000C2958D27B - - - - - - ami4ccm_port - - - ConnectorInherits - - - - T - - - - - - 60,60 - - - - - Object - - - - AMI4CCM_T - - - - - - 160,60 - - - - - Object - - - - - UserExceptionBase - - - - - - 8,13 - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - - InterfaceDefinitions - - Hello - - Base - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - InternalError - - - - - - - - - - - - - - id - - - error_string - - - - MyFoo - - standard - - - - - - - - - - - - - - - - - - foo - - - - - - 60,60 - - - - - - - - - - - - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - in_str - - - - - - 160,60 - - - - - - answer - - - - - - 260,60 - - - - - - - hello - - - - - - 60,160 - - - - - - - - - - - - - - - - - 160,60 - - - - - - answer - - - - - - 60,60 - - - - - - - rw_attrib - - - - - - 60,260 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 60,60 - - - - - - - ro_attrib - - - - - - 60,360 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - - - - HelloA - - Base - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - AMI4CCM_MyFooReplyHandler - - local - - - - - - - - - - - - - - - - - - foo - - - - - - 60,60 - - - - - - - - - - - ami_return_val - - - - - - 60,60 - - - - - - answer - - - - - - 160,60 - - - - - - - foo_excep - - - - - - 60,160 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - hello - - - - - - 60,260 - - - - - - - - - - - answer - - - - - - 60,60 - - - - - - - hello_excep - - - - - - 60,360 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - get_rw_attrib - - - - - - 60,460 - - - - - - - - - - - rw_attrib - - - - - - 60,60 - - - - - - - get_rw_attrib_excep - - - - - - 60,560 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - set_rw_attrib - - - - - - 60,660 - - - - - - - - - - - - set_rw_attrib_excep - - - - - - 60,760 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - get_ro_attrib - - - - - - 60,860 - - - - - - - - - - - ro_attrib - - - - - - 60,60 - - - - - - - get_ro_attrib_excep - - - - - - 60,960 - - - - - - - - - - - excep_holder - - - - - - 60,60 - - - - - - - - AMI4CCM_MyFoo - - local - - - - - - - - - - - - - - - - - - sendc_foo - - - - - - 60,60 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - in_str - - - - - - 160,60 - - - - - - - sendc_hello - - - - - - 60,160 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - sendc_set_rw_attrib - - - - - - 60,260 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - rw_attrib - - - - - - 160,60 - - - - - - - sendc_get_rw_attrib - - - - - - 60,360 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - sendc_get_ro_attrib - - - - - - 60,460 - - - - - - - - - - - ami_handler - - - - - - 60,60 - - - - - - - - AMI4CCM_MyFoo_Connector - - PackageType - - - - - - 60,60 - - - - - - TemplateParameterValue - - - - - - 160,60 - - - - - - TemplateParameterValue - - - - - - 260,60 - - - - - - - - - Hello_Receiver - - Receiver - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - Receiver - - - - - - - - - - - D836B6C6-9E9E-11DF-8DCF-000C2958D27B - - - - - - - - - do_my_foo - - - - - - - - false - - - false - - - false - - - - - - - Hello_Sender - - Sender - - - - - - - - - - - - Hello - - - - - - - - - - - - - - - - - Sender - - - - - - - - - - - D836B6C6-9E9E-11DF-8DD0-000C2958D27B - - - - - - - - - run_my_foo - - false - - - - - - - - - false - - - false - - - false - - - false - - - - - - - - ImplementationArtifacts - - Hello_ReceiverArtifacts - - Hello_Receiver_svnt - - - - - - 150,150 - - - - - D836B6C6-9E9E-11DF-8DD1-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Receiver_svnt - - - - - - - Hello_Receiver_exec - - - - - - 450,150 - - - - - D836B6C6-9E9E-11DF-8DD2-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Receiver_exec - - - - - - - - Hello_SenderArtifacts - - Hello_Sender_svnt - - - - - - 150,150 - - - - - D836B6C6-9E9E-11DF-8DD3-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Sender_svnt - - - - - - - Hello_Sender_exec - - - - - - 450,150 - - - - - D836B6C6-9E9E-11DF-8DD4-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Hello_Sender_exec - - - - - - - - - ComponentImplementations - - Hello_ReceiverImpl - - Hello_ReceiverImpl - - - - - - 250,250 - - - - - D836B6C6-9E9E-11DF-8DD5-000C2958D27B - - - 0.0.0.0 - - - - - - - Receiver - - - - - - 187,75 - - - - - - Hello_Receiver_svnt - - - - - - 506,347 - - - - - create_Hello_Receiver_Servant - - - - Hello_Receiver_exec - - - - - - 506,151 - - - - - create_Hello_Receiver_Impl - - - - - - - - - - - - - - - - - - - - Hello_SenderImpl - - Hello_SenderImpl - - - - - - 250,250 - - - - - D836B6C6-9E9E-11DF-8DD6-000C2958D27B - - - 0.0.0.0 - - - - - - - Sender - - - - - - 187,75 - - - - - - Hello_Sender_svnt - - - - - - 506,347 - - - - - create_Hello_Sender_Servant - - - - Hello_Sender_exec - - - - - - 506,151 - - - - - create_Hello_Sender_Impl - - - - - - - - - - - - - - - - - - - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl deleted file mode 100644 index 1d0d6ab19d4..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.idl +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef QUOTER_IDL -#define QUOTER_IDL - -#pragma ciao lem "Base/QuoterE.idl" -#pragma ciao ami4ccm interface "Quoter::StockManager" -#pragma ciao lem "Base/QuoterAE.idl" -#pragma ciao ami4ccm idl "Base/QuoterA.idl" - -module Quoter -{ - exception InvalidStock { string sym; }; - - interface StockManager { - attribute string stock_exchange_name; - - boolean add_stock(in string symbol, in double quote); - void edit_stock(in string symbol, in double new_quote) - raises(InvalidStock); - void remove_stock(in string symbol, out double quote) - raises(InvalidStock); - - boolean find_closest_symbol(inout string symbol); - double get_quote(in string symbol) raises(InvalidStock); - }; - -}; - -#endif - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc deleted file mode 100644 index b94bbc8fd2b..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc +++ /dev/null @@ -1,190 +0,0 @@ -project(AMI_Quoter_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_STUB_Export \ - -Wb,stub_export_include=Quoter_stub_export.h \ - -Wb,skel_export_macro=QUOTER_SKEL_Export \ - -Wb,skel_export_include=Quoter_skel_export.h \ - -Wb,conn_export_macro=QUOTER_CONN_Export \ - -Wb,conn_export_include=Quoter_conn_export.h \ - -Wb,exec_export_macro=QUOTER_EXEC_Export \ - -Wb,exec_export_include=Quoter_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - Quoter.idl - } -} - -project(AMI_Quoter_lem_gen) : ciaoidldefaults { - after += AMI_Quoter_idl_gen AMI_Quoter_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=QUOTER_LEM_STUB_Export \ - -Wb,export_include=Quoter_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - QuoterE.idl - } -} - -project(AMI_Quoter_lema_gen) : ciaoidldefaults { - after += AMI_Quoter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_STUB_Export \ - -Wb,stub_export_include=Quoter_stub_export.h \ - -Wb,conn_export_macro=QUOTER_CONN_Export \ - -Wb,conn_export_include=Quoter_conn_export.h \ - -Wb,svnt_export_macro=QUOTER_SVNT_Export \ - -Wb,svnt_export_include=Quoter_svnt_export.h \ - -Wb,skel_export_macro=QUOTER_SKEL_Export \ - -Wb,skel_export_include=Quoter_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - QuoterA.idl - } -} - -project(AMI_Quoter_lemae_gen) : ciaoidldefaults { - after += AMI_Quoter_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_LEM_STUB_Export \ - -Wb,stub_export_include=Quoter_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - QuoterAE.idl - } -} - -project(AMI_Quoter_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_Quoter_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Quoter_stub - dynamicflags += QUOTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QuoterC.cpp - QuoterAC.cpp - } - - Header_Files { - QuoterC.h - Quoter_stub_export.h -} - - Inline_Files { - QuoterC.inl - } -} - -project(AMI_Quoter_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_Quoter_lem_gen AMI_Quoter_stub AMI_Quoter_lemae_gen AMI_Quoter_skel - libs += Quoter_stub Quoter_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Quoter_lem_stub - dynamicflags += QUOTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QuoterEC.cpp - QuoterAEC.cpp - } - - Header_Files { - QuoterEC.h - Quoter_lem_stub_export.h -} - - Inline_Files { - QuoterEC.inl - } -} - -project(AMI_Quoter_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_Quoter_stub - sharedname = Quoter_skel - libs += Quoter_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += QUOTER_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QuoterS.cpp - QuoterAS.cpp - } - - Header_Files { - QuoterS.h - Quoter_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_Quoter_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_Quoter_lem_stub Quoter_Base_AMI_stub AMI_Quoter_skel AMI_Quoter_lema_gen AMI_Quoter_lemae_gen - sharedname = Quoter_conn - libs += Quoter_stub Quoter_skel Quoter_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - QuoterA_conn.cpp - } - - Header_Files { - QuoterA_conn.h - Quoter_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_Quoter_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_Quoter_lem_stub Quoter_Base_AMI_stub AMI_Quoter_skel AMI_Quoter_lema_gen AMI_Quoter_lemae_gen AMI_Quoter_conn - sharedname = Quoter_svnt - libs += Quoter_stub Quoter_skel Quoter_lem_stub Quoter_conn - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - QuoterA_svnt.cpp - } - - Header_Files { - QuoterA_svnt.h - QuoterA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl deleted file mode 100644 index 35b632bd3fa..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef QUOTER_CLIENT_IDL -#define QUOTER_CLIENT_IDL - -#include - -#include "Base/Quoter.idl" - -#pragma ciao ami4ccm receptacle "Quoter::Client::my_quoter" - -module Quoter -{ - component Client - { - /// For synchronous invocation - uses StockManager my_quoter; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc deleted file mode 100644 index cb421632929..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Quoter_Base Quoter_Client" - -project(AMI_Quoter_Client_idl_gen) : componentidldefaults { - after += AMI_Quoter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_CLIENT_STUB_Export \ - -Wb,stub_export_include=Quoter_Client_stub_export.h \ - -Wb,skel_export_macro=QUOTER_CLIENT_SVNT_Export \ - -Wb,skel_export_include=Quoter_Client_svnt_export.h \ - -Wb,exec_export_macro=QUOTER_CLIENT_EXEC_Export \ - -Wb,exec_export_include=Quoter_Client_exec_export.h \ - -I.. -GC - - IDL_Files { - Quoter_Client.idl - } -} - -project(AMI_Quoter_Client_lem_gen) : ciaoidldefaults { - after += AMI_Quoter_Client_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_CLIENT_LEM_STUB_Export \ - -Wb,stub_export_include=Quoter_Client_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Quoter_ClientE.idl - } -} - -project(AMI_Quoter_Client_lem_stub) : ccm_svnt, ami { - after += AMI_Quoter_Client_lem_gen AMI_Quoter_stub - libs += Quoter_stub - libpaths += ../lib - libout = ../lib - sharedname = Quoter_Client_lem_stub - dynamicflags += QUOTER_CLIENT_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ClientEC.cpp - } - - Header_Files { - Quoter_ClientEC.h - Quoter_Client_lem_stub_export.h - } - - Inline_Files { - Quoter_ClientEC.inl - } -} - -project(AMI_Quoter_Client_stub) : ccm_stub, ami { - after += AMI_Quoter_Client_idl_gen AMI_Quoter_stub - libs += Quoter_stub - libpaths += ../lib - libout = ../lib - sharedname = Quoter_Client_stub - dynamicflags += QUOTER_CLIENT_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ClientC.cpp - } - - Header_Files { - Quoter_ClientC.h - Quoter_Client_stub_export.h - } - - Inline_Files { - Quoter_ClientC.inl - } -} - -project(AMI_Quoter_Client_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_Quoter_Client_lem_stub AMI_Quoter_Client_stub AMI_Quoter_lem_stub - sharedname = Quoter_Client_exec - libs += Quoter_Client_stub Quoter_Client_lem_stub Quoter_stub Quoter_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_CLIENT_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_Client_exec.cpp - } - - Header_Files { - Quoter_Client_exec.h - Quoter_Client_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Quoter_Client_svnt) : ciao_servant, ami { - after += AMI_Quoter_skel AMI_Quoter_Client_lem_stub AMI_Quoter_Client_stub AMI_Quoter_exec AMI_Quoter_skel - sharedname = Quoter_Client_svnt - libs += Quoter_Client_stub Quoter_Client_lem_stub \ - Quoter_skel \ - Quoter_stub - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_CLIENT_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ClientS.cpp - Quoter_Client_svnt.cpp - } - - Header_Files { - Quoter_ClientS.h - Quoter_Client_svnt.h - Quoter_Client_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp deleted file mode 100644 index 3c2af384de0..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.cpp +++ /dev/null @@ -1,303 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Quoter_Client_exec.h" - -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Quoter_Client_Impl -{ - - //============================================================ - // Worker thread for asynchronous invocations - //============================================================ - asynch_quoter_generator::asynch_quoter_generator ( - ::Quoter::CCM_Client_Context_ptr context) - : context_(::Quoter::CCM_Client_Context::_duplicate (context)) - { - } - - int asynch_quoter_generator::svc () - { - ACE_OS::sleep (3); - ::Quoter::AMI4CCM_StockManager_var my_quoter_ami_ = - context_->get_connection_sendc_my_quoter(); - - if (CORBA::is_nil (my_quoter_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Client (ASYNCH) :") - ACE_TEXT("\tmy_quoter_ami_ is NIL !!!\n"))); - return 1; - } - ::Quoter::CCM_AMI4CCM_StockManagerReplyHandler_var cb = - new AMI4CCM_StockManagerReplyHandler_my_quoter_i (); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - - my_quoter_ami_->sendc_get_stock_exchange_name (cb.in ()); - - my_quoter_ami_->sendc_add_stock (cb.in (), "Google", 10.46); - - my_quoter_ami_->sendc_edit_stock (cb.in (), "Google", 11.13); - - my_quoter_ami_->sendc_remove_stock (cb.in (), "Microsoft"); - - my_quoter_ami_->sendc_find_closest_symbol (cb.in (), "Micro"); - - my_quoter_ami_->sendc_get_quote (cb.in (), "Google"); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client (ASYNCH) :\tInvoked Asynchronous calls\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client (ASYNCH) :\tInvoke Asynchronous call ") - ACE_TEXT("to test except handling\n"))); - - my_quoter_ami_->sendc_get_quote (cb.in (), "Microsoft"); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client (ASYNCH) :\tInvoked Asynchronous call.\n"))); - return 0; - } - - /** - * Component Executor Implementation Class: Client_exec_i - */ - - Client_exec_i::Client_exec_i (void) : - asynch_quoter_gen_ (0) - { - } - - Client_exec_i::~Client_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Client_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Quoter::CCM_Client_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Client_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Client_exec_i::ccm_activate (void) - { - this->asynch_quoter_gen_ = - new asynch_quoter_generator (this->context_.in ()); - this->asynch_quoter_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Client_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Client_exec_i::ccm_remove (void) - { - delete this->asynch_quoter_gen_; - this->asynch_quoter_gen_ = 0; - } - - AMI4CCM_StockManagerReplyHandler_my_quoter_i::AMI4CCM_StockManagerReplyHandler_my_quoter_i (void) - { - } - - AMI4CCM_StockManagerReplyHandler_my_quoter_i::~AMI4CCM_StockManagerReplyHandler_my_quoter_i (void) - { - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::get_stock_exchange_name ( - const char * stock_exchange_name) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : get_stock_exchange_name = %C\n"), - stock_exchange_name)); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::get_stock_exchange_name_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : get_stock_exchange_name threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::set_stock_exchange_name (void) - { - /* Your code here. */ - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::set_stock_exchange_name_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : set_stock_exchange_name threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::add_stock ( - ::CORBA::Boolean ami_return_val) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : add_stock returned %C\n"), - ami_return_val ? "true" : "false")); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::add_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : add_stock threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::edit_stock (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : edit_stock returned successfully\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::edit_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : edit_stock threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::remove_stock ( - ::CORBA::Double quote) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : remove_stock returned %f\n"), - quote)); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::remove_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : remove_stock threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::find_closest_symbol ( - ::CORBA::Boolean ami_return_val, - const char * symbol) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : find_closest_symbol returned %C; ") - ACE_TEXT ("symbol found = %C\n"), - ami_return_val ? "true" : "false", - ami_return_val ? symbol : "(none)")); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::find_closest_symbol_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : find_closest_symbol threw exception\n"))); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::get_quote ( - ::CORBA::Double ami_return_val) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client - StockManagerReplyHandler : get_quote returned %f\n"), - ami_return_val)); - } - - void - AMI4CCM_StockManagerReplyHandler_my_quoter_i::get_quote_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const Quoter::InvalidStock& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client - StockManagerReplyHandler : get_quote threw correct exception type\n"))); - - if (ACE_OS::strcmp (ex.sym.in (), "Microsoft") == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Client - StockManagerReplyHandler : get_quote could not find quote for %C\n"), - ex.sym.in ())); - return; - } - } - catch (const CORBA::Exception& /*ex*/) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR Client - StockManagerReplyHandler : get_quote threw unexpected exception\n"))); - } - } - - extern "C" QUOTER_CLIENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Client_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Client_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h deleted file mode 100644 index afa519f79ad..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client_exec.h +++ /dev/null @@ -1,177 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QUOTER_CLIENT_EXEC_RCQDNE_H_ -#define CIAO_QUOTER_CLIENT_EXEC_RCQDNE_H_ - -#include /**/ "ace/pre.h" - -#include "Quoter_ClientEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Quoter_Client_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_Quoter_Client_Impl -{ - - /// Worker thread for asynchronous invocations - class asynch_quoter_generator : public virtual ACE_Task_Base - { - public: - asynch_quoter_generator (::Quoter::CCM_Client_Context_ptr context); - - virtual int svc (void); - - private: - ::Quoter::CCM_Client_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Client_exec_i - */ - - class Client_exec_i - : public virtual Client_Exec, - public virtual ::CORBA::LocalObject - { - public: - Client_exec_i (void); - virtual ~Client_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - - //@} - - private: - /** @name Component attributes. */ - //@{ - //@} - - /** @name User defined members. */ - //@{ - ::Quoter::CCM_Client_Context_var context_; - asynch_quoter_generator* asynch_quoter_gen_; - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - }; - - class AMI4CCM_StockManagerReplyHandler_my_quoter_i - : public ::Quoter::CCM_AMI4CCM_StockManagerReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_StockManagerReplyHandler_my_quoter_i (void); - virtual ~AMI4CCM_StockManagerReplyHandler_my_quoter_i (void); - - virtual void - get_stock_exchange_name ( - const char * stock_exchange_name); - - virtual void - get_stock_exchange_name_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_stock_exchange_name (void); - - virtual void - set_stock_exchange_name_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - add_stock ( - ::CORBA::Boolean ami_return_val); - - virtual void - add_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - edit_stock (void); - - virtual void - edit_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - remove_stock ( - ::CORBA::Double quote); - - virtual void - remove_stock_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - find_closest_symbol ( - ::CORBA::Boolean ami_return_val, - const char * symbol); - - virtual void - find_closest_symbol_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_quote ( - ::CORBA::Double ami_return_val); - - virtual void - get_quote_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" QUOTER_CLIENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Client_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl deleted file mode 100644 index 1b5090c2d5a..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef QUOTER_PRODUCER_IDL -#define QUOTER_PRODUCER_IDL - -#include - -#include "Base/Quoter.idl" - -module Quoter -{ - component Producer - { - /// Provides - provides StockManager my_quoter; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc deleted file mode 100644 index df56da22cf6..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Quoter_Base Quoter_Producer" - -project(AMI_Quoter_Producer_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_Quoter_idl_gen - idlflags += -Wb,stub_export_macro=QUOTER_PRODUCER_STUB_Export \ - -Wb,stub_export_include=Quoter_Producer_stub_export.h \ - -Wb,skel_export_macro=QUOTER_PRODUCER_SVNT_Export \ - -Wb,skel_export_include=Quoter_Producer_svnt_export.h \ - -Wb,exec_export_macro=QUOTER_PRODUCER_EXEC_Export \ - -Wb,exec_export_include=Quoter_Producer_exec_export.h \ - -Glem -I.. - - IDL_Files { - Quoter_Producer.idl - } -} - -project(AMI_Quoter_Producer_lem_gen) : ciaoidldefaults { - after += AMI_Quoter_Producer_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_PRODUCER_LEM_STUB_Export \ - -Wb,stub_export_include=Quoter_Producer_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Quoter_ProducerE.idl - } -} - -project(AMI_Quoter_Producer_lem_stub) : ccm_svnt, messaging { - after += AMI_Quoter_Producer_lem_gen AMI_Quoter_Producer_stub AMI_Quoter_stub - libs += Quoter_stub Quoter_Producer_stub - libpaths += ../lib - libout = ../lib - sharedname = Quoter_Producer_lem_stub - dynamicflags += QUOTER_PRODUCER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ProducerEC.cpp - } - - Header_Files { - Quoter_ProducerEC.h - Quoter_Producer_lem_stub_export.h - } - - Inline_Files { - Quoter_ProducerEC.inl - } -} - -project(AMI_Quoter_Producer_stub) : ccm_stub, messaging { - after += AMI_Quoter_Producer_idl_gen AMI_Quoter_stub - libs += Quoter_stub - libpaths += ../lib - libout = ../lib - sharedname = Quoter_Producer_stub - dynamicflags += QUOTER_PRODUCER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ProducerC.cpp - } - - Header_Files { - Quoter_ProducerC.h - Quoter_Producer_stub_export.h - } - - Inline_Files { - Quoter_ProducerC.inl - } -} - -project(AMI_Quoter_Producer_exec) : ciao_executor, messaging { - after += AMI_Quoter_Producer_lem_stub AMI_Quoter_Producer_stub AMI_Quoter_stub AMI_Quoter_lem_stub - sharedname = Quoter_Producer_exec - libs += Quoter_Producer_stub Quoter_Producer_lem_stub Quoter_stub Quoter_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_PRODUCER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_Producer_exec.cpp - } - - Header_Files { - Quoter_Producer_exec.h - Quoter_Producer_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Quoter_Producer_svnt) : ciao_servant, messaging { - after += AMI_Quoter_Base_skel AMI_Quoter_Producer_lem_stub AMI_Quoter_stub AMI_Quoter_skel AMI_Quoter_lem_stub - sharedname = Quoter_Producer_svnt - libs += Quoter_Producer_stub Quoter_Producer_lem_stub \ - Quoter_skel \ - Quoter_stub Quoter_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += QUOTER_PRODUCER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Quoter_ProducerS.cpp - Quoter_Producer_svnt.cpp - } - - Header_Files { - Quoter_ProducerS.h - Quoter_Producer_svnt.h - Quoter_Producer_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp deleted file mode 100644 index bbb49754fe0..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp +++ /dev/null @@ -1,187 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Quoter_Producer_exec.h" - -namespace CIAO_Quoter_Producer_Impl -{ - - /** - * Facet Executor Implementation Class: my_quoter_exec_i - */ - - my_quoter_exec_i::my_quoter_exec_i ( - ::Quoter::CCM_Producer_Context_ptr ctx) - : ciao_context_ ( - ::Quoter::CCM_Producer_Context::_duplicate (ctx)) - { - } - - my_quoter_exec_i::~my_quoter_exec_i (void) - { - } - - // Operations from ::Quoter::StockManager - - char * - my_quoter_exec_i::stock_exchange_name (void) - { - return CORBA::string_dup ("EuroNext"); - } - - void - my_quoter_exec_i::stock_exchange_name (const char * /* stock_exchange_name */) - { - /* Your code here. */ - } - - ::CORBA::Boolean - my_quoter_exec_i::add_stock (const char * /* symbol */, - ::CORBA::Double /* quote */) - { - /* Your code here. */ - return true; - } - - void - my_quoter_exec_i::edit_stock (const char * /* symbol */, - ::CORBA::Double /* new_quote */) - { - /* Your code here. */ - } - - void - my_quoter_exec_i::remove_stock (const char * /* symbol */, - ::CORBA::Double_out quote) - { - quote = 13.66; - } - - ::CORBA::Boolean - my_quoter_exec_i::find_closest_symbol (char *& symbol) - { - CORBA::string_free (symbol); - symbol = CORBA::string_dup ("Windoze"); - return true; - } - - ::CORBA::Double - my_quoter_exec_i::get_quote (const char * symbol) - { - if (ACE_OS::strcmp (symbol, "Google") == 0) - return 11.13; - - ::Quoter::InvalidStock ex_; - ex_.sym = CORBA::string_dup (symbol); - throw ex_; - } - - /** - * Component Executor Implementation Class: Producer_exec_i - */ - - Producer_exec_i::Producer_exec_i (void){ - } - - Producer_exec_i::~Producer_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Quoter::CCM_StockManager_ptr - Producer_exec_i::get_my_quoter (void) - { - if ( ::CORBA::is_nil (this->ciao_my_quoter_.in ())) - { - my_quoter_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - my_quoter_exec_i ( - this->ciao_context_.in ()), - ::Quoter::CCM_StockManager::_nil ()); - - this->ciao_my_quoter_ = tmp; - } - - return - ::Quoter::CCM_StockManager::_duplicate ( - this->ciao_my_quoter_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Producer_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Quoter::CCM_Producer_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Producer_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Producer_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Producer_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Producer_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" QUOTER_PRODUCER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Producer_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Producer_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h deleted file mode 100644 index 529db4db704..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.h +++ /dev/null @@ -1,150 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QUOTER_PRODUCER_EXEC_FI8FAR_H_ -#define CIAO_QUOTER_PRODUCER_EXEC_FI8FAR_H_ - -#include /**/ "ace/pre.h" - -#include "Quoter_ProducerEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Quoter_Producer_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Quoter_Producer_Impl -{ - - /** - * Provider Executor Implementation Class: my_quoter_exec_i - */ - - class my_quoter_exec_i - : public virtual ::Quoter::CCM_StockManager, - public virtual ::CORBA::LocalObject - { - public: - my_quoter_exec_i ( - ::Quoter::CCM_Producer_Context_ptr ctx); - virtual ~my_quoter_exec_i (void); - - /** @name Operations and attributes from Quoter::StockManager */ - //@{ - - virtual - char * stock_exchange_name (void); - - virtual - void stock_exchange_name (const char * stock_exchange_name); - - virtual - ::CORBA::Boolean add_stock (const char * symbol, - ::CORBA::Double quote); - - virtual - void edit_stock (const char * symbol, - ::CORBA::Double new_quote); - - virtual - void remove_stock (const char * symbol, - ::CORBA::Double_out quote); - - virtual - ::CORBA::Boolean find_closest_symbol (char *& symbol); - - virtual - ::CORBA::Double get_quote (const char * symbol); - //@} - - private: - ::Quoter::CCM_Producer_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Producer_exec_i - */ - - class Producer_exec_i - : public virtual Producer_Exec, - public virtual ::CORBA::LocalObject - { - public: - Producer_exec_i (void); - virtual ~Producer_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::Quoter::CCM_StockManager_ptr - get_my_quoter (void); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - - //@} - - private: - ::Quoter::CCM_Producer_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::Quoter::CCM_StockManager_var ciao_my_quoter_; - //@} - - /** @name User defined members. */ - //@{ - - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - }; - - extern "C" QUOTER_PRODUCER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Producer_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/Plan.cdp deleted file mode 100644 index 6530d85eed1..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - Quoter_ProducerHomeImplementation - - - - - component factory - - - tk_string - - - create_Quoter_Producer_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.ProducerArtifacts.Producer_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_Producer_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.ProducerArtifacts.Producer_svnt - - - - - - - Quoter_ClientHomeImplementation - - - - - component factory - - - tk_string - - - create_Quoter_Client_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.ClientArtifacts.Client_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_Client_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.ClientArtifacts.Client_svnt - - - - - - - Quoter_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Quoter_AMI4CCM_StockManager_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_AMI4CCM_StockManager_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Quoter.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Quoter.ComponentImplementations.QuoterImplementation.Quoter.Producer - Producer - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Producer.ior - - - - - - - Quoter.ComponentImplementations.QuoterImplementation.Quoter.Client - Client - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Client.ior - - - - - - - Quoter.ComponentImplementations.QuoterImplementation.Quoter.AMI - Client - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_quoter_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_my_quoter - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_quoter_connection - - my_quoter - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_quoter_connection - - my_quoter - true - Facet - - - - my_quoter - false - SimplexReceptacle - - - - - - Quoter.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Quoter_svnt - - entryPoint - - - tk_string - - - create_Quoter_AMI4CCM_StockManager_Connector_AMI4CCM_Connector_Servant - - - - - - - Quoter.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Quoter_conn - - entryPoint - - - tk_string - - - create_Quoter_AMI4CCM_StockManager_Connector_Impl - - - - - - - Quoter.ImplementationArtifacts.ProducerArtifacts.Producer_svnt - - - Quoter_Producer_svnt - - entryPoint - - - tk_string - - - create_Quoter_AMI_ProducerHome_Servant - - - - - - - Quoter.ImplementationArtifacts.ProducerArtifacts.Producer_exec - - - Quoter_Producer_exec - - entryPoint - - - tk_string - - - create_Quoter_AMI_ProducerHome_Impl - - - - - - - Quoter.ImplementationArtifacts.ClientArtifacts.Client_svnt - - - Quoter_Client_svnt - - entryPoint - - - tk_string - - - create_Quoter_AMI_ClientHome_Servant - - - - - - - Quoter.ImplementationArtifacts.ClientArtifacts.Client_exec - - - Quoter_Client_exec - - entryPoint - - - tk_string - - - create_Quoter_AMI_ClientHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl deleted file mode 100755 index 2327ac0fb41..00000000000 --- a/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60000, 60001 ); -@iorbases = ( "Client.ior", "Producer.ior"); -@iorfiles = 0; -@nodenames = ( "Client", "Producer" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\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/CIAO/connectors/ami4ccm/models/CoSMIC/ami4ccm.xme b/CIAO/connectors/ami4ccm/models/CoSMIC/ami4ccm.xme deleted file mode 100644 index 7528ee9aa2f..00000000000 --- a/CIAO/connectors/ami4ccm/models/CoSMIC/ami4ccm.xme +++ /dev/null @@ -1,398 +0,0 @@ - - - - - ami4ccm - - - - ami4ccm - - InterfaceDefinitions - - ami4ccm - - connectors/ami4ccm/ami4ccm - - - - - - - - - - - - CCM_AMI - - - - - - - - - - - - - - - - - ExceptionHolder - - - - - - 181,48 - - - - - local - - - - - - - - - - - - - - - - - - raise_exception - - - - - - 60,60 - - - - - - - - - - - - - ReplyHandler - - - - - - 125,167 - - - - - local - - - - - - - - - - - - - - - - - - - AMI4CCM_Base - - - - - - 306,124 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DCF-000C2958D27B - - - - - - - Connector_T - - - - - - 94,241 - - - - - - - - - - - - - - - - - - - - AMI4CCM_Port_Type - - - - - - 11,11 - - - - - - - - - - - - - - - - - ami4ccm_provides - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - false - - - - ami4ccm_uses - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - AMI4CCM_Connector - - - - - - 126,238 - - - - - - - - - - - - - - 6C31592E-9776-11DF-8DD0-000C2958D27B - - - - - - ami4ccm_port - - - ConnectorInherits - - - - T - - - - - - 60,60 - - - - - Object - - - - AMI4CCM_T - - - - - - 160,60 - - - - - Object - - - - - UserExceptionBase - - - - - - 8,13 - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - diff --git a/CIAO/connectors/ami4ccm/tests/.gitignore b/CIAO/connectors/ami4ccm/tests/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/.gitignore b/CIAO/connectors/ami4ccm/tests/AsynchT/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/.gitignore deleted file mode 100644 index 33d91b4a776..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/AsynchTA.idl -/AsynchTAE.idl -/AsynchTA_conn.cpp -/AsynchTA_conn.h -/AsynchTE.idl -/AsynchT_conn_export.h -/AsynchT_exec_export.h -/AsynchT_lem_stub_export.h -/AsynchT_skel_export.h -/AsynchT_stub_export.h -/AsynchT_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl deleted file mode 100644 index 92b91f62111..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.idl +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef ASYNCHT_IDL -#define ASYNCHT_IDL - -#pragma ciao lem "Base/AsynchTE.idl" -#pragma ciao ami4ccm interface "AsynchT::MyFoo" -#pragma ciao lem "Base/AsynchTAE.idl" -#pragma ciao ami4ccm idl "Base/AsynchTA.idl" - - -module AsynchT -{ - 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); - void bar (in long cmd, out long l_cmd) - raises (InternalError); - attribute short rw_attrib - getraises (InternalError) - setraises (InternalError); - readonly attribute short ro_attrib - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc deleted file mode 100644 index 0d0b1314243..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc +++ /dev/null @@ -1,192 +0,0 @@ -project(AMI_AsynchT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_STUB_Export \ - -Wb,stub_export_include=AsynchT_stub_export.h \ - -Wb,skel_export_macro=ASYNCHT_SKEL_Export \ - -Wb,skel_export_include=AsynchT_skel_export.h \ - -Wb,conn_export_macro=ASYNCHT_CONN_Export \ - -Wb,conn_export_include=AsynchT_conn_export.h \ - -Wb,exec_export_macro=ASYNCHT_EXEC_Export \ - -Wb,exec_export_include=AsynchT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - AsynchT.idl - } -} - -project(AMI_AsynchT_lem_gen) : ciaoidldefaults { - after += AMI_AsynchT_idl_gen AMI_AsynchT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=ASYNCHT_LEM_STUB_Export \ - -Wb,export_include=AsynchT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - AsynchTE.idl - } -} - -project(AMI_AsynchT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_AsynchT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_STUB_Export \ - -Wb,stub_export_include=AsynchT_stub_export.h \ - -Wb,conn_export_macro=ASYNCHT_CONN_Export \ - -Wb,conn_export_include=AsynchT_conn_export.h \ - -Wb,svnt_export_macro=ASYNCHT_SVNT_Export \ - -Wb,svnt_export_include=AsynchT_svnt_export.h \ - -Wb,skel_export_macro=ASYNCHT_SKEL_Export \ - -Wb,skel_export_include=AsynchT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - AsynchTA.idl - } -} - -project(AMI_AsynchT_lemae_gen) : ciaoidldefaults { - after += AMI_AsynchT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_LEM_STUB_Export \ - -Wb,stub_export_include=AsynchT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - AsynchTAE.idl - } -} - -project(AMI_AsynchT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_AsynchT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = AsynchT_stub - dynamicflags += ASYNCHT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - AsynchTC.cpp - AsynchTAC.cpp - } - - Header_Files { - AsynchTC.h - AsynchT_stub_export.h -} - - Inline_Files { - AsynchTC.inl - } -} - -project(AMI_AsynchT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_AsynchT_lem_gen AMI_AsynchT_stub AMI_AsynchT_lemae_gen AMI_AsynchT_skel - libs += AsynchT_stub AsynchT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = AsynchT_lem_stub - dynamicflags += ASYNCHT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - AsynchTEC.cpp - AsynchTAEC.cpp - } - - Header_Files { - AsynchTEC.h - AsynchT_lem_stub_export.h -} - - Inline_Files { - AsynchTEC.inl - } -} - -project(AMI_AsynchT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_AsynchT_stub - sharedname = AsynchT_skel - libs += AsynchT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += ASYNCHT_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - AsynchTS.cpp - AsynchTAS.cpp - } - - Header_Files { - AsynchTS.h - - AsynchT_skel_export.h - } - - Inline_Files { - - } -} - -project(AMI_AsynchT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_AsynchT_lem_stub AsynchT_Base_AMI_stub AMI_AsynchT_skel AMI_AsynchT_lema_gen AMI_AsynchT_lemae_gen - sharedname = AsynchT_conn - libs += AsynchT_stub AsynchT_skel AsynchT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchTA_conn.cpp - } - - Header_Files { - AsynchTA_conn.h - AsynchT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_AsynchT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_AsynchT_lem_stub AsynchT_Base_AMI_stub AMI_AsynchT_skel AMI_AsynchT_lema_gen AMI_AsynchT_lemae_gen AMI_AsynchT_conn - sharedname = AsynchT_svnt - libs += AsynchT_stub AsynchT_skel AsynchT_lem_stub AsynchT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchTA_svnt.cpp - } - - Header_Files { - AsynchTA_svnt.h - AsynchTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/.gitignore deleted file mode 100644 index e061bcbb12a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/AsynchT_ReceiverE.idl -/AsynchT_Receiver_exec_export.h -/AsynchT_Receiver_lem_stub_export.h -/AsynchT_Receiver_stub_export.h -/AsynchT_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl deleted file mode 100644 index ae67b6a2c3b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef ASYNCHT_RECEIVER_IDL -#define ASYNCHT_RECEIVER_IDL - -#include - -#include "Base/AsynchT.idl" - -module AsynchT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc deleted file mode 100644 index 8459bc0607a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p AsynchT_Base AsynchT_Receiver" - -project(AMI_AsynchT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_AsynchT_idl_gen - idlflags += -Wb,stub_export_macro=ASYNCHT_RECEIVER_STUB_Export \ - -Wb,stub_export_include=AsynchT_Receiver_stub_export.h \ - -Wb,skel_export_macro=ASYNCHT_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=AsynchT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=ASYNCHT_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=AsynchT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - AsynchT_Receiver.idl - } -} - -project(AMI_AsynchT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_AsynchT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=AsynchT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - AsynchT_ReceiverE.idl - } -} - -project(AMI_AsynchT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_AsynchT_Base_Receiver_lem_gen AMI_AsynchT_Base_Receiver_stub AMI_AsynchT_stub - libs += AsynchT_stub AsynchT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = AsynchT_Receiver_lem_stub - dynamicflags += ASYNCHT_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_ReceiverEC.cpp - } - - Header_Files { - AsynchT_ReceiverEC.h - AsynchT_Receiver_lem_stub_export.h - } - - Inline_Files { - AsynchT_ReceiverEC.inl - } -} - -project(AMI_AsynchT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_AsynchT_Base_Receiver_idl_gen AMI_AsynchT_stub - libs += AsynchT_stub - libpaths += ../lib - libout = ../lib - sharedname = AsynchT_Receiver_stub - dynamicflags += ASYNCHT_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_ReceiverC.cpp - } - - Header_Files { - AsynchT_ReceiverC.h - AsynchT_Receiver_stub_export.h - } - - Inline_Files { - AsynchT_ReceiverC.inl - } -} - -project(AMI_AsynchT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_AsynchT_Base_Receiver_l_stub AMI_AsynchT_Base_Receiver_stub AMI_AsynchT_stub AMI_AsynchT_lem_stub - sharedname = AsynchT_Receiver_exec - libs += AsynchT_Receiver_stub AsynchT_Receiver_lem_stub AsynchT_stub AsynchT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_Receiver_exec.cpp - } - - Header_Files { - AsynchT_Receiver_exec.h - AsynchT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_AsynchT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_AsynchT_Base_skel AMI_AsynchT_Base_Receiver_l_stub AMI_AsynchT_stub AMI_AsynchT_skel AMI_AsynchT_lem_stub - sharedname = AsynchT_Receiver_svnt - libs += AsynchT_Receiver_stub AsynchT_Receiver_lem_stub \ - AsynchT_skel \ - AsynchT_stub AsynchT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_ReceiverS.cpp - AsynchT_Receiver_svnt.cpp - } - - Header_Files { - AsynchT_ReceiverS.h - AsynchT_Receiver_svnt.h - AsynchT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp deleted file mode 100644 index 9bb758a9cc4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp +++ /dev/null @@ -1,175 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "AsynchT_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_AsynchT_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::AsynchT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::AsynchT::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::AsynchT::MyFoo - - ::CORBA::Long - do_my_foo_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 ("Hi from receiver."); - return cmd; - } - - void - do_my_foo_exec_i::bar (::CORBA::Long cmd, - ::CORBA::Long_out l_cmd) - { - ACE_OS::sleep(2); - l_cmd = cmd; - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - return 3; - } - - void - do_my_foo_exec_i::rw_attrib (::CORBA::Short /* rw_attrib */) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - ACE_OS::sleep (2); - return 4; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::AsynchT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::AsynchT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::AsynchT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::AsynchT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ASYNCHT_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_AsynchT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h deleted file mode 100644 index 52a25ca5c28..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h +++ /dev/null @@ -1,144 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_ASYNCHT_RECEIVER_EXEC_HFDFTT_H_ -#define CIAO_ASYNCHT_RECEIVER_EXEC_HFDFTT_H_ - -#include /**/ "ace/pre.h" - -#include "AsynchT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "AsynchT_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_AsynchT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::AsynchT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::AsynchT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from AsynchT::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - - virtual - void bar (::CORBA::Long cmd, - ::CORBA::Long_out l_cmd); - - virtual - ::CORBA::Short rw_attrib (void); - - virtual - void rw_attrib (::CORBA::Short rw_attrib); - - virtual - ::CORBA::Short ro_attrib (void); - //@} - - private: - ::AsynchT::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::AsynchT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::AsynchT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::AsynchT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" ASYNCHT_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_AsynchT_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/.gitignore deleted file mode 100644 index 583df014cad..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/AsynchT_SenderE.idl -/AsynchT_Sender_exec_export.h -/AsynchT_Sender_lem_stub_export.h -/AsynchT_Sender_stub_export.h -/AsynchT_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl deleted file mode 100644 index e1c26d67a1f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ASYNCHT_SENDER_IDL -#define ASYNCHT_SENDER_IDL - -#include - -#include "Base/AsynchT.idl" - -#pragma ciao ami4ccm receptacle "AsynchT::Sender::run_my_foo" - -module AsynchT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc deleted file mode 100644 index 9157a1f5ec9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p AsynchT_Base AsynchT_Sender" - -project(AMI_AsynchT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_AsynchT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_SENDER_STUB_Export \ - -Wb,stub_export_include=AsynchT_Sender_stub_export.h \ - -Wb,skel_export_macro=ASYNCHT_SENDER_SVNT_Export \ - -Wb,skel_export_include=AsynchT_Sender_svnt_export.h \ - -Wb,exec_export_macro=ASYNCHT_SENDER_EXEC_Export \ - -Wb,exec_export_include=AsynchT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - AsynchT_Sender.idl - } -} - -project(AMI_AsynchT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_AsynchT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ASYNCHT_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=AsynchT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - AsynchT_SenderE.idl - } -} - -project(AMI_AsynchT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_AsynchT_Base_Sender_lem_gen AMI_AsynchT_stub Conn_AsynchT_Base_stub - libs += AsynchT_stub - libpaths += ../lib - libout = ../lib - sharedname = AsynchT_Sender_lem_stub - dynamicflags += ASYNCHT_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_SenderEC.cpp - } - - Header_Files { - AsynchT_SenderEC.h - AsynchT_Sender_lem_stub_export.h - } - - Inline_Files { - AsynchT_SenderEC.inl - } -} - -project(AMI_AsynchT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_AsynchT_Base_Sender_idl_gen AMI_AsynchT_Base_stub AMI_AsynchT_stub Conn_AsynchT_Base_stub - libs += AsynchT_stub - libpaths += ../lib - libout = ../lib - sharedname = AsynchT_Sender_stub - dynamicflags += ASYNCHT_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_SenderC.cpp - } - - Header_Files { - AsynchT_SenderC.h - AsynchT_Sender_stub_export.h - } - - Inline_Files { - AsynchT_SenderC.inl - } -} - -project(AMI_AsynchT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_AsynchT_Base_Sender_lem_stub AMI_AsynchT_Base_Sender_stub AMI_AsynchT_Base_exec Conn_AsynchT_Base_stub AMI_AsynchT_lem_stub - sharedname = AsynchT_Sender_exec - libs += AsynchT_Sender_stub AsynchT_Sender_lem_stub AsynchT_stub AsynchT_stub AsynchT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_Sender_exec.cpp - } - - Header_Files { - AsynchT_Sender_exec.h - AsynchT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_AsynchT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_AsynchT_Base_skel AMI_AsynchT_Base_Sender_lem_stub AMI_AsynchT_Base_Sender_stub AMI_AsynchT_Base_exec AMI_AsynchT_skel - sharedname = AsynchT_Sender_svnt - libs += AsynchT_Sender_stub AsynchT_Sender_lem_stub \ - AsynchT_skel \ - AsynchT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ASYNCHT_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - AsynchT_SenderS.cpp - AsynchT_Sender_svnt.cpp - } - - Header_Files { - AsynchT_SenderS.h - AsynchT_Sender_svnt.h - AsynchT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp deleted file mode 100644 index 13bfa49be17..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp +++ /dev/null @@ -1,359 +0,0 @@ -// -*- C++ -*- -/** -* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 -* TAO and the TAO IDL Compiler have been developed by: -* Center for Distributed Object Computing -* Washington University -* St. Louis, MO -* USA -* http://www.cs.wustl.edu/~schmidt/doc-center.html -* and -* Distributed Object Computing Laboratory -* University of California at Irvine -* Irvine, CA -* USA -* and -* Institute for Software Integrated Systems -* Vanderbilt University -* Nashville, TN -* USA -* http://www.isis.vanderbilt.edu/ -* -* Information about TAO is available at: -* http://www.dre.vanderbilt.edu/~schmidt/TAO.html -**/ - -#include "AsynchT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_AsynchT_Sender_Impl -{ - - CORBA::Boolean asynch = false; - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::AsynchT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_sent, - Atomic_UShort &nr_of_rec) - : context_(::AsynchT::CCM_Sender_Context::_duplicate (context)), - nr_of_sent_(nr_of_sent), - nr_of_rec_(nr_of_rec) - { - } - - int asynch_foo_generator::svc () - { - ::AsynchT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - ACE_OS::sleep(2); - - ::AsynchT::AMI4CCM_MyFooReplyHandler_var cb = - new CIAO_AsynchT_Sender_Impl::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_sent_, - this->nr_of_rec_); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :" - "\tfoo_ami is NIL !\n")); - return 1; - } - //Invoke Asynchronous calls to test - ++this->nr_of_sent_; - my_foo_ami_->sendc_foo ( cb.in(),"Hi ", 1); - ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL foo.\n")); - - ++this->nr_of_sent_; - my_foo_ami_->sendc_bar ( cb.in(), 1); - ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL bar.\n")); - - ++this->nr_of_sent_; - my_foo_ami_->sendc_get_rw_attrib( cb.in()); - ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL get_rw_attrib.\n")); - - ++this->nr_of_sent_; - my_foo_ami_->sendc_set_rw_attrib( cb.in(),2); - ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL set_rw_attrib.\n")); - - ++this->nr_of_sent_; - ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL get_ro_attrib.\n")); - my_foo_ami_->sendc_get_ro_attrib( cb.in()); - - //there is more than 1 message sent, without receiving callbacks, - //so it is asynchronous - if (this->nr_of_sent_.value() > 1) - { - asynch = true; - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::AsynchT::CCM_Sender_Context_ptr context) - : context_(::AsynchT::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ::AsynchT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - ACE_OS::sleep(1); - CORBA::Boolean wait = false; - for (int i = 0; i < 3; ++i) - { - // Run some synch calls, answer has to come before the next step. - CORBA::String_var answer; - try - { - if( wait==true) - { - ACE_ERROR ((LM_ERROR, - "ERROR: NOT RECEIVED SYNCHRONOUS answer.\n")); - } - wait = true; - ACE_DEBUG ((LM_DEBUG, "OK: SEND SYNCHRONOUS CALL foo.\n")); - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - 2 , - answer.out ()); - if ( result == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK: RECEIVED SYNCHRONOUS answer <%C>\n", - answer.in ())); - wait = false; - } - if ( wait==true) - { - ACE_ERROR ((LM_ERROR, - "ERROR: NOT RECEIVED SYNCHRONOUS answer.\n")); - } - wait = true; - CORBA::Long l_cmd = 0; - ACE_DEBUG ((LM_DEBUG, "OK: SEND SYNCHRONOUS CALL bar.\n")); - my_foo_ami_->bar (2,l_cmd); - if ( l_cmd == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK: RECEIVED SYNCHRONOUS answer <%C>\n", - answer.in ())); - wait = false; - } - } - catch (const AsynchT::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) : - asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_sent_ (0), - nr_of_rec_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::AsynchT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_sent_, - this->nr_of_rec_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if ((asynch == false) || (this->nr_of_rec_.value() != 5)) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Test not asynchronous or not received back" - " all requests ( %u/5)!\n", - this->nr_of_rec_.value() )); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Test asynchronous, received back %u.\n", - this->nr_of_rec_.value())); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_sent, - Atomic_UShort &nr_of_rec) - : nr_of_sent_ (nr_of_sent), - nr_of_rec_ (nr_of_rec) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * /* answer */) - { - ++this->nr_of_rec_; - if (ami_return_val == 1) - { - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK foo.\n")); - --this->nr_of_sent_; - } - if (ami_return_val == 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ASYNCHRONOUS CALLBACK " - "FROM SYNCHRONOUS SENT MESSAGE\n")); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::bar ( - ::CORBA::Long l_cmd) - { - ++this->nr_of_rec_; - if (l_cmd == 1) - { - --this->nr_of_sent_; - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK bar.\n")); - } - if (l_cmd == 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ASYNCHRONOUS CALLBACK " - "FROM SYNCHRONOUS SENT MESSAGE\n")); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short /*rw_attrib*/) - { - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK get_rw_attrib.\n")); - ++this->nr_of_rec_; - --this->nr_of_sent_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK set_rw_attrib.\n")); - ++this->nr_of_rec_; - --this->nr_of_sent_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short /*ro_attrib*/) - { - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK get_ro_attrib.\n")); - ++this->nr_of_rec_; - --this->nr_of_sent_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" ASYNCHT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_AsynchT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h deleted file mode 100644 index 834e288b46a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h +++ /dev/null @@ -1,187 +0,0 @@ -// -*- C++ -*- -/** -* Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 -* TAO and the TAO IDL Compiler have been developed by: -* Center for Distributed Object Computing -* Washington University -* St. Louis, MO -* USA -* http://www.cs.wustl.edu/~schmidt/doc-center.html -* and -* Distributed Object Computing Laboratory -* University of California at Irvine -* Irvine, CA -* USA -* and -* Institute for Software Integrated Systems -* Vanderbilt University -* Nashville, TN -* USA -* http://www.isis.vanderbilt.edu/ -* -* Information about TAO is available at: -* http://www.dre.vanderbilt.edu/~schmidt/TAO.html -**/ -#ifndef CIAO_ASYNCHT_SENDER_EXEC_LZKPQ3_H_ -#define CIAO_ASYNCHT_SENDER_EXEC_LZKPQ3_H_ - -#include /**/ "ace/pre.h" -#include "ace/Task.h" -#include "AsynchT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "AsynchT_Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_AsynchT_Sender_Impl -{ - - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator: public virtual ACE_Task_Base - { - public: - asynch_foo_generator(::AsynchT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_sent, Atomic_UShort &nr_of_rec); - - virtual int svc(void); - - private: - ::AsynchT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_sent_; - Atomic_UShort &nr_of_rec_; - - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator: public virtual ACE_Task_Base - { - public: - synch_foo_generator(::AsynchT::CCM_Sender_Context_ptr context); - - virtual int svc(void); - - private: - ::AsynchT::CCM_Sender_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::AsynchT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_sent_; - Atomic_UShort nr_of_rec_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::AsynchT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_of_sent, - Atomic_UShort &nr_of_rec); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - bar ( - ::CORBA::Long l_cmd); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_sent_; - Atomic_UShort &nr_of_rec_; - }; - - extern "C" ASYNCHT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_AsynchT_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp deleted file mode 100644 index c6018d085b5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - AsynchT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_AsynchT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_AsynchT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - AsynchT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_AsynchT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_AsynchT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - AsynchT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_AsynchT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_AsynchT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - AsynchT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - AsynchT.ComponentImplementations.AsynchTImplementation.AsynchT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - AsynchT.ComponentImplementations.AsynchTImplementation.AsynchT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - AsynchT.ComponentImplementations.AsynchTImplementation.AsynchT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - AsynchT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - AsynchT_svnt - - entryPoint - - - tk_string - - - create_AsynchT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - AsynchT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - AsynchT_conn - - entryPoint - - - tk_string - - - create_AsynchT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - AsynchT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - AsynchT_Receiver_svnt - - entryPoint - - - tk_string - - - create_AsynchT_AMI_ReceiverHome_Servant - - - - - - - AsynchT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - AsynchT_Receiver_exec - - entryPoint - - - tk_string - - - create_AsynchT_AMI_ReceiverHome_Impl - - - - - - - AsynchT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - AsynchT_Sender_svnt - - entryPoint - - - tk_string - - - create_AsynchT_AMI_SenderHome_Servant - - - - - - - AsynchT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - AsynchT_Sender_exec - - entryPoint - - - tk_string - - - create_AsynchT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl deleted file mode 100755 index 752c80f81d6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\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/CIAO/connectors/ami4ccm/tests/DelReplyH/.gitignore b/CIAO/connectors/ami4ccm/tests/DelReplyH/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/.gitignore deleted file mode 100644 index bb7cc8dd281..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/DelReplyHA.idl -/DelReplyHAE.idl -/DelReplyHA_conn.cpp -/DelReplyHA_conn.h -/DelReplyHE.idl -/DelReplyH_conn_export.h -/DelReplyH_exec_export.h -/DelReplyH_lem_stub_export.h -/DelReplyH_skel_export.h -/DelReplyH_stub_export.h -/DelReplyH_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl deleted file mode 100644 index a5eb542d1bf..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef DELREPLYH_IDL -#define DELREPLYH_IDL - -#pragma ciao lem "Base/DelReplyHE.idl" -#pragma ciao ami4ccm interface "DelReplyH::MyFoo" -#pragma ciao lem "Base/DelReplyHAE.idl" -#pragma ciao ami4ccm idl "Base/DelReplyHA.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/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc deleted file mode 100644 index e36b8b68ee1..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc +++ /dev/null @@ -1,191 +0,0 @@ -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 - - 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, typecode { - 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 -GC -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 { - } -} - -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/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/.gitignore deleted file mode 100644 index 747d0cc71c6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/DelReplyH_ReceiverE.idl -/DelReplyH_Receiver_exec_export.h -/DelReplyH_Receiver_lem_stub_export.h -/DelReplyH_Receiver_stub_export.h -/DelReplyH_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl deleted file mode 100644 index a95470aaddf..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef DELREPLYH_RECEIVER_IDL -#define DELREPLYH_RECEIVER_IDL - -#include - -#include "Base/DelReplyH.idl" - -module DelReplyH -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc deleted file mode 100644 index 8036398669c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// 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 { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp deleted file mode 100644 index 7bb457254b2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "DelReplyH_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_DelReplyH_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - do_my_foo_exec_i::do_my_foo_exec_i ( - ::DelReplyH::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::DelReplyH::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::DelReplyH::MyFoo - - ::CORBA::Long - do_my_foo_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; - } - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::DelReplyH::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::DelReplyH::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::DelReplyH::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::DelReplyH::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_DelReplyH_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h deleted file mode 100644 index 2048324bd18..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h +++ /dev/null @@ -1,127 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_DELREPLYH_RECEIVER_EXEC_FMXHV6_H_ -#define CIAO_DELREPLYH_RECEIVER_EXEC_FMXHV6_H_ - - -#include "DelReplyH_ReceiverEC.h" -#include "DelReplyH_Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_DelReplyH_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::DelReplyH::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::DelReplyH::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from DelReplyH::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - //@} - - private: - ::DelReplyH::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::DelReplyH::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::DelReplyH::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::DelReplyH::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" DELREPLYH_RECEIVER_EXEC_Export::Components::EnterpriseComponent_ptr - create_DelReplyH_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/.gitignore deleted file mode 100644 index 79c6184872d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/DelReplyH_SenderE.idl -/DelReplyH_Sender_exec_export.h -/DelReplyH_Sender_lem_stub_export.h -/DelReplyH_Sender_stub_export.h -/DelReplyH_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl deleted file mode 100644 index b26a817331d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef DELREPLYH_SENDER_IDL -#define DELREPLYH_SENDER_IDL - -#include - -#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/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc deleted file mode 100644 index fdd51fd53d1..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DelReplyH_Base DelReplyH_Sender" - -project(AMI_DelReplyH_Base_Sender_idl_gen) : componentidldefaults { - after += 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.. -GC - - 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_Sender_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 { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp deleted file mode 100644 index 56d76aae5b3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp +++ /dev/null @@ -1,241 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "DelReplyH_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_DelReplyH_Sender_Impl -{ - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::DelReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_callbacks, - Atomic_UShort &nr_exceptions) - : context_(::DelReplyH::CCM_Sender_Context::_duplicate (context)), - nr_callbacks_(nr_callbacks), - nr_exceptions_(nr_exceptions) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::DelReplyH::AMI4CCM_MyFoo_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - 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::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_callbacks_, - this->nr_exceptions_); - - my_foo_ami_->sendc_foo(cb.in(), - "Do something asynchronous"); - - } - //Invoke Asynchronous calls to test exception handling - ::DelReplyH::AMI4CCM_MyFooReplyHandler_var cb2 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_callbacks_, - this->nr_exceptions_); - - my_foo_ami_->sendc_foo (cb2.in (), ""); - - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::DelReplyH::CCM_Sender_Context_ptr context) - : context_(::DelReplyH::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::DelReplyH::MyFoo_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - - //run some synch calls - try - { - CORBA::String_var answer; - my_foo_ami_->foo("synchronous call", answer.out ()); - ACE_DEBUG ((LM_DEBUG, "OK: SYNCH foo returns <%C>.\n", - answer.in ())); - } - 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) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_callbacks_ (0), - nr_exceptions_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::DelReplyH::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_callbacks_, - this->nr_exceptions_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->nr_callbacks_.value() != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Not all ReplyHandlers were " - "deleted, %d left.\n", - this->nr_callbacks_.value ())); - } - if (this->nr_exceptions_.value() != 1) - { - ACE_ERROR ((LM_ERROR, "ERROR: Wrong number of exceptions received. " - "Expected : 1, Received = %u.\n", - this->nr_exceptions_.value())); - } - if ((this->nr_callbacks_.value() == 0) && - (this->nr_exceptions_.value() == 1)) - { - ACE_DEBUG ((LM_DEBUG, - "OK: All constructed ReplyHandlers were deleted.\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_callbacks, - Atomic_UShort &nr_exceptions) - : nr_callbacks_ (nr_callbacks), - nr_exceptions_ (nr_exceptions) - { - ACE_DEBUG ((LM_DEBUG,"CONSTRUCTOR replyhandle\n")); - ++this->nr_callbacks_; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - ACE_DEBUG ((LM_DEBUG,"DESTRUCTOR replyhandle\n")); - --this->nr_callbacks_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "OK: ASYNCH foo() returns answer: %C.\n", answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ++this->nr_exceptions_; - } - - extern "C" DELREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DelReplyH_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h deleted file mode 100644 index fb624a351af..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.h +++ /dev/null @@ -1,157 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_DELREPLYH_SENDER_EXEC_9OZUBT_H_ -#define CIAO_DELREPLYH_SENDER_EXEC_9OZUBT_H_ - -#include /**/ "ace/pre.h" - -#include "DelReplyH_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "DelReplyH_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_DelReplyH_Sender_Impl -{ - - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::DelReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_callbacks, - Atomic_UShort &nr_exceptions); - - virtual int svc (void); - - private: - ::DelReplyH::CCM_Sender_Context_var context_; - Atomic_UShort &nr_callbacks_; - Atomic_UShort &nr_exceptions_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::DelReplyH::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::DelReplyH::CCM_Sender_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::DelReplyH::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_callbacks_; - Atomic_UShort nr_exceptions_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_callbacks, - Atomic_UShort &nr_exceptions); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_callbacks_; - Atomic_UShort &nr_exceptions_; - }; - - extern "C" DELREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DelReplyH_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp deleted file mode 100644 index 49213c4afa9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - DelReplyH_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_DelReplyH_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_DelReplyH_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - DelReplyH_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_DelReplyH_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_DelReplyH_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - DelReplyH_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_DelReplyH_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_DelReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - DelReplyH.ComponentImplementations.DelReplyHImplementation.DelReplyH.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - DelReplyH_svnt - - entryPoint - - - tk_string - - - create_DelReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - DelReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - DelReplyH_conn - - entryPoint - - - tk_string - - - create_DelReplyH_AMI_MyFoo_Connector_Impl - - - - - - - DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - DelReplyH_Receiver_svnt - - entryPoint - - - tk_string - - - create_DelReplyH_AMI_ReceiverHome_Servant - - - - - - - DelReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - DelReplyH_Receiver_exec - - entryPoint - - - tk_string - - - create_DelReplyH_AMI_ReceiverHome_Impl - - - - - - - DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - DelReplyH_Sender_svnt - - entryPoint - - - tk_string - - - create_DelReplyH_AMI_SenderHome_Servant - - - - - - - DelReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - DelReplyH_Sender_exec - - entryPoint - - - tk_string - - - create_DelReplyH_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl deleted file mode 100755 index 5fc3a8f8324..00000000000 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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\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/CIAO/connectors/ami4ccm/tests/Exceptions/.gitignore b/CIAO/connectors/ami4ccm/tests/Exceptions/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/.gitignore deleted file mode 100644 index 922a1c645fb..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/ExceptionTA.idl -/ExceptionTAE.idl -/ExceptionTA_conn.cpp -/ExceptionTA_conn.h -/ExceptionTE.idl -/ExceptionT_conn_export.h -/ExceptionT_exec_export.h -/ExceptionT_lem_stub_export.h -/ExceptionT_skel_export.h -/ExceptionT_stub_export.h -/ExceptionT_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl deleted file mode 100644 index f3316b59c7a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef EXCEPTION_T_IDL -#define EXCEPTION_T_IDL - -#pragma ciao lem "Base/ExceptionTE.idl" -#pragma ciao ami4ccm interface "ExceptionT::MyFoo" -#pragma ciao lem "Base/ExceptionTAE.idl" -#pragma ciao ami4ccm idl "Base/ExceptionTA.idl" - -module ExceptionT -{ - exception InternalError - { - long id; - string error_string; - string test; - }; - - // 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/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc deleted file mode 100644 index 2c8176499dc..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc +++ /dev/null @@ -1,192 +0,0 @@ -project(AMI_ExceptionT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_STUB_Export \ - -Wb,stub_export_include=ExceptionT_stub_export.h \ - -Wb,skel_export_macro=EXCEPTION_T_SKEL_Export \ - -Wb,skel_export_include=ExceptionT_skel_export.h \ - -Wb,conn_export_macro=EXCEPTION_T_CONN_Export \ - -Wb,conn_export_include=ExceptionT_conn_export.h \ - -Wb,exec_export_macro=EXCEPTION_T_EXEC_Export \ - -Wb,exec_export_include=ExceptionT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - ExceptionT.idl - } -} - -project(AMI_ExceptionT_lem_gen) : ciaoidldefaults { - after += AMI_ExceptionT_idl_gen AMI_ExceptionT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=EXCEPTION_T_LEM_STUB_Export \ - -Wb,export_include=ExceptionT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - ExceptionTE.idl - } -} - -project(AMI_ExceptionT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_ExceptionT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_STUB_Export \ - -Wb,stub_export_include=ExceptionT_stub_export.h \ - -Wb,conn_export_macro=EXCEPTION_T_CONN_Export \ - -Wb,conn_export_include=ExceptionT_conn_export.h \ - -Wb,svnt_export_macro=EXCEPTION_T_SVNT_Export \ - -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 - - IDL_Files { - ExceptionTA.idl - } -} - -project(AMI_ExceptionT_lemae_gen) : ciaoidldefaults { - after += AMI_ExceptionT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_LEM_STUB_Export \ - -Wb,stub_export_include=ExceptionT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - ExceptionTAE.idl - } -} - -project(AMI_ExceptionT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_ExceptionT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = ExceptionT_stub - dynamicflags += EXCEPTION_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ExceptionTC.cpp - ExceptionTAC.cpp - } - - Header_Files { - ExceptionTC.h - ExceptionT_stub_export.h -} - - Inline_Files { - ExceptionTC.inl - } -} - -project(AMI_ExceptionT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_ExceptionT_lem_gen AMI_ExceptionT_stub AMI_ExceptionT_lemae_gen AMI_ExceptionT_skel - libs += ExceptionT_stub ExceptionT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = ExceptionT_lem_stub - dynamicflags += EXCEPTION_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ExceptionTEC.cpp - ExceptionTAEC.cpp - } - - Header_Files { - ExceptionTEC.h - ExceptionT_lem_stub_export.h -} - - Inline_Files { - ExceptionTEC.inl - } -} - -project(AMI_ExceptionT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_ExceptionT_stub - sharedname = ExceptionT_skel - libs += ExceptionT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += EXCEPTION_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ExceptionTS.cpp - ExceptionTAS.cpp - } - - Header_Files { - ExceptionTS.h - - ExceptionT_skel_export.h - } - - Inline_Files { - - } -} - -project(AMI_ExceptionT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_ExceptionT_lem_stub ExceptionT_Base_AMI_stub AMI_ExceptionT_skel AMI_ExceptionT_lema_gen AMI_ExceptionT_lemae_gen - sharedname = ExceptionT_conn - libs += ExceptionT_stub ExceptionT_skel ExceptionT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionTA_conn.cpp - } - - Header_Files { - ExceptionTA_conn.h - ExceptionT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_ExceptionT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_ExceptionT_lem_stub ExceptionT_Base_AMI_stub AMI_ExceptionT_skel AMI_ExceptionT_lema_gen AMI_ExceptionT_lemae_gen AMI_ExceptionT_conn - sharedname = ExceptionT_svnt - libs += ExceptionT_stub ExceptionT_skel ExceptionT_lem_stub ExceptionT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionTA_svnt.cpp - } - - Header_Files { - ExceptionTA_svnt.h - ExceptionTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/.gitignore deleted file mode 100644 index 4fbad2cb5e5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/ExceptionT_ReceiverE.idl -/ExceptionT_Receiver_exec_export.h -/ExceptionT_Receiver_lem_stub_export.h -/ExceptionT_Receiver_stub_export.h -/ExceptionT_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl deleted file mode 100644 index f07aca3b30b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef EXCEPTION_T_RECEIVER_IDL -#define EXCEPTION_T_RECEIVER_IDL - -#include - -#include "Base/ExceptionT.idl" - -module ExceptionT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc deleted file mode 100644 index c7a34340234..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ExceptionT_Base ExceptionT_Receiver" - -project(AMI_ExceptionT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_ExceptionT_idl_gen - idlflags += -Wb,stub_export_macro=EXCEPTION_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=ExceptionT_Receiver_stub_export.h \ - -Wb,skel_export_macro=EXCEPTION_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=ExceptionT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=EXCEPTION_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=ExceptionT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - ExceptionT_Receiver.idl - } -} - -project(AMI_ExceptionT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_ExceptionT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=ExceptionT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ExceptionT_ReceiverE.idl - } -} - -project(AMI_ExceptionT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_ExceptionT_Base_Receiver_lem_gen AMI_ExceptionT_Base_Receiver_stub AMI_ExceptionT_stub - libs += ExceptionT_stub ExceptionT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = ExceptionT_Receiver_lem_stub - dynamicflags += EXCEPTION_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_ReceiverEC.cpp - } - - Header_Files { - ExceptionT_ReceiverEC.h - ExceptionT_Receiver_lem_stub_export.h - } - - Inline_Files { - ExceptionT_ReceiverEC.inl - } -} - -project(AMI_ExceptionT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_ExceptionT_Base_Receiver_idl_gen AMI_ExceptionT_stub - libs += ExceptionT_stub - libpaths += ../lib - libout = ../lib - sharedname = ExceptionT_Receiver_stub - dynamicflags += EXCEPTION_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_ReceiverC.cpp - } - - Header_Files { - ExceptionT_ReceiverC.h - ExceptionT_Receiver_stub_export.h - } - - Inline_Files { - ExceptionT_ReceiverC.inl - } -} - -project(AMI_ExceptionT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_ExceptionT_Base_Receiver_l_stub AMI_ExceptionT_Base_Receiver_stub AMI_ExceptionT_stub AMI_ExceptionT_lem_stub - sharedname = ExceptionT_Receiver_exec - libs += ExceptionT_Receiver_stub ExceptionT_Receiver_lem_stub ExceptionT_stub ExceptionT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_Receiver_exec.cpp - } - - Header_Files { - ExceptionT_Receiver_exec.h - ExceptionT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_ExceptionT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_ExceptionT_Base_skel AMI_ExceptionT_Base_Receiver_l_stub AMI_ExceptionT_stub AMI_ExceptionT_skel AMI_ExceptionT_lem_stub - sharedname = ExceptionT_Receiver_svnt - libs += ExceptionT_Receiver_stub ExceptionT_Receiver_lem_stub \ - ExceptionT_skel \ - ExceptionT_stub ExceptionT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_ReceiverS.cpp - ExceptionT_Receiver_svnt.cpp - } - - Header_Files { - ExceptionT_ReceiverS.h - ExceptionT_Receiver_svnt.h - ExceptionT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp deleted file mode 100644 index 0b6d2a12799..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp +++ /dev/null @@ -1,215 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ExceptionT_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_ExceptionT_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::ExceptionT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::ExceptionT::CCM_Receiver_Context::_duplicate (ctx)), - get_rw_ (true), - get_ro_ (true) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::ExceptionT::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str, - ::CORBA::String_out answer) - { - if (ACE_OS::strlen (in_str) == 0) - { - ExceptionT::InternalError ex (42, "Rec.Exc.foo", - "thrown by receiver"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = CORBA::string_dup ("This is my answer : Hi"); - return ACE_OS::rand () % 100; - } - } - - void - do_my_foo_exec_i::hello (::CORBA::Long_out answer) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - //always an exception is thrown - ExceptionT::InternalError ex (42, "Rec.Exc.hello", - "thrown by receiver"); - throw ex; - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - // this->get_rw_ is always true, so always an exception is thrown. - if (this->get_rw_) - { - ExceptionT::InternalError ex (42, "Rec.Exc.get_rw_attrib", - "thrown by receiver"); - throw ex; - } - else - { - return ACE_OS::rand () % 100; - } - } - - void - do_my_foo_exec_i::rw_attrib(::CORBA::Short new_value) - { - if (new_value == 0) - { - //throw internal excep - ExceptionT::InternalError ex (42, "Rec.Exc.set_rw_attrib", - "thrown by receiver"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - // this->get_ro_ is always true, so always an exception is thrown. - if (this->get_ro_) - { - ExceptionT::InternalError ex (42, "Rec.Exc.ro_attrib", - "thrown by receiver"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - return ACE_OS::rand () % 100; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::ExceptionT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::ExceptionT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::ExceptionT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ExceptionT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_ExceptionT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h deleted file mode 100644 index e4f6ce3b801..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_EXCEPTIONT_RECEIVER_EXEC_LMPZLZ_H_ -#define CIAO_EXCEPTIONT_RECEIVER_EXEC_LMPZLZ_H_ - -#include "ExceptionT_ReceiverEC.h" -#include "ExceptionT_Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_ExceptionT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - class do_my_foo_exec_i - : public virtual ::ExceptionT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::ExceptionT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from ExceptionT::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - - virtual - void hello (::CORBA::Long_out answer); - - virtual - ::CORBA::Short rw_attrib (void); - - virtual - void rw_attrib (::CORBA::Short rw_attrib); - - virtual - ::CORBA::Short ro_attrib (void); - //@} - - private: - ::ExceptionT::CCM_Receiver_Context_var ciao_context_; - bool get_rw_; - bool get_ro_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::ExceptionT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::ExceptionT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::ExceptionT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - extern "C" EXCEPTION_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ExceptionT_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/.gitignore deleted file mode 100644 index 7d93f99f043..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/ExceptionT_SenderE.idl -/ExceptionT_Sender_exec_export.h -/ExceptionT_Sender_lem_stub_export.h -/ExceptionT_Sender_stub_export.h -/ExceptionT_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl deleted file mode 100644 index cfec3871768..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef EXCEPTION_T_SENDER_IDL -#define EXCEPTION_T_SENDER_IDL - -#include - -#include "Base/ExceptionT.idl" - -#pragma ciao ami4ccm receptacle "ExceptionT::Sender::run_my_foo" - -module ExceptionT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc deleted file mode 100644 index 2fbad2110f6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ExceptionT_Base ExceptionT_Sender" - -project(AMI_ExceptionT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_ExceptionT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_SENDER_STUB_Export \ - -Wb,stub_export_include=ExceptionT_Sender_stub_export.h \ - -Wb,skel_export_macro=EXCEPTION_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=ExceptionT_Sender_svnt_export.h \ - -Wb,exec_export_macro=EXCEPTION_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=ExceptionT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - ExceptionT_Sender.idl - } -} - -project(AMI_ExceptionT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_ExceptionT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=EXCEPTION_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=ExceptionT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ExceptionT_SenderE.idl - } -} - -project(AMI_ExceptionT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_ExceptionT_Base_Sender_lem_gen AMI_ExceptionT_stub Conn_ExceptionT_Base_stub - libs += ExceptionT_stub - libpaths += ../lib - libout = ../lib - sharedname = ExceptionT_Sender_lem_stub - dynamicflags += EXCEPTION_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_SenderEC.cpp - } - - Header_Files { - ExceptionT_SenderEC.h - ExceptionT_Sender_lem_stub_export.h - } - - Inline_Files { - ExceptionT_SenderEC.inl - } -} - -project(AMI_ExceptionT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_ExceptionT_Base_Sender_idl_gen AMI_ExceptionT_Base_stub AMI_ExceptionT_stub Conn_ExceptionT_Base_stub - libs += ExceptionT_stub - libpaths += ../lib - libout = ../lib - sharedname = ExceptionT_Sender_stub - dynamicflags += EXCEPTION_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_SenderC.cpp - } - - Header_Files { - ExceptionT_SenderC.h - ExceptionT_Sender_stub_export.h - } - - Inline_Files { - ExceptionT_SenderC.inl - } -} - -project(AMI_ExceptionT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_ExceptionT_Base_Sender_lem_stub AMI_ExceptionT_Base_Sender_stub AMI_ExceptionT_Base_exec Conn_ExceptionT_Base_stub AMI_ExceptionT_lem_stub - sharedname = ExceptionT_Sender_exec - libs += ExceptionT_Sender_stub ExceptionT_Sender_lem_stub ExceptionT_stub ExceptionT_stub ExceptionT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_Sender_exec.cpp - } - - Header_Files { - ExceptionT_Sender_exec.h - ExceptionT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_ExceptionT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_ExceptionT_Base_skel AMI_ExceptionT_Base_Sender_lem_stub AMI_ExceptionT_Base_Sender_stub AMI_ExceptionT_Base_exec AMI_ExceptionT_skel - sharedname = ExceptionT_Sender_svnt - libs += ExceptionT_Sender_stub ExceptionT_Sender_lem_stub \ - ExceptionT_skel \ - ExceptionT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += EXCEPTION_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ExceptionT_SenderS.cpp - ExceptionT_Sender_svnt.cpp - } - - Header_Files { - ExceptionT_SenderS.h - ExceptionT_Sender_svnt.h - ExceptionT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp deleted file mode 100644 index b739d2b9dd0..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp +++ /dev/null @@ -1,390 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ExceptionT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_ExceptionT_Sender_Impl -{ - CORBA::Short nr_of_received = 0; - CORBA::Short nr_of_syn_received = 0; - - void HandleException ( - long id, - const char* error_string, - const char* test, - const char* func) - { - if (id != 42) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender: unexpected ID received in except " - "handler <%u> <%C> (%C)\n", - id, error_string,func)); - return; - } - if (ACE_OS::strcmp (test, "thrown by receiver") != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (%s): unexpected string received in" - " except handler <%s>\n", - func, test)); - return; - } - ACE_DEBUG ((LM_DEBUG, "Sender: Caught correct exception <%u," - "%C> for %C\n", - id, error_string, func)); - ++nr_of_received; - } - - void HandleException ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder, - const char* func) - { - try - { - excep_holder->raise_exception (); - } - catch (const ExceptionT::InternalError& ex) - { - CIAO_ExceptionT_Sender_Impl::HandleException (ex.id, - ex.error_string.in (), - ex.test.in(), func); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - } - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::ExceptionT::CCM_Sender_Context_ptr context) - : context_(::ExceptionT::CCM_Sender_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::ExceptionT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::ExceptionT::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); - - //Invoke Asynchronous calls to test exception handling - //for this test, hello , get_ro_attrib and get_rw_attrib functions of - //receiver always sent back a exception - my_foo_ami_->sendc_hello (cb.in()); - my_foo_ami_->sendc_get_rw_attrib(cb.in()); - my_foo_ami_->sendc_get_ro_attrib(cb.in()); - my_foo_ami_->sendc_foo (cb.in(), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in(), 0); - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::ExceptionT::CCM_Sender_Context_ptr context) - : context_(::ExceptionT::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::ExceptionT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - //run synch calls - CORBA::String_var out_str; - try - { - my_foo_ami_->foo ("Do something synchronous", - out_str.out ()); - } - catch (const ExceptionT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - try - { - my_foo_ami_->foo ("", out_str); - } - catch (const ExceptionT::InternalError& ex) - { - //expected exception - HandleException (ex.id, ex.error_string.in (), ex.test.in(), - "foo (syn)"); - ++nr_of_syn_received; - - } - try - { - CORBA::Long answer; - my_foo_ami_->hello (answer); - } - catch (const ExceptionT::InternalError& ex) - { - //expected exception - HandleException (ex.id, ex.error_string.in (), ex.test.in(), - "hello (syn)"); - ++nr_of_syn_received; - } - try - { - my_foo_ami_->rw_attrib (); - } - catch (const ExceptionT::InternalError& ex) - { - //expected exception - HandleException (ex.id, ex.error_string.in (), ex.test.in(), - "get_rw_attrib (syn)"); - ++nr_of_syn_received; - } - try - { - my_foo_ami_->rw_attrib (0); - } - catch (const ExceptionT::InternalError& ex) - { - //expected exception - HandleException (ex.id, ex.error_string.in (), ex.test.in(), - "set_rw_attrib (syn)"); - ++nr_of_syn_received; - } - try - { - my_foo_ami_->ro_attrib (); - } - catch (const ExceptionT::InternalError& ex) - { - HandleException (ex.id, ex.error_string.in (), ex.test.in(), - "ro_attrib (syn)"); - ++nr_of_syn_received; - } - - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen (0), - synch_foo_gen (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ExceptionT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in ()); - asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in ()); - synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - CORBA::Short nr_of_asyn = nr_of_received - nr_of_syn_received; - if (nr_of_asyn != 5) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - " exceptions for asynchronous calls" - "Expected: 5, Received: %u.\n", - nr_of_asyn)); - } - if (nr_of_syn_received != 5) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - " exceptions for synchronous calls" - "Expected: 5, Received: %u.\n", - nr_of_syn_received)); - } - if ((nr_of_asyn == 5) && (nr_of_syn_received == 5)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Received the expected number of" - " exceptions for asynchronous and " - "synchronous calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * /* answer */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::foo: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "FOO (asyn)"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long /* answer */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::hello: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "HELLO (asyn)"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short /* rw_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_rw_attrib : " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "get_rw_attrib (asyn)"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::set_rw_attrib: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "SET_RW_ATTRIB (asyn)"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short /* ro_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_ro_attrib: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "RO_ATTRIB (asyn)"); - } - - extern "C" EXCEPTION_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ExceptionT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h deleted file mode 100644 index a312317cf6f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.h +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_EXCEPTIONT_SENDER_EXEC_4QC1XJ_H_ -#define CIAO_EXCEPTIONT_SENDER_EXEC_4QC1XJ_H_ - -#include /**/ "ace/pre.h" - -#include "ExceptionT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ExceptionT_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_ExceptionT_Sender_Impl -{ - - void HandleException ( - long id, - const char* error_string, - const char* test, - const char* func); - - void HandleException ( - ::Messaging::ExceptionHolder * excep_holder, - const char* func); - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::ExceptionT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::ExceptionT::CCM_Sender_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::ExceptionT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::ExceptionT::CCM_Sender_Context_var context_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::ExceptionT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::ExceptionT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" EXCEPTION_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ExceptionT_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp deleted file mode 100644 index 890211c449e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - ExceptionT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_ExceptionT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ExceptionT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - ExceptionT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_ExceptionT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ExceptionT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - ExceptionT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_ExceptionT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ExceptionT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ExceptionT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - ExceptionT.ComponentImplementations.ExceptionTImplementation.ExceptionT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - ExceptionT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - ExceptionT_svnt - - entryPoint - - - tk_string - - - create_ExceptionT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - ExceptionT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - ExceptionT_conn - - entryPoint - - - tk_string - - - create_ExceptionT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - ExceptionT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - ExceptionT_Receiver_svnt - - entryPoint - - - tk_string - - - create_ExceptionT_AMI_ReceiverHome_Servant - - - - - - - ExceptionT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - ExceptionT_Receiver_exec - - entryPoint - - - tk_string - - - create_ExceptionT_AMI_ReceiverHome_Impl - - - - - - - ExceptionT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - ExceptionT_Sender_svnt - - entryPoint - - - tk_string - - - create_ExceptionT_AMI_SenderHome_Servant - - - - - - - ExceptionT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - ExceptionT_Sender_exec - - entryPoint - - - tk_string - - - create_ExceptionT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl deleted file mode 100755 index ffa2672cbe5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/ami4ccm/tests/GetComp/.gitignore b/CIAO/connectors/ami4ccm/tests/GetComp/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl deleted file mode 100644 index e078435b41e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.idl +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef GETCOMP_T_IDL -#define GETCOMP_T_IDL - -#pragma ciao lem "Base/GetCompE.idl" -#pragma ciao ami4ccm interface "GetComp::MyFoo" -#pragma ciao lem "Base/GetCompAE.idl" -#pragma ciao ami4ccm idl "Base/GetCompA.idl" - -module GetComp -{ - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interface - interface MyFoo - { - long foo (in string in_str, out string answer) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc deleted file mode 100644 index 5811f788877..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_GetComp_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_STUB_Export \ - -Wb,stub_export_include=GetComp_stub_export.h \ - -Wb,skel_export_macro=GETCOMP_T_SKEL_Export \ - -Wb,skel_export_include=GetComp_skel_export.h \ - -Wb,conn_export_macro=GETCOMP_T_CONN_Export \ - -Wb,conn_export_include=GetComp_conn_export.h \ - -Wb,exec_export_macro=GETCOMP_T_EXEC_Export \ - -Wb,exec_export_include=GetComp_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - GetComp.idl - } -} - -project(AMI_GetComp_lem_gen) : ciaoidldefaults { - after += AMI_GetComp_idl_gen AMI_GetComp_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=GETCOMP_T_LEM_STUB_Export \ - -Wb,export_include=GetComp_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - GetCompE.idl - } -} - -project(AMI_GetComp_lema_gen) : ciaoidldefaults, typecode { - after += AMI_GetComp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_STUB_Export \ - -Wb,stub_export_include=GetComp_stub_export.h \ - -Wb,conn_export_macro=GETCOMP_T_CONN_Export \ - -Wb,conn_export_include=GetComp_conn_export.h \ - -Wb,svnt_export_macro=GETCOMP_T_SVNT_Export \ - -Wb,svnt_export_include=GetComp_svnt_export.h \ - -Wb,skel_export_macro=GETCOMP_T_SKEL_Export \ - -Wb,skel_export_include=GetComp_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - GetCompA.idl - } -} - -project(AMI_GetComp_lemae_gen) : ciaoidldefaults { - after += AMI_GetComp_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_LEM_STUB_Export \ - -Wb,stub_export_include=GetComp_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - GetCompAE.idl - } -} - -project(AMI_GetComp_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_GetComp_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = GetComp_stub - dynamicflags += GETCOMP_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GetCompC.cpp - GetCompAC.cpp - } - - Header_Files { - GetCompC.h - GetComp_stub_export.h -} - - Inline_Files { - GetCompC.inl - } -} - -project(AMI_GetComp_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_GetComp_lem_gen AMI_GetComp_stub AMI_GetComp_lemae_gen AMI_GetComp_skel - libs += GetComp_stub GetComp_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = GetComp_lem_stub - dynamicflags += GETCOMP_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GetCompEC.cpp - GetCompAEC.cpp - } - - Header_Files { - GetCompEC.h - GetComp_lem_stub_export.h -} - - Inline_Files { - GetCompEC.inl - } -} - -project(AMI_GetComp_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_GetComp_stub - sharedname = GetComp_skel - libs += GetComp_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += GETCOMP_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GetCompS.cpp - GetCompAS.cpp - } - - Header_Files { - GetCompS.h - - GetComp_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_GetComp_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_GetComp_lem_stub GetComp_Base_AMI_stub AMI_GetComp_skel AMI_GetComp_lema_gen AMI_GetComp_lemae_gen - sharedname = GetComp_conn - libs += GetComp_stub GetComp_skel GetComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetCompA_conn.cpp - } - - Header_Files { - GetCompA_conn.h - GetComp_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_GetComp_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_GetComp_lem_stub GetComp_Base_AMI_stub AMI_GetComp_skel AMI_GetComp_lema_gen AMI_GetComp_lemae_gen AMI_GetComp_conn - sharedname = GetComp_svnt - libs += GetComp_stub GetComp_skel GetComp_lem_stub GetComp_conn - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetCompA_svnt.cpp - } - - Header_Files { - GetCompA_svnt.h - GetCompA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl deleted file mode 100644 index 64e6f7046b5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef GETCOMP_T_RECEIVER_IDL -#define GETCOMP_T_RECEIVER_IDL - -#include - -#include "Base/GetComp.idl" - -module GetComp -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc deleted file mode 100644 index 699148e8a95..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p GetComp_Base GetComp_Receiver" - -project(AMI_GetCom_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_GetComp_idl_gen - idlflags += -Wb,stub_export_macro=GETCOMP_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=GetComp_Receiver_stub_export.h \ - -Wb,skel_export_macro=GETCOMP_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=GetComp_Receiver_svnt_export.h \ - -Wb,exec_export_macro=GETCOMP_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=GetComp_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - GetComp_Receiver.idl - } -} - -project(AMI_GetCom_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_GetCom_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=GetComp_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - GetComp_ReceiverE.idl - } -} - -project(AMI_GetComp_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_GetCom_Base_Receiver_lem_gen AMI_GetComp_Base_Receiver_stub AMI_GetComp_stub - libs += GetComp_stub GetComp_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = GetComp_Receiver_lem_stub - dynamicflags += GETCOMP_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_ReceiverEC.cpp - } - - Header_Files { - GetComp_ReceiverEC.h - GetComp_Receiver_lem_stub_export.h - } - - Inline_Files { - GetComp_ReceiverEC.inl - } -} - -project(AMI_GetComp_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_GetCom_Base_Receiver_idl_gen AMI_GetComp_stub - libs += GetComp_stub - libpaths += ../lib - libout = ../lib - sharedname = GetComp_Receiver_stub - dynamicflags += GETCOMP_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_ReceiverC.cpp - } - - Header_Files { - GetComp_ReceiverC.h - GetComp_Receiver_stub_export.h - } - - Inline_Files { - GetComp_ReceiverC.inl - } -} - -project(AMI_GetComp_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_GetComp_Base_Receiver_l_stub AMI_GetComp_Base_Receiver_stub AMI_GetComp_stub AMI_GetComp_lem_stub - sharedname = GetComp_Receiver_exec - libs += GetComp_Receiver_stub GetComp_Receiver_lem_stub GetComp_stub GetComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_Receiver_exec.cpp - } - - Header_Files { - GetComp_Receiver_exec.h - GetComp_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_GetComp_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_GetComp_Base_skel AMI_GetComp_Base_Receiver_l_stub AMI_GetComp_stub AMI_GetComp_skel AMI_GetComp_lem_stub - sharedname = GetComp_Receiver_svnt - libs += GetComp_Receiver_stub GetComp_Receiver_lem_stub \ - GetComp_skel \ - GetComp_stub GetComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_ReceiverS.cpp - GetComp_Receiver_svnt.cpp - } - - Header_Files { - GetComp_ReceiverS.h - GetComp_Receiver_svnt.h - GetComp_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp deleted file mode 100644 index b188dd14433..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "GetComp_Receiver_exec.h" - -namespace CIAO_GetComp_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::GetComp::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::GetComp::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::GetComp::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * /*in_str*/, - ::CORBA::String_out answer) - { - answer = CORBA::string_dup ("This is my answer : Hi"); - return 1; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::GetComp::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::GetComp::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::GetComp::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::GetComp::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" GETCOMP_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComp_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h deleted file mode 100644 index 6fed85ee0bc..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h +++ /dev/null @@ -1,130 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_GETCOMP_RECEIVER_EXEC_ILLRIY_H_ -#define CIAO_GETCOMP_RECEIVER_EXEC_ILLRIY_H_ - -#include /**/ "ace/pre.h" - -#include "GetComp_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "GetComp_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_GetComp_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::GetComp::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::GetComp::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from GetComp::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - //@} - - private: - ::GetComp::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::GetComp::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::GetComp::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::GetComp::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" GETCOMP_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComp_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl deleted file mode 100644 index 5868aad537c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef GETCOMP_T_SENDER_IDL -#define GETCOMP_T_SENDER_IDL - -#include - -#include "Base/GetComp.idl" - -#pragma ciao ami4ccm receptacle "GetComp::Sender::run_my_foo" - -module GetComp -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc deleted file mode 100644 index 22d65e3f761..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p GetComp_Base GetComp_Sender" - -project(AMI_GetComp_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_GetComp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_SENDER_STUB_Export \ - -Wb,stub_export_include=GetComp_Sender_stub_export.h \ - -Wb,skel_export_macro=GETCOMP_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=GetComp_Sender_svnt_export.h \ - -Wb,exec_export_macro=GETCOMP_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=GetComp_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - GetComp_Sender.idl - } -} - -project(AMI_GetComp_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_GetComp_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETCOMP_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=GetComp_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - GetComp_SenderE.idl - } -} - -project(AMI_GetComp_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_GetComp_Base_Sender_lem_gen AMI_GetComp_stub Conn_GetComp_Base_stub - libs += GetComp_stub - libpaths += ../lib - libout = ../lib - sharedname = GetComp_Sender_lem_stub - dynamicflags += GETCOMP_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_SenderEC.cpp - } - - Header_Files { - GetComp_SenderEC.h - GetComp_Sender_lem_stub_export.h - } - - Inline_Files { - GetComp_SenderEC.inl - } -} - -project(AMI_GetComp_Base_Sender_stub) : ccm_stub, ami { - after += AMI_GetComp_Base_Sender_idl_gen AMI_GetComp_Base_stub AMI_GetComp_stub Conn_GetComp_Base_stub - libs += GetComp_stub - libpaths += ../lib - libout = ../lib - sharedname = GetComp_Sender_stub - dynamicflags += GETCOMP_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_SenderC.cpp - } - - Header_Files { - GetComp_SenderC.h - GetComp_Sender_stub_export.h - } - - Inline_Files { - GetComp_SenderC.inl - } -} - -project(AMI_GetComp_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_GetComp_Base_Sender_lem_stub AMI_GetComp_Base_Sender_stub AMI_GetComp_Base_exec Conn_GetComp_Base_stub AMI_GetComp_lem_stub - sharedname = GetComp_Sender_exec - libs += GetComp_Sender_stub GetComp_Sender_lem_stub GetComp_stub GetComp_stub GetComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_Sender_exec.cpp - } - - Header_Files { - GetComp_Sender_exec.h - GetComp_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_GetComp_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_GetComp_Base_skel AMI_GetComp_Base_Sender_lem_stub AMI_GetComp_Base_Sender_stub AMI_GetComp_Base_exec AMI_GetComp_skel - sharedname = GetComp_Sender_svnt - libs += GetComp_Sender_stub GetComp_Sender_lem_stub \ - GetComp_skel \ - GetComp_stub - libpaths += ../lib - libout = ../lib - dynamicflags += GETCOMP_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - GetComp_SenderS.cpp - GetComp_Sender_svnt.cpp - } - - Header_Files { - GetComp_SenderS.h - GetComp_Sender_svnt.h - GetComp_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp deleted file mode 100644 index ae18b1a8889..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp +++ /dev/null @@ -1,206 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "GetComp_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_GetComp_Sender_Impl -{ - CORBA::Boolean GetComponent = false; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void){ - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - int - Sender_exec_i::get_component(void) - { - ACE_OS::sleep (3); - - ::GetComp::AMI4CCM_MyFoo_var my_foo_ami_ = - this->ciao_context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR Sender (ASYNCH)") - ACE_TEXT (" :\tmy_foo_ami is NIL !\n"))); - return 1; - } - - CORBA::Object_var cmp; - try - { - cmp = my_foo_ami_->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - GetComp::InternalError ex (1, "Unable to get component interface"); - throw ex; - } - } - catch (const GetComp::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender:") - ACE_TEXT ("caught InternalError exception: retval <%C>\n"), - ex.error_string.in())); - return 1; - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender :") - ACE_TEXT ("Unable to get component interface\n"))); - return 1; - } - - try - { - ::GetComp::AMI4CCM_MyFoo_Connector::CCM_AMI4CCM_Connector_var conn = - ::GetComp::AMI4CCM_MyFoo_Connector::CCM_AMI4CCM_Connector::_narrow (cmp.in ()); - - if (::CORBA::is_nil (conn.in ())) - { - GetComp::InternalError ex (1, "Narrowed connector is nil.\n"); - throw ex; - } - } - catch (const GetComp::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender:") - ACE_TEXT ("caught InternalError exception: retval <%C>\n"), - ex.error_string.in())); - return 1; - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender:") - ACE_TEXT ("Unable to narrow connector interface\n"))); - return 1; - } - return 0; - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::GetComp::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - if (get_component()== 0) - { - GetComponent = true; - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (GetComponent != true) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR:") - ACE_TEXT (" Sender not possible to get component\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK: Sender, possible to get component \n"))); - } - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * /* answer */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" GETCOMP_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComp_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h deleted file mode 100644 index 4c5ba6c5832..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h +++ /dev/null @@ -1,119 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_GETCOMP_SENDER_EXEC_FENJU5_H_ -#define CIAO_GETCOMP_SENDER_EXEC_FENJU5_H_ - -#include /**/ "ace/pre.h" - -#include "GetComp_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "GetComp_Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_GetComp_Sender_Impl -{ - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::GetComp::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - virtual int get_component(void); - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::GetComp::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" GETCOMP_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComp_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp deleted file mode 100644 index 9745da1f98b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - GetComp_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_GetComp_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GetComp_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - GetComp_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_GetComp_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GetComp_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - GetComp_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_GetComp_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GetComp_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - GetComp.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - GetComp.ComponentImplementations.GetCompImplementation.GetComp.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - GetComp.ComponentImplementations.GetCompImplementation.GetComp.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - GetComp.ComponentImplementations.GetCompImplementation.GetComp.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - GetComp.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - GetComp_svnt - - entryPoint - - - tk_string - - - create_GetComp_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - GetComp.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - GetComp_conn - - entryPoint - - - tk_string - - - create_GetComp_AMI4CCM_MyFoo_Connector_Impl - - - - - - - GetComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - GetComp_Receiver_svnt - - entryPoint - - - tk_string - - - create_GetComp_AMI_ReceiverHome_Servant - - - - - - - GetComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - GetComp_Receiver_exec - - entryPoint - - - tk_string - - - create_GetComp_AMI_ReceiverHome_Impl - - - - - - - GetComp.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - GetComp_Sender_svnt - - entryPoint - - - tk_string - - - create_GetComp_AMI_SenderHome_Servant - - - - - - - GetComp.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - GetComp_Sender_exec - - entryPoint - - - tk_string - - - create_GetComp_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl deleted file mode 100755 index ccfd5124591..00000000000 --- a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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 15 seconds to allow task to complete\n"; -sleep (15); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tests/IDL_Test/.gitignore b/CIAO/connectors/ami4ccm/tests/IDL_Test/.gitignore deleted file mode 100644 index e81c10e9797..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/HelloA.idl -/HelloAE.idl -/HelloA_conn.cpp -/HelloA_conn.h -/HelloE.idl -/Hello_conn_export.h -/Hello_exec_export.h -/Hello_lem_stub_export.h -/Hello_skel_export.h -/Hello_stub_export.h -/Hello_svnt_export.h -/lib diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc deleted file mode 100644 index 18616452f3a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc +++ /dev/null @@ -1,193 +0,0 @@ -project(AMI4CCM_IDL_Test_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,skel_export_macro=HELLO_SKEL_Export \ - -Wb,skel_export_include=Hello_skel_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,exec_export_macro=HELLO_EXEC_Export \ - -Wb,exec_export_include=Hello_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - Hello.idl - } -} - -project(AMI4CCM_IDL_Test_lem_gen) : ciaoidldefaults { - after += AMI4CCM_IDL_Test_idl_gen AMI4CCM_IDL_Test_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=HELLO_LEM_STUB_Export \ - -Wb,export_include=Hello_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - HelloE.idl - } -} - -project(AMI4CCM_IDL_Test_lema_gen) : ciaoidldefaults, typecode { - after += AMI4CCM_IDL_Test_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,svnt_export_macro=HELLO_SVNT_Export \ - -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 - - IDL_Files { - HelloA.idl - } -} - -project(AMI4CCM_IDL_Test_lemae_gen) : ciaoidldefaults { - after += AMI4CCM_IDL_Test_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - HelloAE.idl - } -} - -project(AMI4CCM_IDL_Test_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI4CCM_IDL_Test_lem_gen AMI4CCM_IDL_Test_lema_gen - libs += - libout = lib - libpaths += lib - includes += . - - sharedname = Hello_stub - dynamicflags += HELLO_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloC.cpp - HelloAC.cpp - } - - Header_Files { - HelloC.h - Hello_stub_export.h -} - - Inline_Files { - HelloC.inl - } -} - -project(AMI4CCM_IDL_Test_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI4CCM_IDL_Test_stub AMI4CCM_IDL_Test_exec - sharedname = Hello_skel - libs += Hello_stub - libout = lib - libpaths += lib - includes += . - - dynamicflags += HELLO_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloS.cpp - HelloAS.cpp - } - - Header_Files { - HelloS.h - HelloAS.h - Hello_skel_export.h - } - - Inline_Files { - } -} - -project(AMI4CCM_IDL_Test_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI4CCM_IDL_Test_lem_gen AMI4CCM_IDL_Test_stub AMI4CCM_IDL_Test_lemae_gen AMI4CCM_IDL_Test_skel - libs += Hello_stub Hello_skel - libout = lib - libpaths += lib - includes += . - - sharedname = Hello_lem_stub - dynamicflags += HELLO_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloEC.cpp - HelloAEC.cpp - } - - Header_Files { - HelloEC.h - Hello_lem_stub_export.h -} - - Inline_Files { - HelloEC.inl - } -} - -project(AMI4CCM_IDL_Test_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI4CCM_IDL_Test_lem_stub Hello_Base_AMI_stub AMI4CCM_IDL_Test_skel AMI4CCM_IDL_Test_lema_gen AMI4CCM_IDL_Test_lemae_gen -// requires += dummy_label - sharedname = Hello_conn - libs += Hello_stub Hello_skel Hello_lem_stub - libpaths += lib - libout = lib - dynamicflags += HELLO_CONN_BUILD_DLL - includes += . - IDL_Files { - } - - Source_Files { - HelloA_conn.cpp - } - - Header_Files { - HelloA_conn.h - Hello_conn_export.h - } - - Inline_Files { - } -} - -project(AMI4CCM_IDL_Test_svnt) : ciao_servant, ami, ami4ccm_servant { -// requires += dummy_label - after += AMI4CCM_IDL_Test_lem_stub Hello_Base_AMI_stub AMI4CCM_IDL_Test_skel AMI4CCM_IDL_Test_lema_gen AMI4CCM_IDL_Test_lemae_gen AMI4CCM_IDL_Test_conn - sharedname = Hello_svnt - libs += Hello_stub Hello_skel Hello_lem_stub Hello_conn - libpaths += lib - libout = lib - dynamicflags += HELLO_SVNT_BUILD_DLL - includes += . - IDL_Files { - } - - Source_Files { - HelloA_svnt.cpp - } - - Header_Files { - HelloA_svnt.h - HelloA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl deleted file mode 100644 index ea368e162e3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef HELLO_IDL -#define HELLO_IDL - -#pragma ciao lem "HelloE.idl" -#pragma ciao lem "HelloAE.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" -#pragma ciao ami4ccm interface "Bar::One" -#pragma ciao ami4ccm interface "Bar::Two" -#pragma ciao ami4ccm interface "Bar::Three" - -#pragma ciao ami4ccm idl "HelloA.idl" - -module Hello -{ - enum test_enum - { - ZERO, - ONE, - TWO - }; - - exception InternalError - { - long id; - string error_string; - }; - - interface MyFoo - { - oneway void foo_oneway (in string in_str); - - long foo_return (in string in_str, out string answer) - raises (InternalError); - void foo_no_return (in string in_str, out string answer) - raises (InternalError); - void hello (out long answer) - raises (InternalError); - void no_answer (in string in_str) - raises (InternalError); - test_enum enum_return(in string in_str) - raises (InternalError); - void enum_no_return(in string in_str, - in test_enum in_test, - out test_enum out_test) - raises (InternalError); - - attribute short rw_attrib - getraises (InternalError) - setraises (InternalError); - - readonly attribute short ro_attrib - raises (InternalError); - }; - - interface MyDerived : MyFoo - { - 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); - }; - - interface X - { - void mydosomething (in string str); - }; -}; - -module Foo -{ - struct TestTopic - { - string key; - long x; - }; - - interface MyFoo - { - long myop (in TestTopic topic); - }; - - interface MyBar : MyFoo - { - TestTopic mybarop (in string str, in long lg, out double db); - }; - -}; - -module Bar -{ - struct TestTopic - { - string key; - long x; - }; - - interface One - { - long myop (in TestTopic topic); - }; - - interface Two - { - TestTopic mybarop (in string str, in long lg, out double db); - }; - - interface Three : One, Two - { - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl deleted file mode 100644 index a012fa29e58..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef HELLO_SENDER_IDL -#define HELLO_SENDER_IDL - -#include - -#include "Hello.idl" -#pragma ciao ami4ccm idl "HelloA.idl" - -#pragma ciao ami4ccm receptacle "Hello::Sender::run_my_foo" -#pragma ciao ami4ccm receptacle "Hello::Sender::run_my_derived" -#pragma ciao ami4ccm receptacle "Hello::Sender::run_mybar" -#pragma ciao ami4ccm receptacle "Hello::Sender::run_three" - -#pragma ciao ami4ccm receptacle "Hello::Sender::m_run_my_foo" -#pragma ciao ami4ccm receptacle "Hello::Sender::m_run_my_derived" -#pragma ciao ami4ccm receptacle "Hello::Sender::m_run_mybar" -#pragma ciao ami4ccm receptacle "Hello::Sender::m_run_three" - -#pragma ciao ami4ccm receptacle "Bar::SecondSender::run_my_foo" - -module Hello -{ - component Sender - { - uses MyFoo run_my_foo; - uses MyDerived run_my_derived; - uses MyBar run_mybar; - uses ::Bar::Three run_three; - - uses multiple MyFoo m_run_my_foo; - uses multiple MyDerived m_run_my_derived; - uses multiple MyBar m_run_mybar; - uses multiple Bar::Three m_run_three; - - provides MyFoo my_foo; - provides Bar::Three my_three; - provides X myx; - }; -}; - -module Bar -{ - component SecondSender - { - uses Hello::MyFoo run_my_foo; - uses multiple Hello::MyFoo m_run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc deleted file mode 100644 index 7cf2d9226ca..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc +++ /dev/null @@ -1,137 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Component" - -project(AMI4CCM_ITB_Hello_Comp_idl_gen) : componentidldefaults { - after += Conn_Hello_Base_idl_gen AMI4CCM_IDL_Test_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \ - -Wb,stub_export_include=Hello_Component_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,skel_export_include=Hello_Component_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \ - -Wb,exec_export_include=Hello_Component_exec_export.h \ - -I.. -GC -Gex - - IDL_Files { - Hello_Component.idl - } -} - -project(AMI4CCM_ITB_Hello_Comp_lem_gen) : ciaoidldefaults { - after += AMI4CCM_ITB_Hello_Comp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_ComponentE.idl - } -} - -project(AMI4CCM_ITB_Hello_Comp_lem_stub) : ccm_svnt, ami { - after += AMI4CCM_ITB_Hello_Comp_lem_gen AMI4CCM_IDL_Test_stub Conn_Hello_Base_stub AMI4CCM_ITB_Hello_Comp_stub - libs += Hello_stub Hello_Component_stub - libpaths += lib - libout = lib - sharedname = Hello_Component_lem_stub - dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ComponentEC.cpp - } - - Header_Files { - Hello_ComponentEC.h - Hello_Component_lem_stub_export.h - } - - Inline_Files { - Hello_ComponentEC.inl - } -} - -project(AMI4CCM_ITB_Hello_Comp_stub) : ccm_stub, ami { - after += AMI4CCM_ITB_Hello_Comp_idl_gen AMI4CCM_ITB_stub AMI4CCM_IDL_Test_stub Conn_Hello_Base_stub - libs += Hello_stub - libpaths += lib - libout = lib - - sharedname = Hello_Component_stub - dynamicflags += HELLO_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ComponentC.cpp - } - - Header_Files { - Hello_ComponentC.h - Hello_Component_stub_export.h - } - - Inline_Files { - Hello_ComponentC.inl - } -} - -project(AMI4CCM_ITB_Hello_Comp_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI4CCM_ITB_Hello_Comp_lem_stub AMI4CCM_ITB_Hello_Comp_stub AMI4CCM_ITB_exec Conn_Hello_Base_stub AMI4CCM_IDL_Test_lem_stub - sharedname = Hello_Component_exec - libs += Hello_Component_stub Hello_Component_lem_stub Hello_stub Hello_stub Hello_lem_stub - libpaths += lib - libout = lib - - dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_Component_exec.cpp - } - - Header_Files { - Hello_Component_exec.h - Hello_Component_exec_export.h - } - - Inline_Files { - } -} - -project(AMI4CCM_ITB_Hello_Comp_svnt) : ciao_servant, ami { - after += AMI4CCM_ITB_skel AMI4CCM_ITB_Hello_Comp_lem_stub AMI4CCM_ITB_Hello_Comp_stub AMI4CCM_ITB_exec AMI4CCM_IDL_Test_skel - sharedname = Hello_Component_svnt - libs += Hello_Component_stub Hello_Component_lem_stub \ - Hello_skel \ - Hello_lem_stub \ - Hello_stub - libpaths += lib - libout = lib - - dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ComponentS.cpp - Hello_Component_svnt.cpp - } - - Header_Files { - Hello_ComponentS.h - Hello_Component_svnt.h - Hello_Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl b/CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl deleted file mode 100755 index 4d5ccc46d8f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/run_test.pl +++ /dev/null @@ -1,25 +0,0 @@ - -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -$found = 0 ; -open (I_FILE, "Hello_Component_exec.cpp") ; -while( ){ - chomp ; - if( $_ =~ /sendc/ ){ - $found = 1 ; - last ; - } -} - -if( $found == 1 ){ - print STDERR "ERROR: Found sendc in generated code\n"; - $status = 1 ; -} else { - print STDERR "Generated code ok\n"; -} - -exit $status; diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/.gitignore b/CIAO/connectors/ami4ccm/tests/InterInArgs/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/.gitignore deleted file mode 100644 index 7d87aba48e6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/InterInArgsTA.idl -/InterInArgsTAE.idl -/InterInArgsTA_conn.cpp -/InterInArgsTA_conn.h -/InterInArgsTE.idl -/InterInArgsT_conn_export.h -/InterInArgsT_exec_export.h -/InterInArgsT_lem_stub_export.h -/InterInArgsT_skel_export.h -/InterInArgsT_stub_export.h -/InterInArgsT_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl deleted file mode 100644 index cba284a9027..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.idl +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef INTERINARGS_T_IDL -#define INTERINARGS_T_IDL - -#pragma ciao lem "Base/InterInArgsTE.idl" -#pragma ciao ami4ccm interface "InterInArgsT::MyFoo" -#pragma ciao lem "Base/InterInArgsTAE.idl" -#pragma ciao ami4ccm idl "Base/InterInArgsTA.idl" - -module InterInArgsT -{ - const short update_val = 999; - - typedef short short_array[5]; - - // Mixed struct - struct TestTopic { - string key; - long x; - }; - - // String struct - struct TopicString { - string key; - string x_str; - }; - - // Array - struct TopicArray { - string key; - short_array x_array; - }; - - typedef TopicArray 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_seq; - - enum test_enum - { - ZERO, - ONE, - TWO - }; - - 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); - void var_ins (in string in_str, out string answer, in double cmd) - raises (InternalError); - void var_div_ins (in TestTopic test_topic, in TopicString topic_str, - in TestArray topic_arr, out string answer) - raises (InternalError); - void var_div2_ins (in X_Union topic_union, in test_seq seq, - out string answer) - raises (InternalError); - void enum_in(out string answer, in test_enum in_test) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc deleted file mode 100644 index 9c6750e2415..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_InterInArgsT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_stub_export.h \ - -Wb,skel_export_macro=INTERINARGS_T_SKEL_Export \ - -Wb,skel_export_include=InterInArgsT_skel_export.h \ - -Wb,conn_export_macro=INTERINARGS_T_CONN_Export \ - -Wb,conn_export_include=InterInArgsT_conn_export.h \ - -Wb,exec_export_macro=INTERINARGS_T_EXEC_Export \ - -Wb,exec_export_include=InterInArgsT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - InterInArgsT.idl - } -} - -project(AMI_InterInArgsT_lem_gen) : ciaoidldefaults { - after += AMI_InterInArgsT_idl_gen AMI_InterInArgsT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=INTERINARGS_T_LEM_STUB_Export \ - -Wb,export_include=InterInArgsT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - InterInArgsTE.idl - } -} - -project(AMI_InterInArgsT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_InterInArgsT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_stub_export.h \ - -Wb,conn_export_macro=INTERINARGS_T_CONN_Export \ - -Wb,conn_export_include=InterInArgsT_conn_export.h \ - -Wb,svnt_export_macro=INTERINARGS_T_SVNT_Export \ - -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 - - IDL_Files { - InterInArgsTA.idl - } -} - -project(AMI_InterInArgsT_lemae_gen) : ciaoidldefaults { - after += AMI_InterInArgsT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_LEM_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - InterInArgsTAE.idl - } -} - -project(AMI_InterInArgsT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_InterInArgsT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterInArgsT_stub - dynamicflags += INTERINARGS_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInArgsTC.cpp - InterInArgsTAC.cpp - } - - Header_Files { - InterInArgsTC.h - InterInArgsT_stub_export.h -} - - Inline_Files { - InterInArgsTC.inl - } -} - -project(AMI_InterInArgsT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_InterInArgsT_lem_gen AMI_InterInArgsT_stub AMI_InterInArgsT_lemae_gen AMI_InterInArgsT_skel - libs += InterInArgsT_stub InterInArgsT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterInArgsT_lem_stub - dynamicflags += INTERINARGS_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInArgsTEC.cpp - InterInArgsTAEC.cpp - } - - Header_Files { - InterInArgsTEC.h - InterInArgsT_lem_stub_export.h -} - - Inline_Files { - InterInArgsTEC.inl - } -} - -project(AMI_InterInArgsT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_InterInArgsT_stub - sharedname = InterInArgsT_skel - libs += InterInArgsT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += INTERINARGS_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInArgsTS.cpp - InterInArgsTAS.cpp - } - - Header_Files { - InterInArgsTS.h - - InterInArgsT_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInArgsT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_InterInArgsT_lem_stub InterInArgsT_Base_AMI_stub AMI_InterInArgsT_skel AMI_InterInArgsT_lema_gen AMI_InterInArgsT_lemae_gen - sharedname = InterInArgsT_conn - libs += InterInArgsT_stub InterInArgsT_skel InterInArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsTA_conn.cpp - } - - Header_Files { - InterInArgsTA_conn.h - InterInArgsT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInArgsT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_InterInArgsT_lem_stub InterInArgsT_Base_AMI_stub AMI_InterInArgsT_skel AMI_InterInArgsT_lema_gen AMI_InterInArgsT_lemae_gen AMI_InterInArgsT_conn - sharedname = InterInArgsT_svnt - libs += InterInArgsT_stub InterInArgsT_skel InterInArgsT_lem_stub InterInArgsT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsTA_svnt.cpp - } - - Header_Files { - InterInArgsTA_svnt.h - InterInArgsTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/.gitignore deleted file mode 100644 index c9e272fdd59..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterInArgsT_ReceiverE.idl -/InterInArgsT_Receiver_exec_export.h -/InterInArgsT_Receiver_lem_stub_export.h -/InterInArgsT_Receiver_stub_export.h -/InterInArgsT_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl deleted file mode 100644 index b233217e4c6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef INTERINARGS_T_RECEIVER_IDL -#define INTERINARGS_T_RECEIVER_IDL - -#include - -#include "Base/InterInArgsT.idl" - -module InterInArgsT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc deleted file mode 100644 index cf24d5f5c1b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterInArgsT_Base InterInArgsT_Receiver" - -project(AMI_InArgsT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_InterInArgsT_idl_gen - idlflags += -Wb,stub_export_macro=INTERINARGS_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_Receiver_stub_export.h \ - -Wb,skel_export_macro=INTERINARGS_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=InterInArgsT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=INTERINARGS_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=InterInArgsT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - InterInArgsT_Receiver.idl - } -} - -project(AMI_InArgsT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_InArgsT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterInArgsT_ReceiverE.idl - } -} - -project(AMI_InterInArgsT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_InArgsT_Base_Receiver_lem_gen AMI_InterInArgsT_Base_Receiver_stub AMI_InterInArgsT_stub - libs += InterInArgsT_stub InterInArgsT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInArgsT_Receiver_lem_stub - dynamicflags += INTERINARGS_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_ReceiverEC.cpp - } - - Header_Files { - InterInArgsT_ReceiverEC.h - InterInArgsT_Receiver_lem_stub_export.h - } - - Inline_Files { - InterInArgsT_ReceiverEC.inl - } -} - -project(AMI_InterInArgsT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_InArgsT_Base_Receiver_idl_gen AMI_InterInArgsT_stub - libs += InterInArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInArgsT_Receiver_stub - dynamicflags += INTERINARGS_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_ReceiverC.cpp - } - - Header_Files { - InterInArgsT_ReceiverC.h - InterInArgsT_Receiver_stub_export.h - } - - Inline_Files { - InterInArgsT_ReceiverC.inl - } -} - -project(AMI_InterInArgsT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_InterInArgsT_Base_Receiver_l_stub AMI_InterInArgsT_Base_Receiver_stub AMI_InterInArgsT_stub AMI_InterInArgsT_lem_stub - sharedname = InterInArgsT_Receiver_exec - libs += InterInArgsT_Receiver_stub InterInArgsT_Receiver_lem_stub InterInArgsT_stub InterInArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_Receiver_exec.cpp - } - - Header_Files { - InterInArgsT_Receiver_exec.h - InterInArgsT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInArgsT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_InterInArgsT_Base_skel AMI_InterInArgsT_Base_Receiver_l_stub AMI_InterInArgsT_stub AMI_InterInArgsT_skel AMI_InterInArgsT_lem_stub - sharedname = InterInArgsT_Receiver_svnt - libs += InterInArgsT_Receiver_stub InterInArgsT_Receiver_lem_stub \ - InterInArgsT_skel \ - InterInArgsT_stub InterInArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_ReceiverS.cpp - InterInArgsT_Receiver_svnt.cpp - } - - Header_Files { - InterInArgsT_ReceiverS.h - InterInArgsT_Receiver_svnt.h - InterInArgsT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp deleted file mode 100644 index 50fe5517419..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterInArgsT_Receiver_exec.h" - -namespace CIAO_InterInArgsT_Receiver_Impl -{ - CORBA::UShort nr_of_received = 0; - CORBA::UShort update_val = InterInArgsT::update_val; - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::InterInArgsT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterInArgsT::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::InterInArgsT::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str,::CORBA::Long cmd, - ::CORBA::String_out answer) - { - if (ACE_OS::strlen (in_str) == 0) - { - InterInArgsT::InternalError ex (cmd + update_val, - "foo thrown by receiver"); - throw ex; - } - else - { - answer = CORBA::string_dup ("This is my answer : Hi"); - ++nr_of_received; - return (cmd + update_val); - } - } - - void - do_my_foo_exec_i::var_ins (const char * /*in_str*/, - ::CORBA::String_out answer, - ::CORBA::Double cmd) - { - if ( cmd != 1.6) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_ins: " - "received the wrong double, expected 1.6," - " received %2.2f\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_alloc(20); - ACE_OS::sprintf(answer,"double was %2.2f",cmd); - } - - void - do_my_foo_exec_i::var_div_ins ( - const ::InterInArgsT::TestTopic &test_topic, - const ::InterInArgsT::TopicString &topic_str, - const ::InterInArgsT::TestArray topic_arr, - ::CORBA::String_out answer) - { - CORBA::Boolean error = false; - if ((ACE_OS::strcmp (test_topic.key, "aaa") != 0) || (test_topic.x != 10)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'aaa', x = 10," - " received key '%C' , x = %u\n", - test_topic.key.in(),test_topic.x)); - error = true; - } - if ((ACE_OS::strcmp (topic_str.key, "bbb") != 0) || - (ACE_OS::strcmp (topic_str.x_str, "ccc") != 0)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'bbb', x = 'ccc'," - " received key '%C' , x = %C\n", - topic_str.key.in() ,topic_str.x_str.in())); - error = true; - } - if ((ACE_OS::strcmp (topic_arr[0].key, "ddd") != 0) || - (topic_arr[1].x_array[2] != 102)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'ddd', elem 102" - " received key '%C', elem %u\n", - topic_arr[0].key.in(),topic_arr[1].x_array[2] )); - error = true; - } - answer = CORBA::string_dup ("This is my answer from var_div_ins"); - if(error == false) - { - ++nr_of_received; - } - } - - void - do_my_foo_exec_i::var_div2_ins (const ::InterInArgsT::X_Union &topic_union, - const ::InterInArgsT::test_seq &seq, - ::CORBA::String_out answer) - { - CORBA::Boolean error = false; - if (topic_union.x_long() != 11) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong union, " - "expected x = 11," - " received x = %u\n", - topic_union.x_long())); - error = true; - } - if ((ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0)|| - ( seq[0].x_test != 12)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong struct, " - "expected key 'fff', x = 10," - " received key '%C' , x = %u\n", - seq[0].x_teststr.in(),seq[0].x_test)); - error = true; - } - answer = CORBA::string_dup ("This is my answer from var_div2_ins"); - if(error == false) - { - ++nr_of_received; - } - } - - void - do_my_foo_exec_i::enum_in (::CORBA::String_out answer, - InterInArgsT::test_enum in_test) - { - if ( in_test != InterInArgsT::ONE) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::enum_in: " - "received the wrong enum value, expected ONE," - " received %u\n", - in_test)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_dup ("This is my answer from enum_in"); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::InterInArgsT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::InterInArgsT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::InterInArgsT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterInArgsT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (nr_of_received == 6) - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received all expected data" - " from syn- and asynchronous calls\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive all" - " expected data (%u of 6)" - " from syn- and asynchronous calls\n", - nr_of_received)); - } - } - - extern "C" INTERINARGS_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInArgsT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h deleted file mode 100644 index 5f391b33df0..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERINARGST_RECEIVER_EXEC_K9F0UK_H_ -#define CIAO_INTERINARGST_RECEIVER_EXEC_K9F0UK_H_ - -#include /**/ "ace/pre.h" - -#include "InterInArgsT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterInArgsT_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterInArgsT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::InterInArgsT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::InterInArgsT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from InterInArgsT::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - - virtual - void var_ins (const char * in_str, - ::CORBA::String_out answer, - ::CORBA::Double cmd); - - virtual - void var_div_ins (const ::InterInArgsT::TestTopic & test_topic, - const ::InterInArgsT::TopicString & topic_str, - const ::InterInArgsT::TestArray topic_arr, - ::CORBA::String_out answer); - - virtual - void var_div2_ins (const ::InterInArgsT::X_Union & topic_union, - const ::InterInArgsT::test_seq & seq, - ::CORBA::String_out answer); - - virtual - void enum_in (::CORBA::String_out answer, - ::InterInArgsT::test_enum in_test); - //@} - - private: - ::InterInArgsT::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::InterInArgsT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterInArgsT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::InterInArgsT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" INTERINARGS_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInArgsT_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/.gitignore deleted file mode 100644 index bcf271ba60d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterInArgsT_SenderE.idl -/InterInArgsT_Sender_exec_export.h -/InterInArgsT_Sender_lem_stub_export.h -/InterInArgsT_Sender_stub_export.h -/InterInArgsT_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl deleted file mode 100644 index 3a342a58fbd..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef INTERINARGS_T_SENDER_IDL -#define INTERINARGS_T_SENDER_IDL - -#include - -#include "Base/InterInArgsT.idl" - -#pragma ciao ami4ccm receptacle "InterInArgsT::Sender::run_my_foo" - -module InterInArgsT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc deleted file mode 100644 index c280c62041e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterInArgsT_Base InterInArgsT_Sender" - -project(AMI_InterInArgsT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_InterInArgsT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_SENDER_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_Sender_stub_export.h \ - -Wb,skel_export_macro=INTERINARGS_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=InterInArgsT_Sender_svnt_export.h \ - -Wb,exec_export_macro=INTERINARGS_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=InterInArgsT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - InterInArgsT_Sender.idl - } -} - -project(AMI_InterInArgsT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_InterInArgsT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINARGS_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=InterInArgsT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterInArgsT_SenderE.idl - } -} - -project(AMI_InterInArgsT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_InterInArgsT_Base_Sender_lem_gen AMI_InterInArgsT_stub Conn_InterInArgsT_Base_stub - libs += InterInArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInArgsT_Sender_lem_stub - dynamicflags += INTERINARGS_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_SenderEC.cpp - } - - Header_Files { - InterInArgsT_SenderEC.h - InterInArgsT_Sender_lem_stub_export.h - } - - Inline_Files { - InterInArgsT_SenderEC.inl - } -} - -project(AMI_InterInArgsT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_InterInArgsT_Base_Sender_idl_gen AMI_InterInArgsT_Base_stub AMI_InterInArgsT_stub Conn_InterInArgsT_Base_stub - libs += InterInArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInArgsT_Sender_stub - dynamicflags += INTERINARGS_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_SenderC.cpp - } - - Header_Files { - InterInArgsT_SenderC.h - InterInArgsT_Sender_stub_export.h - } - - Inline_Files { - InterInArgsT_SenderC.inl - } -} - -project(AMI_InterInArgsT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_InterInArgsT_Base_Sender_lem_stub AMI_InterInArgsT_Base_Sender_stub AMI_InterInArgsT_Base_exec Conn_InterInArgsT_Base_stub AMI_InterInArgsT_lem_stub - sharedname = InterInArgsT_Sender_exec - libs += InterInArgsT_Sender_stub InterInArgsT_Sender_lem_stub InterInArgsT_stub InterInArgsT_stub InterInArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_Sender_exec.cpp - } - - Header_Files { - InterInArgsT_Sender_exec.h - InterInArgsT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInArgsT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_InterInArgsT_Base_skel AMI_InterInArgsT_Base_Sender_lem_stub AMI_InterInArgsT_Base_Sender_stub AMI_InterInArgsT_Base_exec AMI_InterInArgsT_skel - sharedname = InterInArgsT_Sender_svnt - libs += InterInArgsT_Sender_stub InterInArgsT_Sender_lem_stub \ - InterInArgsT_skel \ - InterInArgsT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINARGS_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInArgsT_SenderS.cpp - InterInArgsT_Sender_svnt.cpp - } - - Header_Files { - InterInArgsT_SenderS.h - InterInArgsT_Sender_svnt.h - InterInArgsT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp deleted file mode 100644 index 24f64ef426d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp +++ /dev/null @@ -1,366 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterInArgsT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_InterInArgsT_Sender_Impl -{ - CORBA::Short nr_of_excep_received = 0; - CORBA::UShort update_val = InterInArgsT::update_val; - CORBA::UShort cmd_synch_ok = 1; - CORBA::UShort cmd_synch_nok = 2; - CORBA::UShort cmd_asynch_ok = 3; - CORBA::UShort cmd_asynch_nok = 4; - - void HandleException ( - long id, - long expect_id, - const char* error_string, - const char* func) - { - //expected exception - if ( id == expect_id) - { - ACE_DEBUG ((LM_DEBUG, "Sender: Caught correct exception <%u," - "%C> for %C\n", - id, error_string, func)); - ++nr_of_excep_received; - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR Sender: wrong exception received" - " for %C\n", func)); - } - } - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::InterInArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterInArgsT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::InterInArgsT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::InterInArgsT::CCM_AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_received_); - //Invoke Asynchronous calls to test - my_foo_ami_->sendc_foo ( cb.in(),"Hi", cmd_asynch_ok); - //this shoukd invoke a exception - my_foo_ami_->sendc_foo (cb.in(), "", cmd_asynch_nok); - my_foo_ami_->sendc_var_ins (cb.in(), "Here a double for you.", 1.6); - - InterInArgsT::TestTopic test_topic; - test_topic.key = "aaa"; - test_topic.x = 10; - InterInArgsT::TopicString topic_str; - topic_str.key = "bbb"; - topic_str.x_str = "ccc"; - InterInArgsT::TestArray topic_arr; - for ( CORBA::UShort i = 0; i < 5; i ++) - { - topic_arr[i].key = CORBA::string_dup("ddd"); - for (CORBA::UShort y = 0; y < 5; y ++) - { - topic_arr[i].x_array[y] = i * 100 + y ; - } - } - my_foo_ami_->sendc_var_div_ins (cb.in(), test_topic,topic_str,topic_arr); - - InterInArgsT::X_Union topic_union; - topic_union.x_long(11); - InterInArgsT::test ttt; - ttt.x_test = 12; - ttt.x_teststr = "fff" ; - InterInArgsT::test_seq seq; - seq.length(2); - seq[0] = ttt; - - my_foo_ami_->sendc_var_div2_ins (cb.in(), topic_union, seq); - InterInArgsT::test_enum in_test; - in_test = ::InterInArgsT::ONE; - my_foo_ami_->sendc_enum_in(cb.in(), in_test); - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::InterInArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterInArgsT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ::InterInArgsT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - ACE_OS::sleep (3); - //run some synch calls - CORBA::String_var out_str; - try - { - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - cmd_synch_ok , - out_str.out ()); - if (result == (update_val + cmd_synch_ok)) - { - ++this->nr_of_received_; - } - } - catch (const InterInArgsT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - try - { - my_foo_ami_->foo ("",cmd_synch_nok, out_str); - } - catch (const InterInArgsT::InternalError& ex) - { - HandleException (ex.id, (update_val + cmd_synch_nok),ex.error_string.in(), - "synch foo"); - } - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_received_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterInArgsT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (nr_of_excep_received != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - " exceptions" - "Expected: 2, Received: %u.\n", - nr_of_excep_received)); - } - if (this->nr_of_received_.value() != 6) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender not received the expected number" - " of callbacks and returns for syn- and " - "asynchronous calls. Expected: 6," - " Received: %u.\n", - this->nr_of_received_.value())); - } - if ((this->nr_of_received_.value() == 6) && (nr_of_excep_received == 2)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" - " callbacks and exceptions for syn- and " - "asynchronous calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * /*answer*/) - { - if ( ami_return_val == ( cmd_asynch_ok + update_val )) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder * excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const InterInArgsT::InternalError& ex) - { - CIAO_InterInArgsT_Sender_Impl::HandleException (ex.id, - (cmd_asynch_nok + update_val), - ex.error_string.in(), "asynch foo"); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_ins ( - const char * /*answer*/) - { - ++this->nr_of_received_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_ins (const char * /* answer */) - { - ++this->nr_of_received_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_ins (const char * /* answer */) - { - ++this->nr_of_received_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_in (const char * /* answer */) - { - ++this->nr_of_received_; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_in_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" INTERINARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInArgsT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h deleted file mode 100644 index c9d0b7e8d84..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h +++ /dev/null @@ -1,175 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERINARGST_SENDER_EXEC_XOE8WS_H_ -#define CIAO_INTERINARGST_SENDER_EXEC_XOE8WS_H_ - -#include /**/ "ace/pre.h" -#include "ace/Task.h" -#include "InterInArgsT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterInArgsT_Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterInArgsT_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Common exception handlers - void HandleException ( - long id, - long expect_id, - const char* error_string, - const char* func); - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::InterInArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterInArgsT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::InterInArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterInArgsT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::InterInArgsT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::InterInArgsT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 var_ins (const char * answer); - - virtual - void var_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div_ins (const char * answer); - - virtual - void var_div_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div2_ins (const char * answer); - - virtual - void var_div2_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void enum_in (const char * answer); - - virtual - void enum_in_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - }; - - extern "C" INTERINARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInArgsT_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp deleted file mode 100644 index c20ab631e4f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterInArgsT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInArgsT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInArgsT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterInArgsT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInArgsT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInArgsT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterInArgsT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInArgsT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInArgsT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterInArgsT.ComponentImplementations.InterInArgsTImplementation.InterInArgsT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - InterInArgsT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterInArgsT_svnt - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - InterInArgsT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterInArgsT_conn - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - InterInArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterInArgsT_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI_ReceiverHome_Servant - - - - - - - InterInArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterInArgsT_Receiver_exec - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI_ReceiverHome_Impl - - - - - - - InterInArgsT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterInArgsT_Sender_svnt - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI_SenderHome_Servant - - - - - - - InterInArgsT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterInArgsT_Sender_exec - - entryPoint - - - tk_string - - - create_InterInArgsT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl deleted file mode 100755 index 752c80f81d6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\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/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl deleted file mode 100644 index ca36ea71350..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.idl +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef INTERINOUT_T_IDL -#define INTERINOUT_T_IDL - -#pragma ciao lem "Base/InterInOutTE.idl" -#pragma ciao ami4ccm interface "InterInOutT::MyFoo" -#pragma ciao lem "Base/InterInOutTAE.idl" -#pragma ciao ami4ccm idl "Base/InterInOutTA.idl" - -module InterInOutT -{ - const short update_val = 999; - - typedef short short_array[5]; - - // Mixed struct - struct TestTopic { - string key; - long x; - }; - - // String struct - struct TopicString { - string key; - string x_str; - }; - - // Array - struct TopicArray { - string key; - short_array x_array; - }; - - typedef TopicArray 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_seq; - - enum test_enum - { - ZERO, - ONE, - TWO - }; - - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interface - interface MyFoo - { - long foo (in string in_str, inout long cmd, inout string answer) - raises (InternalError); - void var_ins (in string in_str, out string answer, inout double cmd) - raises (InternalError); - void var_div_ins (inout TestTopic test_topic, inout TopicString topic_str, - inout TestArray topic_arr, inout string answer) - raises (InternalError); - void var_div2_ins (inout X_Union topic_union, inout test_seq seq, - out string answer) - raises (InternalError); - void enum_in(out string answer, inout test_enum in_test) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc deleted file mode 100644 index 446fec794b5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_InterInOutT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_STUB_Export \ - -Wb,stub_export_include=InterInOutT_stub_export.h \ - -Wb,skel_export_macro=INTERINOUT_T_SKEL_Export \ - -Wb,skel_export_include=InterInOutT_skel_export.h \ - -Wb,conn_export_macro=INTERINOUT_T_CONN_Export \ - -Wb,conn_export_include=InterInOutT_conn_export.h \ - -Wb,exec_export_macro=INTERINOUT_T_EXEC_Export \ - -Wb,exec_export_include=InterInOutT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - InterInOutT.idl - } -} - -project(AMI_InterInOutT_lem_gen) : ciaoidldefaults { - after += AMI_InterInOutT_idl_gen AMI_InterInOutT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=INTERINOUT_T_LEM_STUB_Export \ - -Wb,export_include=InterInOutT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - InterInOutTE.idl - } -} - -project(AMI_InterInOutT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_InterInOutT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_STUB_Export \ - -Wb,stub_export_include=InterInOutT_stub_export.h \ - -Wb,conn_export_macro=INTERINOUT_T_CONN_Export \ - -Wb,conn_export_include=InterInOutT_conn_export.h \ - -Wb,svnt_export_macro=INTERINOUT_T_SVNT_Export \ - -Wb,svnt_export_include=InterInOutT_svnt_export.h \ - -Wb,skel_export_macro=INTERINOUT_T_SKEL_Export \ - -Wb,skel_export_include=InterInOutT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - InterInOutTA.idl - } -} - -project(AMI_InterInOutT_lemae_gen) : ciaoidldefaults { - after += AMI_InterInOutT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_LEM_STUB_Export \ - -Wb,stub_export_include=InterInOutT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - InterInOutTAE.idl - } -} - -project(AMI_InterInOutT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_InterInOutT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterInOutT_stub - dynamicflags += INTERINOUT_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInOutTC.cpp - InterInOutTAC.cpp - } - - Header_Files { - InterInOutTC.h - InterInOutT_stub_export.h -} - - Inline_Files { - InterInOutTC.inl - } -} - -project(AMI_InterInOutT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_InterInOutT_lem_gen AMI_InterInOutT_stub AMI_InterInOutT_lemae_gen AMI_InterInOutT_skel - libs += InterInOutT_stub InterInOutT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterInOutT_lem_stub - dynamicflags += INTERINOUT_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInOutTEC.cpp - InterInOutTAEC.cpp - } - - Header_Files { - InterInOutTEC.h - InterInOutT_lem_stub_export.h -} - - Inline_Files { - InterInOutTEC.inl - } -} - -project(AMI_InterInOutT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_InterInOutT_stub - sharedname = InterInOutT_skel - libs += InterInOutT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += INTERINOUT_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterInOutTS.cpp - InterInOutTAS.cpp - } - - Header_Files { - InterInOutTS.h - - InterInOutT_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInOutT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_InterInOutT_lem_stub InterInOutT_Base_AMI_stub AMI_InterInOutT_skel AMI_InterInOutT_lema_gen AMI_InterInOutT_lemae_gen - sharedname = InterInOutT_conn - libs += InterInOutT_stub InterInOutT_skel InterInOutT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutTA_conn.cpp - } - - Header_Files { - InterInOutTA_conn.h - InterInOutT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInOutT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_InterInOutT_lem_stub InterInOutT_Base_AMI_stub AMI_InterInOutT_skel AMI_InterInOutT_lema_gen AMI_InterInOutT_lemae_gen AMI_InterInOutT_conn - sharedname = InterInOutT_svnt - libs += InterInOutT_stub InterInOutT_skel InterInOutT_lem_stub InterInOutT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutTA_svnt.cpp - } - - Header_Files { - InterInOutTA_svnt.h - InterInOutTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl deleted file mode 100644 index 4606361276d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef INTERINOUT_T_RECEIVER_IDL -#define INTERINOUT_T_RECEIVER_IDL - -#include - -#include "Base/InterInOutT.idl" - -module InterInOutT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc deleted file mode 100644 index ab234f36888..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterInOutT_Base InterInOutT_Receiver" - -project(AMI_InOutT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_InterInOutT_idl_gen - idlflags += -Wb,stub_export_macro=INTERINOUT_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=InterInOutT_Receiver_stub_export.h \ - -Wb,skel_export_macro=INTERINOUT_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=InterInOutT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=INTERINOUT_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=InterInOutT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - InterInOutT_Receiver.idl - } -} - -project(AMI_InOutT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_InOutT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=InterInOutT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterInOutT_ReceiverE.idl - } -} - -project(AMI_InterInOutT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_InOutT_Base_Receiver_lem_gen AMI_InterInOutT_Base_Receiver_stub AMI_InterInOutT_stub - libs += InterInOutT_stub InterInOutT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInOutT_Receiver_lem_stub - dynamicflags += INTERINOUT_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_ReceiverEC.cpp - } - - Header_Files { - InterInOutT_ReceiverEC.h - InterInOutT_Receiver_lem_stub_export.h - } - - Inline_Files { - InterInOutT_ReceiverEC.inl - } -} - -project(AMI_InterInOutT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_InOutT_Base_Receiver_idl_gen AMI_InterInOutT_stub - libs += InterInOutT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInOutT_Receiver_stub - dynamicflags += INTERINOUT_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_ReceiverC.cpp - } - - Header_Files { - InterInOutT_ReceiverC.h - InterInOutT_Receiver_stub_export.h - } - - Inline_Files { - InterInOutT_ReceiverC.inl - } -} - -project(AMI_InterInOutT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_InterInOutT_Base_Receiver_l_stub AMI_InterInOutT_Base_Receiver_stub AMI_InterInOutT_stub AMI_InterInOutT_lem_stub - sharedname = InterInOutT_Receiver_exec - libs += InterInOutT_Receiver_stub InterInOutT_Receiver_lem_stub InterInOutT_stub InterInOutT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_Receiver_exec.cpp - } - - Header_Files { - InterInOutT_Receiver_exec.h - InterInOutT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInOutT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_InterInOutT_Base_skel AMI_InterInOutT_Base_Receiver_l_stub AMI_InterInOutT_stub AMI_InterInOutT_skel AMI_InterInOutT_lem_stub - sharedname = InterInOutT_Receiver_svnt - libs += InterInOutT_Receiver_stub InterInOutT_Receiver_lem_stub \ - InterInOutT_skel \ - InterInOutT_stub InterInOutT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_ReceiverS.cpp - InterInOutT_Receiver_svnt.cpp - } - - Header_Files { - InterInOutT_ReceiverS.h - InterInOutT_Receiver_svnt.h - InterInOutT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp deleted file mode 100644 index 31805222d0c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp +++ /dev/null @@ -1,302 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterInOutT_Receiver_exec.h" - -namespace CIAO_InterInOutT_Receiver_Impl -{ - CORBA::UShort nr_of_received = 0; - CORBA::UShort update_val = InterInOutT::update_val; - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::InterInOutT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterInOutT::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::InterInOutT::MyFoo - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str,::CORBA::Long &cmd, - char * &answer) - { - CORBA::String_var test = CORBA::string_dup (answer); - if (ACE_OS::strcmp (answer, "Hi from sender") != 0) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::foo: " - "received the wrong string answer," - " expected 'Hi from sender'," - " received <%C>\n", - test.in())); - } - else if (ACE_OS::strlen (in_str) == 0) - { - InterInOutT::InternalError ex (cmd + update_val, - "foo thrown by receiver"); - throw ex; - } - else - { - CORBA::string_free (answer); - answer = CORBA::string_dup ("Hi from receiver"); - ++nr_of_received; - cmd = cmd + update_val; - } - return cmd; - } - - void - do_my_foo_exec_i::var_ins (const char * /*in_str*/, - ::CORBA::String_out answer, - ::CORBA::Double_out cmd) - { - if ( cmd != 1.6) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_ins: " - "received the wrong double, expected 1.6," - " received %2.2f\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_alloc(20); - ACE_OS::sprintf(answer,"double was %2.2f",cmd); - cmd = 3.2; - } - - void - do_my_foo_exec_i::var_div_ins (::InterInOutT::TestTopic &test_topic, - ::InterInOutT::TopicString &topic_str, - ::InterInOutT::TestArray topic_arr, - char * &answer) - { - CORBA::Boolean error = false; - if ((ACE_OS::strcmp (test_topic.key, "aaa") != 0) || (test_topic.x != 10)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'aaa', x = 10," - " received key '%C' , x = %u\n", - test_topic.key.in(),test_topic.x)); - error = true; - } - - if ((ACE_OS::strcmp (topic_str.key, "bbb") != 0) || - (ACE_OS::strcmp (topic_str.x_str, "ccc") != 0)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'bbb', x = 'ccc'," - " received key '%C' , x = %C\n", - topic_str.key.in() ,topic_str.x_str.in())); - error = true; - } - - if ((ACE_OS::strcmp (topic_arr[0].key, "ddd") != 0) || - (topic_arr[1].x_array[2] != 102)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key 'ddd', elem 102" - " received key '%C', elem %u\n", - topic_arr[0].key.in(),topic_arr[1].x_array[2] )); - error = true; - } - - CORBA::string_free (answer); - answer = CORBA::string_dup ("This is my answer from var_div_ins"); - if(error == false) - { - test_topic.key = CORBA::string_dup("111"); - test_topic.x = 111; - topic_str.key = CORBA::string_dup("222"); - topic_str.x_str = CORBA::string_dup("333"); - topic_arr[0].key = CORBA::string_dup("444"); - topic_arr[1].x_array[2] = 444; - ++nr_of_received; - } - } - - void - do_my_foo_exec_i::var_div2_ins (::InterInOutT::X_Union &topic_union, - ::InterInOutT::test_seq &seq, - CORBA::String_out answer) - { - CORBA::Boolean error = false; - if (topic_union.x_long() != 11) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong union, " - "expected x = 11," - " received x = %u\n", - topic_union.x_long())); - error = true; - } - if ((ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0)|| - (seq[0].x_test != 12)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong struct, " - "expected key 'fff', x = 10," - " received key '%C' , x = %u\n", - seq[0].x_teststr.in(),seq[0].x_test)); - error = true; - } - if (error == false) - { - topic_union.x_long(555); - seq[0].x_teststr = CORBA::string_dup("666"); - seq[0].x_test = 666; - answer = CORBA::string_dup ("This is my answer from var_div2_ins"); - ++nr_of_received; - } - } - - void - do_my_foo_exec_i::enum_in (::CORBA::String_out answer, - InterInOutT::test_enum &in_test) - { - if (in_test != InterInOutT::ONE) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::enum_in: " - "received the wrong enum value, expected ONE," - " received %u\n", - in_test)); - } - else - { - ++nr_of_received; - in_test = InterInOutT::TWO; - } - answer = CORBA::string_dup ("This is my answer from enum_in"); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::InterInOutT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::InterInOutT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::InterInOutT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterInOutT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (nr_of_received == 6) - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received all expected data" - " from syn- and asynchronous calls\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive all" - " expected data (%u of 6)" - " from syn- and asynchronous calls\n", - nr_of_received)); - } } - - extern "C" INTERINOUT_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInOutT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h deleted file mode 100644 index e9d3d189fdd..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERINOUTT_RECEIVER_EXEC_SRFAZH_H_ -#define CIAO_INTERINOUTT_RECEIVER_EXEC_SRFAZH_H_ - -#include /**/ "ace/pre.h" - -#include "InterInOutT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterInOutT_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterInOutT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::InterInOutT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::InterInOutT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from InterInOutT::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long & cmd, - char *& answer); - - virtual - void var_ins (const char * in_str, - ::CORBA::String_out answer, - ::CORBA::Double & cmd); - - virtual - void var_div_ins (::InterInOutT::TestTopic & test_topic, - ::InterInOutT::TopicString & topic_str, - ::InterInOutT::TestArray topic_arr, - char *& answer); - - virtual - void var_div2_ins (::InterInOutT::X_Union & topic_union, - ::InterInOutT::test_seq & seq, - ::CORBA::String_out answer); - - virtual - void enum_in (::CORBA::String_out answer, - ::InterInOutT::test_enum & in_test); - //@} - - private: - ::InterInOutT::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::InterInOutT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterInOutT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::InterInOutT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" INTERINOUT_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInOutT_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl deleted file mode 100644 index 8b0459297cf..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef INTERINOUT_T_SENDER_IDL -#define INTERINOUT_T_SENDER_IDL - -#include - -#include "Base/InterInOutT.idl" - -#pragma ciao ami4ccm receptacle "InterInOutT::Sender::run_my_foo" - -module InterInOutT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc deleted file mode 100644 index cfd661e2a72..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterInOutT_Base InterInOutT_Sender" - -project(AMI_InterInOutT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_InterInOutT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_SENDER_STUB_Export \ - -Wb,stub_export_include=InterInOutT_Sender_stub_export.h \ - -Wb,skel_export_macro=INTERINOUT_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=InterInOutT_Sender_svnt_export.h \ - -Wb,exec_export_macro=INTERINOUT_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=InterInOutT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - InterInOutT_Sender.idl - } -} - -project(AMI_InterInOutT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_InterInOutT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERINOUT_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=InterInOutT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterInOutT_SenderE.idl - } -} - -project(AMI_InterInOutT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_InterInOutT_Base_Sender_lem_gen AMI_InterInOutT_stub Conn_InterInOutT_Base_stub - libs += InterInOutT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInOutT_Sender_lem_stub - dynamicflags += INTERINOUT_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_SenderEC.cpp - } - - Header_Files { - InterInOutT_SenderEC.h - InterInOutT_Sender_lem_stub_export.h - } - - Inline_Files { - InterInOutT_SenderEC.inl - } -} - -project(AMI_InterInOutT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_InterInOutT_Base_Sender_idl_gen AMI_InterInOutT_Base_stub AMI_InterInOutT_stub Conn_InterInOutT_Base_stub - libs += InterInOutT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterInOutT_Sender_stub - dynamicflags += INTERINOUT_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_SenderC.cpp - } - - Header_Files { - InterInOutT_SenderC.h - InterInOutT_Sender_stub_export.h - } - - Inline_Files { - InterInOutT_SenderC.inl - } -} - -project(AMI_InterInOutT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_InterInOutT_Base_Sender_lem_stub AMI_InterInOutT_Base_Sender_stub AMI_InterInOutT_Base_exec Conn_InterInOutT_Base_stub AMI_InterInOutT_lem_stub - sharedname = InterInOutT_Sender_exec - libs += InterInOutT_Sender_stub InterInOutT_Sender_lem_stub InterInOutT_stub InterInOutT_stub InterInOutT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_Sender_exec.cpp - } - - Header_Files { - InterInOutT_Sender_exec.h - InterInOutT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterInOutT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_InterInOutT_Base_skel AMI_InterInOutT_Base_Sender_lem_stub AMI_InterInOutT_Base_Sender_stub AMI_InterInOutT_Base_exec AMI_InterInOutT_skel - sharedname = InterInOutT_Sender_svnt - libs += InterInOutT_Sender_stub InterInOutT_Sender_lem_stub \ - InterInOutT_skel \ - InterInOutT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERINOUT_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterInOutT_SenderS.cpp - InterInOutT_Sender_svnt.cpp - } - - Header_Files { - InterInOutT_SenderS.h - InterInOutT_Sender_svnt.h - InterInOutT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp deleted file mode 100644 index 9c366ea45fa..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp +++ /dev/null @@ -1,457 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterInOutT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_InterInOutT_Sender_Impl -{ - CORBA::Short nr_of_excep_received = 0; - CORBA::UShort update_val = InterInOutT::update_val; - CORBA::UShort cmd_synch_ok = 1; - CORBA::UShort cmd_synch_nok = 2; - CORBA::UShort cmd_asynch_ok = 3; - CORBA::UShort cmd_asynch_nok = 4; - - void HandleException ( - long id, - long expect_id, - const char* error_string, - const char* func) - { - //expected exception - if ( id == expect_id) - { - ACE_DEBUG ((LM_DEBUG, "Sender: Caught correct exception <%u," - "%C> for %C\n", - id, error_string, func)); - ++nr_of_excep_received; - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR Sender: wrong exception received" - " for %C\n", func)); - } - } - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::InterInOutT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterInOutT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::InterInOutT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::InterInOutT::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_received_); - - CORBA::Long l_cmd = 3; - CORBA::String_var answer = CORBA::string_dup("Hi from sender"); - //Invoke Asynchronous calls to test - my_foo_ami_->sendc_foo ( cb.in (), - "Do something synchronous", l_cmd, answer.inout()); - - //this should invoke a exception - l_cmd = 4; - my_foo_ami_->sendc_foo ( cb.in (), - "", l_cmd, answer.inout()); - my_foo_ami_->sendc_var_ins( cb.in (), - "Here a double for you.", 1.6); - - InterInOutT::TestTopic test_topic; - test_topic.key = "aaa"; - test_topic.x = 10; - InterInOutT::TopicString topic_str; - topic_str.key = "bbb"; - topic_str.x_str = "ccc"; - InterInOutT::TestArray topic_arr; - for ( CORBA::UShort i = 0; i < 5; i ++) - { - topic_arr[i].key = CORBA::string_dup("ddd"); - for (CORBA::UShort y = 0; y < 5; y ++) - { - topic_arr[i].x_array[y] = i * 100 + y ; - } - } - my_foo_ami_->sendc_var_div_ins ( cb.in (), - test_topic,topic_str,topic_arr, answer); - - InterInOutT::X_Union topic_union; - topic_union.x_long(11); - InterInOutT::test ttt; - ttt.x_test = 12; - ttt.x_teststr = "fff" ; - InterInOutT::test_seq seq; - seq.length(2); - seq[0] = ttt; - - my_foo_ami_->sendc_var_div2_ins ( cb.in (), - topic_union, seq); - InterInOutT::test_enum in_test; - in_test = ::InterInOutT::ONE; - my_foo_ami_->sendc_enum_in( cb.in (), - in_test); - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::InterInOutT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterInOutT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - - //run some synch calls - ::InterInOutT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - CORBA::String_var answer = CORBA::string_dup("Hi from sender"); - CORBA::Long l_cmd = 1; - try - { - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - l_cmd , - answer.inout ()); - if ((result == (update_val + cmd_synch_ok)) && - (ACE_OS::strcmp (answer.in(), "Hi from receiver") == 0)) - { - ++this->nr_of_received_; - } - } - catch (const InterInOutT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - try - { - l_cmd = 2; - answer = CORBA::string_dup("Hi from sender"); - my_foo_ami_->foo ("",l_cmd, answer.inout()); - } - catch (const InterInOutT::InternalError& ex) - { - HandleException (ex.id, (update_val + cmd_synch_nok), - ex.error_string.in(), - "synch foo"); - } - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen (0), - synch_foo_gen (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterInOutT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (nr_of_excep_received != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - " exceptions" - "Expected: 2, Received: %u.\n", - nr_of_excep_received)); - } - if (this->nr_of_received_.value() != 6) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender not received the expected number" - " of callbacks and returns for syn- and " - "asynchronous calls. Expected: 6," - " Received: %u.\n", - this->nr_of_received_.value())); - } - if ((this->nr_of_received_.value() == 6) && (nr_of_excep_received == 2)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" - " callbacks and exceptions for syn- and " - "asynchronous calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( ::CORBA::Long ami_return_val, - ::CORBA::Long l_cmd, - const char * answer) - { - if (( ami_return_val == ( cmd_asynch_ok + update_val )) && - ( l_cmd == ami_return_val) && - ( ACE_OS::strcmp (answer, "Hi from receiver") == 0)) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( ::CCM_AMI::ExceptionHolder * excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const InterInOutT::InternalError& ex) - { - CIAO_InterInOutT_Sender_Impl::HandleException (ex.id, (cmd_asynch_nok + update_val), - ex.error_string.in(), "asynch foo"); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_ins (const char * /* answer */, - ::CORBA::Double cmd ) - { - if (cmd == 3.2) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_ins ( - const InterInOutT::TestTopic &test_topic, - const InterInOutT::TopicString &topic_str, - const InterInOutT::TestArray topic_arr, - const char * /*answer*/) - { - CORBA::Boolean error = false; - if ((ACE_OS::strcmp (test_topic.key, "111") != 0) || (test_topic.x != 111)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key '111', x = 111," - " received key '%C' , x = %u\n", - test_topic.key.in(),test_topic.x)); - error = true; - } - - if ((ACE_OS::strcmp (topic_str.key, "222") != 0) || - (ACE_OS::strcmp (topic_str.x_str, "333") != 0)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key '222', x = '333'," - " received key '%C' , x = %C\n", - topic_str.key.in() ,topic_str.x_str.in())); - error = true; - } - - if ((ACE_OS::strcmp (topic_arr[0].key, "444") != 0) || - (topic_arr[1].x_array[2] != 444)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div_ins: " - "received the wrong struct, " - "expected key '444', elem 444" - " received key '%C', elem %u\n", - topic_arr[0].key.in(),topic_arr[1].x_array[2] )); - error = true; - } - - if(error == false) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_ins (const InterInOutT::X_Union &x_uni, - const InterInOutT::test_seq &seq, - const char * /*answer*/) - { - CORBA::Boolean error = false; - if (x_uni.x_long() != 555) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong union, " - "expected x = 555," - " received x = %u\n", - x_uni.x_long())); - error = true; - } - if ((ACE_OS::strcmp (seq[0].x_teststr, "666") != 0)|| - (seq[0].x_test != 666)) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::var_div2_ins: " - "received the wrong struct, " - "expected key '666', x = 666," - " received key '%C' , x = %u\n", - seq[0].x_teststr.in(),seq[0].x_test)); - error = true; - } - if(error == false) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_ins_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder ) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_in (const char * /*answer*/, - InterInOutT::test_enum test_enum) - { - if ( test_enum != InterInOutT::TWO) - { - ACE_ERROR ((LM_ERROR, "MyFoo_exec_i::enum_in: " - "received the wrong enum value, expected TWO," - " received %u\n", - test_enum)); - } - else - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_in_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - - extern "C" INTERINOUT_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInOutT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h deleted file mode 100644 index a1cabb94032..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h +++ /dev/null @@ -1,187 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERINOUTT_SENDER_EXEC_FSBIFS_H_ -#define CIAO_INTERINOUTT_SENDER_EXEC_FSBIFS_H_ - -#include /**/ "ace/pre.h" -#include "ace/Task.h" -#include "InterInOutT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterInOutT_Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterInOutT_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Common exception handlers - void HandleException ( - long id, - long expect_id, - const char* error_string, - const char* func); - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::InterInOutT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterInOutT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::InterInOutT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterInOutT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterInOutT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::InterInOutT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual - void foo (::CORBA::Long ami_return_val, - ::CORBA::Long cmd, - const char * answer); - - virtual - void foo_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_ins (const char * answer, - ::CORBA::Double cmd); - - virtual - void var_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div_ins (const ::InterInOutT::TestTopic & test_topic, - const ::InterInOutT::TopicString & topic_str, - const ::InterInOutT::TestArray topic_arr, - const char * answer); - - virtual - void var_div_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div2_ins (const ::InterInOutT::X_Union & topic_union, - const ::InterInOutT::test_seq & seq, - const char * answer); - - virtual - void var_div2_ins_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void enum_in (const char * answer, - ::InterInOutT::test_enum in_test); - - virtual - void enum_in_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - }; - - extern "C" INTERINOUT_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterInOutT_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp deleted file mode 100644 index 510528d32c4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterInOutT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInOutT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInOutT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterInOutT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInOutT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInOutT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterInOutT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterInOutT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterInOutT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterInOutT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterInOutT.ComponentImplementations.InterInOutTImplementation.InterInOutT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterInOutT.ComponentImplementations.InterInOutTImplementation.InterInOutT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterInOutT.ComponentImplementations.InterInOutTImplementation.InterInOutT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - InterInOutT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterInOutT_svnt - - entryPoint - - - tk_string - - - create_InterInOutT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - InterInOutT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterInOutT_conn - - entryPoint - - - tk_string - - - create_InterInOutT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - InterInOutT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterInOutT_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterInOutT_AMI_ReceiverHome_Servant - - - - - - - InterInOutT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterInOutT_Receiver_exec - - entryPoint - - - tk_string - - - create_InterInOutT_AMI_ReceiverHome_Impl - - - - - - - InterInOutT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterInOutT_Sender_svnt - - entryPoint - - - tk_string - - - create_InterInOutT_AMI_SenderHome_Servant - - - - - - - InterInOutT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterInOutT_Sender_exec - - entryPoint - - - tk_string - - - create_InterInOutT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl deleted file mode 100755 index 72bb46f1ea2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tests/InterMulti/.gitignore b/CIAO/connectors/ami4ccm/tests/InterMulti/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/.gitignore deleted file mode 100644 index 8c667f760c5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/InterMultiA.idl -/InterMultiAE.idl -/InterMultiA_conn.cpp -/InterMultiA_conn.h -/InterMultiE.idl -/InterMulti_conn_export.h -/InterMulti_exec_export.h -/InterMulti_lem_stub_export.h -/InterMulti_skel_export.h -/InterMulti_stub_export.h -/InterMulti_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl deleted file mode 100644 index 863814f03f3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.idl +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef INTERMULTI_IDL -#define INTERMULTI_IDL - -#pragma ciao lem "Base/InterMultiE.idl" -#pragma ciao ami4ccm interface "InterMulti::One" -#pragma ciao ami4ccm interface "InterMulti::Two" -#pragma ciao ami4ccm interface "InterMulti::Three" -#pragma ciao lem "Base/InterMultiAE.idl" -#pragma ciao ami4ccm idl "Base/InterMultiA.idl" - -module InterMulti -{ - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interfaces - interface One - { - long foo (in string in_str, in long cmd, out string answer) - raises (InternalError); - }; - interface Two - { - void bar (in long cmd, out string answer) - raises (InternalError); - }; - - //multiple inheritance - interface Three: One, Two - { - void plus (in long cmd, out string answer) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc deleted file mode 100644 index bb55e1d8bbd..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_InterMulti_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_STUB_Export \ - -Wb,stub_export_include=InterMulti_stub_export.h \ - -Wb,skel_export_macro=INTERMULTI_SKEL_Export \ - -Wb,skel_export_include=InterMulti_skel_export.h \ - -Wb,conn_export_macro=INTERMULTI_CONN_Export \ - -Wb,conn_export_include=InterMulti_conn_export.h \ - -Wb,exec_export_macro=INTERMULTI_EXEC_Export \ - -Wb,exec_export_include=InterMulti_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - InterMulti.idl - } -} - -project(AMI_InterMulti_lem_gen) : ciaoidldefaults { - after += AMI_InterMulti_idl_gen AMI_InterMulti_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=INTERMULTI_LEM_STUB_Export \ - -Wb,export_include=InterMulti_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - InterMultiE.idl - } -} - -project(AMI_InterMulti_lema_gen) : ciaoidldefaults, typecode { - after += AMI_InterMulti_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_STUB_Export \ - -Wb,stub_export_include=InterMulti_stub_export.h \ - -Wb,conn_export_macro=INTERMULTI_CONN_Export \ - -Wb,conn_export_include=InterMulti_conn_export.h \ - -Wb,svnt_export_macro=INTERMULTI_SVNT_Export \ - -Wb,svnt_export_include=InterMulti_svnt_export.h \ - -Wb,skel_export_macro=INTERMULTI_SKEL_Export \ - -Wb,skel_export_include=InterMulti_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - InterMultiA.idl - } -} - -project(AMI_InterMulti_lemae_gen) : ciaoidldefaults { - after += AMI_InterMulti_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_LEM_STUB_Export \ - -Wb,stub_export_include=InterMulti_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - InterMultiAE.idl - } -} - -project(AMI_InterMulti_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_InterMulti_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterMulti_stub - dynamicflags += INTERMULTI_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterMultiC.cpp - InterMultiAC.cpp - } - - Header_Files { - InterMultiC.h - InterMulti_stub_export.h -} - - Inline_Files { - InterMultiC.inl - } -} - -project(AMI_InterMulti_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_InterMulti_lem_gen AMI_InterMulti_stub AMI_InterMulti_lemae_gen AMI_InterMulti_skel - libs += InterMulti_stub InterMulti_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterMulti_lem_stub - dynamicflags += INTERMULTI_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterMultiEC.cpp - InterMultiAEC.cpp - } - - Header_Files { - InterMultiEC.h - InterMulti_lem_stub_export.h -} - - Inline_Files { - InterMultiEC.inl - } -} - -project(AMI_InterMulti_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_InterMulti_stub - sharedname = InterMulti_skel - libs += InterMulti_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += INTERMULTI_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterMultiS.cpp - InterMultiAS.cpp - } - - Header_Files { - InterMultiS.h - - InterMulti_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_InterMulti_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_InterMulti_lem_stub InterMulti_Base_AMI_stub AMI_InterMulti_skel AMI_InterMulti_lema_gen AMI_InterMulti_lemae_gen - sharedname = InterMulti_conn - libs += InterMulti_stub InterMulti_skel InterMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMultiA_conn.cpp - } - - Header_Files { - InterMultiA_conn.h - InterMulti_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_InterMulti_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_InterMulti_lem_stub InterMulti_Base_AMI_stub AMI_InterMulti_skel AMI_InterMulti_lema_gen AMI_InterMulti_lemae_gen AMI_InterMulti_conn - sharedname = InterMulti_svnt - libs += InterMulti_stub InterMulti_skel InterMulti_lem_stub InterMulti_conn - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMultiA_svnt.cpp - } - - Header_Files { - InterMultiA_svnt.h - InterMultiA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/.gitignore deleted file mode 100644 index f15dc33a1f4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterMulti_ReceiverE.idl -/InterMulti_Receiver_exec_export.h -/InterMulti_Receiver_lem_stub_export.h -/InterMulti_Receiver_stub_export.h -/InterMulti_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl deleted file mode 100644 index 3fe5a72655e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef INTERMULTI_RECEIVER_IDL -#define INTERMULTI_RECEIVER_IDL - -#include - -#include "Base/InterMulti.idl" - -module InterMulti -{ - component Receiver - { - /// Provides - provides One do_my_one; - provides Two do_my_two; - provides Three do_my_three; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc deleted file mode 100644 index 965ebad6de6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterMulti_Base InterMulti_Receiver" - -project(AMI_InterMulti_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_InterMulti_idl_gen - idlflags += -Wb,stub_export_macro=INTERMULTI_RECEIVER_STUB_Export \ - -Wb,stub_export_include=InterMulti_Receiver_stub_export.h \ - -Wb,skel_export_macro=INTERMULTI_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=InterMulti_Receiver_svnt_export.h \ - -Wb,exec_export_macro=INTERMULTI_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=InterMulti_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - InterMulti_Receiver.idl - } -} - -project(AMI_InterMulti_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_InterMulti_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=InterMulti_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterMulti_ReceiverE.idl - } -} - -project(AMI_InterMulti_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_InterMulti_Base_Receiver_lem_gen AMI_InterMulti_Base_Receiver_stub AMI_InterMulti_stub - libs += InterMulti_stub InterMulti_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = InterMulti_Receiver_lem_stub - dynamicflags += INTERMULTI_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_ReceiverEC.cpp - } - - Header_Files { - InterMulti_ReceiverEC.h - InterMulti_Receiver_lem_stub_export.h - } - - Inline_Files { - InterMulti_ReceiverEC.inl - } -} - -project(AMI_InterMulti_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_InterMulti_Base_Receiver_idl_gen AMI_InterMulti_stub - libs += InterMulti_stub - libpaths += ../lib - libout = ../lib - sharedname = InterMulti_Receiver_stub - dynamicflags += INTERMULTI_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_ReceiverC.cpp - } - - Header_Files { - InterMulti_ReceiverC.h - InterMulti_Receiver_stub_export.h - } - - Inline_Files { - InterMulti_ReceiverC.inl - } -} - -project(AMI_InterMulti_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_InterMulti_Base_Receiver_l_stub AMI_InterMulti_Base_Receiver_stub AMI_InterMulti_stub AMI_InterMulti_lem_stub - sharedname = InterMulti_Receiver_exec - libs += InterMulti_Receiver_stub InterMulti_Receiver_lem_stub InterMulti_stub InterMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_Receiver_exec.cpp - } - - Header_Files { - InterMulti_Receiver_exec.h - InterMulti_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterMulti_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_InterMulti_Base_skel AMI_InterMulti_Base_Receiver_l_stub AMI_InterMulti_stub AMI_InterMulti_skel AMI_InterMulti_lem_stub - sharedname = InterMulti_Receiver_svnt - libs += InterMulti_Receiver_stub InterMulti_Receiver_lem_stub \ - InterMulti_skel \ - InterMulti_stub InterMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_ReceiverS.cpp - InterMulti_Receiver_svnt.cpp - } - - Header_Files { - InterMulti_ReceiverS.h - InterMulti_Receiver_svnt.h - InterMulti_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp deleted file mode 100644 index 4f4f8c8e443..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp +++ /dev/null @@ -1,315 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterMulti_Receiver_exec.h" - -namespace CIAO_InterMulti_Receiver_Impl -{ - CORBA::UShort nr_of_received = 0; - - /** - * Facet Executor Implementation Class: do_my_one_exec_i - */ - - do_my_one_exec_i::do_my_one_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterMulti::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_one_exec_i::~do_my_one_exec_i (void) - { - } - - // Operations from ::InterMulti::One - - ::CORBA::Long - do_my_one_exec_i::foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_DEBUG ((LM_DEBUG, "Receiver: one_foo, in_str = %C" - " cmd = <%u>\n", - in_str, cmd)); - if (cmd != 1) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver ONE::foo," - " origin not 1, but <%u>\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_dup ("answer foo one"); - return cmd; - } - - /** - * Facet Executor Implementation Class: do_my_two_exec_i - */ - - do_my_two_exec_i::do_my_two_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterMulti::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_two_exec_i::~do_my_two_exec_i (void) - { - } - - // Operations from ::InterMulti::Two - - void - do_my_two_exec_i::bar (::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_DEBUG ((LM_DEBUG, "Receiver: two_bar," - " cmd = <%u>\n", - cmd)); - if (cmd != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR Receiver: TWO::bar," - " origin not 2, but <%u>\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_dup ("answer bar two"); - } - - /** - * Facet Executor Implementation Class: do_my_three_exec_i - */ - - do_my_three_exec_i::do_my_three_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterMulti::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_three_exec_i::~do_my_three_exec_i (void) - { - } - - // Operations from ::InterMulti::Three - - void - do_my_three_exec_i::bar (::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_DEBUG ((LM_DEBUG, "Receiver: three_bar," - " cmd = <%u>\n", - cmd)); - if (cmd != 3) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver Three::bar," - " origin not 3, but <%u>\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_dup ("answer bar three"); - } - - ::CORBA::Long - do_my_three_exec_i::foo (const char * in_str,::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_DEBUG ((LM_DEBUG, "Receiver: three_foo, in_str = %C" - " cmd = <%u>\n", - in_str, cmd)); - if (cmd != 3) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver THREE::foo," - " origin not 3, but <%u>\n", - cmd)); - } - else - { - ++nr_of_received; - } - answer = CORBA::string_dup ("answer foo three"); - return 3; - } - - void - do_my_three_exec_i::plus (::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_DEBUG ((LM_DEBUG, "Receiver: three_plus," - " cmd = <%u>\n", - cmd)); - ++nr_of_received; - answer = CORBA::string_dup ("answer plus three"); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::InterMulti::CCM_One_ptr - Receiver_exec_i::get_do_my_one (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_one_.in ())) - { - do_my_one_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_one_exec_i ( - this->ciao_context_.in ()), - ::InterMulti::CCM_One::_nil ()); - - this->ciao_do_my_one_ = tmp; - } - - return - ::InterMulti::CCM_One::_duplicate ( - this->ciao_do_my_one_.in ()); - } - - ::InterMulti::CCM_Two_ptr - Receiver_exec_i::get_do_my_two (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_two_.in ())) - { - do_my_two_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_two_exec_i ( - this->ciao_context_.in ()), - ::InterMulti::CCM_Two::_nil ()); - - this->ciao_do_my_two_ = tmp; - } - - return - ::InterMulti::CCM_Two::_duplicate ( - this->ciao_do_my_two_.in ()); - } - - ::InterMulti::CCM_Three_ptr - Receiver_exec_i::get_do_my_three (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_three_.in ())) - { - do_my_three_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_three_exec_i ( - this->ciao_context_.in ()), - ::InterMulti::CCM_Three::_nil ()); - - this->ciao_do_my_three_ = tmp; - } - - return - ::InterMulti::CCM_Three::_duplicate ( - this->ciao_do_my_three_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterMulti::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (nr_of_received != 7) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - "correct calls" - "Expected: 7, Received: %u.\n", - nr_of_received)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " - "number of correct calls. " - "Expected: 7, Received: %u.\n", - nr_of_received)); - } } - - extern "C" INTERMULTI_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterMulti_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h deleted file mode 100644 index 6a6859fea7e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h +++ /dev/null @@ -1,197 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERMULTI_RECEIVER_EXEC_GUFSW6_H_ -#define CIAO_INTERMULTI_RECEIVER_EXEC_GUFSW6_H_ - -#include /**/ "ace/pre.h" - -#include "InterMulti_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterMulti_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterMulti_Receiver_Impl -{ - /** - * Provider Executor Implementation Class: do_my_one_exec_i - */ - - class do_my_one_exec_i - : public virtual ::InterMulti::CCM_One, - public virtual ::CORBA::LocalObject - { - public: - do_my_one_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_one_exec_i (void); - - //@{ - /** Operations and attributes from InterMulti::One. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::InterMulti::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: do_my_two_exec_i - */ - - class do_my_two_exec_i - : public virtual ::InterMulti::CCM_Two, - public virtual ::CORBA::LocalObject - { - public: - do_my_two_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_two_exec_i (void); - - //@{ - /** Operations and attributes from InterMulti::Two. */ - - virtual - void bar (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::InterMulti::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: do_my_three_exec_i - */ - - class do_my_three_exec_i - : public virtual ::InterMulti::CCM_Three, - public virtual ::CORBA::LocalObject - { - public: - do_my_three_exec_i ( - ::InterMulti::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_three_exec_i (void); - - //@{ - /** Operations and attributes from InterMulti::Three. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - - virtual - void bar (::CORBA::Long cmd, - ::CORBA::String_out answer); - - virtual - void plus (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::InterMulti::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::InterMulti::CCM_One_ptr - get_do_my_one (void); - - virtual ::InterMulti::CCM_Two_ptr - get_do_my_two (void); - - virtual ::InterMulti::CCM_Three_ptr - get_do_my_three (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterMulti::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::InterMulti::CCM_One_var ciao_do_my_one_; - ::InterMulti::CCM_Two_var ciao_do_my_two_; - ::InterMulti::CCM_Three_var ciao_do_my_three_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" INTERMULTI_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterMulti_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/.gitignore deleted file mode 100644 index b4a094fde4c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterMulti_SenderE.idl -/InterMulti_Sender_exec_export.h -/InterMulti_Sender_lem_stub_export.h -/InterMulti_Sender_stub_export.h -/InterMulti_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl deleted file mode 100644 index ea17f183764..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef INTERMULTI_SENDER_IDL -#define INTERMULTI_SENDER_IDL - -#include - -#include "Base/InterMulti.idl" - -#pragma ciao ami4ccm receptacle "InterMulti::Sender::run_my_one" -#pragma ciao ami4ccm receptacle "InterMulti::Sender::run_my_two" -#pragma ciao ami4ccm receptacle "InterMulti::Sender::run_my_three" - -module InterMulti -{ - component Sender - { - /// For synchronous invocation - uses One run_my_one; - uses Two run_my_two; - uses Three run_my_three; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc deleted file mode 100644 index 7c2b6d0eb15..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterMulti_Base InterMulti_Sender" - -project(AMI_InterMulti_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_InterMulti_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_SENDER_STUB_Export \ - -Wb,stub_export_include=InterMulti_Sender_stub_export.h \ - -Wb,skel_export_macro=INTERMULTI_SENDER_SVNT_Export \ - -Wb,skel_export_include=InterMulti_Sender_svnt_export.h \ - -Wb,exec_export_macro=INTERMULTI_SENDER_EXEC_Export \ - -Wb,exec_export_include=InterMulti_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - InterMulti_Sender.idl - } -} - -project(AMI_InterMulti_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_InterMulti_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTERMULTI_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=InterMulti_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterMulti_SenderE.idl - } -} - -project(AMI_InterMulti_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_InterMulti_Base_Sender_lem_gen AMI_InterMulti_stub Conn_InterMulti_Base_stub - libs += InterMulti_stub - libpaths += ../lib - libout = ../lib - sharedname = InterMulti_Sender_lem_stub - dynamicflags += INTERMULTI_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_SenderEC.cpp - } - - Header_Files { - InterMulti_SenderEC.h - InterMulti_Sender_lem_stub_export.h - } - - Inline_Files { - InterMulti_SenderEC.inl - } -} - -project(AMI_InterMulti_Base_Sender_stub) : ccm_stub, ami { - after += AMI_InterMulti_Base_Sender_idl_gen AMI_InterMulti_Base_stub AMI_InterMulti_stub Conn_InterMulti_Base_stub - libs += InterMulti_stub - libpaths += ../lib - libout = ../lib - sharedname = InterMulti_Sender_stub - dynamicflags += INTERMULTI_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_SenderC.cpp - } - - Header_Files { - InterMulti_SenderC.h - InterMulti_Sender_stub_export.h - } - - Inline_Files { - InterMulti_SenderC.inl - } -} - -project(AMI_InterMulti_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_InterMulti_Base_Sender_lem_stub AMI_InterMulti_Base_Sender_stub AMI_InterMulti_Base_exec Conn_InterMulti_Base_stub AMI_InterMulti_lem_stub - sharedname = InterMulti_Sender_exec - libs += InterMulti_Sender_stub InterMulti_Sender_lem_stub InterMulti_stub InterMulti_stub InterMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_Sender_exec.cpp - } - - Header_Files { - InterMulti_Sender_exec.h - InterMulti_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterMulti_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_InterMulti_Base_skel AMI_InterMulti_Base_Sender_lem_stub AMI_InterMulti_Base_Sender_stub AMI_InterMulti_Base_exec AMI_InterMulti_skel - sharedname = InterMulti_Sender_svnt - libs += InterMulti_Sender_stub InterMulti_Sender_lem_stub \ - InterMulti_skel \ - InterMulti_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTERMULTI_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterMulti_SenderS.cpp - InterMulti_Sender_svnt.cpp - } - - Header_Files { - InterMulti_SenderS.h - InterMulti_Sender_svnt.h - InterMulti_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp deleted file mode 100644 index 9cf19bf4e3e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp +++ /dev/null @@ -1,410 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterMulti_Sender_exec.h" - -namespace CIAO_InterMulti_Sender_Impl -{ - //============================================================ - // Worker thread for asynchronous invocations for One - //============================================================ - asynch_one_generator::asynch_one_generator ( - ::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterMulti::CCM_Sender_Context::_duplicate (context)), - nr_of_received_ (nr_of_received) - { - } - - int asynch_one_generator::svc () - { - ::InterMulti::AMI4CCM_One_var my_one_ami_ = - context_->get_connection_sendc_run_my_one(); - - ::InterMulti::AMI4CCM_OneReplyHandler_var cb = - new AMI4CCM_OneReplyHandler_run_my_one_i ( - this->nr_of_received_); - - //Invoke Asynchronous calls to test - my_one_ami_->sendc_foo ( cb.in(), - "Hi from asynch call ONE::foo", 1); - return 0; - } - - //============================================================ - // Worker thread for asynchronous invocations for Two - //============================================================ - asynch_two_generator::asynch_two_generator ( - ::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterMulti::CCM_Sender_Context::_duplicate (context)), - nr_of_received_ (nr_of_received) - { - } - - int asynch_two_generator::svc () - { - ::InterMulti::AMI4CCM_Two_var my_two_ami_ = - context_->get_connection_sendc_run_my_two(); - - if (CORBA::is_nil (my_two_ami_.in ())) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_two_ami_ is NIL !\n")); - return 1; - } - else - { - ::InterMulti::AMI4CCM_TwoReplyHandler_var cb = - new AMI4CCM_TwoReplyHandler_run_my_two_i ( - this->nr_of_received_); - - //Invoke Asynchronous calls to test - my_two_ami_->sendc_bar ( cb.in(), 2); - } - return 0; - } - - //============================================================ - // Worker thread for asynchronous invocations for Three - //============================================================ - asynch_three_generator::asynch_three_generator ( - ::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterMulti::CCM_Sender_Context::_duplicate (context)), - nr_of_received_ (nr_of_received) - { - } - - int asynch_three_generator::svc () - { - ::InterMulti::AMI4CCM_Three_var my_three_ami_ = - context_->get_connection_sendc_run_my_three(); - - if (CORBA::is_nil (my_three_ami_)) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_three_ami_ is NIL !\n")); - return 1; - } - else - { - ::InterMulti::AMI4CCM_ThreeReplyHandler_var cb = - new AMI4CCM_ThreeReplyHandler_run_my_three_i ( - this->nr_of_received_); - - //Invoke Asynchronous calls to test - my_three_ami_->sendc_plus(cb.in (), 3); - // derived from CLASS ONE - my_three_ami_->sendc_foo ( cb.in (),"hoi", 3); - // derived fron CLASS TWO - my_three_ami_->sendc_bar ( cb.in (), 3); - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for One - //============================================================ - synch_one_generator::synch_one_generator ( - ::InterMulti::CCM_Sender_Context_ptr context) - : context_(::InterMulti::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_one_generator::svc () - { - ::InterMulti::One_var my_one_ami_ = - context_->get_connection_run_my_one (); - - CORBA::String_var answer; - CORBA::Long result = my_one_ami_->foo ( - "Synchronous call foo from class One", - 1, - answer.out ()); - if (result != 1) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (SYNCH) : CLASS One foo !\n")); - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for One - //============================================================ - synch_three_generator::synch_three_generator ( - ::InterMulti::CCM_Sender_Context_ptr context) - : context_(::InterMulti::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_three_generator::svc () - { - ::InterMulti::Three_var my_three_ami_ = - context_->get_connection_run_my_three (); - - ::CORBA::String_var answer; - CORBA::Long result = my_three_ami_->foo ( - "Synchronous call foo from class Three, " - " derived from class ONE", - 3 , - answer.out ()); - if (result != 3) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (SYNCH) : CLASS Three foo !\n")); - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : nr_of_received_ (0), - asynch_one_gen (0), - synch_one_gen (0), - asynch_two_gen (0), - asynch_three_gen (0), - synch_three_gen (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterMulti::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_one_gen = - new asynch_one_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_one_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->asynch_two_gen = - new asynch_two_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_two_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->asynch_three_gen = - new asynch_three_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_three_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - - this->synch_one_gen = - new synch_one_generator (this->ciao_context_.in()); - this->synch_one_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_three_gen = - new synch_three_generator (this->ciao_context_.in()); - this->synch_three_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->nr_of_received_.value() != 5) - { - ACE_ERROR ((LM_ERROR, "ERROR: Did not get all callbacks for" - "derived classes." - " Received = %u of 5\n", - this->nr_of_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "OK: All messages received back by Sender\n")); - } - delete this->asynch_one_gen; - this->asynch_one_gen = 0; - delete this->synch_one_gen; - this->synch_one_gen = 0; - delete this->asynch_two_gen; - this->asynch_two_gen = 0; - delete this->asynch_three_gen; - this->asynch_three_gen = 0; - delete this->synch_three_gen; - this->synch_three_gen = 0; - } - - - AMI4CCM_OneReplyHandler_run_my_one_i::AMI4CCM_OneReplyHandler_run_my_one_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_OneReplyHandler_run_my_one_i::~AMI4CCM_OneReplyHandler_run_my_one_i (void) - { - } - - void - AMI4CCM_OneReplyHandler_run_my_one_i::foo (::CORBA::Long /* ami_return_val */, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from ONE::foo," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; } - - void - AMI4CCM_OneReplyHandler_run_my_one_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - - AMI4CCM_TwoReplyHandler_run_my_two_i::AMI4CCM_TwoReplyHandler_run_my_two_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - - { - } - - AMI4CCM_TwoReplyHandler_run_my_two_i::~AMI4CCM_TwoReplyHandler_run_my_two_i (void) - { - } - - void - AMI4CCM_TwoReplyHandler_run_my_two_i::bar (const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from TWO::bar," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - } - - void - AMI4CCM_TwoReplyHandler_run_my_two_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - - AMI4CCM_ThreeReplyHandler_run_my_three_i::AMI4CCM_ThreeReplyHandler_run_my_three_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_ThreeReplyHandler_run_my_three_i::~AMI4CCM_ThreeReplyHandler_run_my_three_i (void) - { - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::foo (::CORBA::Long /* ami_return_val */, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::foo," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::bar (const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::bar," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::plus (const char * answer ) - { - ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::plus," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - } - - void - AMI4CCM_ThreeReplyHandler_run_my_three_i::plus_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" INTERMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterMulti_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h deleted file mode 100644 index d6a453f7544..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h +++ /dev/null @@ -1,261 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERMULTI_SENDER_EXEC_QPLRQR_H_ -#define CIAO_INTERMULTI_SENDER_EXEC_QPLRQR_H_ - -#include /**/ "ace/pre.h" - -#include "InterMulti_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterMulti_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_InterMulti_Sender_Impl -{ - - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker threads for asynchronous invocations - class asynch_one_generator : public virtual ACE_Task_Base - { - public: - asynch_one_generator (::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - class asynch_two_generator : public virtual ACE_Task_Base - { - public: - asynch_two_generator (::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - - }; - - class asynch_three_generator : public virtual ACE_Task_Base - { - public: - asynch_three_generator (::InterMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker threads for synchronous invocations - class synch_one_generator : public virtual ACE_Task_Base - { - public: - synch_one_generator (::InterMulti::CCM_Sender_Context_ptr context); - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - }; - - class synch_two_generator : public virtual ACE_Task_Base - { - public: - synch_two_generator (::InterMulti::CCM_Sender_Context_ptr context); - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - - }; - class synch_three_generator : public virtual ACE_Task_Base - { - public: - synch_three_generator (::InterMulti::CCM_Sender_Context_ptr context); - virtual int svc (void); - - private: - ::InterMulti::CCM_Sender_Context_var context_; - - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterMulti::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - asynch_one_generator* asynch_one_gen; - synch_one_generator* synch_one_gen; - asynch_two_generator* asynch_two_gen; - asynch_three_generator* asynch_three_gen; - synch_three_generator* synch_three_gen; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - - class AMI4CCM_OneReplyHandler_run_my_one_i - : public ::InterMulti::CCM_AMI4CCM_OneReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_OneReplyHandler_run_my_one_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_OneReplyHandler_run_my_one_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - - }; - - class AMI4CCM_TwoReplyHandler_run_my_two_i - : public ::InterMulti::CCM_AMI4CCM_TwoReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_TwoReplyHandler_run_my_two_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_TwoReplyHandler_run_my_two_i (void); - - virtual void - bar ( - const char * answer); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - - }; - - class AMI4CCM_ThreeReplyHandler_run_my_three_i - : public ::InterMulti::CCM_AMI4CCM_ThreeReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_ThreeReplyHandler_run_my_three_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_ThreeReplyHandler_run_my_three_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 - bar ( - const char * answer); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - plus ( - const char * answer); - - virtual void - plus_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - - }; - - extern "C" INTERMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterMulti_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp deleted file mode 100644 index 85cfa99f412..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp +++ /dev/null @@ -1,679 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterMulti_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterMulti_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - - - - run_asynch_one_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_two_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_two - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_three_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_three - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_one_connection - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_two_connection - - do_my_two - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_three_connection - - do_my_three - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_one_connection - - do_my_one - true - Facet - - - - run_my_one - false - SimplexReceptacle - - - - - synch_two_connection - - do_my_two - true - Facet - - - - run_my_two - false - SimplexReceptacle - - - - - synch_three_connection - - do_my_three - true - Facet - - - - run_my_three - false - SimplexReceptacle - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant - - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_One_Connector_Impl - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_Two_Connector_Impl - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_Three_Connector_Impl - - - - - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterMulti_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI_ReceiverHome_Servant - - - - - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterMulti_Receiver_exec - - entryPoint - - - tk_string - - - create_InterMulti_AMI_ReceiverHome_Impl - - - - - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterMulti_Sender_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI_SenderHome_Servant - - - - - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterMulti_Sender_exec - - entryPoint - - - tk_string - - - create_InterMulti_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp deleted file mode 100644 index 73a35fd549a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp +++ /dev/null @@ -1,736 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterMulti_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterMulti_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - - - - run_asynch_one_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_two_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_two - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_three_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_three - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_one_connection - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_two_connection - - do_my_two - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_three_connection - - do_my_three - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - - - - - synch_one_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - synch_two_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_two - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - synch_three_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_three - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterMulti_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant - - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_One_Connector_Impl - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_Two_Connector_Impl - - - - - - InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterMulti_conn - - entryPoint - - - tk_string - - - create_InterMulti_AMI_Three_Connector_Impl - - - - - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterMulti_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI_ReceiverHome_Servant - - - - - - - InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterMulti_Receiver_exec - - entryPoint - - - tk_string - - - create_InterMulti_AMI_ReceiverHome_Impl - - - - - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterMulti_Sender_svnt - - entryPoint - - - tk_string - - - create_InterMulti_AMI_SenderHome_Servant - - - - - - - InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterMulti_Sender_exec - - entryPoint - - - tk_string - - - create_InterMulti_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl deleted file mode 100755 index db1b39e2fc4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl +++ /dev/null @@ -1,259 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 (); -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -foreach $file (@files) { - print "=============================\nStarting test for deployment $file\n================================\n"; - - # Invoke naming service - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - - print STDERR "Starting Naming Service with -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 $file -k file://$ior_emfile\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $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 $file\n"; - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $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; - } - - delete_ior_files (); - kill_open_processes (); - # Sleep for a couple seconds to make sure everything has a chance to shut down. - sleep 5; -} -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/.gitignore b/CIAO/connectors/ami4ccm/tests/InterOutArgs/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/.gitignore deleted file mode 100644 index 23b7cd4d762..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/InterOutArgsTA.idl -/InterOutArgsTAE.idl -/InterOutArgsTA_conn.cpp -/InterOutArgsTA_conn.h -/InterOutArgsTE.idl -/InterOutArgsT_conn_export.h -/InterOutArgsT_exec_export.h -/InterOutArgsT_lem_stub_export.h -/InterOutArgsT_skel_export.h -/InterOutArgsT_stub_export.h -/InterOutArgsT_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl deleted file mode 100644 index 0a997192cd7..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef INTEROUTARGS_T_IDL -#define INTEROUTARGS_T_IDL - -#pragma ciao lem "Base/InterOutArgsTE.idl" -#pragma ciao ami4ccm interface "InterOutArgsT::MyFoo" -#pragma ciao lem "Base/InterOutArgsTAE.idl" -#pragma ciao ami4ccm idl "Base/InterOutArgsTA.idl" - -module InterOutArgsT -{ - typedef short short_array[5]; - - // Mixed struct - struct TestTopic { - string key; - long x; - }; - - // String struct - struct TopicString { - string key; - string x_str; - }; - - // Array - struct TopicArray { - string key; - short_array x_array; - }; - - // 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_seq; - - enum test_enum - { - ZERO, - ONE, - TWO - }; - - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interface - interface MyFoo - { - void var_outs (in string in_str, out string answer, out double d_cmd, - out long l_cmd ) - raises (InternalError); - void var_div_outs (out TestTopic test_topic, out TopicString topic_str, - out TopicArray topic_arr) - raises (InternalError); - void var_div2_outs (out X_Union x_uni, - out test_seq seq) - raises (InternalError); - void enum_out (out test_enum out_test) - raises (InternalError); - }; -}; - -#endif - diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc deleted file mode 100644 index 106d7e3253c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_InterOutArgsT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_stub_export.h \ - -Wb,skel_export_macro=INTEROUTARGS_T_SKEL_Export \ - -Wb,skel_export_include=InterOutArgsT_skel_export.h \ - -Wb,conn_export_macro=INTEROUTARGS_T_CONN_Export \ - -Wb,conn_export_include=InterOutArgsT_conn_export.h \ - -Wb,exec_export_macro=INTEROUTARGS_T_EXEC_Export \ - -Wb,exec_export_include=InterOutArgsT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - InterOutArgsT.idl - } -} - -project(AMI_InterOutArgsT_lem_gen) : ciaoidldefaults { - after += AMI_InterOutArgsT_idl_gen AMI_InterOutArgsT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=INTEROUTARGS_T_LEM_STUB_Export \ - -Wb,export_include=InterOutArgsT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - InterOutArgsTE.idl - } -} - -project(AMI_InterOutArgsT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_InterOutArgsT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_stub_export.h \ - -Wb,conn_export_macro=INTEROUTARGS_T_CONN_Export \ - -Wb,conn_export_include=InterOutArgsT_conn_export.h \ - -Wb,svnt_export_macro=INTEROUTARGS_T_SVNT_Export \ - -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 - - IDL_Files { - InterOutArgsTA.idl - } -} - -project(AMI_InterOutArgsT_lemae_gen) : ciaoidldefaults { - after += AMI_InterOutArgsT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_LEM_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - InterOutArgsTAE.idl - } -} - -project(AMI_InterOutArgsT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_InterOutArgsT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterOutArgsT_stub - dynamicflags += INTEROUTARGS_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterOutArgsTC.cpp - InterOutArgsTAC.cpp - } - - Header_Files { - InterOutArgsTC.h - InterOutArgsT_stub_export.h -} - - Inline_Files { - InterOutArgsTC.inl - } -} - -project(AMI_InterOutArgsT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_InterOutArgsT_lem_gen AMI_InterOutArgsT_stub AMI_InterOutArgsT_lemae_gen AMI_InterOutArgsT_skel - libs += InterOutArgsT_stub InterOutArgsT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = InterOutArgsT_lem_stub - dynamicflags += INTEROUTARGS_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterOutArgsTEC.cpp - InterOutArgsTAEC.cpp - } - - Header_Files { - InterOutArgsTEC.h - InterOutArgsT_lem_stub_export.h -} - - Inline_Files { - InterOutArgsTEC.inl - } -} - -project(AMI_InterOutArgsT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_InterOutArgsT_stub - sharedname = InterOutArgsT_skel - libs += InterOutArgsT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += INTEROUTARGS_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - InterOutArgsTS.cpp - InterOutArgsTAS.cpp - } - - Header_Files { - InterOutArgsTS.h - - InterOutArgsT_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_InterOutArgsT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_InterOutArgsT_lem_stub InterOutArgsT_Base_AMI_stub AMI_InterOutArgsT_skel AMI_InterOutArgsT_lema_gen AMI_InterOutArgsT_lemae_gen - sharedname = InterOutArgsT_conn - libs += InterOutArgsT_stub InterOutArgsT_skel InterOutArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsTA_conn.cpp - } - - Header_Files { - InterOutArgsTA_conn.h - InterOutArgsT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_InterOutArgsT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_InterOutArgsT_lem_stub InterOutArgsT_Base_AMI_stub AMI_InterOutArgsT_skel AMI_InterOutArgsT_lema_gen AMI_InterOutArgsT_lemae_gen AMI_InterOutArgsT_conn - sharedname = InterOutArgsT_svnt - libs += InterOutArgsT_stub InterOutArgsT_skel InterOutArgsT_lem_stub InterOutArgsT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsTA_svnt.cpp - } - - Header_Files { - InterOutArgsTA_svnt.h - InterOutArgsTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/.gitignore deleted file mode 100644 index 64a0fabe24b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterOutArgsT_ReceiverE.idl -/InterOutArgsT_Receiver_exec_export.h -/InterOutArgsT_Receiver_lem_stub_export.h -/InterOutArgsT_Receiver_stub_export.h -/InterOutArgsT_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl deleted file mode 100644 index 77665baf7ab..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef INTEROUTARGS_T_RECEIVER_IDL -#define INTEROUTARGS_T_RECEIVER_IDL - -#include - -#include "Base/InterOutArgsT.idl" - -module InterOutArgsT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc deleted file mode 100644 index 9188019f8c9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterOutArgsT_Base InterOutArgsT_Receiver" - -project(AMI_OutArgsT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_InterOutArgsT_idl_gen - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_Receiver_stub_export.h \ - -Wb,skel_export_macro=INTEROUTARGS_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=InterOutArgsT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=INTEROUTARGS_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=InterOutArgsT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - InterOutArgsT_Receiver.idl - } -} - -project(AMI_OutArgsT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_OutArgsT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterOutArgsT_ReceiverE.idl - } -} - -project(AMI_OutArgsT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_OutArgsT_Base_Receiver_lem_gen AMI_InterOutArgsT_Base_Receiver_stub AMI_InterOutArgsT_stub - libs += InterOutArgsT_stub InterOutArgsT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = InterOutArgsT_Receiver_lem_stub - dynamicflags += INTEROUTARGS_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_ReceiverEC.cpp - } - - Header_Files { - InterOutArgsT_ReceiverEC.h - InterOutArgsT_Receiver_lem_stub_export.h - } - - Inline_Files { - InterOutArgsT_ReceiverEC.inl - } -} - -project(AMI_InterOutArgsT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_OutArgsT_Base_Receiver_idl_gen AMI_InterOutArgsT_stub - libs += InterOutArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterOutArgsT_Receiver_stub - dynamicflags += INTEROUTARGS_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_ReceiverC.cpp - } - - Header_Files { - InterOutArgsT_ReceiverC.h - InterOutArgsT_Receiver_stub_export.h - } - - Inline_Files { - InterOutArgsT_ReceiverC.inl - } -} - -project(AMI_InterOutArgsT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_OutArgsT_Base_Receiver_l_stub AMI_InterOutArgsT_Base_Receiver_stub AMI_InterOutArgsT_stub AMI_InterOutArgsT_lem_stub - sharedname = InterOutArgsT_Receiver_exec - libs += InterOutArgsT_Receiver_stub InterOutArgsT_Receiver_lem_stub InterOutArgsT_stub InterOutArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_Receiver_exec.cpp - } - - Header_Files { - InterOutArgsT_Receiver_exec.h - InterOutArgsT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterOutArgsT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_InterOutArgsT_Base_skel AMI_OutArgsT_Base_Receiver_l_stub AMI_InterOutArgsT_stub AMI_InterOutArgsT_skel AMI_InterOutArgsT_lem_stub - sharedname = InterOutArgsT_Receiver_svnt - libs += InterOutArgsT_Receiver_stub InterOutArgsT_Receiver_lem_stub \ - InterOutArgsT_skel \ - InterOutArgsT_stub InterOutArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_ReceiverS.cpp - InterOutArgsT_Receiver_svnt.cpp - } - - Header_Files { - InterOutArgsT_ReceiverS.h - InterOutArgsT_Receiver_svnt.h - InterOutArgsT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp deleted file mode 100644 index 13e45fd6855..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp +++ /dev/null @@ -1,188 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterOutArgsT_Receiver_exec.h" - -namespace CIAO_InterOutArgsT_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::InterOutArgsT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterOutArgsT::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::InterOutArgsT::MyFoo - - void - do_my_foo_exec_i::var_outs (const char * /* in_str */, - ::CORBA::String_out answer, - ::CORBA::Double_out d_cmd, - ::CORBA::Long_out l_cmd) - { - answer = CORBA::string_dup ("This is my answer from var_outs"); - d_cmd = 3.14; - l_cmd = 100; - } - - void - do_my_foo_exec_i::var_div_outs (::InterOutArgsT::TestTopic_out test_topic, - ::InterOutArgsT::TopicString_out topic_str, - ::InterOutArgsT::TopicArray_out topic_arr) - { - InterOutArgsT::TestTopic *new_topic = new InterOutArgsT::TestTopic(); - test_topic = new_topic; - test_topic->key = CORBA::string_dup("aaa"); - test_topic->x = 10; - - topic_str = new InterOutArgsT::TopicString(); - topic_str->key = CORBA::string_dup("bbb"); - topic_str->x_str = CORBA::string_dup("ccc"); - - topic_arr = new InterOutArgsT::TopicArray(); - topic_arr->key = CORBA::string_dup("ddd"); - for (CORBA::UShort i = 0; i < 5; i ++) - { - topic_arr->x_array[i] = i * 100; - } - } - - void - do_my_foo_exec_i::var_div2_outs (::InterOutArgsT::X_Union_out x_uni, - ::InterOutArgsT::test_seq_out seq) - { - x_uni = new InterOutArgsT::X_Union(); - x_uni->x_long(11); - - InterOutArgsT::test ttt; - ttt.x_test = 12; - ttt.x_teststr = CORBA::string_dup("fff") ; - seq = new InterOutArgsT::test_seq(); - seq->length(2); - (*seq)[0]= ttt; - } - - void - do_my_foo_exec_i::enum_out (::InterOutArgsT::test_enum_out out_test) - { - out_test = ::InterOutArgsT::ONE; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::InterOutArgsT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::InterOutArgsT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::InterOutArgsT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterOutArgsT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" INTEROUTARGS_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterOutArgsT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h deleted file mode 100644 index 5372acfeb14..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h +++ /dev/null @@ -1,144 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTEROUTARGST_RECEIVER_EXEC_WOVGIR_H_ -#define CIAO_INTEROUTARGST_RECEIVER_EXEC_WOVGIR_H_ - -#include /**/ "ace/pre.h" - -#include "InterOutArgsT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterOutArgsT_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterOutArgsT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::InterOutArgsT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::InterOutArgsT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from InterOutArgsT::MyFoo. */ - - virtual - void var_outs (const char * in_str, - ::CORBA::String_out answer, - ::CORBA::Double_out d_cmd, - ::CORBA::Long_out l_cmd); - - virtual - void var_div_outs (::InterOutArgsT::TestTopic_out test_topic, - ::InterOutArgsT::TopicString_out topic_str, - ::InterOutArgsT::TopicArray_out topic_arr); - - virtual - void var_div2_outs (::InterOutArgsT::X_Union_out x_uni, - ::InterOutArgsT::test_seq_out seq); - - virtual - void enum_out (::InterOutArgsT::test_enum_out out_test); - //@} - - private: - ::InterOutArgsT::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::InterOutArgsT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::InterOutArgsT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::InterOutArgsT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" INTEROUTARGS_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterOutArgsT_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/.gitignore deleted file mode 100644 index b9b1fc19815..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterOutArgsT_SenderE.idl -/InterOutArgsT_Sender_exec_export.h -/InterOutArgsT_Sender_lem_stub_export.h -/InterOutArgsT_Sender_stub_export.h -/InterOutArgsT_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl deleted file mode 100644 index 840ecf1d9da..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef INTEROUTARGS_T_SENDER_IDL -#define INTEROUTARGS_T_SENDER_IDL - -#include - -#include "Base/InterOutArgsT.idl" - -#pragma ciao ami4ccm receptacle "InterOutArgsT::Sender::run_my_foo" - -module InterOutArgsT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc deleted file mode 100644 index e7ef8aa6ca6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterOutArgsT_Base InterOutArgsT_Sender" - -project(AMI_InterOutArgsT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_InterOutArgsT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_SENDER_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_Sender_stub_export.h \ - -Wb,skel_export_macro=INTEROUTARGS_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=InterOutArgsT_Sender_svnt_export.h \ - -Wb,exec_export_macro=INTEROUTARGS_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=InterOutArgsT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - InterOutArgsT_Sender.idl - } -} - -project(AMI_InterOutArgsT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_InterOutArgsT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=INTEROUTARGS_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=InterOutArgsT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - InterOutArgsT_SenderE.idl - } -} - -project(AMI_OutArgsT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_InterOutArgsT_Base_Sender_lem_gen AMI_InterOutArgsT_stub Conn_InterOutArgsT_Base_stub - libs += InterOutArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterOutArgsT_Sender_lem_stub - dynamicflags += INTEROUTARGS_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_SenderEC.cpp - } - - Header_Files { - InterOutArgsT_SenderEC.h - InterOutArgsT_Sender_lem_stub_export.h - } - - Inline_Files { - InterOutArgsT_SenderEC.inl - } -} - -project(AMI_InterOutArgsT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_InterOutArgsT_Base_Sender_idl_gen AMI_InterOutArgsT_Base_stub AMI_InterOutArgsT_stub Conn_InterOutArgsT_Base_stub - libs += InterOutArgsT_stub - libpaths += ../lib - libout = ../lib - sharedname = InterOutArgsT_Sender_stub - dynamicflags += INTEROUTARGS_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_SenderC.cpp - } - - Header_Files { - InterOutArgsT_SenderC.h - InterOutArgsT_Sender_stub_export.h - } - - Inline_Files { - InterOutArgsT_SenderC.inl - } -} - -project(AMI_InterOutArgsT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_OutArgsT_Base_Sender_lem_stub AMI_InterOutArgsT_Base_Sender_stub AMI_InterOutArgsT_Base_exec Conn_InterOutArgsT_Base_stub AMI_InterOutArgsT_lem_stub - sharedname = InterOutArgsT_Sender_exec - libs += InterOutArgsT_Sender_stub InterOutArgsT_Sender_lem_stub InterOutArgsT_stub InterOutArgsT_stub InterOutArgsT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_Sender_exec.cpp - } - - Header_Files { - InterOutArgsT_Sender_exec.h - InterOutArgsT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_InterOutArgsT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_InterOutArgsT_Base_skel AMI_OutArgsT_Base_Sender_lem_stub AMI_OutArgsT_Base_Sender_stub AMI_InterOutArgsT_Base_exec AMI_InterOutArgsT_skel - sharedname = InterOutArgsT_Sender_svnt - libs += InterOutArgsT_Sender_stub InterOutArgsT_Sender_lem_stub \ - InterOutArgsT_skel \ - InterOutArgsT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += INTEROUTARGS_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - InterOutArgsT_SenderS.cpp - InterOutArgsT_Sender_svnt.cpp - } - - Header_Files { - InterOutArgsT_SenderS.h - InterOutArgsT_Sender_svnt.h - InterOutArgsT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp deleted file mode 100644 index f99ffc98895..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp +++ /dev/null @@ -1,379 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterOutArgsT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_InterOutArgsT_Sender_Impl -{ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::InterOutArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterOutArgsT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - if (CORBA::is_nil (context_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tContext is NIL !\n")); - return 1; - } - - ::InterOutArgsT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::InterOutArgsT::CCM_AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_received_); - - //Invoke Asynchronous calls to test - my_foo_ami_->sendc_var_outs ( cb.in (), - "Send me a double and a long."); - my_foo_ami_->sendc_var_div_outs (cb.in ()); - my_foo_ami_->sendc_var_div2_outs (cb.in ()); - my_foo_ami_->sendc_enum_out (cb.in ()); - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::InterOutArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterOutArgsT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::InterOutArgsT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - //run some synch calls - InterOutArgsT::TestTopic_var test_topic = 0; - InterOutArgsT::TopicString_var topic_str = 0; - InterOutArgsT::TopicArray_var topic_arr = 0; - CORBA::Double d_cmd = 0; - CORBA::Long l_cmd = 0; - CORBA::String_var out_str; - try - { - my_foo_ami_->var_outs ("Do something synchronous", - out_str, - d_cmd , - l_cmd); - if ( (d_cmd == 3.14 ) && (l_cmd == 100)) - { - ++this->nr_of_received_; - } - } - catch (const InterOutArgsT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_outs: " - "Unexpected exception.\n")); - } - try - { - my_foo_ami_->var_div_outs(test_topic,topic_str,topic_arr); - if ((ACE_OS::strcmp (test_topic->key, "aaa") == 0) && - (test_topic->x == 10)) - { - ++this->nr_of_received_; - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_div_outs: " - "Unexpected data returned.\n")); - } - } - catch (const InterOutArgsT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_div_outs: " - "Unexpected exception.\n")); - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_received_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterOutArgsT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->nr_of_received_.value() == 6) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected data" - " for syn- and asynchronous calls\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected data" - " for syn- and asynchronous calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_outs ( const char * /*answer*/, - CORBA::Double d_cmd, CORBA::Long l_cmd ) - { - if (d_cmd != 3.14) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::var_outs: " - "received the wrong double, expected 3.14," - " received %2.2f\n", - d_cmd)); - } - else if (l_cmd != 100) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::var_outs: " - "received the wrong double, expected 3.14," - " received %lu\n", - l_cmd)); - } - else - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_outs_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_outs ( - const InterOutArgsT::TestTopic &test_topic, - const InterOutArgsT::TopicString &topic_str, - const InterOutArgsT::TopicArray &topic_arr) - { - CORBA::Boolean error = false; - if ((ACE_OS::strcmp (test_topic.key, "aaa") != 0) || (test_topic.x != 10)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_exec_i::var_div_outs: " - "received the wrong struct, " - "expected key 'aaa', x = 10," - " received key '%C' , x = %u\n", - test_topic.key.in(),test_topic.x)); - error = true; - } - if (( ACE_OS::strcmp (topic_str.key,"bbb") != 0) || - (ACE_OS::strcmp (topic_str.x_str, "ccc") != 0)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_exec_i::var_div_outs: " - "received the wrong struct, " - "expected key 'bbb', x = 'ccc'," - " received key '%C' , x = %C\n", - topic_str.key.in() ,topic_str.x_str.in())); - error = true; - } - if (( ACE_OS::strcmp (topic_arr.key,"ddd") != 0) || - (topic_arr.x_array[1] != 100)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_exec_i::var_div_outs: " - "received the wrong struct, " - "expected key 'ddd', second elem 100 ," - " received key '%C', second elem %u\n", - topic_arr.key.in(), topic_arr.x_array[1])); - error = true; - } - if (error == false) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div_outs_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_outs ( - const InterOutArgsT::X_Union &x_uni, - const InterOutArgsT::test_seq &seq) - { - CORBA::Boolean error = false; - - if (x_uni.x_long() != 11) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_exec_i::var_div2_outs: " - "received the wrong union, " - "expected x_long = 11," - " received x_long = %u\n", - x_uni.x_long())); - error = true; - } - if (( ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0) || - (seq[0].x_test != 12)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_exec_i::var_div2_outs: " - "received the wrong sequence, " - "expected key 'fff', x = 12," - " received key '%C' , x = %u\n", - seq[0].x_teststr.in(),seq[0].x_test)); - error = true; - } - if (error == false) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::var_div2_outs_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_out (InterOutArgsT::test_enum test_enum) - { - if (test_enum != InterOutArgsT::ONE) - - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::enum_out: " - "received the wrong value, expected ONE," - " received %u\n", - test_enum)); - } - else - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::enum_out_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - - extern "C" INTEROUTARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterOutArgsT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h deleted file mode 100644 index 7677dbb1cb8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTEROUTARGST_SENDER_EXEC_LH0LDR_H_ -#define CIAO_INTEROUTARGST_SENDER_EXEC_LH0LDR_H_ - -#include /**/ "ace/pre.h" - -#include "InterOutArgsT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterOutArgsT_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_InterOutArgsT_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::InterOutArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterOutArgsT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::InterOutArgsT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::InterOutArgsT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::InterOutArgsT::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::InterOutArgsT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual - void var_outs (const char * answer, - ::CORBA::Double d_cmd, - ::CORBA::Long l_cmd); - - virtual - void var_outs_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div_outs (const ::InterOutArgsT::TestTopic & test_topic, - const ::InterOutArgsT::TopicString & topic_str, - const ::InterOutArgsT::TopicArray & topic_arr); - - virtual - void var_div_outs_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void var_div2_outs (const ::InterOutArgsT::X_Union & x_uni, - const ::InterOutArgsT::test_seq & seq); - - virtual - void var_div2_outs_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual - void enum_out (::InterOutArgsT::test_enum out_test); - - virtual - void enum_out_excep (::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - }; - extern "C" INTEROUTARGS_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterOutArgsT_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp deleted file mode 100644 index d79662dbaee..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterOutArgsT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterOutArgsT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterOutArgsT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterOutArgsT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterOutArgsT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterOutArgsT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterOutArgsT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterOutArgsT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterOutArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterOutArgsT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterOutArgsT.ComponentImplementations.InterOutArgsTImplementation.InterOutArgsT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - InterOutArgsT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterOutArgsT_svnt - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - InterOutArgsT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterOutArgsT_conn - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI_MyFoo_Connector_Impl - - - - - - - InterOutArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterOutArgsT_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI_ReceiverHome_Servant - - - - - - - InterOutArgsT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterOutArgsT_Receiver_exec - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI_ReceiverHome_Impl - - - - - - - InterOutArgsT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterOutArgsT_Sender_svnt - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI_SenderHome_Servant - - - - - - - InterOutArgsT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterOutArgsT_Sender_exec - - entryPoint - - - tk_string - - - create_InterOutArgsT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl deleted file mode 100755 index 72bb46f1ea2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tests/InterReturn/.gitignore b/CIAO/connectors/ami4ccm/tests/InterReturn/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/.gitignore deleted file mode 100644 index 61d8acd9de0..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/InterReturnTA.idl -/InterReturnTAE.idl -/InterReturnTA_conn.cpp -/InterReturnTA_conn.h -/InterReturnTE.idl -/InterReturnT_conn_export.h -/InterReturnT_exec_export.h -/InterReturnT_lem_stub_export.h -/InterReturnT_skel_export.h -/InterReturnT_stub_export.h -/InterReturnT_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl deleted file mode 100644 index 830fb08938f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl +++ /dev/null @@ -1,80 +0,0 @@ -#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" -#pragma ciao ami4ccm idl "Base/InterReturnTA.idl" - -module InterReturnT -{ - typedef short short_array[5]; - - // Mixed struct - struct TestStruct { - string key; - long x; - }; - - // Array - struct TestArr { - string key; - short_array x_array; - }; - - 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 TestSeq; - - enum test_enum - { - ZERO, - ONE, - TWO - }; - - 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); - test_enum ret_enum (in string in_str, out string answer, out long l_cmd) - raises (InternalError); - }; -}; - -#endif - diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc deleted file mode 100644 index 52d4af7f272..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -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 - - 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, typecode { - 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 -GC -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 { - } -} - -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/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/.gitignore deleted file mode 100644 index 18d38ef529f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterReturnT_ReceiverE.idl -/InterReturnT_Receiver_exec_export.h -/InterReturnT_Receiver_lem_stub_export.h -/InterReturnT_Receiver_stub_export.h -/InterReturnT_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl deleted file mode 100644 index a02a5425348..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef INTERRETURN_T_RECEIVER_IDL -#define INTERRETURN_T_RECEIVER_IDL - -#include - -#include "Base/InterReturnT.idl" - -module InterReturnT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc deleted file mode 100644 index d3281beefdb..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// 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 { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp deleted file mode 100644 index d63a7fcc2d3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp +++ /dev/null @@ -1,236 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterReturnT_Receiver_exec.h" - -namespace CIAO_InterReturnT_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::InterReturnT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::InterReturnT::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::InterReturnT::MyFoo - - void - do_my_foo_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 - do_my_foo_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 - do_my_foo_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 * - do_my_foo_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 * - do_my_foo_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 * - do_my_foo_exec_i::ret_seq (const char * /* in_str */, - ::CORBA::String_out /* answer */, - ::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 * - do_my_foo_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; - } - - ::InterReturnT::test_enum - do_my_foo_exec_i::ret_enum (const char * /* in_str */, - ::CORBA::String_out answer, - ::CORBA::Long_out l_cmd) - { - answer = CORBA::string_dup ("This is my answer from ret_enum"); - l_cmd = 8; - InterReturnT::test_enum test_enum; - test_enum = InterReturnT::TWO; - return test_enum; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::InterReturnT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::InterReturnT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::InterReturnT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterReturnT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" INTERRETURN_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterReturnT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h deleted file mode 100644 index 96d81b682c2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h +++ /dev/null @@ -1,163 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERRETURNT_RECEIVER_EXEC_1ZDCPF_H_ -#define CIAO_INTERRETURNT_RECEIVER_EXEC_1ZDCPF_H_ - -#include /**/ "ace/pre.h" - -#include "InterReturnT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterReturnT_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_InterReturnT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::InterReturnT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::InterReturnT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from InterReturnT::MyFoo. */ - - 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 answer, - ::CORBA::Long_out l_cmd); - - virtual - ::InterReturnT::X_Union * ret_union (const char * in_str, - ::CORBA::String_out answer, - ::CORBA::Long_out l_cmd); - - virtual - ::InterReturnT::test_enum ret_enum (const char * in_str, - ::CORBA::String_out answer, - ::CORBA::Long_out l_cmd); - //@} - - private: - ::InterReturnT::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::InterReturnT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::InterReturnT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::InterReturnT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - extern "C" INTERRETURN_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterReturnT_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/.gitignore deleted file mode 100644 index 43e32d94091..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/InterReturnT_SenderE.idl -/InterReturnT_Sender_exec_export.h -/InterReturnT_Sender_lem_stub_export.h -/InterReturnT_Sender_stub_export.h -/InterReturnT_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl deleted file mode 100644 index 3e44baa364f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef INTERRETURN_T_SENDER_IDL -#define INTERRETURN_T_SENDER_IDL - -#include - -#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/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc deleted file mode 100644 index 07a6bcb7f80..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p InterReturnT_Base InterReturnT_Sender" - -project(AMI_InterReturnT_Base_Sender_idl_gen) : componentidldefaults { - after += 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.. -GC - - 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_ReturnT_Base_Sender_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 { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp deleted file mode 100644 index b5954b11577..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp +++ /dev/null @@ -1,533 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "InterReturnT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_InterReturnT_Sender_Impl -{ - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::InterReturnT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterReturnT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::InterReturnT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::InterReturnT::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_received_); - - //Invoke Asynchronous calls to test - my_foo_ami_->sendc_ret_void (cb.in (), "Send me a void." ); - my_foo_ami_->sendc_ret_long (cb.in (),"Send me a long."); - my_foo_ami_->sendc_ret_double (cb.in (),"Send me a double."); - my_foo_ami_->sendc_ret_struct (cb.in (), "Send me a struct."); - my_foo_ami_->sendc_ret_array (cb.in (),"Send me an array."); - my_foo_ami_->sendc_ret_seq (cb.in (),"Send me a sequence."); - my_foo_ami_->sendc_ret_union (cb.in (),"Send me a union."); - my_foo_ami_->sendc_ret_enum (cb.in (),"Send me a enum value."); - - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::InterReturnT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::InterReturnT::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::InterReturnT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - //run some synch calls - InterReturnT::TestStruct_var test_topic = 0; - InterReturnT::TestArray_var topic_arr = 0; - CORBA::Long l_cmd = 0; - CORBA::String_var out_str; - try - { - CORBA::Double ret = - my_foo_ami_->ret_double ("Send me synch double",out_str, l_cmd); - if ( (ret == 3.14 ) && (l_cmd == 3)) - { - ++this->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); - if ((l_cmd != 5) || (arr[1].x_array[2] != 102)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo synchronous ret_array: " - "received the wrong long or array, expected 5 " - "and 102, received %u and %u\n", - l_cmd, arr[1].x_array[2])); - } - else - { - ++this->nr_of_received_; - } - if (arr) - { - InterReturnT::TestArray_free(arr); - arr = 0; - } - } - - catch (const InterReturnT::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_array: " - "Unexpected exception.\n")); - } - - - InterReturnT::TestStruct_var struct_return_val = - my_foo_ami_->ret_struct ("Send me synch struct",out_str, 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 (struct_return_val->key.in(), "aaa") != 0) || - (struct_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", - struct_return_val->key.in(), - struct_return_val->x)); - } - else - { - ++this->nr_of_received_; - } - - const InterReturnT::TestSeq_var seq_return_val = - my_foo_ami_->ret_seq ("Send me synch struct",out_str, l_cmd); - if ((l_cmd != 6)|| (CORBA::is_nil(seq_return_val))) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_seq: " - "received the wrong long, expected 6," - " received %u\n", - l_cmd)); - } - else - { - ++this->nr_of_received_; - } - - - const InterReturnT::X_Union_var union_return_val = - my_foo_ami_->ret_union ("Send me synch union",out_str, l_cmd); - if ((l_cmd != 7) || (union_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, union_return_val->x_long())); - } - - else - { - ++this->nr_of_received_; - } - - InterReturnT::test_enum enum_return_val = - my_foo_ami_->ret_enum ("Send me synch enum",out_str, l_cmd); - - if ((l_cmd != 8) || (enum_return_val != InterReturnT::TWO)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_enum: " - "received the wrong long or enum value, expected 8" - " and TWO, received %u and %u\n", - l_cmd, enum_return_val)); - } - else - { - ++this->nr_of_received_; - } - - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_received_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::InterReturnT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->nr_of_received_.value() == 14) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected return data" - " for syn- and asynchronous calls\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected" - " return data for syn- and asynchronous" - " calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_void_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_long_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_double_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_struct_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_array ( - const ::InterReturnT::TestArray 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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_array_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_seq_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_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 - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_union_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_enum ( - ::InterReturnT::test_enum ami_return_val, - const char * /* answer */, - ::CORBA::Long l_cmd) - { - if ((l_cmd != 8) || (ami_return_val != InterReturnT::TWO)) - { - ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_enum: " - "received the wrong long or enum value, expected 8" - " and TWO, received %u and %u\n", - l_cmd, ami_return_val)); - } - else - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::ret_enum_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" INTERRETURN_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterReturnT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h deleted file mode 100644 index 131c246af4a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h +++ /dev/null @@ -1,218 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_INTERRETURNT_SENDER_EXEC_GN3CO7_H_ -#define CIAO_INTERRETURNT_SENDER_EXEC_GN3CO7_H_ - -#include /**/ "ace/pre.h" - -#include "InterReturnT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "InterReturnT_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_InterReturnT_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::InterReturnT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - - virtual int svc (void); - - private: - ::InterReturnT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::InterReturnT::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - - virtual int svc (void); - - private: - ::InterReturnT::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::InterReturnT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::InterReturnT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &nr_of_received_); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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::TestArray 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); - - virtual void - ret_enum ( - ::InterReturnT::test_enum ami_return_val, - const char * answer, - ::CORBA::Long l_cmd); - - virtual void - ret_enum_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - }; - - extern "C" INTERRETURN_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_InterReturnT_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp deleted file mode 100644 index b953d059da6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp +++ /dev/null @@ -1,375 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterReturnT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterReturnT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterReturnT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterReturnT_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterReturnT_conn - - entryPoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterReturnT_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_ReceiverHome_Servant - - - - - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterReturnT_Receiver_exec - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_ReceiverHome_Impl - - - - - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterReturnT_Sender_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_SenderHome_Servant - - - - - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterReturnT_Sender_exec - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp deleted file mode 100644 index 0de78c1641e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp +++ /dev/null @@ -1,377 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - InterReturnT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - InterReturnT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - InterReturnT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - synch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - InterReturnT_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - InterReturnT_conn - - entryPoint - - - tk_string - - - create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - InterReturnT_Receiver_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_ReceiverHome_Servant - - - - - - - InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - InterReturnT_Receiver_exec - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_ReceiverHome_Impl - - - - - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - InterReturnT_Sender_svnt - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_SenderHome_Servant - - - - - - - InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - InterReturnT_Sender_exec - - entryPoint - - - tk_string - - - create_InterReturnT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl deleted file mode 100755 index 948e9f88e0b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl +++ /dev/null @@ -1,257 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 (); -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} -foreach $file (@files) { - print "=============================\nStarting test for deployment $file\n================================\n"; - - # Invoke naming service - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - - print STDERR "Starting Naming Service with -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 $file -k file://$ior_emfile\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - - $pl_status = $E->SpawnWaitKill (2 * $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 $file\n"; - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); - - if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; - } - delete_ior_files (); - kill_open_processes (); - # Sleep for a couple seconds to make sure everything has a chance to shut down. - sleep 5; -} -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl deleted file mode 100644 index e2020190291..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.idl +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef HELLO_T_IDL -#define HELLO_T_IDL - -#pragma ciao lem "Base/HelloTE.idl" -#pragma ciao ami4ccm interface "HelloT::MyFoo" -#pragma ciao lem "Base/HelloTAE.idl" -#pragma ciao ami4ccm idl "Base/HelloTA.idl" - -module HelloT -{ - // Sender/Receiver interface - interface MyFoo - { - void hello (out string answer); - - attribute short rw_attrib; - - readonly attribute short ro_attrib; - }; -}; - -#endif - diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc deleted file mode 100644 index ed67272061f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_HelloT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_STUB_Export \ - -Wb,stub_export_include=HelloT_stub_export.h \ - -Wb,skel_export_macro=HELLO_T_SKEL_Export \ - -Wb,skel_export_include=HelloT_skel_export.h \ - -Wb,conn_export_macro=HELLO_T_CONN_Export \ - -Wb,conn_export_include=HelloT_conn_export.h \ - -Wb,exec_export_macro=HELLO_T_EXEC_Export \ - -Wb,exec_export_include=HelloT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - HelloT.idl - } -} - -project(AMI_HelloT_lem_gen) : ciaoidldefaults { - after += AMI_HelloT_idl_gen AMI_HelloT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=HELLO_T_LEM_STUB_Export \ - -Wb,export_include=HelloT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - HelloTE.idl - } -} - -project(AMI_HelloT_lema_gen) : ciaoidldefaults, typecode { - after += AMI_HelloT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_STUB_Export \ - -Wb,stub_export_include=HelloT_stub_export.h \ - -Wb,conn_export_macro=HELLO_T_CONN_Export \ - -Wb,conn_export_include=HelloT_conn_export.h \ - -Wb,svnt_export_macro=HELLO_T_SVNT_Export \ - -Wb,svnt_export_include=HelloT_svnt_export.h \ - -Wb,skel_export_macro=HELLO_T_SKEL_Export \ - -Wb,skel_export_include=HelloT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - HelloTA.idl - } -} - -project(AMI_HelloT_lemae_gen) : ciaoidldefaults { - after += AMI_HelloT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_LEM_STUB_Export \ - -Wb,stub_export_include=HelloT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - HelloTAE.idl - } -} - -project(AMI_HelloT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_HelloT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = HelloT_stub - dynamicflags += HELLO_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloTC.cpp - HelloTAC.cpp - } - - Header_Files { - HelloTC.h - HelloT_stub_export.h -} - - Inline_Files { - HelloTC.inl - } -} - -project(AMI_HelloT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_HelloT_lem_gen AMI_HelloT_stub AMI_HelloT_lemae_gen AMI_HelloT_skel - libs += HelloT_stub HelloT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = HelloT_lem_stub - dynamicflags += HELLO_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloTEC.cpp - HelloTAEC.cpp - } - - Header_Files { - HelloTEC.h - HelloT_lem_stub_export.h -} - - Inline_Files { - HelloTEC.inl - } -} - -project(AMI_HelloT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_HelloT_stub - sharedname = HelloT_skel - libs += HelloT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += HELLO_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloTS.cpp - HelloTAS.cpp - } - - Header_Files { - HelloTS.h - - HelloT_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_HelloT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_HelloT_lem_stub HelloT_Base_AMI_stub AMI_HelloT_skel AMI_HelloT_lema_gen AMI_HelloT_lemae_gen - sharedname = HelloT_conn - libs += HelloT_stub HelloT_skel HelloT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloTA_conn.cpp - } - - Header_Files { - HelloTA_conn.h - HelloT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_HelloT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_HelloT_lem_stub HelloT_Base_AMI_stub AMI_HelloT_skel AMI_HelloT_lema_gen AMI_HelloT_lemae_gen AMI_HelloT_conn - sharedname = HelloT_svnt - libs += HelloT_stub HelloT_skel HelloT_lem_stub HelloT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloTA_svnt.cpp - } - - Header_Files { - HelloTA_svnt.h - HelloTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl deleted file mode 100644 index e4d97c8b3fc..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef HELLO_T_RECEIVER_IDL -#define HELLO_T_RECEIVER_IDL - -#include - -#include "Base/HelloT.idl" - -module HelloT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc deleted file mode 100644 index 5999953de14..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p HelloT_Base HelloT_Receiver" - -project(AMI_HelloT_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_HelloT_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=HelloT_Receiver_stub_export.h \ - -Wb,skel_export_macro=HELLO_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=HelloT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=HELLO_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=HelloT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - HelloT_Receiver.idl - } -} - -project(AMI_HelloT_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_HelloT_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=HelloT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - HelloT_ReceiverE.idl - } -} - -project(AMI_HelloT_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_HelloT_Base_Receiver_lem_gen AMI_HelloT_Base_Receiver_stub AMI_HelloT_stub - libs += HelloT_stub HelloT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = HelloT_Receiver_lem_stub - dynamicflags += HELLO_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_ReceiverEC.cpp - } - - Header_Files { - HelloT_ReceiverEC.h - HelloT_Receiver_lem_stub_export.h - } - - Inline_Files { - HelloT_ReceiverEC.inl - } -} - -project(AMI_HelloT_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_HelloT_Base_Receiver_idl_gen AMI_HelloT_stub - libs += HelloT_stub - libpaths += ../lib - libout = ../lib - sharedname = HelloT_Receiver_stub - dynamicflags += HELLO_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_ReceiverC.cpp - } - - Header_Files { - HelloT_ReceiverC.h - HelloT_Receiver_stub_export.h - } - - Inline_Files { - HelloT_ReceiverC.inl - } -} - -project(AMI_HelloT_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_HelloT_Base_Receiver_l_stub AMI_HelloT_Base_Receiver_stub AMI_HelloT_stub AMI_HelloT_lem_stub - sharedname = HelloT_Receiver_exec - libs += HelloT_Receiver_stub HelloT_Receiver_lem_stub HelloT_stub HelloT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_Receiver_exec.cpp - } - - Header_Files { - HelloT_Receiver_exec.h - HelloT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_HelloT_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_HelloT_Base_skel AMI_HelloT_Base_Receiver_l_stub AMI_HelloT_stub AMI_HelloT_skel AMI_HelloT_lem_stub - sharedname = HelloT_Receiver_svnt - libs += HelloT_Receiver_stub HelloT_Receiver_lem_stub \ - HelloT_skel \ - HelloT_stub HelloT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_ReceiverS.cpp - HelloT_Receiver_svnt.cpp - } - - Header_Files { - HelloT_ReceiverS.h - HelloT_Receiver_svnt.h - HelloT_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp deleted file mode 100644 index 3972ae62806..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.cpp +++ /dev/null @@ -1,160 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "HelloT_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_HelloT_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::HelloT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::HelloT::CCM_Receiver_Context::_duplicate (ctx)), - rw_attrib_ (-1) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::HelloT::MyFoo - - void - do_my_foo_exec_i::hello (::CORBA::String_out answer) - { - answer = CORBA::string_dup ("This is my answer : Hi"); - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - return this->rw_attrib_; - } - - void - do_my_foo_exec_i::rw_attrib(::CORBA::Short new_value) - { - this->rw_attrib_ = new_value; - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - return ACE_OS::rand () % 100; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::HelloT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::HelloT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::HelloT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::HelloT::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_HelloT_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h deleted file mode 100644 index 9e843cc2e30..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver_exec.h +++ /dev/null @@ -1,132 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_HELLOT_RECEIVER_EXEC_LMPZLZ_H_ -#define CIAO_HELLOT_RECEIVER_EXEC_LMPZLZ_H_ - -#include "HelloT_ReceiverEC.h" -#include "HelloT_Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_HelloT_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - class do_my_foo_exec_i - : public virtual ::HelloT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::HelloT::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from HelloT::MyFoo. */ - - virtual - void hello (::CORBA::String_out answer); - - virtual - ::CORBA::Short rw_attrib (void); - - virtual - void rw_attrib (::CORBA::Short rw_attrib); - - virtual - ::CORBA::Short ro_attrib (void); - //@} - - private: - ::HelloT::CCM_Receiver_Context_var ciao_context_; - ::CORBA::Short rw_attrib_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::HelloT::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::HelloT::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::HelloT::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - extern "C" HELLO_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_HelloT_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl deleted file mode 100644 index 0073d580692..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef HELLO_T_SENDER_IDL -#define HELLO_T_SENDER_IDL - -#include - -#include "Base/HelloT.idl" - -#pragma ciao ami4ccm receptacle "HelloT::Sender::run_my_foo" - -module HelloT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc deleted file mode 100644 index 0e7b0c8eef3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p HelloT_Base HelloT_Sender" - -project(AMI_HelloT_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_HelloT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_SENDER_STUB_Export \ - -Wb,stub_export_include=HelloT_Sender_stub_export.h \ - -Wb,skel_export_macro=HELLO_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=HelloT_Sender_svnt_export.h \ - -Wb,exec_export_macro=HELLO_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=HelloT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - HelloT_Sender.idl - } -} - -project(AMI_HelloT_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_HelloT_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=HelloT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - HelloT_SenderE.idl - } -} - -project(AMI_HelloT_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_HelloT_Base_Sender_lem_gen AMI_HelloT_stub Conn_HelloT_Base_stub - libs += HelloT_stub - libpaths += ../lib - libout = ../lib - sharedname = HelloT_Sender_lem_stub - dynamicflags += HELLO_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_SenderEC.cpp - } - - Header_Files { - HelloT_SenderEC.h - HelloT_Sender_lem_stub_export.h - } - - Inline_Files { - HelloT_SenderEC.inl - } -} - -project(AMI_HelloT_Base_Sender_stub) : ccm_stub, ami { - after += AMI_HelloT_Base_Sender_idl_gen AMI_HelloT_Base_stub AMI_HelloT_stub Conn_HelloT_Base_stub - libs += HelloT_stub - libpaths += ../lib - libout = ../lib - sharedname = HelloT_Sender_stub - dynamicflags += HELLO_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_SenderC.cpp - } - - Header_Files { - HelloT_SenderC.h - HelloT_Sender_stub_export.h - } - - Inline_Files { - HelloT_SenderC.inl - } -} - -project(AMI_HelloT_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_HelloT_Base_Sender_lem_stub AMI_HelloT_Base_Sender_stub AMI_HelloT_Base_exec Conn_HelloT_Base_stub AMI_HelloT_lem_stub - sharedname = HelloT_Sender_exec - libs += HelloT_Sender_stub HelloT_Sender_lem_stub HelloT_stub HelloT_stub HelloT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_Sender_exec.cpp - } - - Header_Files { - HelloT_Sender_exec.h - HelloT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_HelloT_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_HelloT_Base_skel AMI_HelloT_Base_Sender_lem_stub AMI_HelloT_Base_Sender_stub AMI_HelloT_Base_exec AMI_HelloT_skel - sharedname = HelloT_Sender_svnt - libs += HelloT_Sender_stub HelloT_Sender_lem_stub \ - HelloT_skel \ - HelloT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloT_SenderS.cpp - HelloT_Sender_svnt.cpp - } - - Header_Files { - HelloT_SenderS.h - HelloT_Sender_svnt.h - HelloT_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp deleted file mode 100644 index 82bf197ff09..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.cpp +++ /dev/null @@ -1,361 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "HelloT_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_HelloT_Sender_Impl -{ - CORBA::Short nr_of_asyn_received = 0; - CORBA::Short nr_of_asyn_called = 0; - CORBA::Short nr_of_syn_failed = 0; - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::HelloT::CCM_Sender_Context_ptr context) - : context_(::HelloT::CCM_Sender_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::HelloT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::HelloT::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); - - //Invoke Asynchronous calls - try - { - my_foo_ami_->sendc_hello (cb.in()); - ++nr_of_asyn_called; - } - catch (const CORBA::INV_OBJREF& ex) - { - if (ex.completed () != CORBA::COMPLETED_NO) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - - // expected exception - } - try - { - my_foo_ami_->sendc_get_rw_attrib(cb.in()); - ++nr_of_asyn_called; - } - catch (const CORBA::INV_OBJREF& ex) - { - if (ex.completed () != CORBA::COMPLETED_NO) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - - // expected exception - } - try - { - my_foo_ami_->sendc_get_ro_attrib(cb.in()); - ++nr_of_asyn_called; - } - catch (const CORBA::INV_OBJREF& ex) - { - if (ex.completed () != CORBA::COMPLETED_NO) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - - // expected exception - } - try - { - my_foo_ami_->sendc_set_rw_attrib(cb.in(), 0); - ++nr_of_asyn_called; - } - catch (const CORBA::INV_OBJREF& ex) - { - if (ex.completed () != CORBA::COMPLETED_NO) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - - // expected exception - } - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::HelloT::CCM_Sender_Context_ptr context) - : context_(::HelloT::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::HelloT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR - NO synchronous connection available.")); - return 0; - } - - CORBA::String_var out_str; - try - { - my_foo_ami_->hello (out_str.out ()); - } - catch (...) - { - ACE_ERROR ((LM_INFO, "Exception on sync call")); - ++nr_of_syn_failed; - } - try - { - my_foo_ami_->rw_attrib (); - } - catch (...) - { - ACE_ERROR ((LM_INFO, "Exception on sync call")); - ++nr_of_syn_failed; - } - try - { - my_foo_ami_->rw_attrib (0); - } - catch (...) - { - ACE_ERROR ((LM_INFO, "Exception on sync call")); - ++nr_of_syn_failed; - } - try - { - my_foo_ami_->ro_attrib (); - } - catch (...) - { - ACE_ERROR ((LM_INFO, "Exception on sync call")); - ++nr_of_syn_failed; - } - - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen(0), - synch_foo_gen(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::HelloT::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in ()); - asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in ()); - synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (nr_of_asyn_received > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: received unexpected asynchronous responses.\n")); - } - if (nr_of_asyn_called > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: unexpectedly succeeded calling asynchronously.\n")); - } - if (nr_of_syn_failed > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: unexpected failures calling synchronously.\n")); - } - - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - const char * /* answer */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::hello: " - "Unexpected return.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr /*excep_holder*/) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::hello_excep: " - "Unexpected exception.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short /* rw_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_rw_attrib : " - "Unexpected return.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /*excep_holder*/) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_rw_attrib_excep: " - "Unexpected exception.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::set_rw_attrib: " - "Unexpected return.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /*excep_holder*/) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::set_rw_attrib_excep: " - "Unexpected exception.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short /* ro_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_ro_attrib: " - "Unexpected return.\n")); - ++nr_of_asyn_received; - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /*excep_holder*/) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MyFoo_callback_exec_i::get_ro_attrib_excep: " - "Unexpected exception.\n")); - ++nr_of_asyn_received; - } - - extern "C" HELLO_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_HelloT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h deleted file mode 100644 index bc2f12dc123..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender_exec.h +++ /dev/null @@ -1,167 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_HELLOT_SENDER_EXEC_4QC1XJ_H_ -#define CIAO_HELLOT_SENDER_EXEC_4QC1XJ_H_ - -#include /**/ "ace/pre.h" - -#include "HelloT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "HelloT_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_HelloT_Sender_Impl -{ - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::HelloT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::HelloT::CCM_Sender_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::HelloT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::HelloT::CCM_Sender_Context_var context_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::HelloT::CCM_Sender_Context_var ciao_context_; - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::HelloT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual void - hello ( - const char * answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_HelloT_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/Plan.cdp deleted file mode 100644 index 0100f817491..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/Plan.cdp +++ /dev/null @@ -1,376 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - HelloT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_HelloT_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_HelloT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - HelloT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_HelloT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_HelloT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - HelloT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_HelloT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_HelloT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - HelloT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - HelloT.ComponentImplementations.HelloTImplementation.HelloT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - HelloT.ComponentImplementations.HelloTImplementation.HelloT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - HelloT.ComponentImplementations.HelloTImplementation.HelloT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - HelloT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - HelloT_svnt - - entryPoint - - - tk_string - - - create_HelloT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - HelloT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - HelloT_conn - - entryPoint - - - tk_string - - - create_HelloT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - HelloT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - HelloT_Receiver_svnt - - entryPoint - - - tk_string - - - create_HelloT_AMI_ReceiverHome_Servant - - - - - - - HelloT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - HelloT_Receiver_exec - - entryPoint - - - tk_string - - - create_HelloT_AMI_ReceiverHome_Impl - - - - - - - HelloT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - HelloT_Sender_svnt - - entryPoint - - - tk_string - - - create_HelloT_AMI_SenderHome_Servant - - - - - - - HelloT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - HelloT_Sender_exec - - entryPoint - - - tk_string - - - create_HelloT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl deleted file mode 100755 index c96e71c4088..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/ami4ccm/tests/NoReplyH/.gitignore b/CIAO/connectors/ami4ccm/tests/NoReplyH/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/.gitignore deleted file mode 100644 index 66f8fa622be..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/NoReplyHA.idl -/NoReplyHAE.idl -/NoReplyHA_conn.cpp -/NoReplyHA_conn.h -/NoReplyHE.idl -/NoReplyH_conn_export.h -/NoReplyH_exec_export.h -/NoReplyH_lem_stub_export.h -/NoReplyH_skel_export.h -/NoReplyH_stub_export.h -/NoReplyH_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl deleted file mode 100644 index 92f94d76872..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef NOREPLYH_IDL -#define NOREPLYH_IDL - -#pragma ciao lem "Base/NoReplyHE.idl" -#pragma ciao ami4ccm interface "NoReplyH::MyFoo" -#pragma ciao lem "Base/NoReplyHAE.idl" -#pragma ciao ami4ccm idl "Base/NoReplyHA.idl" - -module NoReplyH -{ - 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/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc deleted file mode 100644 index 2beb75478e4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_NoReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_STUB_Export \ - -Wb,stub_export_include=NoReplyH_stub_export.h \ - -Wb,skel_export_macro=NOREPLYH_SKEL_Export \ - -Wb,skel_export_include=NoReplyH_skel_export.h \ - -Wb,conn_export_macro=NOREPLYH_CONN_Export \ - -Wb,conn_export_include=NoReplyH_conn_export.h \ - -Wb,exec_export_macro=NOREPLYH_EXEC_Export \ - -Wb,exec_export_include=NoReplyH_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - NoReplyH.idl - } -} - -project(AMI_NoReplyH_lem_gen) : ciaoidldefaults { - after += AMI_NoReplyH_idl_gen AMI_NoReplyH_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=NOREPLYH_LEM_STUB_Export \ - -Wb,export_include=NoReplyH_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - NoReplyHE.idl - } -} - -project(AMI_NoReplyH_lema_gen) : ciaoidldefaults, typecode { - after += AMI_NoReplyH_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_STUB_Export \ - -Wb,stub_export_include=NoReplyH_stub_export.h \ - -Wb,conn_export_macro=NOREPLYH_CONN_Export \ - -Wb,conn_export_include=NoReplyH_conn_export.h \ - -Wb,svnt_export_macro=NOREPLYH_SVNT_Export \ - -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 - - IDL_Files { - NoReplyHA.idl - } -} - -project(AMI_NoReplyH_lemae_gen) : ciaoidldefaults { - after += AMI_NoReplyH_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_LEM_STUB_Export \ - -Wb,stub_export_include=NoReplyH_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - NoReplyHAE.idl - } -} - -project(AMI_NoReplyH_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_NoReplyH_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = NoReplyH_stub - dynamicflags += NOREPLYH_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoReplyHC.cpp - NoReplyHAC.cpp - } - - Header_Files { - NoReplyHC.h - NoReplyH_stub_export.h -} - - Inline_Files { - NoReplyHC.inl - } -} - -project(AMI_NoReplyH_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_NoReplyH_lem_gen AMI_NoReplyH_stub AMI_NoReplyH_lemae_gen AMI_NoReplyH_skel - libs += NoReplyH_stub NoReplyH_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = NoReplyH_lem_stub - dynamicflags += NOREPLYH_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoReplyHEC.cpp - NoReplyHAEC.cpp - } - - Header_Files { - NoReplyHEC.h - NoReplyH_lem_stub_export.h -} - - Inline_Files { - NoReplyHEC.inl - } -} - -project(AMI_NoReplyH_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_NoReplyH_stub - sharedname = NoReplyH_skel - libs += NoReplyH_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += NOREPLYH_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoReplyHS.cpp - NoReplyHAS.cpp - } - - Header_Files { - NoReplyHS.h - - NoReplyH_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_NoReplyH_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_NoReplyH_lem_stub NoReplyH_Base_AMI_stub AMI_NoReplyH_skel AMI_NoReplyH_lema_gen AMI_NoReplyH_lemae_gen - sharedname = NoReplyH_conn - libs += NoReplyH_stub NoReplyH_skel NoReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyHA_conn.cpp - } - - Header_Files { - NoReplyHA_conn.h - NoReplyH_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_NoReplyH_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_NoReplyH_lem_stub NoReplyH_Base_AMI_stub AMI_NoReplyH_skel AMI_NoReplyH_lema_gen AMI_NoReplyH_lemae_gen AMI_NoReplyH_conn - sharedname = NoReplyH_svnt - libs += NoReplyH_stub NoReplyH_skel NoReplyH_lem_stub NoReplyH_conn - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyHA_svnt.cpp - } - - Header_Files { - NoReplyHA_svnt.h - NoReplyHA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/.gitignore deleted file mode 100644 index bdd29919c85..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/NoReplyH_ReceiverE.idl -/NoReplyH_Receiver_exec_export.h -/NoReplyH_Receiver_lem_stub_export.h -/NoReplyH_Receiver_stub_export.h -/NoReplyH_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl deleted file mode 100644 index 69973ed826a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef NOREPLYH_RECEIVER_IDL -#define NOREPLYH_RECEIVER_IDL - -#include - -#include "Base/NoReplyH.idl" - -module NoReplyH -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc deleted file mode 100644 index 0455c415edd..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p NoReplyH_Base NoReplyH_Receiver" - -project(AMI_NoReplyH_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_NoReplyH_idl_gen - idlflags += -Wb,stub_export_macro=NOREPLYH_RECEIVER_STUB_Export \ - -Wb,stub_export_include=NoReplyH_Receiver_stub_export.h \ - -Wb,skel_export_macro=NOREPLYH_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=NoReplyH_Receiver_svnt_export.h \ - -Wb,exec_export_macro=NOREPLYH_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=NoReplyH_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - NoReplyH_Receiver.idl - } -} - -project(AMI_NoReplyH_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_NoReplyH_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=NoReplyH_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - NoReplyH_ReceiverE.idl - } -} - -project(AMI_NoReplyH_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_NoReplyH_Base_Receiver_lem_gen AMI_NoReplyH_Base_Receiver_stub AMI_NoReplyH_stub - libs += NoReplyH_stub NoReplyH_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = NoReplyH_Receiver_lem_stub - dynamicflags += NOREPLYH_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_ReceiverEC.cpp - } - - Header_Files { - NoReplyH_ReceiverEC.h - NoReplyH_Receiver_lem_stub_export.h - } - - Inline_Files { - NoReplyH_ReceiverEC.inl - } -} - -project(AMI_NoReplyH_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_NoReplyH_Base_Receiver_idl_gen AMI_NoReplyH_stub - libs += NoReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = NoReplyH_Receiver_stub - dynamicflags += NOREPLYH_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_ReceiverC.cpp - } - - Header_Files { - NoReplyH_ReceiverC.h - NoReplyH_Receiver_stub_export.h - } - - Inline_Files { - NoReplyH_ReceiverC.inl - } -} - -project(AMI_NoReplyH_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_NoReplyH_Base_Receiver_l_stub AMI_NoReplyH_Base_Receiver_stub AMI_NoReplyH_stub AMI_NoReplyH_lem_stub - sharedname = NoReplyH_Receiver_exec - libs += NoReplyH_Receiver_stub NoReplyH_Receiver_lem_stub NoReplyH_stub NoReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_Receiver_exec.cpp - } - - Header_Files { - NoReplyH_Receiver_exec.h - NoReplyH_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_NoReplyH_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_NoReplyH_Base_skel AMI_NoReplyH_Base_Receiver_l_stub AMI_NoReplyH_stub AMI_NoReplyH_skel AMI_NoReplyH_lem_stub - sharedname = NoReplyH_Receiver_svnt - libs += NoReplyH_Receiver_stub NoReplyH_Receiver_lem_stub \ - NoReplyH_skel \ - NoReplyH_stub NoReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_ReceiverS.cpp - NoReplyH_Receiver_svnt.cpp - } - - Header_Files { - NoReplyH_ReceiverS.h - NoReplyH_Receiver_svnt.h - NoReplyH_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp deleted file mode 100644 index afdbef89d97..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "NoReplyH_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_NoReplyH_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::NoReplyH::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &calls) - : ciao_context_ ( - ::NoReplyH::CCM_Receiver_Context::_duplicate (ctx)), - attrib_ (0), - calls_(calls) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::NoReplyH::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str, - ::CORBA::String_out answer) - { - ++this->calls_; - if (ACE_OS::strlen (in_str) == 0) - { - NoReplyH::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; - } - } - - void - do_my_foo_exec_i::hello (::CORBA::Long_out answer) - { - ++this->calls_; - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = 4; - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - ++this->calls_; - ACE_OS::sleep (ACE_OS::rand () % 2); - return 2; - } - - void - do_my_foo_exec_i::rw_attrib (::CORBA::Short rw_attrib) - { - ++this->calls_; - if (rw_attrib == 0) - { - NoReplyH::InternalError ex (42, "Hello world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - ++this->calls_; - return 3; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - :calls_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::NoReplyH::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in (), - this->calls_), - ::NoReplyH::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::NoReplyH::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::NoReplyH::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->calls_.value() != 10) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - "calls" - "Expected: 10, Received: %u.\n", - this->calls_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " - "number of calls. " - "Expected: 10, Received: %u.\n", - this->calls_.value())); - } - } - - extern "C" NOREPLYH_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NoReplyH_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h deleted file mode 100644 index bbfc6add7a5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h +++ /dev/null @@ -1,142 +0,0 @@ - // -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_NOREPLYH_RECEIVER_EXEC_G46GZJ_H_ -#define CIAO_NOREPLYH_RECEIVER_EXEC_G46GZJ_H_ - -#include /**/ "ace/pre.h" - -#include "NoReplyH_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "NoReplyH_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_NoReplyH_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::NoReplyH::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::NoReplyH::CCM_Receiver_Context_ptr ctx, Atomic_UShort &); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from NoReplyH::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - - virtual - void hello (::CORBA::Long_out answer); - - virtual - ::CORBA::Short rw_attrib (void); - - virtual - void rw_attrib (::CORBA::Short rw_attrib); - - virtual - ::CORBA::Short ro_attrib (void); - //@} - - private: - ::NoReplyH::CCM_Receiver_Context_var ciao_context_; - CORBA::Long attrib_; - Atomic_UShort &calls_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::NoReplyH::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::NoReplyH::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::NoReplyH::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - Atomic_UShort calls_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - extern "C" NOREPLYH_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NoReplyH_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/.gitignore deleted file mode 100644 index 744d3810a46..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/NoReplyH_SenderE.idl -/NoReplyH_Sender_exec_export.h -/NoReplyH_Sender_lem_stub_export.h -/NoReplyH_Sender_stub_export.h -/NoReplyH_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl deleted file mode 100644 index 6558b429398..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef NOREPLYH_SENDER_IDL -#define NOREPLYH_SENDER_IDL - -#include - -#include "Base/NoReplyH.idl" - -#pragma ciao ami4ccm receptacle "NoReplyH::Sender::run_my_foo" - -module NoReplyH -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc deleted file mode 100644 index 9ea5f80ec14..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p NoReplyH_Base NoReplyH_Sender" - -project(AMI_NoReplyH_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_NoReplyH_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_SENDER_STUB_Export \ - -Wb,stub_export_include=NoReplyH_Sender_stub_export.h \ - -Wb,skel_export_macro=NOREPLYH_SENDER_SVNT_Export \ - -Wb,skel_export_include=NoReplyH_Sender_svnt_export.h \ - -Wb,exec_export_macro=NOREPLYH_SENDER_EXEC_Export \ - -Wb,exec_export_include=NoReplyH_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - NoReplyH_Sender.idl - } -} - -project(AMI_NoReplyH_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_NoReplyH_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOREPLYH_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=NoReplyH_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - NoReplyH_SenderE.idl - } -} - -project(AMI_NoReplyH_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_NoReplyH_Base_Sender_lem_gen AMI_NoReplyH_stub Conn_NoReplyH_Base_stub - libs += NoReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = NoReplyH_Sender_lem_stub - dynamicflags += NOREPLYH_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_SenderEC.cpp - } - - Header_Files { - NoReplyH_SenderEC.h - NoReplyH_Sender_lem_stub_export.h - } - - Inline_Files { - NoReplyH_SenderEC.inl - } -} - -project(AMI_NoReplyH_Base_Sender_stub) : ccm_stub, ami { - after += AMI_NoReplyH_Base_Sender_idl_gen AMI_NoReplyH_Base_stub AMI_NoReplyH_stub Conn_NoReplyH_Base_stub - libs += NoReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = NoReplyH_Sender_stub - dynamicflags += NOREPLYH_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_SenderC.cpp - } - - Header_Files { - NoReplyH_SenderC.h - NoReplyH_Sender_stub_export.h - } - - Inline_Files { - NoReplyH_SenderC.inl - } -} - -project(AMI_NoReplyH_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_NoReplyH_Base_Sender_lem_stub AMI_NoReplyH_Base_Sender_stub AMI_NoReplyH_Base_exec Conn_NoReplyH_Base_stub AMI_NoReplyH_lem_stub - sharedname = NoReplyH_Sender_exec - libs += NoReplyH_Sender_stub NoReplyH_Sender_lem_stub NoReplyH_stub NoReplyH_stub NoReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_Sender_exec.cpp - } - - Header_Files { - NoReplyH_Sender_exec.h - NoReplyH_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_NoReplyH_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_NoReplyH_Base_skel AMI_NoReplyH_Base_Sender_lem_stub AMI_NoReplyH_Base_Sender_stub AMI_NoReplyH_Base_exec AMI_NoReplyH_skel - sharedname = NoReplyH_Sender_svnt - libs += NoReplyH_Sender_stub NoReplyH_Sender_lem_stub \ - NoReplyH_skel \ - NoReplyH_stub - libpaths += ../lib - libout = ../lib - dynamicflags += NOREPLYH_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - NoReplyH_SenderS.cpp - NoReplyH_Sender_svnt.cpp - } - - Header_Files { - NoReplyH_SenderS.h - NoReplyH_Sender_svnt.h - NoReplyH_Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp deleted file mode 100644 index 7bdb81d812a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp +++ /dev/null @@ -1,325 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "NoReplyH_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - - -namespace CIAO_NoReplyH_Sender_Impl -{ - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::NoReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_received_back) - : context_(::NoReplyH::CCM_Sender_Context::_duplicate (context)), - nr_received_back_(nr_received_back) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::NoReplyH::AMI4CCM_MyFoo_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); - return 1; - } - else - { - ::NoReplyH::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_received_back_); - - //Invoke Asynchronous calls - //test with replyhandler. - my_foo_ami_->sendc_foo ( cb.in (), - "Do something asynchronous"); - - //test without replyhandlers. - my_foo_ami_->sendc_foo ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), - "Do something asynchronous with no replyhandler"); - 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::AMI4CCM_MyFooReplyHandler::_nil ()); - } - //Invoke Asynchronous calls to test exception handling - //without replyhandlers. - my_foo_ami_->sendc_foo ( - NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), ""); - my_foo_ami_->sendc_set_rw_attrib ( - NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), 0); - - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::NoReplyH::CCM_Sender_Context_ptr context) - : context_(::NoReplyH::CCM_Sender_Context::_duplicate (context)) - - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::NoReplyH::MyFoo_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - - //run some synch calls - try - { - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, "OK: SYNCH rw_attrib() returns %u.\n", - rw_attrib)); - } - catch (const NoReplyH::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR: SYNCH rw_attrib(): " - "Unexpected return.\n")); - } - try - { - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, "OK: SYNCH ro_attrib() returns %u.\n", - ro_attrib)); - } - catch (const NoReplyH::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR: SYNCH ro_attrib(): " - "Unexpected return.\n")); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen(0), - synch_foo_gen(0), - nr_received_back_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::NoReplyH::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_received_back_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if(this->nr_received_back_.value() != 1) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender doesn't received the expected " - "number of callbacks" - "Expected: 1, Received: %u.\n", - this->nr_received_back_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of " - "callbacks: %u.\n", - this->nr_received_back_.value())); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_received_back) - : nr_received_back_(nr_received_back) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * answer) - { - ++this->nr_received_back_; - ACE_DEBUG ((LM_DEBUG, "OK: ASYNCH foo() returns answer: %C.\n", - answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::foo_excep: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long /* answer */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::hello: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::hello_excep: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short /* rw_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::get_rw_attrib: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::get_rw_attrib_excep: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::set_rw_attrib: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::set_rw_attrib_excep: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short /* ro_attrib */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::get_ro_attrib: " - "Unexpected return.\n")); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - // never should come here in this test. - ACE_ERROR ((LM_ERROR, "ERROR: MI4CCM_MyFooReplyHandler_i::get_ro_attrib_excep: " - "Unexpected return.\n")); - } - - extern "C" NOREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NoReplyH_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h deleted file mode 100644 index b1ca991cab8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.h +++ /dev/null @@ -1,181 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_NOREPLYH_SENDER_EXEC_5F9YOB_H_ -#define CIAO_NOREPLYH_SENDER_EXEC_5F9YOB_H_ - -#include /**/ "ace/pre.h" - -#include "NoReplyH_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "NoReplyH_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_NoReplyH_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::NoReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_received_back); - - virtual int svc (void); - - private: - ::NoReplyH::CCM_Sender_Context_var context_; - Atomic_UShort &nr_received_back_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::NoReplyH::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::NoReplyH::CCM_Sender_Context_var context_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::NoReplyH::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_UShort nr_received_back_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::NoReplyH::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_received_back_; - - }; - - extern "C" NOREPLYH_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NoReplyH_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp deleted file mode 100644 index 4ef231a4614..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - NoReplyH_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_NoReplyH_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_NoReplyH_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - NoReplyH_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_NoReplyH_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_NoReplyH_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - NoReplyH_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_NoReplyH_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_NoReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - NoReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - NoReplyH.ComponentImplementations.NoReplyHImplementation.NoReplyH.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - NoReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - NoReplyH_svnt - - entryPoint - - - tk_string - - - create_NoReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - NoReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - NoReplyH_conn - - entryPoint - - - tk_string - - - create_NoReplyH_AMI_MyFoo_Connector_Impl - - - - - - - NoReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - NoReplyH_Receiver_svnt - - entryPoint - - - tk_string - - - create_NoReplyH_AMI_ReceiverHome_Servant - - - - - - - NoReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - NoReplyH_Receiver_exec - - entryPoint - - - tk_string - - - create_NoReplyH_AMI_ReceiverHome_Impl - - - - - - - NoReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - NoReplyH_Sender_svnt - - entryPoint - - - tk_string - - - create_NoReplyH_AMI_SenderHome_Servant - - - - - - - NoReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - NoReplyH_Sender_exec - - entryPoint - - - tk_string - - - create_NoReplyH_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl deleted file mode 100755 index 8acd07c277c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill ( 2 * $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/CIAO/connectors/ami4ccm/tests/OneProcess/.gitignore b/CIAO/connectors/ami4ccm/tests/OneProcess/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/.gitignore deleted file mode 100644 index 9c14381c4e2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/OneProcessA.idl -/OneProcessAE.idl -/OneProcessA_conn.cpp -/OneProcessA_conn.h -/OneProcessE.idl -/OneProcess_conn_export.h -/OneProcess_exec_export.h -/OneProcess_lem_stub_export.h -/OneProcess_skel_export.h -/OneProcess_stub_export.h -/OneProcess_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl deleted file mode 100644 index 63dac05ef1f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.idl +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef ONEPROCESS_IDL -#define ONEPROCESS_IDL - -#pragma ciao lem "Base/OneProcessE.idl" -#pragma ciao ami4ccm interface "OneProcess::MyFoo" -#pragma ciao lem "Base/OneProcessAE.idl" -#pragma ciao ami4ccm idl "Base/OneProcessA.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/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc deleted file mode 100644 index d95c388d446..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc +++ /dev/null @@ -1,191 +0,0 @@ -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 - - 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, typecode { - 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 -GC -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 { - } -} - -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/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/.gitignore deleted file mode 100644 index e997f691181..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/OneProcess_ReceiverE.idl -/OneProcess_Receiver_exec_export.h -/OneProcess_Receiver_lem_stub_export.h -/OneProcess_Receiver_stub_export.h -/OneProcess_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl deleted file mode 100644 index 3c6e8370312..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef ONEPROCESS_RECEIVER_IDL -#define ONEPROCESS_RECEIVER_IDL - -#include - -#include "Base/OneProcess.idl" - -module OneProcess -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc deleted file mode 100644 index 69474e0a621..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc +++ /dev/null @@ -1,131 +0,0 @@ -// 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 { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp deleted file mode 100644 index d5a810ed47f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.cpp +++ /dev/null @@ -1,152 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "OneProcess_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_OneProcess_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::OneProcess::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::OneProcess::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::OneProcess::MyFoo - - ::CORBA::Long - do_my_foo_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; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::OneProcess::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::OneProcess::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::OneProcess::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::OneProcess::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ONEPROCESS_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneProcess_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h deleted file mode 100644 index 7dc5d7be4b7..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h +++ /dev/null @@ -1,131 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_ONEPROCESS_RECEIVER_EXEC_XIUX6C_H_ -#define CIAO_ONEPROCESS_RECEIVER_EXEC_XIUX6C_H_ - -#include /**/ "ace/pre.h" - -#include "OneProcess_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "OneProcess_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_OneProcess_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::OneProcess::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::OneProcess::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from OneProcess::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::OneProcess::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::OneProcess::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::OneProcess::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::OneProcess::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" ONEPROCESS_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneProcess_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/.gitignore deleted file mode 100644 index 7c5170e4cf2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/OneProcess_SenderE.idl -/OneProcess_Sender_exec_export.h -/OneProcess_Sender_lem_stub_export.h -/OneProcess_Sender_stub_export.h -/OneProcess_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl deleted file mode 100644 index 40a01d136ee..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ONEPROCESS_SENDER_IDL -#define ONEPROCESS_SENDER_IDL - -#include - -#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/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc deleted file mode 100644 index 34648144487..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OneProcess_Base OneProcess_Sender" - -project(AMI_OneProcess_Base_Sender_idl_gen) : componentidldefaults { - after += 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.. -GC - - 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_Sender_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 { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp deleted file mode 100644 index 34c27908d87..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp +++ /dev/null @@ -1,293 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "OneProcess_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - - -namespace CIAO_OneProcess_Sender_Impl -{ - Atomic_UShort nr_of_sent = 0; - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::OneProcess::CCM_Sender_Context_ptr context, - Atomic_Boolean &asynch) - : context_(::OneProcess::CCM_Sender_Context::_duplicate (context)), - asynch_(asynch) - - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep(3); - ::OneProcess::AMI4CCM_MyFoo_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - ::OneProcess::AMI4CCM_MyFooReplyHandler_var cb0 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->asynch_); - ::OneProcess::AMI4CCM_MyFooReplyHandler_var cb1 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->asynch_); - ::OneProcess::AMI4CCM_MyFooReplyHandler_var cb2 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->asynch_); - ::OneProcess::AMI4CCM_MyFooReplyHandler_var cb3 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->asynch_); - ::OneProcess::AMI4CCM_MyFooReplyHandler_var cb4 = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->asynch_); - - for (int i = 0; i < 5; ++i) - { - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :" - "\tfoo_ami is NIL !\n")); - return 1; - } - // sender, receiver and connector in one node: asynchronous callbacks - // should become received synchronous. - if (this->asynch_.value() == true) - { - //expect to have receive an answer before you come here again. - //if asynch == true, error because no answer received in - //MyFoo_callback_exec_i::foo - ACE_ERROR ((LM_ERROR, "ERROR: not received synchronous answer " - "for asynchronous call\n")); - } - else - { - ++nr_of_sent; - //Invoke Asynchronous calls to test - if (i == 0) - { - this->asynch_ = true; - my_foo_ami_->sendc_foo ( cb0.in(),"Hi 1", 1); - } - else if (i == 1) - { - this->asynch_ = true; - my_foo_ami_->sendc_foo ( cb1.in(),"Hi 2", 1); - } - else if (i == 2) - { - this->asynch_ = true; - my_foo_ami_->sendc_foo ( cb2.in(),"Hi 3", 1); - } - else if (i == 3) - { - this->asynch_ = true; - my_foo_ami_->sendc_foo ( cb3.in(),"Hi 4", 1); - } - else if (i == 4) - { - this->asynch_ = true; - my_foo_ami_->sendc_foo ( cb4.in(),"Hi 5", 1); - } - } - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::OneProcess::CCM_Sender_Context_ptr context) - : context_(::OneProcess::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep(3); - ::OneProcess::MyFoo_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - - CORBA::Boolean wait = false; - for (int i = 0; i < 3; ++i) - { - //run some synch calls - try - { - CORBA::String_var answer; - if( wait==true) - { - ACE_ERROR ((LM_ERROR, - "ERROR: NOT RECEIVED SYNCHRONOUS answer.\n")); - } - wait = true; - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - 2 , - answer.out ()); - if ( result == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK: RECEIVED SYNCHRONOUS answer <%C>\n", - answer.in ())); - wait = false; - } - } - catch (const OneProcess::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - ACE_OS::sleep(1); - } - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen(0), - synch_foo_gen(0), - asynch_(false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::OneProcess::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->asynch_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if ((this->asynch_.value() == true) || (nr_of_sent.value() != 5)) - { - ACE_ERROR ((LM_ERROR, - "ERROR: All in one proces worked asynchronous, " - "this was not expected!\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "OK: All in one proces worked synchronous as expected\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_Boolean &asynch) - : asynch_(asynch) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * /* answer */) - { - if (ami_return_val == 1) - { - ACE_DEBUG ((LM_DEBUG, "OK: GET ASYNCHRONOUS CALLBACK, \n")); - this->asynch_ = false; - } - if (ami_return_val == 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ASYNCHRONOUS CALLBACK " - "FROM SYNCHRONOUS SENT MESSAGE\n")); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" ONEPROCESS_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneProcess_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h deleted file mode 100644 index f2dabd4136e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h +++ /dev/null @@ -1,148 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_ONEPROCESS_SENDER_EXEC_MFMTWV_H_ -#define CIAO_ONEPROCESS_SENDER_EXEC_MFMTWV_H_ - -#include /**/ "ace/pre.h" - -#include "OneProcess_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "OneProcess_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_OneProcess_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - typedef ACE_Atomic_Op Atomic_Boolean; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::OneProcess::CCM_Sender_Context_ptr context, - Atomic_Boolean &asynch); - - virtual int svc (void); - - private: - ::OneProcess::CCM_Sender_Context_var context_; - Atomic_Boolean &asynch_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::OneProcess::CCM_Sender_Context_ptr context); - virtual int svc (void); - - private: - ::OneProcess::CCM_Sender_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::OneProcess::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_Boolean asynch_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::OneProcess::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_Boolean &asynch); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_Boolean &asynch_; - - }; - - extern "C" ONEPROCESS_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneProcess_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp deleted file mode 100644 index 14a2b49dd65..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - OneProcess_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_OneProcess_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneProcess_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - OneProcess_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_OneProcess_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneProcess_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - OneProcess_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_OneProcess_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Receiver - AllInOne - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.Sender - AllInOne - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - OneProcess.ComponentImplementations.OneProcessImplementation.OneProcess.AMI - AllInOne - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - OneProcess_svnt - - entryPoint - - - tk_string - - - create_OneProcess_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - OneProcess.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - OneProcess_conn - - entryPoint - - - tk_string - - - create_OneProcess_AMI4CCM_MyFoo_Connector_Impl - - - - - - - OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - OneProcess_Receiver_svnt - - entryPoint - - - tk_string - - - create_OneProcess_AMI_ReceiverHome_Servant - - - - - - - OneProcess.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - OneProcess_Receiver_exec - - entryPoint - - - tk_string - - - create_OneProcess_AMI_ReceiverHome_Impl - - - - - - - OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - OneProcess_Sender_svnt - - entryPoint - - - tk_string - - - create_OneProcess_AMI_SenderHome_Servant - - - - - - - OneProcess.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - OneProcess_Sender_exec - - entryPoint - - - tk_string - - - create_OneProcess_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl deleted file mode 100755 index 51d32223619..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = "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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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\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/CIAO/connectors/ami4ccm/tests/OneReplyH/.gitignore b/CIAO/connectors/ami4ccm/tests/OneReplyH/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/.gitignore deleted file mode 100644 index a238cfdb595..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/OneReplyHA.idl -/OneReplyHAE.idl -/OneReplyHA_conn.cpp -/OneReplyHA_conn.h -/OneReplyHE.idl -/OneReplyH_conn_export.h -/OneReplyH_exec_export.h -/OneReplyH_lem_stub_export.h -/OneReplyH_skel_export.h -/OneReplyH_stub_export.h -/OneReplyH_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl deleted file mode 100644 index ae50eec2191..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.idl +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ONEREPLYH_T_IDL -#define ONEREPLYH_T_IDL - -#pragma ciao lem "Base/OneReplyHE.idl" -#pragma ciao ami4ccm interface "OneReplyH::MyFoo" -#pragma ciao lem "Base/OneReplyHAE.idl" -#pragma ciao ami4ccm idl "Base/OneReplyHA.idl" - -module OneReplyH -{ - - const short cmd_synch_foo_ok = 1; - const short cmd_synch_foo_nok = 2; - const short cmd_asynch_foo_ok = 3; - const short cmd_asynch_foo_nok = 4; - const short cmd_synch_bar_ok = 5; - const short cmd_synch_bar_nok = 6; - const short cmd_asynch_bar_ok = 7; - const short cmd_asynch_bar_nok = 8; - - 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); - void bar (in string in_str, in long cmd, out string answer, out long l_cmd) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc deleted file mode 100644 index 290f7ff1edb..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_OneReplyH_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_STUB_Export \ - -Wb,stub_export_include=OneReplyH_stub_export.h \ - -Wb,skel_export_macro=ONEREPLYH_T_SKEL_Export \ - -Wb,skel_export_include=OneReplyH_skel_export.h \ - -Wb,conn_export_macro=ONEREPLYH_T_CONN_Export \ - -Wb,conn_export_include=OneReplyH_conn_export.h \ - -Wb,exec_export_macro=ONEREPLYH_T_EXEC_Export \ - -Wb,exec_export_include=OneReplyH_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - OneReplyH.idl - } -} - -project(AMI_OneReplyH_lem_gen) : ciaoidldefaults { - after += AMI_OneReplyH_idl_gen AMI_OneReplyH_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=ONEREPLYH_T_LEM_STUB_Export \ - -Wb,export_include=OneReplyH_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - OneReplyHE.idl - } -} - -project(AMI_OneReplyH_lema_gen) : ciaoidldefaults, typecode { - after += AMI_OneReplyH_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_STUB_Export \ - -Wb,stub_export_include=OneReplyH_stub_export.h \ - -Wb,conn_export_macro=ONEREPLYH_T_CONN_Export \ - -Wb,conn_export_include=OneReplyH_conn_export.h \ - -Wb,svnt_export_macro=ONEREPLYH_T_SVNT_Export \ - -Wb,svnt_export_include=OneReplyH_svnt_export.h \ - -Wb,skel_export_macro=ONEREPLYH_T_SKEL_Export \ - -Wb,skel_export_include=OneReplyH_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - OneReplyHA.idl - } -} - -project(AMI_OneReplyH_lemae_gen) : ciaoidldefaults { - after += AMI_OneReplyH_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_LEM_STUB_Export \ - -Wb,stub_export_include=OneReplyH_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - OneReplyHAE.idl - } -} - -project(AMI_OneReplyH_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_OneReplyH_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = OneReplyH_stub - dynamicflags += ONEREPLYH_T_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OneReplyHC.cpp - OneReplyHAC.cpp - } - - Header_Files { - OneReplyHC.h - OneReplyH_stub_export.h -} - - Inline_Files { - OneReplyHC.inl - } -} - -project(AMI_OneReplyH_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_OneReplyH_lem_gen AMI_OneReplyH_stub AMI_OneReplyH_lemae_gen AMI_OneReplyH_skel - libs += OneReplyH_stub OneReplyH_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = OneReplyH_lem_stub - dynamicflags += ONEREPLYH_T_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OneReplyHEC.cpp - OneReplyHAEC.cpp - } - - Header_Files { - OneReplyHEC.h - OneReplyH_lem_stub_export.h -} - - Inline_Files { - OneReplyHEC.inl - } -} - -project(AMI_OneReplyH_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_OneReplyH_stub - sharedname = OneReplyH_skel - libs += OneReplyH_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += ONEREPLYH_T_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OneReplyHS.cpp - OneReplyHAS.cpp - } - - Header_Files { - OneReplyHS.h - - OneReplyH_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_OneReplyH_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_OneReplyH_lem_stub OneReplyH_Base_AMI_stub AMI_OneReplyH_skel AMI_OneReplyH_lema_gen AMI_OneReplyH_lemae_gen - sharedname = OneReplyH_conn - libs += OneReplyH_stub OneReplyH_skel OneReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyHA_conn.cpp - } - - Header_Files { - OneReplyHA_conn.h - OneReplyH_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_OneReplyH_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_OneReplyH_lem_stub OneReplyH_Base_AMI_stub AMI_OneReplyH_skel AMI_OneReplyH_lema_gen AMI_OneReplyH_lemae_gen AMI_OneReplyH_conn - sharedname = OneReplyH_svnt - libs += OneReplyH_stub OneReplyH_skel OneReplyH_lem_stub OneReplyH_conn - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyHA_svnt.cpp - } - - Header_Files { - OneReplyHA_svnt.h - OneReplyHA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/.gitignore deleted file mode 100644 index 4cda43d012a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/OneReplyH_ReceiverE.idl -/OneReplyH_Receiver_exec_export.h -/OneReplyH_Receiver_lem_stub_export.h -/OneReplyH_Receiver_stub_export.h -/OneReplyH_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl deleted file mode 100644 index 1ce93c3ed9c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef ONEREPLYH_T_RECEIVER_IDL -#define ONEREPLYH_T_RECEIVER_IDL - -#include - -#include "Base/OneReplyH.idl" - -module OneReplyH -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc deleted file mode 100644 index ac45051ab56..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OneReplyH_Base OneReplyH_Receiver" - -project(AMI_OneRep_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_OneReplyH_idl_gen - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_RECEIVER_STUB_Export \ - -Wb,stub_export_include=OneReplyH_Receiver_stub_export.h \ - -Wb,skel_export_macro=ONEREPLYH_T_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=OneReplyH_Receiver_svnt_export.h \ - -Wb,exec_export_macro=ONEREPLYH_T_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=OneReplyH_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - OneReplyH_Receiver.idl - } -} - -project(AMI_OneRep_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_OneRep_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=OneReplyH_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - OneReplyH_ReceiverE.idl - } -} - -project(AMI_OneReplyH_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_OneRep_Base_Receiver_lem_gen AMI_OneReplyH_Base_Receiver_stub AMI_OneReplyH_stub - libs += OneReplyH_stub OneReplyH_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = OneReplyH_Receiver_lem_stub - dynamicflags += ONEREPLYH_T_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_ReceiverEC.cpp - } - - Header_Files { - OneReplyH_ReceiverEC.h - OneReplyH_Receiver_lem_stub_export.h - } - - Inline_Files { - OneReplyH_ReceiverEC.inl - } -} - -project(AMI_OneReplyH_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_OneRep_Base_Receiver_idl_gen AMI_OneReplyH_stub - libs += OneReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = OneReplyH_Receiver_stub - dynamicflags += ONEREPLYH_T_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_ReceiverC.cpp - } - - Header_Files { - OneReplyH_ReceiverC.h - OneReplyH_Receiver_stub_export.h - } - - Inline_Files { - OneReplyH_ReceiverC.inl - } -} - -project(AMI_OneReplyH_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_OneReplyH_Base_Receiver_l_stub AMI_OneReplyH_Base_Receiver_stub AMI_OneReplyH_stub AMI_OneReplyH_lem_stub - sharedname = OneReplyH_Receiver_exec - libs += OneReplyH_Receiver_stub OneReplyH_Receiver_lem_stub OneReplyH_stub OneReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_Receiver_exec.cpp - } - - Header_Files { - OneReplyH_Receiver_exec.h - OneReplyH_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_OneReplyH_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_OneReplyH_Base_skel AMI_OneReplyH_Base_Receiver_l_stub AMI_OneReplyH_stub AMI_OneReplyH_skel AMI_OneReplyH_lem_stub - sharedname = OneReplyH_Receiver_svnt - libs += OneReplyH_Receiver_stub OneReplyH_Receiver_lem_stub \ - OneReplyH_skel \ - OneReplyH_stub OneReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_ReceiverS.cpp - OneReplyH_Receiver_svnt.cpp - } - - Header_Files { - OneReplyH_ReceiverS.h - OneReplyH_Receiver_svnt.h - OneReplyH_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp deleted file mode 100644 index 134d15024b2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "OneReplyH_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_OneReplyH_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::OneReplyH::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::OneReplyH::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::OneReplyH::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer) - { - if (ACE_OS::strlen (in_str) == 0) - { - OneReplyH::InternalError ex (cmd,"foo thrown by receiver"); - throw ex; - } - else - { - answer = CORBA::string_dup ("This is my answer : Hi"); - return cmd; - } - } - - void - do_my_foo_exec_i::bar (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer, - ::CORBA::Long_out l_cmd) - { - if (ACE_OS::strlen (in_str) == 0) - { - OneReplyH::InternalError ex (cmd,"bar thrown by receiver"); - throw ex; - } - else - { - answer = CORBA::string_dup("hi from receiver."); - l_cmd = cmd; - } - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::OneReplyH::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::OneReplyH::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::OneReplyH::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::OneReplyH::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ONEREPLYH_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneReplyH_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h deleted file mode 100644 index 0deb6e181b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_ONEREPLYH_RECEIVER_EXEC_6ZK29Q_H_ -#define CIAO_ONEREPLYH_RECEIVER_EXEC_6ZK29Q_H_ - -#include /**/ "ace/pre.h" - -#include "OneReplyH_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "OneReplyH_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_OneReplyH_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::OneReplyH::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::OneReplyH::CCM_Receiver_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from OneReplyH::MyFoo. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - - virtual - void bar (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer, - ::CORBA::Long_out l_cmd); - //@} - - private: - ::OneReplyH::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::OneReplyH::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::OneReplyH::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::OneReplyH::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" ONEREPLYH_T_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneReplyH_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/.gitignore deleted file mode 100644 index 5e9472c664c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/OneReplyH_SenderE.idl -/OneReplyH_Sender_exec_export.h -/OneReplyH_Sender_lem_stub_export.h -/OneReplyH_Sender_stub_export.h -/OneReplyH_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl deleted file mode 100644 index c79e67aa9a8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ONEREPLYH_T_SENDER_IDL -#define ONEREPLYH_T_SENDER_IDL - -#include - -#include "Base/OneReplyH.idl" - -#pragma ciao ami4ccm receptacle "OneReplyH::Sender::run_my_foo" - -module OneReplyH -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc deleted file mode 100644 index ac195d708e4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OneReplyH_Base OneReplyH_Sender" - -project(AMI_OneReplyH_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_OneReplyH_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_SENDER_STUB_Export \ - -Wb,stub_export_include=OneReplyH_Sender_stub_export.h \ - -Wb,skel_export_macro=ONEREPLYH_T_SENDER_SVNT_Export \ - -Wb,skel_export_include=OneReplyH_Sender_svnt_export.h \ - -Wb,exec_export_macro=ONEREPLYH_T_SENDER_EXEC_Export \ - -Wb,exec_export_include=OneReplyH_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - OneReplyH_Sender.idl - } -} - -project(AMI_OneReplyH_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_OneReplyH_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=ONEREPLYH_T_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=OneReplyH_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - OneReplyH_SenderE.idl - } -} - -project(AMI_OneReplyH_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_OneReplyH_Base_Sender_lem_gen AMI_OneReplyH_stub Conn_OneReplyH_Base_stub - libs += OneReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = OneReplyH_Sender_lem_stub - dynamicflags += ONEREPLYH_T_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_SenderEC.cpp - } - - Header_Files { - OneReplyH_SenderEC.h - OneReplyH_Sender_lem_stub_export.h - } - - Inline_Files { - OneReplyH_SenderEC.inl - } -} - -project(AMI_OneReplyH_Base_Sender_stub) : ccm_stub, ami { - after += AMI_OneReplyH_Base_Sender_idl_gen AMI_OneReplyH_Base_stub AMI_OneReplyH_stub Conn_OneReplyH_Base_stub - libs += OneReplyH_stub - libpaths += ../lib - libout = ../lib - sharedname = OneReplyH_Sender_stub - dynamicflags += ONEREPLYH_T_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_SenderC.cpp - } - - Header_Files { - OneReplyH_SenderC.h - OneReplyH_Sender_stub_export.h - } - - Inline_Files { - OneReplyH_SenderC.inl - } -} - -project(AMI_OneReplyH_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_OneReplyH_Base_Sender_lem_stub AMI_OneReplyH_Base_Sender_stub AMI_OneReplyH_Base_exec Conn_OneReplyH_Base_stub AMI_OneReplyH_lem_stub - sharedname = OneReplyH_Sender_exec - libs += OneReplyH_Sender_stub OneReplyH_Sender_lem_stub OneReplyH_stub OneReplyH_stub OneReplyH_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_Sender_exec.cpp - } - - Header_Files { - OneReplyH_Sender_exec.h - OneReplyH_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_OneReplyH_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_OneReplyH_Base_skel AMI_OneReplyH_Base_Sender_lem_stub AMI_OneReplyH_Base_Sender_stub AMI_OneReplyH_Base_exec AMI_OneReplyH_skel - sharedname = OneReplyH_Sender_svnt - libs += OneReplyH_Sender_stub OneReplyH_Sender_lem_stub \ - OneReplyH_skel \ - OneReplyH_stub - libpaths += ../lib - libout = ../lib - dynamicflags += ONEREPLYH_T_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - OneReplyH_SenderS.cpp - OneReplyH_Sender_svnt.cpp - } - - Header_Files { - OneReplyH_SenderS.h - OneReplyH_Sender_svnt.h - OneReplyH_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp deleted file mode 100644 index 7d3cc436b3d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp +++ /dev/null @@ -1,340 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "OneReplyH_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - - -namespace CIAO_OneReplyH_Sender_Impl -{ - CORBA::Short nr_of_excep_received = 0; - - void HandleException ( - long id, - long expect_id, - const char* /*error_string*/, - const char* func) - { - //expected exception - if ( id == expect_id) - { - ++nr_of_excep_received; - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR Sender: wrong exception received" - " for %C\n", func)); - } - } - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::OneReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::OneReplyH::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - cb_ = new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_received_); - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::OneReplyH::AMI4CCM_MyFoo_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - 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 one replyhandler. - my_foo_ami_->sendc_foo ( this->cb_.in(), "Hi from foo 1", - OneReplyH::cmd_asynch_foo_ok); - //this should invoke a exception - my_foo_ami_->sendc_foo ( this->cb_.in(), "", - OneReplyH::cmd_asynch_foo_nok); - my_foo_ami_->sendc_foo ( this->cb_.in(), "Hi from foo 2", - OneReplyH::cmd_asynch_foo_ok); - my_foo_ami_->sendc_bar ( this->cb_.in(), "Hi from bar", - OneReplyH::cmd_asynch_bar_ok); - my_foo_ami_->sendc_foo ( this->cb_.in(), "Hi from foo 3", - OneReplyH::cmd_asynch_foo_ok); - - //this should invoke a exception - my_foo_ami_->sendc_bar ( this->cb_.in(), "", OneReplyH::cmd_asynch_bar_nok); - } - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::OneReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::OneReplyH::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::OneReplyH::MyFoo_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - - //run some synch calls - CORBA::String_var out_str; - CORBA::Long l_cmd = 0; - try - { - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - OneReplyH::cmd_synch_foo_ok, - out_str.out ()); - if ( result == OneReplyH::cmd_synch_foo_ok) - { - ++this->nr_of_received_; - } - } - catch (const OneReplyH::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - try - { - my_foo_ami_->foo ("",OneReplyH::cmd_synch_foo_nok, out_str); - } - catch (const OneReplyH::InternalError& ex) - { - HandleException (ex.id, OneReplyH::cmd_synch_foo_nok, - ex.error_string.in(), - "synch foo"); - } - try - { - my_foo_ami_->bar ("Do something synchronous", - OneReplyH::cmd_synch_bar_ok, - out_str, l_cmd); - if ( l_cmd == OneReplyH::cmd_synch_bar_ok) - { - ++this->nr_of_received_; - } - } - catch (const OneReplyH::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::bar: " - "Unexpected exception.\n")); - } - try - { - my_foo_ami_->bar ( "", OneReplyH::cmd_synch_bar_nok, out_str, l_cmd); - } - catch (const OneReplyH::InternalError& ex) - { - HandleException (ex.id, OneReplyH::cmd_synch_bar_nok, - ex.error_string.in(), - "synch bar"); - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen(0), - synch_foo_gen(0), - nr_of_received_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::OneReplyH::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (nr_of_excep_received != 4) - { - ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" - " exceptions" - "Expected: 4, Received: %u.\n", - nr_of_excep_received)); - } - if (this->nr_of_received_.value() != 6) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender not received the expected number" - " of callbacks and returns for syn- and " - "asynchronous calls. Expected: 6," - " Received: %u.\n", - this->nr_of_received_.value())); - } - if ((this->nr_of_received_.value() == 6) && (nr_of_excep_received == 4)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" - " callbacks and exceptions for syn- and " - "asynchronous calls\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_ (nr_of_received) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * /* answer */) - { - if ( ami_return_val == OneReplyH::cmd_asynch_foo_ok) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const OneReplyH::InternalError& ex) - { - CIAO_OneReplyH_Sender_Impl::HandleException (ex.id, - OneReplyH::cmd_asynch_foo_nok, - ex.error_string.in(), "asynch foo"); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::bar ( - const char * /* answer */, - ::CORBA::Long l_cmd) - { - if ( l_cmd == OneReplyH::cmd_asynch_bar_ok ) - { - ++this->nr_of_received_; - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const OneReplyH::InternalError& ex) - { - CIAO_OneReplyH_Sender_Impl::HandleException (ex.id, OneReplyH::cmd_asynch_bar_nok, - ex.error_string.in(), "asynch bar"); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected exception:"); - } - } - - extern "C" ONEREPLYH_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneReplyH_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h deleted file mode 100644 index b30c3036300..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h +++ /dev/null @@ -1,170 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_ONEREPLYH_SENDER_EXEC_QDXBFS_H_ -#define CIAO_ONEREPLYH_SENDER_EXEC_QDXBFS_H_ - -#include /**/ "ace/pre.h" - -#include "OneReplyH_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "OneReplyH_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_OneReplyH_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Common exception handlers - void HandleException ( - long id, - long expect_id, - const char* error_string, - const char* func); - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::OneReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::OneReplyH::CCM_Sender_Context_var context_; - ::OneReplyH::AMI4CCM_MyFooReplyHandler_var cb_; - Atomic_UShort &nr_of_received_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::OneReplyH::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received_); - - virtual int svc (void); - - private: - ::OneReplyH::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::OneReplyH::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_UShort nr_of_received_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::OneReplyH::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (Atomic_UShort &); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - bar ( - const char * answer, - ::CORBA::Long l_cmd); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - }; - - extern "C" ONEREPLYH_T_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OneReplyH_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp deleted file mode 100644 index 2d42f067db2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - OneReplyH_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_OneReplyH_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneReplyH_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - OneReplyH_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_OneReplyH_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneReplyH_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - OneReplyH_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_OneReplyH_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OneReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - OneReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - OneReplyH.ComponentImplementations.OneReplyHImplementation.OneReplyH.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - OneReplyH.ComponentImplementations.OneReplyHImplementation.OneReplyH.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - OneReplyH.ComponentImplementations.OneReplyHImplementation.OneReplyH.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - OneReplyH.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - OneReplyH_svnt - - entryPoint - - - tk_string - - - create_OneReplyH_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - OneReplyH.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - OneReplyH_conn - - entryPoint - - - tk_string - - - create_OneReplyH_AMI4CCM_MyFoo_Connector_Impl - - - - - - - OneReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - OneReplyH_Receiver_svnt - - entryPoint - - - tk_string - - - create_OneReplyH_AMI_ReceiverHome_Servant - - - - - - - OneReplyH.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - OneReplyH_Receiver_exec - - entryPoint - - - tk_string - - - create_OneReplyH_AMI_ReceiverHome_Impl - - - - - - - OneReplyH.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - OneReplyH_Sender_svnt - - entryPoint - - - tk_string - - - create_OneReplyH_AMI_SenderHome_Servant - - - - - - - OneReplyH.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - OneReplyH_Sender_exec - - entryPoint - - - tk_string - - - create_OneReplyH_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl deleted file mode 100755 index 72bb46f1ea2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl deleted file mode 100644 index 456dcd1f829..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef PRAGMAT_IDL -#define PRAGMAT_IDL - -#pragma ciao lem "Base/PragmaTE.idl" -#pragma ami4ccm interface "PragmaT::MyFoo" -#pragma ciao lem "Base/PragmaTAE.idl" -#pragma ami4ccm idl "Base/PragmaTA.idl" - -module PragmaT -{ - 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/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc deleted file mode 100644 index ee11910389e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc +++ /dev/null @@ -1,191 +0,0 @@ -project(AMI_PragmaT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \ - -Wb,stub_export_include=PragmaT_stub_export.h \ - -Wb,skel_export_macro=PRAGMAT_SKEL_Export \ - -Wb,skel_export_include=PragmaT_skel_export.h \ - -Wb,conn_export_macro=PRAGMAT_CONN_Export \ - -Wb,conn_export_include=PragmaT_conn_export.h \ - -Wb,exec_export_macro=PRAGMAT_EXEC_Export \ - -Wb,exec_export_include=PragmaT_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - PragmaT.idl - } -} - -project(AMI_PragmaT_lem_gen) : ciaoidldefaults { - after += AMI_PragmaT_idl_gen AMI_PragmaT_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=PRAGMAT_LEM_STUB_Export \ - -Wb,export_include=PragmaT_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - PragmaTE.idl - } -} - -project(AMI_PragmaT_lema_gen) : ciaoidldefaults { - after += AMI_PragmaT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \ - -Wb,stub_export_include=PragmaT_stub_export.h \ - -Wb,conn_export_macro=PRAGMAT_CONN_Export \ - -Wb,conn_export_include=PragmaT_conn_export.h \ - -Wb,svnt_export_macro=PRAGMAT_SVNT_Export \ - -Wb,svnt_export_include=PragmaT_svnt_export.h \ - -Wb,skel_export_macro=PRAGMAT_SKEL_Export \ - -Wb,skel_export_include=PragmaT_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - PragmaTA.idl - } -} - -project(AMI_PragmaT_lemae_gen) : ciaoidldefaults { - after += AMI_PragmaT_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_LEM_STUB_Export \ - -Wb,stub_export_include=PragmaT_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - PragmaTAE.idl - } -} - -project(AMI_PragmaT_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_PragmaT_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = PragmaT_stub - dynamicflags += PRAGMAT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PragmaTC.cpp - PragmaTAC.cpp - } - - Header_Files { - PragmaTC.h - PragmaT_stub_export.h -} - - Inline_Files { - PragmaTC.inl - } -} - -project(AMI_PragmaT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_PragmaT_lem_gen AMI_PragmaT_stub AMI_PragmaT_lemae_gen AMI_PragmaT_skel - libs += PragmaT_stub PragmaT_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = PragmaT_lem_stub - dynamicflags += PRAGMAT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PragmaTEC.cpp - PragmaTAEC.cpp - } - - Header_Files { - PragmaTEC.h - PragmaT_lem_stub_export.h -} - - Inline_Files { - PragmaTEC.inl - } -} - -project(AMI_PragmaT_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_PragmaT_stub - sharedname = PragmaT_skel - libs += PragmaT_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += PRAGMAT_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PragmaTS.cpp - PragmaTAS.cpp - } - - Header_Files { - PragmaTS.h - PragmaT_skel_export.h - } - - Inline_Files { - PragmaTS.inl - } -} - -project(AMI_PragmaT_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen - sharedname = PragmaT_conn - libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaTA_conn.cpp - } - - Header_Files { - PragmaTA_conn.h - PragmaT_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_PragmaT_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen AMI_PragmaT_conn - sharedname = PragmaT_svnt - libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub PragmaT_conn - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaTA_svnt.cpp - } - - Header_Files { - PragmaTA_svnt.h - PragmaTA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/README b/CIAO/connectors/ami4ccm/tests/PragmaT/README deleted file mode 100644 index cb0bd1370dd..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/README +++ /dev/null @@ -1,7 +0,0 @@ -This test is used to test the use of the new pragma's. - -Instead of '#PRAGMA ciao ami4ccm interface' , '#PRAGMA ciao ami4ccm receptacle' and -'#PRAGMA ciao ami4ccm idl' the new pragma's, according to the ami4ccm spec are used: -'#PRAGMA ami4ccm interface' , '#PRAGMA ami4ccm receptacle' and -'#PRAGMA ami4ccm idl' - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl deleted file mode 100644 index c98d382f11e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef PRAGMAT_RECEIVER_IDL -#define PRAGMAT_RECEIVER_IDL - -#include - -#include "Base/PragmaT.idl" - -module PragmaT -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc deleted file mode 100644 index 563ad55bba1..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Receiver" - -project(AMI_PTB_PragmaT_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_PragmaT_idl_gen - idlflags += -Wb,stub_export_macro=PRAGMAT_RECEIVER_STUB_Export \ - -Wb,stub_export_include=PragmaT_Receiver_stub_export.h \ - -Wb,skel_export_macro=PRAGMAT_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=PragmaT_Receiver_svnt_export.h \ - -Wb,exec_export_macro=PRAGMAT_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=PragmaT_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - PragmaT_Receiver.idl - } -} - -project(AMI_PTB_PragmaT_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_PTB_PragmaT_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=PragmaT_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PragmaT_ReceiverE.idl - } -} - -project(AMI_PTB_PragmaT_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_PTB_PragmaT_Receiver_lem_gen AMI_PTB_PragmaT_Receiver_stub AMI_PragmaT_stub - libs += PragmaT_stub PragmaT_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = PragmaT_Receiver_lem_stub - dynamicflags += PRAGMAT_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_ReceiverEC.cpp - } - - Header_Files { - PragmaT_ReceiverEC.h - PragmaT_Receiver_lem_stub_export.h - } - - Inline_Files { - PragmaT_ReceiverEC.inl - } -} - -project(AMI_PTB_PragmaT_Receiver_stub) : ccm_stub, messaging { - after += AMI_PTB_PragmaT_Receiver_idl_gen AMI_PragmaT_stub - libs += PragmaT_stub - libpaths += ../lib - libout = ../lib - sharedname = PragmaT_Receiver_stub - dynamicflags += PRAGMAT_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_ReceiverC.cpp - } - - Header_Files { - PragmaT_ReceiverC.h - PragmaT_Receiver_stub_export.h - } - - Inline_Files { - PragmaT_ReceiverC.inl - } -} - -project(AMI_PTB_PragmaT_Receiver_exec) : ciao_executor, messaging { - after += AMI_PTB_PragmaT_Receiver_l_stub AMI_PTB_PragmaT_Receiver_stub AMI_PragmaT_stub AMI_PragmaT_lem_stub - sharedname = PragmaT_Receiver_exec - libs += PragmaT_Receiver_stub PragmaT_Receiver_lem_stub PragmaT_stub PragmaT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_Receiver_exec.cpp - } - - Header_Files { - PragmaT_Receiver_exec.h - PragmaT_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_PTB_PragmaT_Receiver_svnt) : ciao_servant, messaging { - after += AMI_PragmaT_Base_skel AMI_PTB_PragmaT_Receiver_l_stub AMI_PragmaT_stub AMI_PragmaT_skel AMI_PragmaT_lem_stub - sharedname = PragmaT_Receiver_svnt - libs += PragmaT_Receiver_stub PragmaT_Receiver_lem_stub \ - PragmaT_skel \ - PragmaT_stub PragmaT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_ReceiverS.cpp - PragmaT_Receiver_svnt.cpp - } - - Header_Files { - PragmaT_ReceiverS.h - PragmaT_Receiver_svnt.h - PragmaT_Receiver_svnt_export.h - } - - Inline_Files { - PragmaT_ReceiverS.inl - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp deleted file mode 100644 index 1d618f57f74..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- -#include "PragmaT_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_PragmaT_Receiver_Impl -{ - MyFoo_exec_i::MyFoo_exec_i ( - ::PragmaT::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::PragmaT::CCM_Receiver_Context::_duplicate (ctx)), - get_rw_ (false), - get_ro_ (false) - { - } - - 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) - { - PragmaT::InternalError ex (42, "PragmaT world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = CORBA::string_dup ("This is my answer : Hi"); - return ACE_OS::rand () % 100; - } - } - - void - MyFoo_exec_i::hello (::CORBA::Long_out answer) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - } - - ::CORBA::Short - MyFoo_exec_i::rw_attrib () - { - if (this->get_rw_) - { - this->get_rw_ = false; - PragmaT::InternalError ex (42, "PragmaT world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - this->get_rw_ = true; - } - return ACE_OS::rand () % 100; - } - - void - MyFoo_exec_i::rw_attrib (::CORBA::Short new_value) - { - if (new_value == 0) - { - PragmaT::InternalError ex (42, "PragmaT world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - } - - CORBA::Short - MyFoo_exec_i::ro_attrib () - { - if (this->get_ro_) - { - this->get_ro_ = false; - PragmaT::InternalError ex (42, "PragmaT world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - this->get_ro_ = true; - } - return ACE_OS::rand () % 100; - } - - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - ::PragmaT::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - MyFoo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - MyFoo_exec_i ( - this->context_.in ()), - ::PragmaT::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::PragmaT::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::PragmaT::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_PragmaT_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/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h deleted file mode 100644 index 16c4019986e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h +++ /dev/null @@ -1,68 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_PRAGMAT_RECEIVER_EXEC_H_ -#define CIAO_PRAGMAT_RECEIVER_EXEC_H_ - -#include "PragmaT_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "PragmaT_Receiver_exec_export.h" - -namespace CIAO_PragmaT_Receiver_Impl -{ - class MyFoo_exec_i - : public virtual ::PragmaT::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - MyFoo_exec_i (::PragmaT::CCM_Receiver_Context_ptr ctx); - virtual ~MyFoo_exec_i (void); - - virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer); - - virtual void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (); - - virtual void rw_attrib (::CORBA::Short new_value); - - virtual CORBA::Short ro_attrib (); - private: - ::PragmaT::CCM_Receiver_Context_var ciao_context_; - bool get_rw_; - bool get_ro_; - }; - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - virtual ::PragmaT::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: - ::PragmaT::CCM_Receiver_Context_var context_; - ::PragmaT::CCM_MyFoo_var ciao_do_my_foo_; - - }; - - extern "C" PRAGMAT_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PragmaT_AMI_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl deleted file mode 100644 index 9cf40bb9230..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef PRAGMAT_SENDER_IDL -#define PRAGMAT_SENDER_IDL - -#include - -#include "Base/PragmaT.idl" - -#pragma ami4ccm receptacle "PragmaT::Sender::run_my_foo" - -module PragmaT -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc deleted file mode 100644 index 2d26735edd4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc +++ /dev/null @@ -1,134 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Sender" - -project(AMI_PTB_PragmaT_Sender_idl_gen) : componentidldefaults { - after += AMI_PragmaT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_STUB_Export \ - -Wb,stub_export_include=PragmaT_Sender_stub_export.h \ - -Wb,skel_export_macro=PRAGMAT_SENDER_SVNT_Export \ - -Wb,skel_export_include=PragmaT_Sender_svnt_export.h \ - -Wb,exec_export_macro=PRAGMAT_SENDER_EXEC_Export \ - -Wb,exec_export_include=PragmaT_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - PragmaT_Sender.idl - } -} - -project(AMI_PTB_PragmaT_Sender_lem_gen) : ciaoidldefaults { - after += AMI_PTB_PragmaT_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=PragmaT_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PragmaT_SenderE.idl - } -} - -project(AMI_PTB_PragmaT_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_PTB_PragmaT_Sender_lem_gen AMI_PragmaT_stub Conn_PragmaT_Base_stub - libs += PragmaT_stub - libpaths += ../lib - libout = ../lib - sharedname = PragmaT_Sender_lem_stub - dynamicflags += PRAGMAT_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_SenderEC.cpp - } - - Header_Files { - PragmaT_SenderEC.h - PragmaT_Sender_lem_stub_export.h - } - - Inline_Files { - PragmaT_SenderEC.inl - } -} - -project(AMI_PTB_PragmaT_Sender_stub) : ccm_stub, ami { - after += AMI_PTB_PragmaT_Sender_idl_gen AMI_PragmaT_Base_stub AMI_PragmaT_stub Conn_PragmaT_Base_stub - libs += PragmaT_stub - libpaths += ../lib - libout = ../lib - sharedname = PragmaT_Sender_stub - dynamicflags += PRAGMAT_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_SenderC.cpp - } - - Header_Files { - PragmaT_SenderC.h - PragmaT_Sender_stub_export.h - } - - Inline_Files { - PragmaT_SenderC.inl - } -} - -project(AMI_PTB_PragmaT_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_PTB_PragmaT_Sender_lem_stub AMI_PTB_PragmaT_Sender_stub AMI_PragmaT_Base_exec Conn_PragmaT_Base_stub AMI_PragmaT_lem_stub - sharedname = PragmaT_Sender_exec - libs += PragmaT_Sender_stub PragmaT_Sender_lem_stub PragmaT_stub PragmaT_stub PragmaT_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_Sender_exec.cpp - } - - Header_Files { - PragmaT_Sender_exec.h - PragmaT_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_PTB_PragmaT_Sender_svnt) : ciao_servant, ami { - after += AMI_PragmaT_Base_skel AMI_PTB_PragmaT_Sender_lem_stub AMI_PTB_PragmaT_Sender_stub AMI_PragmaT_Base_exec AMI_PragmaT_skel - sharedname = PragmaT_Sender_svnt - libs += PragmaT_Sender_stub PragmaT_Sender_lem_stub \ - PragmaT_skel \ - PragmaT_stub - libpaths += ../lib - libout = ../lib - dynamicflags += PRAGMAT_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - PragmaT_SenderS.cpp - PragmaT_Sender_svnt.cpp - } - - Header_Files { - PragmaT_SenderS.h - PragmaT_Sender_svnt.h - PragmaT_Sender_svnt_export.h - } - - Inline_Files { - PragmaT_SenderS.inl - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp deleted file mode 100644 index 0bb16e1fabf..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp +++ /dev/null @@ -1,400 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "PragmaT_Sender_exec.h" - -#include "ace/OS_NS_unistd.h" - -namespace CIAO_PragmaT_Sender_Impl -{ - void HandleException ( - long id, - const char* error_string, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"), - func)); - if (id != 42) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received") - ACE_TEXT(" in except handler.\n"), - func)); - return; - } - if (ACE_OS::strcmp (error_string, "PragmaT world") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected error string") - ACE_TEXT(" received in except handler.\n"), - func)); - return; - } - } - - void HandleException ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func)); - try - { - excep_holder->raise_exception (); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender: Caught the correct except type") - ACE_TEXT(" <%u> <%C>\n"), - ex.id, ex.error_string.in ())); - HandleException (ex.id, ex.error_string.in (), func); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - } - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::PragmaT::CCM_Sender_Context_ptr context) - : context_(::PragmaT::CCM_Sender_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::PragmaT::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Sender (ASYNCH) :") - ACE_TEXT("\tfoo_ami is NIL !!!\n"))); - return 1; - } - ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); - - for (int i = 0; i < 5; ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - my_foo_ami_->sendc_foo (cb.in (), - "Do something asynchronous"); - my_foo_ami_->sendc_hello (cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n"))); - } - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") - ACE_TEXT("to test except handling\n"))); - my_foo_ami_->sendc_foo (cb.in (), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n"))); - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::PragmaT::CCM_Sender_Context_ptr context) - : context_(::PragmaT::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::PragmaT::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - //run synch calls - CORBA::String_var out_str; - for (int i = 0; i < 5; ++i) - { - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)") - ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ())); - - CORBA::Long answer; - my_foo_ami_->hello (answer); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(PRAGMAT) answer <%u>\n"), answer)); - - try - { - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib)); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - my_foo_ami_->rw_attrib (15); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(SET_RW_ATTRIB) to <15>\n"))); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib)); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - } - try - { - CORBA::Long result = my_foo_ami_->foo ("", out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call result ") - ACE_TEXT("<%u> answer <%C>\n"), result, out_str.in ())); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ") - ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - try - { - my_foo_ami_->rw_attrib (0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n"))); - } - catch (const PragmaT::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen_(0), - synch_foo_gen_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes. - - // Port operations. - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::PragmaT::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) - { - this->asynch_foo_gen_ = - new asynch_foo_generator (this->context_.in ()); - this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - this->synch_foo_gen_ = - new synch_foo_generator (this->context_.in()); - this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - delete this->asynch_foo_gen_; - this->asynch_foo_gen_ = 0; - delete this->synch_foo_gen_; - this->synch_foo_gen_ = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ") - ACE_TEXT("answer <%C>\n"), ami_return_val, answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "FOO"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI (PRAGMAT) :") - ACE_TEXT(" answer <%u>\n"), answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "PRAGMAT"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short ami_return_val) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):") - ACE_TEXT(" answer <%u>\n"), ami_return_val)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "GET RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ") - ACE_TEXT("AMI (RW_ATTRIB)\n"))); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "SET_RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short ro_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ") - ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "RO_ATTRIB"); - } - - extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PragmaT_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h deleted file mode 100644 index 3356b1e4a6b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h +++ /dev/null @@ -1,184 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_ -#define CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_ - -#include /**/ "ace/pre.h" - -#include "PragmaT_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "PragmaT_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_PragmaT_Sender_Impl -{ - /// Common exception handlers - void HandleException ( - long id, - const char* error_string, - const char* func); - - void HandleException ( - ::Messaging::ExceptionHolder * excep_holder, - const char* func); - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::PragmaT::CCM_Sender_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::PragmaT::CCM_Sender_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - ::PragmaT::CCM_Sender_Context_var context_; - asynch_foo_generator* asynch_foo_gen_; - synch_foo_generator* synch_foo_gen_; - //@} - - //@{ - /** User defined private operations. */ - private: - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PragmaT_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp deleted file mode 100644 index af361bc6dea..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - PragmaT_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_PragmaT_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PragmaT_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - PragmaT_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_PragmaT_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PragmaT_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - PragmaT_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_PragmaT_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PragmaT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - PragmaT_svnt - - entryPoint - - - tk_string - - - create_PragmaT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - PragmaT_conn - - entryPoint - - - tk_string - - - create_PragmaT_AMI4CCM_MyFoo_Connector_Impl - - - - - - - PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - PragmaT_Receiver_svnt - - entryPoint - - - tk_string - - - create_PragmaT_AMI_ReceiverHome_Servant - - - - - - - PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - PragmaT_Receiver_exec - - entryPoint - - - tk_string - - - create_PragmaT_AMI_ReceiverHome_Impl - - - - - - - PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - PragmaT_Sender_svnt - - entryPoint - - - tk_string - - - create_PragmaT_AMI_SenderHome_Servant - - - - - - - PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - PragmaT_Sender_exec - - entryPoint - - - tk_string - - - create_PragmaT_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl deleted file mode 100755 index 479936299d4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60000, 60001 ); -@iorbases = ( "Sender.ior", "Receiver.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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 90 seconds to allow task to complete\n"; -sleep (90); - -# 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\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/CIAO/connectors/ami4ccm/tests/SimplexMulti/.gitignore b/CIAO/connectors/ami4ccm/tests/SimplexMulti/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl deleted file mode 100644 index c54d0b5a533..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.idl +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef USESSM_IDL -#define USESSM_IDL - -#pragma ciao lem "Base/UsesSME.idl" -#pragma ciao ami4ccm interface "UsesSM::One" -#pragma ciao ami4ccm interface "UsesSM::Two" -#pragma ciao lem "Base/UsesSMAE.idl" -//needed for uses multiple -#pragma ciao ami4ccm idl "Base/UsesSMA.idl" - -module UsesSM -{ - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interfaces - interface One - { - long foo (in string in_str, in long cmd, out string answer) - raises (InternalError); - }; - interface Two - { - void bar (in long cmd, out string answer) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc deleted file mode 100644 index ec8b63e6789..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc +++ /dev/null @@ -1,192 +0,0 @@ -project(AMI_UsesSM_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_STUB_Export \ - -Wb,stub_export_include=UsesSM_stub_export.h \ - -Wb,skel_export_macro=USESSM_SKEL_Export \ - -Wb,skel_export_include=UsesSM_skel_export.h \ - -Wb,conn_export_macro=USESSM_CONN_Export \ - -Wb,conn_export_include=UsesSM_conn_export.h \ - -Wb,exec_export_macro=USESSM_EXEC_Export \ - -Wb,exec_export_include=UsesSM_exec_export.h \ - -I.. -GM -Gxhcn - - - IDL_Files { - UsesSM.idl - } -} - -project(AMI_UsesSM_lem_gen) : ciaoidldefaults { - after += AMI_UsesSM_idl_gen AMI_UsesSM_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=USESSM_LEM_STUB_Export \ - -Wb,export_include=UsesSM_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - UsesSME.idl - } -} - -project(AMI_UsesSM_lema_gen) : ciaoidldefaults, typecode { - after += AMI_UsesSM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_STUB_Export \ - -Wb,stub_export_include=UsesSM_stub_export.h \ - -Wb,conn_export_macro=USESSM_CONN_Export \ - -Wb,conn_export_include=UsesSM_conn_export.h \ - -Wb,svnt_export_macro=USESSM_SVNT_Export \ - -Wb,svnt_export_include=UsesSM_svnt_export.h \ - -Wb,skel_export_macro=USESSM_SKEL_Export \ - -Wb,skel_export_include=UsesSM_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - UsesSMA.idl - } -} - -project(AMI_UsesSM_lemae_gen) : ciaoidldefaults { - after += AMI_UsesSM_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_LEM_STUB_Export \ - -Wb,stub_export_include=UsesSM_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - UsesSMAE.idl - } -} - -project(AMI_UsesSM_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_UsesSM_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = UsesSM_stub - dynamicflags += USESSM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesSMC.cpp - UsesSMAC.cpp - } - - Header_Files { - UsesSMC.h - UsesSM_stub_export.h -} - - Inline_Files { - UsesSMC.inl - } -} - -project(AMI_UsesSM_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_UsesSM_lem_gen AMI_UsesSM_stub AMI_UsesSM_lemae_gen AMI_UsesSM_skel - libs += UsesSM_stub UsesSM_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = UsesSM_lem_stub - dynamicflags += USESSM_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesSMEC.cpp - UsesSMAEC.cpp - } - - Header_Files { - UsesSMEC.h - UsesSM_lem_stub_export.h -} - - Inline_Files { - UsesSMEC.inl - } -} - -project(AMI_UsesSM_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_UsesSM_stub - sharedname = UsesSM_skel - libs += UsesSM_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += USESSM_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesSMS.cpp - UsesSMAS.cpp - } - - Header_Files { - UsesSMS.h - - UsesSM_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesSM_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_UsesSM_lem_stub UsesSM_Base_AMI_stub AMI_UsesSM_skel AMI_UsesSM_lema_gen AMI_UsesSM_lemae_gen - sharedname = UsesSM_conn - libs += UsesSM_stub UsesSM_skel UsesSM_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSMA_conn.cpp - } - - Header_Files { - UsesSMA_conn.h - UsesSM_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesSM_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_UsesSM_lem_stub UsesSM_Base_AMI_stub AMI_UsesSM_skel AMI_UsesSM_lema_gen AMI_UsesSM_lemae_gen AMI_UsesSM_conn - sharedname = UsesSM_svnt - libs += UsesSM_stub UsesSM_skel UsesSM_lem_stub UsesSM_conn - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSMA_svnt.cpp - } - - Header_Files { - UsesSMA_svnt.h - UsesSMA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl deleted file mode 100644 index b2133fdcb08..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.idl +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef USESSM_RECEIVER_IDL -#define USESSM_RECEIVER_IDL - -#include - -#include "Base/UsesSM.idl" - -module UsesSM -{ - component Receiver - { - /// Provides - provides One do_my_one; - provides Two do_my_two; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc deleted file mode 100644 index 5612bf116be..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UsesSM_Base UsesSM_Receiver" - -project(AMI_UsesSM_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_UsesSM_idl_gen - idlflags += -Wb,stub_export_macro=USESSM_RECEIVER_STUB_Export \ - -Wb,stub_export_include=UsesSM_Receiver_stub_export.h \ - -Wb,skel_export_macro=USESSM_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=UsesSM_Receiver_svnt_export.h \ - -Wb,exec_export_macro=USESSM_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=UsesSM_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - UsesSM_Receiver.idl - } -} - -project(AMI_UsesSM_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_UsesSM_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=UsesSM_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UsesSM_ReceiverE.idl - } -} - -project(AMI_UsesSM_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_UsesSM_Base_Receiver_lem_gen AMI_UsesSM_Base_Receiver_stub AMI_UsesSM_stub - libs += UsesSM_stub UsesSM_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesSM_Receiver_lem_stub - dynamicflags += USESSM_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_ReceiverEC.cpp - } - - Header_Files { - UsesSM_ReceiverEC.h - UsesSM_Receiver_lem_stub_export.h - } - - Inline_Files { - UsesSM_ReceiverEC.inl - } -} - -project(AMI_UsesSM_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_UsesSM_Base_Receiver_idl_gen AMI_UsesSM_stub - libs += UsesSM_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesSM_Receiver_stub - dynamicflags += USESSM_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_ReceiverC.cpp - } - - Header_Files { - UsesSM_ReceiverC.h - UsesSM_Receiver_stub_export.h - } - - Inline_Files { - UsesSM_ReceiverC.inl - } -} - -project(AMI_UsesSM_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_UsesSM_Base_Receiver_l_stub AMI_UsesSM_Base_Receiver_stub AMI_UsesSM_stub AMI_UsesSM_lem_stub - sharedname = UsesSM_Receiver_exec - libs += UsesSM_Receiver_stub UsesSM_Receiver_lem_stub UsesSM_stub UsesSM_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_Receiver_exec.cpp - } - - Header_Files { - UsesSM_Receiver_exec.h - UsesSM_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesSM_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_UsesSM_Base_skel AMI_UsesSM_Base_Receiver_l_stub AMI_UsesSM_stub AMI_UsesSM_skel AMI_UsesSM_lem_stub - sharedname = UsesSM_Receiver_svnt - libs += UsesSM_Receiver_stub UsesSM_Receiver_lem_stub \ - UsesSM_skel \ - UsesSM_stub UsesSM_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_ReceiverS.cpp - UsesSM_Receiver_svnt.cpp - } - - Header_Files { - UsesSM_ReceiverS.h - UsesSM_Receiver_svnt.h - UsesSM_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp deleted file mode 100644 index 23cc4900c5f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UsesSM_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_UsesSM_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_one_exec_i - */ - - do_my_one_exec_i::do_my_one_exec_i ( - ::UsesSM::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_one_received) - : ciao_context_ ( - ::UsesSM::CCM_Receiver_Context::_duplicate (ctx)), - nr_of_one_received_(nr_of_one_received) - { - } - - do_my_one_exec_i::~do_my_one_exec_i (void) - { - } - - // Operations from ::UsesSM::One - - ::CORBA::Long - do_my_one_exec_i::foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer) - { - // sleep to make it possible to test asynchronous behavior. - ACE_OS::sleep(2); - ++this->nr_of_one_received_; - answer = CORBA::string_dup (in_str); - return cmd; - } - - /** - * Facet Executor Implementation Class: do_my_two_exec_i - */ - - do_my_two_exec_i::do_my_two_exec_i ( - ::UsesSM::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_two_received) - : ciao_context_ ( - ::UsesSM::CCM_Receiver_Context::_duplicate (ctx)), - nr_of_two_received_(nr_of_two_received) - { - } - - do_my_two_exec_i::~do_my_two_exec_i (void) - { - } - - // Operations from ::UsesSM::Two - - void - do_my_two_exec_i::bar (::CORBA::Long /* cmd */, - ::CORBA::String_out answer) - { - ++this->nr_of_two_received_; - answer = CORBA::string_dup ("answer TWO::bar"); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : nr_of_one_received_(0), - nr_of_two_received_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::UsesSM::CCM_One_ptr - Receiver_exec_i::get_do_my_one (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_one_.in ())) - { - do_my_one_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_one_exec_i ( - this->ciao_context_.in (), - this->nr_of_one_received_), - ::UsesSM::CCM_One::_nil ()); - - this->ciao_do_my_one_ = tmp; - } - - return - ::UsesSM::CCM_One::_duplicate ( - this->ciao_do_my_one_.in ()); - } - - ::UsesSM::CCM_Two_ptr - Receiver_exec_i::get_do_my_two (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_two_.in ())) - { - do_my_two_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_two_exec_i ( - this->ciao_context_.in (), - this->nr_of_two_received_), - ::UsesSM::CCM_Two::_nil ()); - - this->ciao_do_my_two_ = tmp; - } - - return - ::UsesSM::CCM_Two::_duplicate ( - this->ciao_do_my_two_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UsesSM::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - //this receiver instance received my_one foo, or this is a receiver instance - //that received my_two bar . - if (((this->nr_of_one_received_.value() == 2) && - (this->nr_of_two_received_.value() == 0)) || - ((this->nr_of_two_received_.value() == 3) && - (this->nr_of_one_received_.value() == 0))) - { - if (this->nr_of_one_received_.value() == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " - "number of correct calls for foo (%u/2).\n", - this->nr_of_one_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " - "number of correct calls for bar (%u/3).\n", - this->nr_of_two_received_.value())); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive the expected " - "number of correct calls.\n" - "Expected 2 calls for foo but received %u or \n" - "Expected 3 calls for bar but received %u.\n", - this->nr_of_one_received_.value(), - this->nr_of_two_received_.value())); - - } - } - - extern "C" USESSM_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesSM_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h deleted file mode 100644 index 0ebd23dd9a3..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h +++ /dev/null @@ -1,167 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_USESSM_RECEIVER_EXEC_ZOKDRU_H_ -#define CIAO_USESSM_RECEIVER_EXEC_ZOKDRU_H_ - -#include /**/ "ace/pre.h" - -#include "UsesSM_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "UsesSM_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_UsesSM_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /** - * Provider Executor Implementation Class: do_my_one_exec_i - */ - - class do_my_one_exec_i - : public virtual ::UsesSM::CCM_One, - public virtual ::CORBA::LocalObject - { - public: - do_my_one_exec_i ( - ::UsesSM::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_one_received); - virtual ~do_my_one_exec_i (void); - - //@{ - /** Operations and attributes from UsesSM::One. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::UsesSM::CCM_Receiver_Context_var ciao_context_; - Atomic_UShort &nr_of_one_received_; - - }; - - /** - * Provider Executor Implementation Class: do_my_two_exec_i - */ - - class do_my_two_exec_i - : public virtual ::UsesSM::CCM_Two, - public virtual ::CORBA::LocalObject - { - public: - do_my_two_exec_i ( - ::UsesSM::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_two_received); - virtual ~do_my_two_exec_i (void); - - //@{ - /** Operations and attributes from UsesSM::Two. */ - - virtual - void bar (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::UsesSM::CCM_Receiver_Context_var ciao_context_; - Atomic_UShort &nr_of_two_received_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::UsesSM::CCM_One_ptr - get_do_my_one (void); - - virtual ::UsesSM::CCM_Two_ptr - get_do_my_two (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::UsesSM::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::UsesSM::CCM_One_var ciao_do_my_one_; - ::UsesSM::CCM_Two_var ciao_do_my_two_; - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_one_received_; - Atomic_UShort nr_of_two_received_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" USESSM_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesSM_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl deleted file mode 100644 index f084fdb7443..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef USESSM_SENDER_IDL -#define USESSM_SENDER_IDL - -#include - -#include "Base/UsesSM.idl" - -#pragma ciao ami4ccm receptacle "UsesSM::Sender::run_my_um_one" -#pragma ciao ami4ccm receptacle "UsesSM::Sender::run_my_two" -#pragma ciao ami4ccm receptacle "UsesSM::Sender::s_run_my_um_one" -#pragma ciao ami4ccm receptacle "UsesSM::Sender::m_run_my_two" - -module UsesSM -{ - component Sender - { - /// For synchronous invocation - uses multiple One run_my_um_one; - uses Two run_my_two; - uses One s_run_my_um_one; - uses multiple Two m_run_my_two; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc deleted file mode 100644 index 7e47112496d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UsesSM_Base UsesSM_Sender" - -project(AMI_UsesSM_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_UsesSM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_SENDER_STUB_Export \ - -Wb,stub_export_include=UsesSM_Sender_stub_export.h \ - -Wb,skel_export_macro=USESSM_SENDER_SVNT_Export \ - -Wb,skel_export_include=UsesSM_Sender_svnt_export.h \ - -Wb,exec_export_macro=USESSM_SENDER_EXEC_Export \ - -Wb,exec_export_include=UsesSM_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - UsesSM_Sender.idl - } -} - -project(AMI_UsesSM_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_UsesSM_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESSM_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=UsesSM_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UsesSM_SenderE.idl - } -} - -project(AMI_UsesSM_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_UsesSM_Base_Sender_lem_gen AMI_UsesSM_stub AMI_UsesSM_Base_Sender_stub - libs += UsesSM_stub UsesSM_Sender_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesSM_Sender_lem_stub - dynamicflags += USESSM_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_SenderEC.cpp - } - - Header_Files { - UsesSM_SenderEC.h - UsesSM_Sender_lem_stub_export.h - } - - Inline_Files { - UsesSM_SenderEC.inl - } -} - -project(AMI_UsesSM_Base_Sender_stub) : ccm_stub, ami { - after += AMI_UsesSM_Base_Sender_idl_gen AMI_UsesSM_Base_stub AMI_UsesSM_stub - libs += UsesSM_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesSM_Sender_stub - dynamicflags += USESSM_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_SenderC.cpp - } - - Header_Files { - UsesSM_SenderC.h - UsesSM_Sender_stub_export.h - } - - Inline_Files { - UsesSM_SenderC.inl - } -} - -project(AMI_UsesSM_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_UsesSM_Base_Sender_lem_stub AMI_UsesSM_Base_Sender_stub AMI_UsesSM_Base_exec AMI_UsesSM_lem_stub - sharedname = UsesSM_Sender_exec - libs += UsesSM_Sender_stub UsesSM_Sender_lem_stub UsesSM_stub UsesSM_stub UsesSM_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_Sender_exec.cpp - } - - Header_Files { - UsesSM_Sender_exec.h - UsesSM_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesSM_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_UsesSM_Base_skel AMI_UsesSM_Base_Sender_lem_stub AMI_UsesSM_Base_Sender_stub AMI_UsesSM_Base_exec AMI_UsesSM_skel - sharedname = UsesSM_Sender_svnt - libs += UsesSM_Sender_stub UsesSM_Sender_lem_stub \ - UsesSM_skel \ - UsesSM_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESSM_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesSM_SenderS.cpp - UsesSM_Sender_svnt.cpp - } - - Header_Files { - UsesSM_SenderS.h - UsesSM_Sender_svnt.h - UsesSM_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp deleted file mode 100644 index ace2ce02c67..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp +++ /dev/null @@ -1,371 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UsesSM_Sender_exec.h" - -namespace CIAO_UsesSM_Sender_Impl -{ - CORBA::Boolean asynch = false; - - //============================================================ - // Worker thread for asynchronous invocations for One (multiple) - // and Two (simplex) - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::UsesSM::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent) - : context_(::UsesSM::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received), - nr_of_sent_(nr_of_sent) - { - } - - int asynch_foo_generator::svc () - { - // multiple - ::UsesSM::Sender::sendc_run_my_um_oneConnections_var my_one_ami_ = - context_->get_connections_sendc_run_my_um_one(); - // simplex - ::UsesSM::AMI4CCM_Two_var my_two_ami_ = - context_->get_connection_sendc_run_my_two(); - - if (my_one_ami_->length () == 0) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_one_ami_ is NIL !\n")); - return 1; - } - if (CORBA::is_nil (my_two_ami_)) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_two_ami_ is NIL !\n")); - return 1; - } - // Invoke Asynchronous calls to test - for (CORBA::ULong i = 0; i < my_one_ami_->length (); ++i) - { - ::UsesSM::AMI4CCM_OneReplyHandler_var cb_one = - new AMI4CCM_OneReplyHandler_run_my_um_one_i ( - this->nr_of_received_, - this->nr_of_sent_); - - CORBA::String_var test; - switch (i) - { - case 0: - test = CORBA::string_dup ("Asynch. foo call one"); - break; - case 1: - test = CORBA::string_dup ("Asynch. foo call two"); - break; - case 2: - test = CORBA::string_dup ("Asynch. foo call three"); - break; - default: - break; - } - ++this->nr_of_sent_; - my_one_ami_[i].objref->sendc_foo (cb_one.in (), - test.in (), - i); - ACE_DEBUG ((LM_DEBUG, "Sender (ASYNCH) : send <%C> !\n", - test.in ())); - // There is more than 1 message sent, without receiving callbacks, - // so it is asynchronous - if (this->nr_of_sent_.value() > 1) - { - asynch = true; - } - ACE_DEBUG ((LM_DEBUG, - "Sender (ASYNCH) : send asynch call bar <%u>!\n", i)); - ::UsesSM::AMI4CCM_TwoReplyHandler_var cb_two = - new AMI4CCM_TwoReplyHandler_run_my_two_i ( - this->nr_of_received_); - my_two_ami_->sendc_bar ( cb_two.in (), i); - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for One - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::UsesSM::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::UsesSM::CCM_Sender_Context::_duplicate (context)), - nr_of_received_ (nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ::UsesSM::Sender::run_my_um_oneConnections_var my_one_ami_ = - context_->get_connections_run_my_um_one (); - - for(CORBA::ULong i = 0; i < my_one_ami_->length(); ++i) - { - CORBA::String_var test; - switch (i) - { - case 0: - test = CORBA::string_dup ("Synch. call 0."); - break; - case 1: - test = CORBA::string_dup ("Synch. call 1"); - break; - case 2: - test = CORBA::string_dup ("Synch. call 2"); - break; - default: - break; - } - - ACE_DEBUG ((LM_DEBUG,"Sender (SYNCH) : send <%C> !\n", - test.in ())); - - CORBA::String_var answer; - CORBA::ULong result = my_one_ami_[i].objref->foo( test, - i, - answer.out ()); - if (result != i) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (SYNCH) : CLASS One foo !\n")); - } - else - { - ++this->nr_of_received_; - ACE_DEBUG ((LM_DEBUG, - "Sender (SYNCH) : received answer = <%C> !\n", - answer.in ())); - } - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) : - synch_foo_gen(0), - asynch_foo_gen(0), - nr_of_received_(0), - nr_of_sent_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UsesSM::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_, - this->nr_of_sent_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in (), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (asynch == false) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Uses multiple test not asynchronous!\n")); - } - if (this->nr_of_received_.value() != 9) - { - ACE_ERROR ((LM_ERROR, "ERROR: Did not get all callbacks from " - "multiple ports." - " Received = %u of 9\n", - this->nr_of_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "OK: All messages received back by Sender\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - - AMI4CCM_OneReplyHandler_run_my_um_one_i::AMI4CCM_OneReplyHandler_run_my_um_one_i ( - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent) - : nr_of_received_(nr_of_received), - nr_of_sent_(nr_of_sent) - { - } - - AMI4CCM_OneReplyHandler_run_my_um_one_i::~AMI4CCM_OneReplyHandler_run_my_um_one_i (void) - { - } - - void - AMI4CCM_OneReplyHandler_run_my_um_one_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from foo," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - --this->nr_of_sent_; - } - - void - AMI4CCM_OneReplyHandler_run_my_um_one_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - AMI4CCM_TwoReplyHandler_run_my_two_i::AMI4CCM_TwoReplyHandler_run_my_two_i ( - Atomic_UShort &nr_of_received) - : nr_of_received_(nr_of_received) - { - } - - AMI4CCM_TwoReplyHandler_run_my_two_i::~AMI4CCM_TwoReplyHandler_run_my_two_i (void) - { - } - - void - AMI4CCM_TwoReplyHandler_run_my_two_i::bar ( - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from bar," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - } - - void - AMI4CCM_TwoReplyHandler_run_my_two_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - AMI4CCM_OneReplyHandler_s_run_my_um_one_i::AMI4CCM_OneReplyHandler_s_run_my_um_one_i (void) - { - } - - AMI4CCM_OneReplyHandler_s_run_my_um_one_i::~AMI4CCM_OneReplyHandler_s_run_my_um_one_i (void) - { - } - - void - AMI4CCM_OneReplyHandler_s_run_my_um_one_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * /* answer */) - { - /* Your code here. */ - } - - void - AMI4CCM_OneReplyHandler_s_run_my_um_one_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - AMI4CCM_TwoReplyHandler_m_run_my_two_i::AMI4CCM_TwoReplyHandler_m_run_my_two_i (void) - { - } - - AMI4CCM_TwoReplyHandler_m_run_my_two_i::~AMI4CCM_TwoReplyHandler_m_run_my_two_i (void) - { - } - - void - AMI4CCM_TwoReplyHandler_m_run_my_two_i::bar ( - const char * /* answer */) - { - /* Your code here. */ - } - - void - AMI4CCM_TwoReplyHandler_m_run_my_two_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" USESSM_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesSM_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h deleted file mode 100644 index 7593aba1d1a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_USESSM_SENDER_EXEC_U17LTA_H_ -#define CIAO_USESSM_SENDER_EXEC_U17LTA_H_ - -#include /**/ "ace/pre.h" - -#include "UsesSM_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "UsesSM_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_UsesSM_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker threads for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::UsesSM::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent); - virtual int svc (void); - - private: - ::UsesSM::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - Atomic_UShort &nr_of_sent_; - }; - - /// Worker threads for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::UsesSM::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - virtual int svc (void); - - private: - ::UsesSM::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::UsesSM::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - synch_foo_generator* synch_foo_gen; - asynch_foo_generator* asynch_foo_gen; - Atomic_UShort nr_of_received_; - Atomic_UShort nr_of_sent_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - class AMI4CCM_OneReplyHandler_run_my_um_one_i - : public ::UsesSM::CCM_AMI4CCM_OneReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_OneReplyHandler_run_my_um_one_i ( - Atomic_UShort &nr_of_received_, - Atomic_UShort &nr_of_sent_); - virtual ~AMI4CCM_OneReplyHandler_run_my_um_one_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - Atomic_UShort &nr_of_sent_; - - }; - - class AMI4CCM_TwoReplyHandler_run_my_two_i - : public ::UsesSM::CCM_AMI4CCM_TwoReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_TwoReplyHandler_run_my_two_i (Atomic_UShort &); - virtual ~AMI4CCM_TwoReplyHandler_run_my_two_i (void); - - virtual void - bar ( - const char * answer); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - - }; - - class AMI4CCM_OneReplyHandler_s_run_my_um_one_i - : public ::UsesSM::CCM_AMI4CCM_OneReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_OneReplyHandler_s_run_my_um_one_i (void); - virtual ~AMI4CCM_OneReplyHandler_s_run_my_um_one_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - class AMI4CCM_TwoReplyHandler_m_run_my_two_i - : public ::UsesSM::CCM_AMI4CCM_TwoReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_TwoReplyHandler_m_run_my_two_i (void); - virtual ~AMI4CCM_TwoReplyHandler_m_run_my_two_i (void); - - virtual void - bar ( - const char * answer); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" USESSM_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesSM_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp deleted file mode 100644 index d8d8cdc8939..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp +++ /dev/null @@ -1,697 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - UsesSM_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesSM_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesSM_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - UsesSM_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesSM_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesSM_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - - UsesSM_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesSM_AMI4CCM_One_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesSM_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - UsesSM_AMITwoHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesSM_AMI4CCM_Two_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesSM_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverA - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverB - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverC - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverS - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMIOneA - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMIOneB - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMIOneC - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMITwoS - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_one_connectionA - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionB - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionC - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_two_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_two - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_one_connectionA - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionB - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionC - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - do_two_connection - - do_my_two - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_one_connectionA - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - synch_one_connectionB - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - synch_one_connectionC - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - UsesSM_svnt - - entryPoint - - - tk_string - - - create_UsesSM_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - UsesSM_svnt - - entryPoint - - - tk_string - - - create_UsesSM_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant - - - - - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - UsesSM_conn - - entryPoint - - - tk_string - - - create_UsesSM_AMI_One_Connector_Impl - - - - - - - UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - UsesSM_conn - - entryPoint - - - tk_string - - - create_UsesSM_AMI_Two_Connector_Impl - - - - - - - - UsesSM.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - UsesSM_Receiver_svnt - - entryPoint - - - tk_string - - - create_UsesSM_AMI_ReceiverHome_Servant - - - - - - - UsesSM.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - UsesSM_Receiver_exec - - entryPoint - - - tk_string - - - create_UsesSM_AMI_ReceiverHome_Impl - - - - - - - UsesSM.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - UsesSM_Sender_svnt - - entryPoint - - - tk_string - - - create_UsesSM_AMI_SenderHome_Servant - - - - - - - UsesSM.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - UsesSM_Sender_exec - - entryPoint - - - tk_string - - - create_UsesSM_AMI_SenderHome_Impl - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl deleted file mode 100755 index 7eda0bb9439..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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\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/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl deleted file mode 100644 index 9cc1ee019da..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef HELLO_IDL -#define HELLO_IDL - -#pragma ciao lem "Base/HelloE.idl" -#pragma ami4ccm interface "Hello::MyFoo" -#pragma ciao lem "Base/HelloAE.idl" -#pragma ami4ccm idl "Base/HelloA.idl" - -module Hello -{ - 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/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc deleted file mode 100644 index 07c05fb9270..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc +++ /dev/null @@ -1,190 +0,0 @@ -project(SyncPortCon_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,skel_export_macro=HELLO_SKEL_Export \ - -Wb,skel_export_include=Hello_skel_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,exec_export_macro=HELLO_EXEC_Export \ - -Wb,exec_export_include=Hello_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - Hello.idl - } -} - -project(SyncPortCon_lem_gen) : ciaoidldefaults { - after += SyncPortCon_idl_gen SyncPortCon_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=HELLO_LEM_STUB_Export \ - -Wb,export_include=Hello_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - HelloE.idl - } -} - -project(SyncPortCon_lema_gen) : ciaoidldefaults { - after += SyncPortCon_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h \ - -Wb,conn_export_macro=HELLO_CONN_Export \ - -Wb,conn_export_include=Hello_conn_export.h \ - -Wb,svnt_export_macro=HELLO_SVNT_Export \ - -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 - - IDL_Files { - HelloA.idl - } -} - -project(SyncPortCon_lemae_gen) : ciaoidldefaults { - after += SyncPortCon_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - HelloAE.idl - } -} - -project(SyncPortCon_stub) : ccm_stub, ami, ami4ccm_stub { - after += SyncPortCon_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Hello_stub - dynamicflags += HELLO_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloC.cpp - HelloAC.cpp - } - - Header_Files { - HelloC.h - Hello_stub_export.h -} - - Inline_Files { - HelloC.inl - } -} - -project(SyncPortCon_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += SyncPortCon_lem_gen SyncPortCon_stub SyncPortCon_lemae_gen SyncPortCon_skel - libs += Hello_stub Hello_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = Hello_lem_stub - dynamicflags += HELLO_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloEC.cpp - HelloAEC.cpp - } - - Header_Files { - HelloEC.h - Hello_lem_stub_export.h -} - - Inline_Files { - HelloEC.inl - } -} - -project(SyncPortCon_skel) : ciao_executor, ami, ami4ccm_servant { - after += SyncPortCon_stub - sharedname = Hello_skel - libs += Hello_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += HELLO_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloS.cpp - HelloAS.cpp - } - - Header_Files { - HelloS.h - Hello_skel_export.h - } - - Inline_Files { - HelloS.inl - } -} - -project(SyncPortCon_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += SyncPortCon_lem_stub Hello_Base_AMIB_stub SyncPortCon_skel SyncPortCon_lema_gen SyncPortCon_lemae_gen - sharedname = Hello_conn - libs += Hello_stub Hello_skel Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloA_conn.cpp - } - - Header_Files { - HelloA_conn.h - Hello_conn_export.h - } - - Inline_Files { - } -} - -project(SyncPortCon_svnt) : ciao_servant, ami, ami4ccm_servant { - after += SyncPortCon_lem_stub Hello_Base_AMIB_stub SyncPortCon_skel SyncPortCon_lema_gen SyncPortCon_lemae_gen SyncPortCon_conn - sharedname = Hello_svnt - libs += Hello_stub Hello_skel Hello_lem_stub Hello_conn - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - HelloA_svnt.cpp - } - - Header_Files { - HelloA_svnt.h - HelloA_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl deleted file mode 100644 index f7f1ff0006b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef HELLO_RECEIVER_IDL -#define HELLO_RECEIVER_IDL - -#include - -#include "Base/Hello.idl" - -module Hello -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc deleted file mode 100644 index f8e8d96b975..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver" - -project(SPC_Base_Hello_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += SyncPortCon_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_stub_export.h \ - -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Hello_Receiver_svnt_export.h \ - -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Hello_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - Hello_Receiver.idl - } -} - -project(SPC_Base_Hello_Receiver_lem_gen) : ciaoidldefaults { - after += SPC_Base_Hello_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_ReceiverE.idl - } -} - -project(SPC_Base_Hello_Receiver_l_stub) : ccm_svnt, messaging { - after += SPC_Base_Hello_Receiver_lem_gen SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub - libs += Hello_stub Hello_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Receiver_lem_stub - dynamicflags += HELLO_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverEC.cpp - } - - Header_Files { - Hello_ReceiverEC.h - Hello_Receiver_lem_stub_export.h - } - - Inline_Files { - Hello_ReceiverEC.inl - } -} - -project(SyncPortCon_Base_Hello_Receiver_stub) : ccm_stub, messaging { - after += SPC_Base_Hello_Receiver_idl_gen SyncPortCon_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Receiver_stub - dynamicflags += HELLO_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverC.cpp - } - - Header_Files { - Hello_ReceiverC.h - Hello_Receiver_stub_export.h - } - - Inline_Files { - Hello_ReceiverC.inl - } -} - -project(SyncPortCon_Base_Hello_Receiver_exec) : ciao_executor, messaging { - after += SPC_Base_Hello_Receiver_l_stub SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub SyncPortCon_lem_stub - sharedname = Hello_Receiver_exec - libs += Hello_Receiver_stub Hello_Receiver_lem_stub Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_Receiver_exec.cpp - } - - Header_Files { - Hello_Receiver_exec.h - Hello_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(SyncPortCon_Base_Hello_Receiver_svnt) : ciao_servant, messaging { - after += SyncPortCon_Base_skel SPC_Base_Hello_Receiver_l_stub SyncPortCon_stub SyncPortCon_skel SyncPortCon_lem_stub - sharedname = Hello_Receiver_svnt - libs += Hello_Receiver_stub Hello_Receiver_lem_stub \ - Hello_skel \ - Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_ReceiverS.cpp - Hello_Receiver_svnt.cpp - } - - Header_Files { - Hello_ReceiverS.h - Hello_Receiver_svnt.h - Hello_Receiver_svnt_export.h - } - - Inline_Files { - Hello_ReceiverS.inl - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp deleted file mode 100644 index b764c189b0d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// -*- C++ -*- -#include "Hello_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Receiver_Impl -{ - MyFoo_exec_i::MyFoo_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - 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) - { - Hello::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 ACE_OS::rand () % 100; - } - } - - void - MyFoo_exec_i::hello (::CORBA::Long_out answer) - { - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - } - - ::CORBA::Short - MyFoo_exec_i::rw_attrib () - { - ACE_OS::sleep (ACE_OS::rand () % 2); - return ACE_OS::rand () % 100; - } - - void - MyFoo_exec_i::rw_attrib (::CORBA::Short new_value) - { - if (new_value == 0) - { - Hello::InternalError ex (42, "Hello world"); - throw ex; - } - else - { - ACE_OS::sleep (ACE_OS::rand () % 2); - } - } - - CORBA::Short - MyFoo_exec_i::ro_attrib () - { - ACE_OS::sleep (ACE_OS::rand () % 2); - return ACE_OS::rand () % 100; - } - - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - ::Hello::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - MyFoo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - MyFoo_exec_i ( - this->context_.in ()), - ::Hello::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::Hello::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::Hello::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_Hello_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/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h deleted file mode 100644 index 3193b13a9b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h +++ /dev/null @@ -1,66 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_HELLO_RECEIVER_EXEC_H_ -#define CIAO_HELLO_RECEIVER_EXEC_H_ - -#include "Hello_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "Hello_Receiver_exec_export.h" - -namespace CIAO_Hello_Receiver_Impl -{ - class MyFoo_exec_i - : public virtual ::Hello::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - MyFoo_exec_i (::Hello::CCM_Receiver_Context_ptr ctx); - virtual ~MyFoo_exec_i (void); - - virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer); - - virtual void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (); - - virtual void rw_attrib (::CORBA::Short new_value); - - virtual CORBA::Short ro_attrib (); - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - }; - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - virtual ::Hello::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: - ::Hello::CCM_Receiver_Context_var context_; - ::Hello::CCM_MyFoo_var ciao_do_my_foo_; - - }; - - extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_AMI_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl deleted file mode 100644 index d30c50afca0..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef HELLO_SENDER_IDL -#define HELLO_SENDER_IDL - -#include - -#include "Base/Hello.idl" - -#pragma ciao ami4ccm receptacle "Hello::Sender::run_my_foo" - -module Hello -{ - component Sender - { - /// For synchronous invocation - uses MyFoo run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc deleted file mode 100644 index 62e1a3f0fb1..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc +++ /dev/null @@ -1,134 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender" - -project(SyncPortCon_Base_Hello_Sender_idl_gen) : componentidldefaults { - after += SyncPortCon_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,skel_export_include=Hello_Sender_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \ - -Wb,exec_export_include=Hello_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - Hello_Sender.idl - } -} - -project(SyncPortCon_Base_Hello_Sender_lem_gen) : ciaoidldefaults { - after += SyncPortCon_Base_Hello_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_SenderE.idl - } -} - -project(SPC_Base_Hello_Sender_lem_stub) : ccm_svnt, ami { - after += SyncPortCon_Base_Hello_Sender_lem_gen SyncPortCon_stub Conn_Hello_Base_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Sender_lem_stub - dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderEC.cpp - } - - Header_Files { - Hello_SenderEC.h - Hello_Sender_lem_stub_export.h - } - - Inline_Files { - Hello_SenderEC.inl - } -} - -project(SyncPortCon_Base_Hello_Sender_stub) : ccm_stub, ami { - after += SyncPortCon_Base_Hello_Sender_idl_gen SyncPortCon_Base_stub SyncPortCon_stub Conn_Hello_Base_stub - libs += Hello_stub - libpaths += ../lib - libout = ../lib - sharedname = Hello_Sender_stub - dynamicflags += HELLO_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderC.cpp - } - - Header_Files { - Hello_SenderC.h - Hello_Sender_stub_export.h - } - - Inline_Files { - Hello_SenderC.inl - } -} - -project(SyncPortCon_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += SPC_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec Conn_Hello_Base_stub SyncPortCon_lem_stub - sharedname = Hello_Sender_exec - libs += Hello_Sender_stub Hello_Sender_lem_stub Hello_stub Hello_stub Hello_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_Sender_exec.cpp - } - - Header_Files { - Hello_Sender_exec.h - Hello_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(SyncPortCon_Base_Hello_Sender_svnt) : ciao_servant, ami { - after += SyncPortCon_Base_skel SPC_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec SyncPortCon_skel - sharedname = Hello_Sender_svnt - libs += Hello_Sender_stub Hello_Sender_lem_stub \ - Hello_skel \ - Hello_stub - libpaths += ../lib - libout = ../lib - dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - Hello_SenderS.cpp - Hello_Sender_svnt.cpp - } - - Header_Files { - Hello_SenderS.h - Hello_Sender_svnt.h - Hello_Sender_svnt_export.h - } - - Inline_Files { - Hello_SenderS.inl - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp deleted file mode 100644 index 6ac11387a25..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp +++ /dev/null @@ -1,400 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Sender_exec.h" - -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Sender_Impl -{ - void HandleException ( - long id, - const char* error_string, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"), - func)); - if (id != 42) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received") - ACE_TEXT(" in except handler.\n"), - func)); - return; - } - if (ACE_OS::strcmp (error_string, "Hello world") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR (%C) :\tReceived unexpected error string") - ACE_TEXT(" received in except handler.\n"), - func)); - return; - } - } - - void HandleException ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder, - const char* func) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func)); - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender: Caught the correct except type") - ACE_TEXT(" <%u> <%C>\n"), - ex.id, ex.error_string.in ())); - HandleException (ex.id, ex.error_string.in (), func); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - } - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::Hello::CCM_Sender_Context_ptr context) - : context_(::Hello::CCM_Sender_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::Hello::AMI4CCM_MyFoo_var my_foo_ami_ = - context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Sender (ASYNCH) :") - ACE_TEXT("\tfoo_ami is NIL !!!\n"))); - return 1; - } - ::Hello::CCM_AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - my_foo_ami_->sendc_foo (cb.in (), - "Do something asynchronous"); - my_foo_ami_->sendc_hello (cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") - ACE_TEXT("to test except handling\n"))); - my_foo_ami_->sendc_foo (cb.in (), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n"))); - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::Hello::CCM_Sender_Context_ptr context) - : context_(::Hello::CCM_Sender_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (3); - ::Hello::MyFoo_var my_foo_ami_ = - context_->get_connection_run_my_foo (); - - //run synch calls - CORBA::String_var out_str; - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)") - ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ())); - - CORBA::Long answer; - my_foo_ami_->hello (answer); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(HELLO) answer <%u>\n"), answer)); - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoke synchronous call foo, expect exception \n"))); - - CORBA::Long result = my_foo_ami_->foo ("", out_str.out ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ERROR : Sender (SYNCH):\tInvoked synchronous call (FOO)") - ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ())); - - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ") - ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call rw_attrib\n"))); - - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call rw_attrib ") - ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib)); - - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ERROR:Sender (SYNCH FOO) :\tUnexpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - my_foo_ami_->rw_attrib (15); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(SET_RW_ATTRIB) to <15>\n"))); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ERROR:Sender (SYNCH FOO) :\tUnexpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - - try - { - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib)); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ERROR: Sender (SYNCH FOO) :\tUnexpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - try - { - my_foo_ami_->rw_attrib (0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n"))); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Caught unexpected except:"); - } - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) : - asynch_foo_gen_ (0), - synch_foo_gen_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes. - - // Port operations. - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Hello::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) - { - this->asynch_foo_gen_ = - new asynch_foo_generator (this->context_.in ()); - this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - this->synch_foo_gen_ = - new synch_foo_generator (this->context_.in()); - this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - delete this->asynch_foo_gen_; - this->asynch_foo_gen_ = 0; - delete this->synch_foo_gen_; - this->synch_foo_gen_ = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ") - ACE_TEXT("answer <%C>\n"), ami_return_val, answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "FOO"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (FOO) :\tCallback from AMI (HELLO) :") - ACE_TEXT(" answer <%u>\n"), answer)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "HELLO"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short ami_return_val) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):") - ACE_TEXT(" answer <%u>\n"), ami_return_val)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "GET RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ") - ACE_TEXT("AMI (RW_ATTRIB)\n"))); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "SET_RW_ATTRIB"); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short ro_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ") - ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib)); - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - HandleException (excep_holder, "RO_ATTRIB"); - } - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h deleted file mode 100644 index 96bc8ed84b5..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_ -#define CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Hello_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_Hello_Sender_Impl -{ - /// Common exception handlers - void HandleException ( - long id, - const char* error_string, - const char* func); - - void HandleException ( - ::Messaging::ExceptionHolder * excep_holder, - const char* func); - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::Hello::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::Hello::CCM_Sender_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_Context_var context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - private: - ::Hello::CCM_Sender_Context_var context_; - asynch_foo_generator* asynch_foo_gen_; - synch_foo_generator* synch_foo_gen_; - - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::Hello::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp deleted file mode 100644 index c74d507a752..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp +++ /dev/null @@ -1,394 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - - - run_synch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - Hello_Receiver_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp deleted file mode 100644 index 5e4a63db65e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp +++ /dev/null @@ -1,394 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - Hello_Receiver_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl deleted file mode 100755 index 69b9341ae7c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl +++ /dev/null @@ -1,264 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; - -#$ENV{'DANCE_LOG_LEVEL'}=9; -#$ENV{'CIAO_LOG_LEVEL'}=10; -#$ENV{'DANCE_TRACE_ENABLE'}=1; -#$ENV{'CIAO_TRACE_ENABLE'}=1; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60000, 60001 ); -@iorbases = ( "Sender.ior", "Receiver.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "+++++++++++++++++++++++++++++++++++++++++++++++++++\nStarting test for deployment $file\n======================================================\n"; - - # Invoke naming service - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - - print STDERR "Starting Naming Service with -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 $file -k file://$ior_emfile\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - - $pl_status = $E->SpawnWaitKill (2 * $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 15 seconds to allow task to complete\n"; - sleep (15); - - # 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\n"; - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $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; - } - delete_ior_files (); - kill_open_processes (); - # Sleep for a couple seconds to make sure everything has a chance to shut down. - sleep 5; -} -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl deleted file mode 100644 index 2c7ec8b2940..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef THREECOMP_IDL -#define THREECOMP_IDL - -#pragma ciao lem "Base/ThreeCompE.idl" -#pragma ciao ami4ccm interface "ThreeComp::MyFoo" -#pragma ciao ami4ccm interface "ThreeComp::State" -#pragma ciao lem "Base/ThreeCompAE.idl" -#pragma ciao ami4ccm idl "Base/ThreeCompA.idl" - - -module ThreeComp -{ - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interface - interface MyFoo - { - long foo (in long cmd, out string answer) - raises (InternalError); - }; - // Master/Sender interface - interface State - { - long bar (in long cmd, out string answer) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc deleted file mode 100644 index bec7c29c3a4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc +++ /dev/null @@ -1,216 +0,0 @@ -project(AMI_ThreeComp_no_ami_dl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \ - -Wb,stub_export_include=ThreeComp_stub_export.h \ - -Wb,skel_export_macro=THREECOMP_SKEL_Export \ - -Wb,skel_export_include=ThreeComp_skel_export.h \ - -Wb,conn_export_macro=THREECOMP_CONN_Export \ - -Wb,conn_export_include=ThreeComp_conn_export.h \ - -Wb,exec_export_macro=THREECOMP_EXEC_Export \ - -Wb,exec_export_include=ThreeComp_exec_export.h \ - -I.. - - IDL_Files { - ThreeComp_no_ami.idl - } -} -project(AMI_ThreeComp_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \ - -Wb,stub_export_include=ThreeComp_stub_export.h \ - -Wb,skel_export_macro=THREECOMP_SKEL_Export \ - -Wb,skel_export_include=ThreeComp_skel_export.h \ - -Wb,conn_export_macro=THREECOMP_CONN_Export \ - -Wb,conn_export_include=ThreeComp_conn_export.h \ - -Wb,exec_export_macro=THREECOMP_EXEC_Export \ - -Wb,exec_export_include=ThreeComp_exec_export.h \ - -I.. -GM -Gxhcn - - IDL_Files { - ThreeComp.idl - } -} - -project(AMI_ThreeComp_lem_gen) : ciaoidldefaults { - after += AMI_ThreeComp_idl_gen AMI_ThreeComp_lema_gen AMI_ThreeComp_no_ami_dl_gen - custom_only = 1 - idlflags += -Wb,export_macro=THREECOMP_LEM_STUB_Export \ - -Wb,export_include=ThreeComp_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - ThreeCompE.idl - ThreeComp_no_amiE.idl - } -} - -project(AMI_ThreeComp_lema_gen) : ciaoidldefaults, typecode { - after += AMI_ThreeComp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \ - -Wb,stub_export_include=ThreeComp_stub_export.h \ - -Wb,conn_export_macro=THREECOMP_CONN_Export \ - -Wb,conn_export_include=ThreeComp_conn_export.h \ - -Wb,svnt_export_macro=THREECOMP_SVNT_Export \ - -Wb,svnt_export_include=ThreeComp_svnt_export.h \ - -Wb,skel_export_macro=THREECOMP_SKEL_Export \ - -Wb,skel_export_include=ThreeComp_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - ThreeCompA.idl - } -} - -project(AMI_ThreeComp_lemae_gen) : ciaoidldefaults { - after += AMI_ThreeComp_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_LEM_STUB_Export \ - -Wb,stub_export_include=ThreeComp_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - ThreeCompAE.idl - } -} - -project(AMI_ThreeComp_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_ThreeComp_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = ThreeComp_stub - dynamicflags += THREECOMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ThreeCompC.cpp - ThreeCompAC.cpp - ThreeComp_no_amiC.cpp - } - - Header_Files { - ThreeCompC.h - ThreeComp_stub_export.h - ThreeComp_no_amiC.h -} - - Inline_Files { - ThreeCompC.inl - ThreeComp_no_amiC.inl - } -} - -project(AMI_ThreeComp_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_ThreeComp_lem_gen AMI_ThreeComp_stub AMI_ThreeComp_lemae_gen AMI_ThreeComp_skel - libs += ThreeComp_stub ThreeComp_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = ThreeComp_lem_stub - dynamicflags += THREECOMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ThreeCompEC.cpp - ThreeCompAEC.cpp - ThreeComp_no_amiEC.cpp - } - - Header_Files { - ThreeCompEC.h - ThreeComp_lem_stub_export.h - ThreeComp_no_amiEC.h -} - - Inline_Files { - ThreeCompEC.inl - ThreeComp_no_amiEC.inl - } -} - -project(AMI_ThreeComp_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_ThreeComp_stub - sharedname = ThreeComp_skel - libs += ThreeComp_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += THREECOMP_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ThreeCompS.cpp - ThreeCompAS.cpp - ThreeComp_no_amiS.cpp - } - - Header_Files { - ThreeCompS.h - ThreeComp_no_amiS.h - - ThreeComp_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_ThreeComp_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_ThreeComp_lem_stub ThreeComp_Base_AMI_stub AMI_ThreeComp_skel AMI_ThreeComp_lema_gen AMI_ThreeComp_lemae_gen - sharedname = ThreeComp_conn - libs += ThreeComp_stub ThreeComp_skel ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeCompA_conn.cpp - } - - Header_Files { - ThreeCompA_conn.h - ThreeComp_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_ThreeComp_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_ThreeComp_lem_stub ThreeComp_Base_AMI_stub AMI_ThreeComp_skel AMI_ThreeComp_lema_gen AMI_ThreeComp_lemae_gen AMI_ThreeComp_conn - sharedname = ThreeComp_svnt - libs += ThreeComp_stub ThreeComp_skel ThreeComp_lem_stub ThreeComp_conn - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeCompA_svnt.cpp - } - - Header_Files { - ThreeCompA_svnt.h - ThreeCompA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl deleted file mode 100644 index 702224cc6b2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef THREECOMP_NO_AMI_IDL -#define THREECOMP_NO_AMI_IDL - -#pragma ciao lem "Base/ThreeComp_no_amiE.idl" - -module ThreeComp -{ - // test with no ciao ami4ccm interface, no pragma, see above - interface MyBar - { - long testbar (in long cmd, out string answer); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl deleted file mode 100644 index d8db5d6e2d4..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef THREECOMP_MASTER_IDL -#define THREECOMP_MASTER_IDL - -#include - -#include "Base/ThreeComp.idl" - -#pragma ciao ami4ccm receptacle "ThreeComp::Master::run_my_state" - -module ThreeComp -{ - component Master - { - /// For synchronous invocation - uses State run_my_state; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc deleted file mode 100644 index ab86da6e178..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Master" - -project(AMI_ThreeComp_Base_Master_idl_gen) : componentidldefaults { - after += AMI_ThreeComp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_MASTER_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Master_stub_export.h \ - -Wb,skel_export_macro=THREECOMP_MASTER_SVNT_Export \ - -Wb,skel_export_include=ThreeComp_Master_svnt_export.h \ - -Wb,exec_export_macro=THREECOMP_MASTER_EXEC_Export \ - -Wb,exec_export_include=ThreeComp_Master_exec_export.h \ - -I.. -GC - IDL_Files { - ThreeComp_Master.idl - } -} - -project(AMI_ThreeComp_Base_Master_lem_gen) : ciaoidldefaults { - after += AMI_ThreeComp_Base_Master_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_MASTER_LEM_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Master_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ThreeComp_MasterE.idl - } -} - -project(AMI_ThreeComp_Base_Master_lem_stub) : ccm_svnt, ami { - after += AMI_ThreeComp_Base_Master_lem_gen AMI_ThreeComp_stub Conn_ThreeComp_Base_stub - libs += ThreeComp_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Master_lem_stub - dynamicflags += THREECOMP_MASTER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_MasterEC.cpp - } - - Header_Files { - ThreeComp_MasterEC.h - ThreeComp_Master_lem_stub_export.h - } - - Inline_Files { - ThreeComp_MasterEC.inl - } -} - -project(AMI_ThreeComp_Base_Master_stub) : ccm_stub, ami { - after += AMI_ThreeComp_Base_Master_idl_gen AMI_ThreeComp_Base_stub AMI_ThreeComp_stub Conn_ThreeComp_Base_stub - libs += ThreeComp_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Master_stub - dynamicflags += THREECOMP_MASTER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_MasterC.cpp - } - - Header_Files { - ThreeComp_MasterC.h - ThreeComp_Master_stub_export.h - } - - Inline_Files { - ThreeComp_MasterC.inl - } -} - -project(AMI_ThreeComp_Base_Master_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_ThreeComp_Base_Master_lem_stub AMI_ThreeComp_Base_Master_stub AMI_ThreeComp_Base_exec Conn_ThreeComp_Base_stub AMI_ThreeComp_lem_stub - sharedname = ThreeComp_Master_exec - libs += ThreeComp_Master_stub ThreeComp_Master_lem_stub ThreeComp_stub ThreeComp_stub ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_MASTER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_Master_exec.cpp - } - - Header_Files { - ThreeComp_Master_exec.h - ThreeComp_Master_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_ThreeComp_Base_Master_svnt) : ciao_servant, ami { - after += AMI_ThreeComp_Base_skel AMI_ThreeComp_Base_Master_lem_stub AMI_ThreeComp_Base_Master_stub AMI_ThreeComp_Base_exec AMI_ThreeComp_skel - sharedname = ThreeComp_Master_svnt - libs += ThreeComp_Master_stub ThreeComp_Master_lem_stub \ - ThreeComp_skel \ - ThreeComp_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_MASTER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_MasterS.cpp - ThreeComp_Master_svnt.cpp - } - - Header_Files { - ThreeComp_MasterS.h - ThreeComp_Master_svnt.h - ThreeComp_Master_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp deleted file mode 100644 index 1f8a20e7b47..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp +++ /dev/null @@ -1,252 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ThreeComp_Master_exec.h" -#include "ace/OS_NS_unistd.h" - - -namespace CIAO_ThreeComp_Master_Impl -{ - CORBA::Boolean asynch = false; - //============================================================ - // Worker thread for asynchronous invocations for State - //============================================================ - asynch_state_generator::asynch_state_generator ( - ::ThreeComp::CCM_Master_Context_ptr context, - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent) - : context_(::ThreeComp::CCM_Master_Context::_duplicate (context)), - nr_of_rec_(nr_of_rec), - nr_of_sent_(nr_of_sent) - { - } - - int asynch_state_generator::svc () - { - ::ThreeComp::AMI4CCM_State_var my_state_ami_ = - context_->get_connection_sendc_run_my_state(); - - ACE_OS::sleep(2); - ::ThreeComp::AMI4CCM_StateReplyHandler_var cb = - new AMI4CCM_StateReplyHandler_run_my_state_i ( - this->nr_of_rec_, - this->nr_of_sent_); - - if (CORBA::is_nil (my_state_ami_)) - { - ACE_ERROR ((LM_ERROR, "ERROR Master (ASYNCH) :" - "\tstate_ami is NIL !\n")); - return 1; - } - //Invoke Asynchronous calls to test - - for (int i = 0; i < 3; i ++) - { - ++this->nr_of_sent_; - my_state_ami_->sendc_bar ( cb.in(), 1); - ACE_DEBUG ((LM_DEBUG, "OK: Master sends ASYNCHRONOUS call to Sender.\n")); - } - //there is more than 1 message sent, without receiving callbacks, - //so it is asynchronous - if (this->nr_of_sent_.value() > 1) - { - asynch = true; - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for State - //============================================================ - synch_state_generator::synch_state_generator ( - ::ThreeComp::CCM_Master_Context_ptr context) - : context_(::ThreeComp::CCM_Master_Context::_duplicate (context)) - { - } - - int synch_state_generator::svc () - { - ::ThreeComp::State_var my_state_ami_ = - context_->get_connection_run_my_state (); - - ACE_OS::sleep(1); - CORBA::Boolean wait = false; - for (int i = 0; i < 3; ++i) - { - // Run some synch calls, answer has to come before the next step. - CORBA::String_var answer; - ::CORBA::Long ret = 0; - try - { - if ( wait==true) - { - ACE_ERROR ((LM_ERROR, - "ERROR: NOT RECEIVED SYNCHRONOUS answer.\n")); - } - wait = true; - ACE_DEBUG ((LM_DEBUG, "OK: Master send SYNCHRONOUS call to Sender.\n")); - ret = my_state_ami_->bar (2,answer.out()); - if (ret == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK: Master received SYNCHRONOUS answer from Sender <%C>\n", - answer.in ())); - wait = false; - } - } - catch (const ThreeComp::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_state_generator::state: " - "Unexpected exception.\n")); - } - } - return 0; - } - /** - * Component Executor Implementation Class: Master_exec_i - */ - - Master_exec_i::Master_exec_i (void) - : asynch_state_gen(0), - synch_state_gen(0), - nr_of_rec_ (0), - nr_of_sent_(0) - { - } - - Master_exec_i::~Master_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Master_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ThreeComp::CCM_Master_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Master_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Master_exec_i::ccm_activate (void) - { - this->asynch_state_gen = - new asynch_state_generator (this->ciao_context_.in (), - this->nr_of_rec_, - this->nr_of_sent_); - this->asynch_state_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_state_gen = - new synch_state_generator (this->ciao_context_.in()); - this->synch_state_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Master_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Master_exec_i::ccm_remove (void) - { - if ((asynch == false) || (this->nr_of_rec_.value() != 3)) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Test not asynchronous or not received back" - " all requests ( %u/3)!\n", - this->nr_of_rec_.value() )); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Test Master.\n")); - } - delete this->asynch_state_gen; - this->asynch_state_gen = 0; - delete this->synch_state_gen; - this->synch_state_gen = 0; - } - - AMI4CCM_StateReplyHandler_run_my_state_i::AMI4CCM_StateReplyHandler_run_my_state_i ( - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent) - : nr_of_rec_(nr_of_rec), - nr_of_sent_(nr_of_sent) - { - } - - AMI4CCM_StateReplyHandler_run_my_state_i::~AMI4CCM_StateReplyHandler_run_my_state_i (void) - { - } - - void - AMI4CCM_StateReplyHandler_run_my_state_i::bar ( - ::CORBA::Long ami_return_val, - const char * answer) - { - if (ami_return_val == 1) - { - ++this->nr_of_rec_; - --this->nr_of_sent_; - ACE_DEBUG ((LM_DEBUG, "OK: Master get ASYNCHRONOUS callback " - "from Sender: <%C>.\n", - answer)); - } - } - - void - AMI4CCM_StateReplyHandler_run_my_state_i::bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" THREECOMP_MASTER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Master_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Master_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h deleted file mode 100644 index 20f8136f722..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.h +++ /dev/null @@ -1,152 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_THREECOMP_MASTER_EXEC_0MCF2C_H_ -#define CIAO_THREECOMP_MASTER_EXEC_0MCF2C_H_ - -#include /**/ "ace/pre.h" - -#include "ThreeComp_MasterEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ThreeComp_Master_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_ThreeComp_Master_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_state_generator : public virtual ACE_Task_Base - { - public: - asynch_state_generator (::ThreeComp::CCM_Master_Context_ptr context, - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent); - - virtual int svc (void); - - private: - ::ThreeComp::CCM_Master_Context_var context_; - Atomic_UShort &nr_of_rec_; - Atomic_UShort &nr_of_sent_; - - }; - - /// Worker thread for synchronous invocations - class synch_state_generator : public virtual ACE_Task_Base - { - public: - synch_state_generator (::ThreeComp::CCM_Master_Context_ptr context); - virtual int svc (void); - - private: - ::ThreeComp::CCM_Master_Context_var context_; - }; - /* - * Component Executor Implementation Class: Master_exec_i - */ - - class Master_exec_i - : public virtual Master_Exec, - public virtual ::CORBA::LocalObject - { - public: - Master_exec_i (void); - virtual ~Master_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::ThreeComp::CCM_Master_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_state_generator* asynch_state_gen; - synch_state_generator* synch_state_gen; - Atomic_UShort nr_of_rec_; - Atomic_UShort nr_of_sent_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - class AMI4CCM_StateReplyHandler_run_my_state_i - : public ::ThreeComp::CCM_AMI4CCM_StateReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_StateReplyHandler_run_my_state_i ( - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent); - virtual ~AMI4CCM_StateReplyHandler_run_my_state_i (void); - - virtual void - bar ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - bar_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_rec_; - Atomic_UShort &nr_of_sent_; - }; - - extern "C" THREECOMP_MASTER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Master_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt b/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt deleted file mode 100644 index 44c114b5eee..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt +++ /dev/null @@ -1,8 +0,0 @@ - - -This test exists of 3 components. --Master component which sends asynchronous and synchronous calls to a Sender. --Sender which recieves asynchronous and synchronous calls from the Master and replies them. Also the -Sender sends asynchronous and synchronous calls ( uses multiple) to 3 Receivers. So the Sender has -'uses' and 'provides' ports. --Receiver which recieves asynchronous and synchronous calls from the Sender and replies them. diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl deleted file mode 100644 index efd4c52c819..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef THREECOMP_RECEIVER_IDL -#define THREECOMP_RECEIVER_IDL - -#include - -#include "Base/ThreeComp.idl" - -module ThreeComp -{ - component Receiver - { - /// Provides - provides MyFoo do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc deleted file mode 100644 index 010c2e09ad1..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Receiver" - -project(AMI_ThreeComp_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_ThreeComp_idl_gen - idlflags += -Wb,stub_export_macro=THREECOMP_RECEIVER_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Receiver_stub_export.h \ - -Wb,skel_export_macro=THREECOMP_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=ThreeComp_Receiver_svnt_export.h \ - -Wb,exec_export_macro=THREECOMP_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=ThreeComp_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - ThreeComp_Receiver.idl - } -} - -project(AMI_ThreeComp_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_ThreeComp_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ThreeComp_ReceiverE.idl - } -} - -project(AMI_ThreeComp_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_ThreeComp_Base_Receiver_lem_gen AMI_ThreeComp_Base_Receiver_stub AMI_ThreeComp_stub - libs += ThreeComp_stub ThreeComp_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Receiver_lem_stub - dynamicflags += THREECOMP_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_ReceiverEC.cpp - } - - Header_Files { - ThreeComp_ReceiverEC.h - ThreeComp_Receiver_lem_stub_export.h - } - - Inline_Files { - ThreeComp_ReceiverEC.inl - } -} - -project(AMI_ThreeComp_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_ThreeComp_Base_Receiver_idl_gen AMI_ThreeComp_stub - libs += ThreeComp_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Receiver_stub - dynamicflags += THREECOMP_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_ReceiverC.cpp - } - - Header_Files { - ThreeComp_ReceiverC.h - ThreeComp_Receiver_stub_export.h - } - - Inline_Files { - ThreeComp_ReceiverC.inl - } -} - -project(AMI_ThreeComp_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_ThreeComp_Base_Receiver_l_stub AMI_ThreeComp_Base_Receiver_stub AMI_ThreeComp_stub AMI_ThreeComp_lem_stub - sharedname = ThreeComp_Receiver_exec - libs += ThreeComp_Receiver_stub ThreeComp_Receiver_lem_stub ThreeComp_stub ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_Receiver_exec.cpp - } - - Header_Files { - ThreeComp_Receiver_exec.h - ThreeComp_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_ThreeComp_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_ThreeComp_Base_skel AMI_ThreeComp_Base_Receiver_l_stub AMI_ThreeComp_stub AMI_ThreeComp_skel AMI_ThreeComp_lem_stub - sharedname = ThreeComp_Receiver_svnt - libs += ThreeComp_Receiver_stub ThreeComp_Receiver_lem_stub \ - ThreeComp_skel \ - ThreeComp_stub ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_ReceiverS.cpp - ThreeComp_Receiver_svnt.cpp - } - - Header_Files { - ThreeComp_ReceiverS.h - ThreeComp_Receiver_svnt.h - ThreeComp_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp deleted file mode 100644 index 654a57ecd3e..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.cpp +++ /dev/null @@ -1,169 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ThreeComp_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_ThreeComp_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_foo_exec_i - */ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::ThreeComp::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_received) - : ciao_context_ ( - ::ThreeComp::CCM_Receiver_Context::_duplicate (ctx)), - nr_of_received_(nr_of_received) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::ThreeComp::MyFoo - - ::CORBA::Long - do_my_foo_exec_i::foo (::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_OS::sleep(2); - CORBA::Long ret = 0; - ++nr_of_received_; - if (cmd == 10) - { - ret = 1; - } - if (cmd == 20) - { - ret = 2; - } - answer = CORBA::string_dup ("Hi from receiver."); - return ret; } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - :nr_of_received_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::ThreeComp::CCM_MyFoo_ptr - Receiver_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in (), - this->nr_of_received_), - ::ThreeComp::CCM_MyFoo::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::ThreeComp::CCM_MyFoo::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ThreeComp::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - // each Receiver has to receive 2 requests. - if (nr_of_received_.value() != 2) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Receiver received wrong number of messages" - " ( %u/2)!\n", - nr_of_received_.value() )); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: This Receiver works as expected.\n")); - } - } - - extern "C" THREECOMP_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h deleted file mode 100644 index 28d09505f7b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_THREECOMP_RECEIVER_EXEC_I1LVQG_H_ -#define CIAO_THREECOMP_RECEIVER_EXEC_I1LVQG_H_ - -#include /**/ "ace/pre.h" - -#include "ThreeComp_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ThreeComp_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ThreeComp_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /** - * Provider Executor Implementation Class: do_my_foo_exec_i - */ - - class do_my_foo_exec_i - : public virtual ::ThreeComp::CCM_MyFoo, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::ThreeComp::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_received); - virtual ~do_my_foo_exec_i (void); - - //@{ - /** Operations and attributes from ThreeComp::MyFoo. */ - - virtual - ::CORBA::Long foo (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::ThreeComp::CCM_Receiver_Context_var ciao_context_; - Atomic_UShort &nr_of_received_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::ThreeComp::CCM_MyFoo_ptr - get_do_my_foo (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::ThreeComp::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::ThreeComp::CCM_MyFoo_var ciao_do_my_foo_; - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" THREECOMP_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl deleted file mode 100644 index 60ee17a49a9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef THREECOMP_SENDER_IDL -#define THREECOMP_SENDER_IDL - -#include - -#include "Base/ThreeComp.idl" -#include "Base/ThreeComp_no_ami.idl" - -#pragma ciao ami4ccm receptacle "ThreeComp::Sender::run_my_foo" - -module ThreeComp -{ - component Sender - { - /// For synchronous invocation - uses multiple MyFoo run_my_foo; - provides State do_my_state; - - // test for no ami4ccm interface - provides MyBar do_my_bar; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc deleted file mode 100644 index 5c5ff3307f9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ThreeComp_Base ThreeComp_Sender" - -project(AMI_ThreeComp_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_ThreeComp_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_SENDER_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Sender_stub_export.h \ - -Wb,skel_export_macro=THREECOMP_SENDER_SVNT_Export \ - -Wb,skel_export_include=ThreeComp_Sender_svnt_export.h \ - -Wb,exec_export_macro=THREECOMP_SENDER_EXEC_Export \ - -Wb,exec_export_include=ThreeComp_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - ThreeComp_Sender.idl - } -} - -project(AMI_ThreeComp_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_ThreeComp_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=THREECOMP_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=ThreeComp_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ThreeComp_SenderE.idl - } -} - -project(AMI_ThreeComp_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_ThreeComp_Base_Sender_lem_gen AMI_ThreeComp_stub Conn_ThreeComp_Base_stub AMI_ThreeComp_Base_Sender_stub - libs += ThreeComp_stub ThreeComp_Sender_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Sender_lem_stub - dynamicflags += THREECOMP_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_SenderEC.cpp - } - - Header_Files { - ThreeComp_SenderEC.h - ThreeComp_Sender_lem_stub_export.h - } - - Inline_Files { - ThreeComp_SenderEC.inl - } -} - -project(AMI_ThreeComp_Base_Sender_stub) : ccm_stub, ami { - after += AMI_ThreeComp_Base_Sender_idl_gen AMI_ThreeComp_Base_stub AMI_ThreeComp_stub Conn_ThreeComp_Base_stub - libs += ThreeComp_stub - libpaths += ../lib - libout = ../lib - sharedname = ThreeComp_Sender_stub - dynamicflags += THREECOMP_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_SenderC.cpp - } - - Header_Files { - ThreeComp_SenderC.h - ThreeComp_Sender_stub_export.h - } - - Inline_Files { - ThreeComp_SenderC.inl - } -} - -project(AMI_ThreeComp_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_ThreeComp_Base_Sender_lem_stub AMI_ThreeComp_Base_Sender_stub AMI_ThreeComp_Base_exec Conn_ThreeComp_Base_stub AMI_ThreeComp_lem_stub - sharedname = ThreeComp_Sender_exec - libs += ThreeComp_Sender_stub ThreeComp_Sender_lem_stub ThreeComp_stub ThreeComp_stub ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_Sender_exec.cpp - } - - Header_Files { - ThreeComp_Sender_exec.h - ThreeComp_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_ThreeComp_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_ThreeComp_Base_skel AMI_ThreeComp_Base_Sender_lem_stub AMI_ThreeComp_Base_Sender_stub AMI_ThreeComp_Base_exec AMI_ThreeComp_stub AMI_ThreeComp_lem_stub AMI_ThreeComp_skel - sharedname = ThreeComp_Sender_svnt - libs += ThreeComp_Sender_stub ThreeComp_Sender_lem_stub \ - ThreeComp_skel \ - ThreeComp_stub ThreeComp_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += THREECOMP_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - ThreeComp_SenderS.cpp - ThreeComp_Sender_svnt.cpp - } - - Header_Files { - ThreeComp_SenderS.h - ThreeComp_Sender_svnt.h - ThreeComp_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp deleted file mode 100644 index ebfd12e68e2..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp +++ /dev/null @@ -1,344 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ThreeComp_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_ThreeComp_Sender_Impl -{ - CORBA::Boolean asynch = false; - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::ThreeComp::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent) - : context_(::ThreeComp::CCM_Sender_Context::_duplicate (context)), - nr_of_rec_(nr_of_rec), - nr_of_sent_(nr_of_sent) - - { - } - - int asynch_foo_generator::svc () - { - ::ThreeComp::Sender::sendc_run_my_fooConnections_var my_foo_ami_ = - context_->get_connections_sendc_run_my_foo(); - ::ThreeComp::AMI4CCM_MyFooReplyHandler_var cb = - new AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - this->nr_of_rec_, - this->nr_of_sent_); - - // Invoke Asynchronous calls to test - for (CORBA::ULong i = 0; i < my_foo_ami_->length (); ++i) - { - ++this->nr_of_sent_; - my_foo_ami_[i].objref->sendc_foo (cb.in(), - 10 ); - ACE_DEBUG ((LM_DEBUG, "OK Sender send ASYNCHRONOUS call to Receiver.\n")); - // There is more than 1 message sent, without receiving callbacks, - // so it is asynchronous - if (this->nr_of_sent_.value() > 1) - { - asynch = true; - } - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::ThreeComp::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_rec) - : context_(::ThreeComp::CCM_Sender_Context::_duplicate (context)), - nr_of_rec_(nr_of_rec) - { - } - - int synch_foo_generator::svc () - { - - ::ThreeComp::Sender::run_my_fooConnections_var my_foo_ami_ = - context_->get_connections_run_my_foo (); - - CORBA::Boolean wait = false; - - for(CORBA::ULong i = 0; i < my_foo_ami_->length(); ++i) - { - CORBA::String_var answer; - try - { - if ( wait==true) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Sender didn't receive SYNCHRONOUS answer" - " from Receiver.\n")); - } - wait = true; - ACE_DEBUG ((LM_DEBUG, "OK Sender send SYNCHRONOUS CALL to Receiver.\n")); - - CORBA::ULong result = my_foo_ami_[i].objref->foo( 20, - answer.out ()); - if (result == 2) - { - ACE_DEBUG ((LM_DEBUG, "OK Sender received SYNCHRONOUS answer " - "from Receiver <%C>\n", - answer.in ())); - ++this->nr_of_rec_; - wait = false; - } - } - catch (const ThreeComp::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); - } - } - return 0; - } - /** - * Facet Executor Implementation Class: do_my_state_exec_i - */ - - do_my_state_exec_i::do_my_state_exec_i ( - ::ThreeComp::CCM_Sender_Context_ptr ctx) - : ciao_context_ ( - ::ThreeComp::CCM_Sender_Context::_duplicate (ctx)) - { - } - - do_my_state_exec_i::~do_my_state_exec_i (void) - { - } - - // Operations from ::ThreeComp::State - - ::CORBA::Long - do_my_state_exec_i::bar (::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_OS::sleep(2); - answer = CORBA::string_dup ("Hi from sender."); - return cmd; - } - - /** - * Facet Executor Implementation Class: do_my_bar_exec_i - */ - - do_my_bar_exec_i::do_my_bar_exec_i ( - ::ThreeComp::CCM_Sender_Context_ptr ctx) - : ciao_context_ ( - ::ThreeComp::CCM_Sender_Context::_duplicate (ctx)) - { - } - - do_my_bar_exec_i::~do_my_bar_exec_i (void) - { - } - - // Operations from ::ThreeComp::MyBar - - ::CORBA::Long - do_my_bar_exec_i::testbar (::CORBA::Long /* cmd */, - ::CORBA::String_out /* answer */) - { - /* Your code here. */ - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_rec_(0), - nr_of_sent_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::ThreeComp::CCM_State_ptr - Sender_exec_i::get_do_my_state (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_state_.in ())) - { - do_my_state_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_state_exec_i ( - this->ciao_context_.in ()), - ::ThreeComp::CCM_State::_nil ()); - - this->ciao_do_my_state_ = tmp; - } - - return - ::ThreeComp::CCM_State::_duplicate ( - this->ciao_do_my_state_.in ()); - } - - ::ThreeComp::CCM_MyBar_ptr - Sender_exec_i::get_do_my_bar (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_bar_.in ())) - { - do_my_bar_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_bar_exec_i ( - this->ciao_context_.in ()), - ::ThreeComp::CCM_MyBar::_nil ()); - - this->ciao_do_my_bar_ = tmp; - } - - return - ::ThreeComp::CCM_MyBar::_duplicate ( - this->ciao_do_my_bar_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ThreeComp::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - //for connection with Receiver component - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in (), - this->nr_of_rec_, - this->nr_of_sent_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_rec_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - // each Receiver (total 3, see deployment plan) send back 2 requests. - if ((asynch == false) || (this->nr_of_rec_.value() != 6) || - (this->nr_of_sent_.value() != 0)) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Test not asynchronous or not received back" - " all requests ( %u/6)!\n", - this->nr_of_rec_.value() )); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Sender works as expected.\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent) - : nr_of_rec_(nr_of_rec), - nr_of_sent_(nr_of_sent) - { - } - - AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_ret_val, - const char * answer ) - { - ++this->nr_of_rec_; - if (ami_ret_val == 1 ) - { - --this->nr_of_sent_; - ACE_DEBUG ((LM_DEBUG, - "OK: Sender get ASYNCHRONOUS callback from Receiver: <%C>.\n", - answer)); - } - } - - void - AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" THREECOMP_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h deleted file mode 100644 index 83c6fbe716c..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h +++ /dev/null @@ -1,214 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_THREECOMP_SENDER_EXEC_G5GGIG_H_ -#define CIAO_THREECOMP_SENDER_EXEC_G5GGIG_H_ - -#include /**/ "ace/pre.h" - -#include "ThreeComp_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ThreeComp_Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include "ace/Task.h" - -namespace CIAO_ThreeComp_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::ThreeComp::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent); - - virtual int svc (void); - - private: - ::ThreeComp::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_rec_; - Atomic_UShort &nr_of_sent_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::ThreeComp::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_rec); - virtual int svc (void); - - private: - ::ThreeComp::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_rec_; - }; - /** - * Provider Executor Implementation Class: do_my_state_exec_i - */ - - class do_my_state_exec_i - : public virtual ::ThreeComp::CCM_State, - public virtual ::CORBA::LocalObject - { - public: - do_my_state_exec_i ( - ::ThreeComp::CCM_Sender_Context_ptr ctx); - virtual ~do_my_state_exec_i (void); - - //@{ - /** Operations and attributes from ThreeComp::State. */ - - virtual - ::CORBA::Long bar (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::ThreeComp::CCM_Sender_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: do_my_bar_exec_i - */ - - class do_my_bar_exec_i - : public virtual ::ThreeComp::CCM_MyBar, - public virtual ::CORBA::LocalObject - { - public: - do_my_bar_exec_i ( - ::ThreeComp::CCM_Sender_Context_ptr ctx); - virtual ~do_my_bar_exec_i (void); - - //@{ - /** Operations and attributes from ThreeComp::MyBar. */ - - virtual - ::CORBA::Long testbar (::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::ThreeComp::CCM_Sender_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::ThreeComp::CCM_State_ptr - get_do_my_state (void); - - virtual ::ThreeComp::CCM_MyBar_ptr - get_do_my_bar (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::ThreeComp::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::ThreeComp::CCM_State_var ciao_do_my_state_; - ::ThreeComp::CCM_MyBar_var ciao_do_my_bar_; - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_UShort nr_of_rec_; - Atomic_UShort nr_of_sent_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - class AMI4CCM_MyFooReplyHandler_run_my_foo_i - : public ::ThreeComp::CCM_AMI4CCM_MyFooReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFooReplyHandler_run_my_foo_i ( - Atomic_UShort &nr_of_rec, - Atomic_UShort &nr_of_sent); - virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_rec_; - Atomic_UShort &nr_of_sent_; - }; - - extern "C" THREECOMP_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ThreeComp_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp deleted file mode 100644 index d04f4d4ff67..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp +++ /dev/null @@ -1,813 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - ThreeComp_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_ThreeComp_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ThreeComp_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - ThreeComp_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_ThreeComp_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ThreeComp_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - ThreeComp_MasterHomeImplementation - - - - - component factory - - - tk_string - - - create_ThreeComp_Master_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.MasterArtifacts.Master_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ThreeComp_Master_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.MasterArtifacts.Master_svnt - - - - - - - - - ThreeComp_AMIHomeImplementation1 - - - - - component factory - - - tk_string - - - create_ThreeComp_AMI4CCM_MyFoo_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI1_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ThreeComp_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI1_svnt - - - - - - - - ThreeComp_AMIHomeImplementation2 - - - - - component factory - - - tk_string - - - create_ThreeComp_AMI4CCM_State_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI2_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ThreeComp_AMI4CCM_State_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI2_svnt - - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.ReceiverA - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.ReceiverB - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.ReceiverC - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.Master - Master - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Master.ior - - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.AMI1A - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI1.ior - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.AMI1B - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI1.ior - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.AMI1C - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI1.ior - - - - - - - ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.AMI2 - Master - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI2.ior - - - - - - - - - run_asynch_foo_connectionA - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_foo_connectionB - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_foo_connectionC - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - - run_asynch_state_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_state - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - - do_foo_connectionA - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_foo_connectionB - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_foo_connectionC - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - do_state_connection - - do_my_state - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connectionA - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - synch_foo_connectionB - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - synch_foo_connectionC - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - synch_state_connection - - do_my_state - true - Facet - - - - run_my_state - false - SimplexReceptacle - - - - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI1_svnt - - - ThreeComp_svnt - - entryPoint - - - tk_string - - - create_ThreeComp_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant - - - - - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI1_exec - - - ThreeComp_conn - - entryPoint - - - tk_string - - - create_ThreeComp_AMI4CCM_MyFoo_Connector_Impl - - - - - - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI2_svnt - - - ThreeComp_svnt - - entryPoint - - - tk_string - - - create_ThreeComp_AMI4CCM_State_Connector_AMI4CCM_Connector_Servant - - - - - - - ThreeComp.ImplementationArtifacts.AMIArtifacts.AMI2_exec - - - ThreeComp_conn - - entryPoint - - - tk_string - - - create_ThreeComp_AMI4CCM_State_Connector_Impl - - - - - - - - ThreeComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - ThreeComp_Receiver_svnt - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_ReceiverHome_Servant - - - - - - - ThreeComp.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - ThreeComp_Receiver_exec - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_ReceiverHome_Impl - - - - - - - ThreeComp.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - ThreeComp_Sender_svnt - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_SenderHome_Servant - - - - - - - ThreeComp.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - ThreeComp_Sender_exec - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_SenderHome_Impl - - - - - - - ThreeComp.ImplementationArtifacts.MasterArtifacts.Master_svnt - - - ThreeComp_Master_svnt - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_MasterHome_Servant - - - - - - - ThreeComp.ImplementationArtifacts.MasterArtifacts.Master_exec - - - ThreeComp_Master_exec - - entryPoint - - - tk_string - - - create_ThreeComp_AMI_MasterHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl deleted file mode 100755 index 8d036bdc559..00000000000 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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, 60002 ); -@iorbases = ("Master.ior", "Sender.ior", "Receiver.ior", "AMI1.ior", "AMI2.ior" ); -@iorfiles = 0; -@nodenames = ( "Master", "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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2* $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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tests/UsesMulti/.gitignore b/CIAO/connectors/ami4ccm/tests/UsesMulti/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/.gitignore b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/.gitignore deleted file mode 100644 index b99a522f5de..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/UsesMultiA.idl -/UsesMultiAE.idl -/UsesMultiA_conn.cpp -/UsesMultiA_conn.h -/UsesMultiE.idl -/UsesMulti_conn_export.h -/UsesMulti_exec_export.h -/UsesMulti_lem_stub_export.h -/UsesMulti_skel_export.h -/UsesMulti_stub_export.h -/UsesMulti_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl deleted file mode 100644 index 9c7e64b75ff..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.idl +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef USESMULTI_IDL -#define USESMULTI_IDL - -#pragma ciao lem "Base/UsesMultiE.idl" -#pragma ciao ami4ccm interface "UsesMulti::One" -#pragma ciao lem "Base/UsesMultiAE.idl" -#pragma ciao ami4ccm idl "Base/UsesMultiA.idl" - -module UsesMulti -{ - exception InternalError - { - long id; - string error_string; - }; - - // Sender/Receiver interfaces - interface One - { - long foo (in string in_str, in long cmd, out string answer) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc deleted file mode 100644 index 718be35730f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc +++ /dev/null @@ -1,192 +0,0 @@ -project(AMI_UsesMulti_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_STUB_Export \ - -Wb,stub_export_include=UsesMulti_stub_export.h \ - -Wb,skel_export_macro=USESMULTI_SKEL_Export \ - -Wb,skel_export_include=UsesMulti_skel_export.h \ - -Wb,conn_export_macro=USESMULTI_CONN_Export \ - -Wb,conn_export_include=UsesMulti_conn_export.h \ - -Wb,exec_export_macro=USESMULTI_EXEC_Export \ - -Wb,exec_export_include=UsesMulti_exec_export.h \ - -I.. -GM -Gxhcn - - - IDL_Files { - UsesMulti.idl - } -} - -project(AMI_UsesMulti_lem_gen) : ciaoidldefaults { - after += AMI_UsesMulti_idl_gen AMI_UsesMulti_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=USESMULTI_LEM_STUB_Export \ - -Wb,export_include=UsesMulti_lem_stub_export.h \ - -I.. -SS -Gxhst - - IDL_Files { - UsesMultiE.idl - } -} - -project(AMI_UsesMulti_lema_gen) : ciaoidldefaults, typecode { - after += AMI_UsesMulti_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_STUB_Export \ - -Wb,stub_export_include=UsesMulti_stub_export.h \ - -Wb,conn_export_macro=USESMULTI_CONN_Export \ - -Wb,conn_export_include=UsesMulti_conn_export.h \ - -Wb,svnt_export_macro=USESMULTI_SVNT_Export \ - -Wb,svnt_export_include=UsesMulti_svnt_export.h \ - -Wb,skel_export_macro=USESMULTI_SKEL_Export \ - -Wb,skel_export_include=UsesMulti_skel_export.h \ - -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - UsesMultiA.idl - } -} - -project(AMI_UsesMulti_lemae_gen) : ciaoidldefaults { - after += AMI_UsesMulti_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_LEM_STUB_Export \ - -Wb,stub_export_include=UsesMulti_lem_stub_export.h \ - -I.. -SS - - IDL_Files { - UsesMultiAE.idl - } -} - -project(AMI_UsesMulti_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_UsesMulti_lem_gen - libs += - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = UsesMulti_stub - dynamicflags += USESMULTI_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesMultiC.cpp - UsesMultiAC.cpp - } - - Header_Files { - UsesMultiC.h - UsesMulti_stub_export.h -} - - Inline_Files { - UsesMultiC.inl - } -} - -project(AMI_UsesMulti_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_UsesMulti_lem_gen AMI_UsesMulti_stub AMI_UsesMulti_lemae_gen AMI_UsesMulti_skel - libs += UsesMulti_stub UsesMulti_skel - libout = ../lib - libpaths += ../lib - includes += .. - - sharedname = UsesMulti_lem_stub - dynamicflags += USESMULTI_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesMultiEC.cpp - UsesMultiAEC.cpp - } - - Header_Files { - UsesMultiEC.h - UsesMulti_lem_stub_export.h -} - - Inline_Files { - UsesMultiEC.inl - } -} - -project(AMI_UsesMulti_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_UsesMulti_stub - sharedname = UsesMulti_skel - libs += UsesMulti_stub - libout = ../lib - libpaths += ../lib - includes += .. - - dynamicflags += USESMULTI_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UsesMultiS.cpp - UsesMultiAS.cpp - } - - Header_Files { - UsesMultiS.h - - UsesMulti_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesMulti_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_UsesMulti_lem_stub UsesMulti_Base_AMI_stub AMI_UsesMulti_skel AMI_UsesMulti_lema_gen AMI_UsesMulti_lemae_gen - sharedname = UsesMulti_conn - libs += UsesMulti_stub UsesMulti_skel UsesMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_CONN_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMultiA_conn.cpp - } - - Header_Files { - UsesMultiA_conn.h - UsesMulti_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesMulti_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_UsesMulti_lem_stub UsesMulti_Base_AMI_stub AMI_UsesMulti_skel AMI_UsesMulti_lema_gen AMI_UsesMulti_lemae_gen AMI_UsesMulti_conn - sharedname = UsesMulti_svnt - libs += UsesMulti_stub UsesMulti_skel UsesMulti_lem_stub UsesMulti_conn - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMultiA_svnt.cpp - } - - Header_Files { - UsesMultiA_svnt.h - UsesMultiA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/.gitignore b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/.gitignore deleted file mode 100644 index ef35c4ef20a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/UsesMulti_ReceiverE.idl -/UsesMulti_Receiver_exec_export.h -/UsesMulti_Receiver_lem_stub_export.h -/UsesMulti_Receiver_stub_export.h -/UsesMulti_Receiver_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl deleted file mode 100644 index a1bd29e47ea..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef USESMULTI_RECEIVER_IDL -#define USESMULTI_RECEIVER_IDL - -#include - -#include "Base/UsesMulti.idl" - -module UsesMulti -{ - component Receiver - { - /// Provides - provides One do_my_one; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc deleted file mode 100644 index 21b0ea12933..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc +++ /dev/null @@ -1,132 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UsesMulti_Base UsesMulti_Receiver" - -project(AMI_UsesMulti_Base_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_UsesMulti_idl_gen - idlflags += -Wb,stub_export_macro=USESMULTI_RECEIVER_STUB_Export \ - -Wb,stub_export_include=UsesMulti_Receiver_stub_export.h \ - -Wb,skel_export_macro=USESMULTI_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=UsesMulti_Receiver_svnt_export.h \ - -Wb,exec_export_macro=USESMULTI_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=UsesMulti_Receiver_exec_export.h \ - -Glem -I.. - - IDL_Files { - UsesMulti_Receiver.idl - } -} - -project(AMI_UsesMulti_Base_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_UsesMulti_Base_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=UsesMulti_Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UsesMulti_ReceiverE.idl - } -} - -project(AMI_UsesMulti_Base_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_UsesMulti_Base_Receiver_lem_gen AMI_UsesMulti_Base_Receiver_stub AMI_UsesMulti_stub - libs += UsesMulti_stub UsesMulti_Receiver_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesMulti_Receiver_lem_stub - dynamicflags += USESMULTI_RECEIVER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_ReceiverEC.cpp - } - - Header_Files { - UsesMulti_ReceiverEC.h - UsesMulti_Receiver_lem_stub_export.h - } - - Inline_Files { - UsesMulti_ReceiverEC.inl - } -} - -project(AMI_UsesMulti_Base_Receiver_stub) : ccm_stub, messaging { - after += AMI_UsesMulti_Base_Receiver_idl_gen AMI_UsesMulti_stub - libs += UsesMulti_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesMulti_Receiver_stub - dynamicflags += USESMULTI_RECEIVER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_ReceiverC.cpp - } - - Header_Files { - UsesMulti_ReceiverC.h - UsesMulti_Receiver_stub_export.h - } - - Inline_Files { - UsesMulti_ReceiverC.inl - } -} - -project(AMI_UsesMulti_Base_Receiver_exec) : ciao_executor, messaging { - after += AMI_UsesMulti_Base_Receiver_l_stub AMI_UsesMulti_Base_Receiver_stub AMI_UsesMulti_stub AMI_UsesMulti_lem_stub - sharedname = UsesMulti_Receiver_exec - libs += UsesMulti_Receiver_stub UsesMulti_Receiver_lem_stub UsesMulti_stub UsesMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_RECEIVER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_Receiver_exec.cpp - } - - Header_Files { - UsesMulti_Receiver_exec.h - UsesMulti_Receiver_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesMulti_Base_Receiver_svnt) : ciao_servant, messaging { - after += AMI_UsesMulti_Base_skel AMI_UsesMulti_Base_Receiver_l_stub AMI_UsesMulti_stub AMI_UsesMulti_skel AMI_UsesMulti_lem_stub - sharedname = UsesMulti_Receiver_svnt - libs += UsesMulti_Receiver_stub UsesMulti_Receiver_lem_stub \ - UsesMulti_skel \ - UsesMulti_stub UsesMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_RECEIVER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_ReceiverS.cpp - UsesMulti_Receiver_svnt.cpp - } - - Header_Files { - UsesMulti_ReceiverS.h - UsesMulti_Receiver_svnt.h - UsesMulti_Receiver_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp deleted file mode 100644 index c24bdc09c4b..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.cpp +++ /dev/null @@ -1,173 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UsesMulti_Receiver_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_UsesMulti_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: do_my_one_exec_i - */ - - do_my_one_exec_i::do_my_one_exec_i ( - ::UsesMulti::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_received) - : ciao_context_ ( - ::UsesMulti::CCM_Receiver_Context::_duplicate (ctx)), - nr_of_received_(nr_of_received) - { - } - - do_my_one_exec_i::~do_my_one_exec_i (void) - { - } - - // Operations from ::UsesMulti::One - - ::CORBA::Long - do_my_one_exec_i::foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer) - { - ACE_OS::sleep(2); - if ((cmd < 0) || (cmd > 2)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver foo," - " origin not between 0 and 3, but <%u>\n", - cmd)); - } - else - { - ++nr_of_received_; - } - answer = CORBA::string_dup (in_str); - - return cmd; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : nr_of_received_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::UsesMulti::CCM_One_ptr - Receiver_exec_i::get_do_my_one (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_one_.in ())) - { - do_my_one_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_one_exec_i ( - this->ciao_context_.in (), - this->nr_of_received_), - ::UsesMulti::CCM_One::_nil ()); - - this->ciao_do_my_one_ = tmp; - } - - return - ::UsesMulti::CCM_One::_duplicate ( - this->ciao_do_my_one_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UsesMulti::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (nr_of_received_.value() != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive the expected " - "number of correct calls.\n" - "Expected: 2, Received: %u.\n", - nr_of_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " - "number of correct calls.\n" - "Expected: 2, Received: %u.\n", - nr_of_received_.value())); - } } - - extern "C" USESMULTI_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesMulti_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h deleted file mode 100644 index b6bdeb3c260..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h +++ /dev/null @@ -1,131 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_USESMULTI_RECEIVER_EXEC_BNFVCJ_H_ -#define CIAO_USESMULTI_RECEIVER_EXEC_BNFVCJ_H_ - -#include /**/ "ace/pre.h" - -#include "UsesMulti_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "UsesMulti_Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_UsesMulti_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /** - * Provider Executor Implementation Class: do_my_one_exec_i - */ - - class do_my_one_exec_i - : public virtual ::UsesMulti::CCM_One, - public virtual ::CORBA::LocalObject - { - public: - do_my_one_exec_i ( - ::UsesMulti::CCM_Receiver_Context_ptr ctx, - Atomic_UShort &nr_of_received); - virtual ~do_my_one_exec_i (void); - - //@{ - /** Operations and attributes from UsesMulti::One. */ - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::Long cmd, - ::CORBA::String_out answer); - //@} - - private: - ::UsesMulti::CCM_Receiver_Context_var ciao_context_; - Atomic_UShort &nr_of_received_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::UsesMulti::CCM_One_ptr - get_do_my_one (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::UsesMulti::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::UsesMulti::CCM_One_var ciao_do_my_one_; - //@} - - //@{ - /** User defined members. */ - Atomic_UShort nr_of_received_; - //@} - - //@{ - /** User defined private operations. */ - //@} - }; - - extern "C" USESMULTI_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesMulti_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/.gitignore b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/.gitignore deleted file mode 100644 index 14c83941c56..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/UsesMulti_SenderE.idl -/UsesMulti_Sender_exec_export.h -/UsesMulti_Sender_lem_stub_export.h -/UsesMulti_Sender_stub_export.h -/UsesMulti_Sender_svnt_export.h diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl deleted file mode 100644 index 7b91e3e39a9..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef USESMULTI_SENDER_IDL -#define USESMULTI_SENDER_IDL - -#include - -#include "Base/UsesMulti.idl" - -#pragma ciao ami4ccm receptacle "UsesMulti::Sender::run_my_um_one" - -module UsesMulti -{ - component Sender - { - /// For synchronous invocation - uses multiple One run_my_um_one; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc deleted file mode 100644 index 8d28ac61253..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc +++ /dev/null @@ -1,133 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UsesMulti_Base UsesMulti_Sender" - -project(AMI_UsesMulti_Base_Sender_idl_gen) : componentidldefaults { - after += AMI_UsesMulti_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_SENDER_STUB_Export \ - -Wb,stub_export_include=UsesMulti_Sender_stub_export.h \ - -Wb,skel_export_macro=USESMULTI_SENDER_SVNT_Export \ - -Wb,skel_export_include=UsesMulti_Sender_svnt_export.h \ - -Wb,exec_export_macro=USESMULTI_SENDER_EXEC_Export \ - -Wb,exec_export_include=UsesMulti_Sender_exec_export.h \ - -I.. -GC - - IDL_Files { - UsesMulti_Sender.idl - } -} - -project(AMI_UsesMulti_Base_Sender_lem_gen) : ciaoidldefaults { - after += AMI_UsesMulti_Base_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=USESMULTI_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=UsesMulti_Sender_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UsesMulti_SenderE.idl - } -} - -project(AMI_UsesMulti_Base_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_UsesMulti_Base_Sender_lem_gen AMI_UsesMulti_stub AMI_UsesMulti_Base_Sender_stub - libs += UsesMulti_stub UsesMulti_Sender_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesMulti_Sender_lem_stub - dynamicflags += USESMULTI_SENDER_LEM_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_SenderEC.cpp - } - - Header_Files { - UsesMulti_SenderEC.h - UsesMulti_Sender_lem_stub_export.h - } - - Inline_Files { - UsesMulti_SenderEC.inl - } -} - -project(AMI_UsesMulti_Base_Sender_stub) : ccm_stub, ami { - after += AMI_UsesMulti_Base_Sender_idl_gen AMI_UsesMulti_Base_stub AMI_UsesMulti_stub - libs += UsesMulti_stub - libpaths += ../lib - libout = ../lib - sharedname = UsesMulti_Sender_stub - dynamicflags += USESMULTI_SENDER_STUB_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_SenderC.cpp - } - - Header_Files { - UsesMulti_SenderC.h - UsesMulti_Sender_stub_export.h - } - - Inline_Files { - UsesMulti_SenderC.inl - } -} - -project(AMI_UsesMulti_Base_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_UsesMulti_Base_Sender_lem_stub AMI_UsesMulti_Base_Sender_stub AMI_UsesMulti_Base_exec AMI_UsesMulti_lem_stub - sharedname = UsesMulti_Sender_exec - libs += UsesMulti_Sender_stub UsesMulti_Sender_lem_stub UsesMulti_stub UsesMulti_stub UsesMulti_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_SENDER_EXEC_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_Sender_exec.cpp - } - - Header_Files { - UsesMulti_Sender_exec.h - UsesMulti_Sender_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_UsesMulti_Base_Sender_svnt) : ciao_servant, ami { - after += AMI_UsesMulti_Base_skel AMI_UsesMulti_Base_Sender_lem_stub AMI_UsesMulti_Base_Sender_stub AMI_UsesMulti_Base_exec AMI_UsesMulti_skel - sharedname = UsesMulti_Sender_svnt - libs += UsesMulti_Sender_stub UsesMulti_Sender_lem_stub \ - UsesMulti_skel \ - UsesMulti_stub - libpaths += ../lib - libout = ../lib - dynamicflags += USESMULTI_SENDER_SVNT_BUILD_DLL - includes += .. - IDL_Files { - } - - Source_Files { - UsesMulti_SenderS.cpp - UsesMulti_Sender_svnt.cpp - } - - Header_Files { - UsesMulti_SenderS.h - UsesMulti_Sender_svnt.h - UsesMulti_Sender_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp deleted file mode 100644 index 7b2c4555ad6..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp +++ /dev/null @@ -1,276 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UsesMulti_Sender_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_UsesMulti_Sender_Impl -{ - CORBA::Boolean asynch = false; - - //============================================================ - // Worker thread for asynchronous invocations for One - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::UsesMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent) - : context_(::UsesMulti::CCM_Sender_Context::_duplicate (context)), - nr_of_received_(nr_of_received), - nr_of_sent_(nr_of_sent) - { - } - - int asynch_foo_generator::svc () - { - ::UsesMulti::Sender::sendc_run_my_um_oneConnections_var my_one_ami_ = - context_->get_connections_sendc_run_my_um_one(); - - // Invoke Asynchronous calls to test - for (CORBA::ULong i = 0; i < my_one_ami_->length (); ++i) - { - ::UsesMulti::AMI4CCM_OneReplyHandler_var cb = - new AMI4CCM_OneReplyHandler_run_my_um_one_i ( - this->nr_of_received_, - this->nr_of_sent_); - - CORBA::String_var test; - switch (i) - { - case 0: - test = CORBA::string_dup ("Asynch. call one"); - break; - case 1: - test = CORBA::string_dup ("Asynch. call two"); - break; - case 2: - test = CORBA::string_dup ("Asynch. call three"); - break; - default: - break; - } - ++this->nr_of_sent_; - my_one_ami_[i].objref->sendc_foo (cb.in (), - test.in (), - i); - ACE_DEBUG ((LM_DEBUG, "Sender (ASYNCH) : send <%C> !\n", - test.in ())); - // There is more than 1 message sent, without receiving callbacks, - // so it is asynchronous - if (this->nr_of_sent_.value() > 1) - { - asynch = true; - } - } - return 0; - } - //============================================================ - // Worker thread for synchronous invocations for One - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::UsesMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received) - : context_(::UsesMulti::CCM_Sender_Context::_duplicate (context)), - nr_of_received_ (nr_of_received) - { - } - - int synch_foo_generator::svc () - { - ::UsesMulti::Sender::run_my_um_oneConnections_var my_one_ami_ = - context_->get_connections_run_my_um_one (); - - for(CORBA::ULong i = 0; i < my_one_ami_->length(); ++i) - { - CORBA::String_var test; - switch (i) - { - case 0: - test = CORBA::string_dup ("Synch. call 0."); - break; - case 1: - test = CORBA::string_dup ("Synch. call 1"); - break; - case 2: - test = CORBA::string_dup ("Synch. call 2"); - break; - default: - break; - } - - ACE_DEBUG ((LM_DEBUG,"Sender (SYNCH) : send <%C> !\n", - test.in ())); - - CORBA::String_var answer; - CORBA::ULong result = my_one_ami_[i].objref->foo( test, - i, - answer.out ()); - if (result != i) - { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (SYNCH) : CLASS One foo !\n")); - } - else - { - ++this->nr_of_received_; - ACE_DEBUG ((LM_DEBUG, - "Sender (SYNCH) : received answer = <%C> !\n", - answer.in ())); - } - } - return 0; - } - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : asynch_foo_gen (0), - synch_foo_gen (0), - nr_of_received_(0), - nr_of_sent_(0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UsesMulti::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_, - this->nr_of_sent_); - this->asynch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in(), - this->nr_of_received_); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - if (asynch == false) - { - ACE_ERROR ((LM_ERROR, - "ERROR: Uses multiple test not asynchronous!\n")); - } - if (this->nr_of_received_.value() != 6) - { - ACE_ERROR ((LM_ERROR, "ERROR: Did not get all callbacks from " - "multiple ports." - " Received = %u of 6\n", - this->nr_of_received_.value())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "OK: All messages received back by Sender\n")); - } - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_OneReplyHandler_run_my_um_one_i::AMI4CCM_OneReplyHandler_run_my_um_one_i ( - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent) - : nr_of_received_(nr_of_received), - nr_of_sent_(nr_of_sent) - { - } - - AMI4CCM_OneReplyHandler_run_my_um_one_i::~AMI4CCM_OneReplyHandler_run_my_um_one_i (void) - { - } - - void - AMI4CCM_OneReplyHandler_run_my_um_one_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * answer) - { - ACE_DEBUG ((LM_DEBUG, "Sender: Get asynchronous callback from foo," - " answer = <%C>\n", - answer)); - ++this->nr_of_received_; - --this->nr_of_sent_; - } - - void - AMI4CCM_OneReplyHandler_run_my_um_one_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" USESMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesMulti_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h deleted file mode 100644 index cbe2be184f7..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h +++ /dev/null @@ -1,158 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_USESMULTI_SENDER_EXEC_OLXUDX_H_ -#define CIAO_USESMULTI_SENDER_EXEC_OLXUDX_H_ - -#include /**/ "ace/pre.h" - -#include "UsesMulti_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "UsesMulti_Sender_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_UsesMulti_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_UShort; - - /// Worker threads for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::UsesMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent); - virtual int svc (void); - - private: - ::UsesMulti::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - Atomic_UShort &nr_of_sent_; - - }; - - /// Worker threads for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::UsesMulti::CCM_Sender_Context_ptr context, - Atomic_UShort &nr_of_received); - virtual int svc (void); - - private: - ::UsesMulti::CCM_Sender_Context_var context_; - Atomic_UShort &nr_of_received_; - }; - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::UsesMulti::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - Atomic_UShort nr_of_received_; - Atomic_UShort nr_of_sent_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_OneReplyHandler_run_my_um_one_i - : public ::UsesMulti::CCM_AMI4CCM_OneReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_OneReplyHandler_run_my_um_one_i ( - Atomic_UShort &nr_of_received, - Atomic_UShort &nr_of_sent); - virtual ~AMI4CCM_OneReplyHandler_run_my_um_one_i (void); - - virtual void - foo ( - ::CORBA::Long ami_return_val, - const char * answer); - - virtual void - foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - private: - Atomic_UShort &nr_of_received_; - Atomic_UShort &nr_of_sent_; - }; - - extern "C" USESMULTI_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UsesMulti_Sender_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp deleted file mode 100644 index dfd9503cd7f..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp +++ /dev/null @@ -1,549 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - UsesMulti_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - UsesMulti_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - - UsesMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - - run_asynch_one_connectionA - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionB - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionC - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - - do_one_connectionA - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionB - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionC - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - - - synch_one_connectionA - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - synch_one_connectionB - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - synch_one_connectionC - - do_my_one - true - Facet - - - - run_my_um_one - false - SimplexReceptacle - - - - - - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - UsesMulti_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - - - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - UsesMulti_conn - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_One_Connector_Impl - - - - - - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - UsesMulti_Receiver_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_ReceiverHome_Servant - - - - - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - UsesMulti_Receiver_exec - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_ReceiverHome_Impl - - - - - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - UsesMulti_Sender_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_SenderHome_Servant - - - - - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - UsesMulti_Sender_exec - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_SenderHome_Impl - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp deleted file mode 100644 index 86ad82ab75d..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp +++ /dev/null @@ -1,558 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - UsesMulti_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - UsesMulti_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - - UsesMulti_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - - run_asynch_one_connectionA - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionB - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - run_asynch_one_connectionC - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - - do_one_connectionA - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionB - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - do_one_connectionC - - do_my_one - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_one_connectionA - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - synch_one_connectionB - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - synch_one_connectionC - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - run_my_um_one - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_sync_provides - true - Facet - - - - - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - UsesMulti_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant - - - - - - - - - UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - UsesMulti_conn - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_One_Connector_Impl - - - - - - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - UsesMulti_Receiver_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_ReceiverHome_Servant - - - - - - - UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec - - - UsesMulti_Receiver_exec - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_ReceiverHome_Impl - - - - - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - UsesMulti_Sender_svnt - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_SenderHome_Servant - - - - - - - UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - UsesMulti_Sender_exec - - entryPoint - - - tk_string - - - create_UsesMulti_AMI_SenderHome_Impl - - - - - diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl deleted file mode 100755 index 203254a442a..00000000000 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl +++ /dev/null @@ -1,257 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 (); -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} -foreach $file (@files) { - print "=============================\nStarting test for deployment $file\n================================\n"; - - # Invoke naming service - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - - print STDERR "Starting Naming Service with -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 $file -k file://$ior_emfile\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $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 $file\n"; - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $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; - } - - delete_ior_files (); - kill_open_processes (); - # Sleep for a couple seconds to make sure everything has a chance to shut down. - sleep 5; -} -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/.gitignore b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/.gitignore deleted file mode 100644 index e73c15370ed..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/GeneratedCode -/Ports -/lib diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp deleted file mode 100644 index baeb334ae2d..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Receiver_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_comp_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_Sender_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_MyFoo_obj_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_MyFoo_obj_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Receiver_comp_exec - - - Hello_Receiver_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl deleted file mode 100755 index 4554b23ec7a..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = "../descriptors/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 daemon $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 ('dance_locality_manager'); -} - -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 = "$DANCE_ROOT/bin/dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl deleted file mode 100644 index 798151db843..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef HELLO_RECEIVER_IDL -#define HELLO_RECEIVER_IDL - -#include - -#include "Hello_MyFoo_obj.idl" - -module Hello -{ - component Receiver_comp - { - /// Provides - provides MyFoo_obj do_my_foo; - }; -}; -#endif diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc deleted file mode 100644 index 54f7a9b0857..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc +++ /dev/null @@ -1,162 +0,0 @@ -project(AMI_Hello_Tuto_Hello_Receiver_idl_gen) : componentidldefaults { - custom_only = 1 - after += AMI_Hello_Tuto_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_COMP_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_comp_stub_export.h \ - -Wb,skel_export_macro=HELLO_RECEIVER_COMP_SVNT_Export \ - -Wb,skel_export_include=Hello_Receiver_comp_svnt_export.h \ - -Wb,exec_export_macro=HELLO_RECEIVER_COMP_EXEC_Export \ - -Wb,exec_export_include=Hello_Receiver_comp_exec_export.h \ - -Glem \ - -I../../ports \ - -I../../GeneratedCode \ - -o ../../GeneratedCode - - - IDL_Files { - Hello_Receiver_comp.idl - gendir=../../GeneratedCode - } -} - -project(AMI_Hello_Hello_Receiver_exec_idl_gen) : componentidldefaults { - requires += dummy_label - custom_only = 1 - idlflags += -Gex -SS -Sci \ - -I../ports \ - -I../../ports \ - -o ../../../Tutorial/Code/GeneratedExec - - IDL_Files { - Hello_Receiver_comp.idl - } -} - -project(AMI_Hello_Tuto_Hello_Receiver_lem_gen) : ciaoidldefaults { - after += AMI_Hello_Tuto_Hello_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Receiver_comp_lem_stub_export.h \ - -SS -Gxhst \ - -I../../ports \ - -I../../GeneratedCode\ - -o ../../GeneratedCode - - - IDL_Files { - ../../GeneratedCode/Hello_Receiver_compE.idl - gendir=../../GeneratedCode - } -} - -project(AMI_Hello_Tuto_Hello_Receiver_l_stub) : ccm_svnt, messaging { - after += AMI_Hello_Tuto_Hello_Receiver_lem_gen\ - AMI_Hello_Tuto_Hello_Receiver_stub AMI_Hello_Tuto_stub - libs += Hello_MyFoo_obj_stub Hello_Receiver_comp_stub - libpaths += ../../lib - libout = ../../lib - sharedname = Hello_Receiver_comp_lem_stub - dynamicflags += HELLO_RECEIVER_COMP_LEM_STUB_BUILD_DLL - includes += ../.. ../../GeneratedCode - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Receiver_compEC.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Receiver_compEC.h - ../../GeneratedCode/Hello_Receiver_comp_lem_stub_export.h - } - - Inline_Files { - ../../GeneratedCode/Hello_Receiver_compEC.inl - } -} - -project(AMI_Hello_Tuto_Hello_Receiver_stub) : ccm_stub, messaging { - after += AMI_Hello_Tuto_Hello_Receiver_idl_gen AMI_Hello_Tuto_stub - libs += Hello_MyFoo_obj_stub - libpaths += ../../lib - libout = ../../lib - sharedname = Hello_Receiver_comp_stub - dynamicflags += HELLO_RECEIVER_COMP_STUB_BUILD_DLL - includes += ../../GeneratedCode - - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Receiver_compC.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Receiver_compC.h - ../../GeneratedCode/Hello_Receiver_comp_stub_export.h - } - - Inline_Files { - ../../GeneratedCode/Hello_Receiver_compC.inl - } -} - -project(AMI_Hello_Tuto_Hello_Receiver_exec) : ciao_executor, messaging { - after += AMI_Hello_Tuto_Hello_Receiver_l_stub\ - AMI_Hello_Tuto_Hello_Receiver_stub\ - AMI_Hello_Tuto_stub AMI_Hello_Tuto_lem_stub - sharedname = Hello_Receiver_comp_exec - libs += Hello_Receiver_comp_stub Hello_Receiver_comp_lem_stub\ - Hello_MyFoo_obj_stub\ - Hello_MyFoo_obj_lem_stub Hello_common_defn_stub - libpaths += ../../lib - libout = ../../lib - dynamicflags += HELLO_RECEIVER_COMP_EXEC_BUILD_DLL - includes += ../../GeneratedCode - - IDL_Files { - } - - Source_Files { - Hello_Receiver_comp_exec.cpp - } - - Header_Files { - Hello_Receiver_comp_exec.h - ../../GeneratedCode/Hello_Receiver_comp_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Tuto_Hello_Receiver_svnt) : ciao_servant, messaging { - after += AMI_Hello_Tuto_skel AMI_Hello_Tuto_Hello_Receiver_l_stub\ - AMI_Hello_Tuto_stub\ - AMI_Hello_Tuto_skel AMI_Hello_Tuto_lem_stub - sharedname = Hello_Receiver_comp_svnt - libs += Hello_Receiver_comp_stub Hello_Receiver_comp_lem_stub\ - Hello_MyFoo_obj_skel\ - Hello_MyFoo_obj_stub Hello_MyFoo_obj_lem_stub - libpaths += ../../lib - libout = ../../lib - dynamicflags += HELLO_RECEIVER_COMP_SVNT_BUILD_DLL - includes += ../.. ../../GeneratedCode - - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Receiver_compS.cpp - ../../GeneratedCode/Hello_Receiver_comp_svnt.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Receiver_compS.h - ../../GeneratedCode/Hello_Receiver_comp_svnt.h - ../../GeneratedCode/Hello_Receiver_comp_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp deleted file mode 100644 index 303697cae44..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Receiver_comp_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Facet Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_comp_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::Hello::MyFoo_obj - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str, - ::CORBA::String_out answer) - { - // for test purposes : throw an exception. - if (ACE_OS::strlen (in_str) == 0) - { - Hello::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 ACE_OS::rand () % 100; - } - } - - void - do_my_foo_exec_i::hello (::CORBA::Long_out answer) - { - /* Your code here. */ - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - /* Your code here. */ - return ACE_OS::rand () % 100; - } - - void - do_my_foo_exec_i::rw_attrib (::CORBA::Short /* rw_attrib */) - { - /* Your code here. */ - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - /* Your code here. */ - return ACE_OS::rand () % 100; - } - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - Receiver_comp_exec_i::Receiver_comp_exec_i (void){ - } - - Receiver_comp_exec_i::~Receiver_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Hello::CCM_MyFoo_obj_ptr - Receiver_comp_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::Hello::CCM_MyFoo_obj::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::Hello::CCM_MyFoo_obj::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Receiver_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h deleted file mode 100644 index 49292bc1852..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h +++ /dev/null @@ -1,126 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ -#define CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Receiver_compEC.h" -#include "Hello_Receiver_comp_exec_export.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Provider Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - class do_my_foo_exec_i - : public virtual ::Hello::CCM_MyFoo_obj, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - // Operations and attributes from Hello::MyFoo_obj - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - - virtual - void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (void); - - virtual void rw_attrib (::CORBA::Short rw_attrib); - - virtual ::CORBA::Short ro_attrib (void); - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - }; - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - class Receiver_comp_exec_i - : public virtual Receiver_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_comp_exec_i (void); - virtual ~Receiver_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Hello::CCM_MyFoo_obj_ptr - get_do_my_foo (void);//@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - - //@} - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - ::Hello::CCM_MyFoo_obj_var ciao_do_my_foo_; - }; - - extern "C" HELLO_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl deleted file mode 100644 index 70cb4738010..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef HELLO_SENDER_IDL -#define HELLO_SENDER_IDL - -#include - -#include "Hello_MyFoo_obj.idl" - -#pragma ciao ami4ccm receptacle "Hello::Sender_comp::run_my_foo" - -module Hello -{ - component Sender_comp - { - /// For synchronous invocation - uses MyFoo_obj run_my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc deleted file mode 100644 index d4cbe1f0994..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc +++ /dev/null @@ -1,156 +0,0 @@ -project(AMI_Hello_Tuto_Hello_Sender_idl_gen) : componentidldefaults { - after += AMI_Hello_Tuto_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_COMP_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_comp_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_COMP_SVNT_Export \ - -Wb,skel_export_include=Hello_Sender_comp_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_COMP_EXEC_Export \ - -Wb,exec_export_include=Hello_Sender_comp_exec_export.h \ - -I../../ports \ - -I../../GeneratedCode \ - -o ../../GeneratedCode \ - -GC - - IDL_Files { - Hello_Sender_comp.idl - gendir=../../GeneratedCode - } -} - -project(AMI_Hello_Hello_Sender_exec_idl_gen) : componentidldefaults { - requires += dummy_label - custom_only = 1 - idlflags += -Gex -SS -Sci \ - -I../ports \ - -I../../ports \ - -o ../../../Tutorial/Code/GeneratedExec - - IDL_Files { - Hello_Sender_comp.idl - } -} - -project(AMI_Hello_Tuto_Hello_Sender_lem_gen) : ciaoidldefaults { - after += AMI_Hello_Tuto_Hello_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Sender_comp_lem_stub_export.h \ - -SS -Gxhst\ - -I../../ports \ - -I../../GeneratedCode\ - -o ../../GeneratedCode - - - IDL_Files { - ../../GeneratedCode/Hello_Sender_compE.idl - gendir=../../GeneratedCode - } -} - -project(AMI_Hello_Tuto_Hello_Sender_lem_stub) : ccm_svnt, ami { - after += AMI_Hello_Tuto_Hello_Sender_lem_gen AMI_Hello_Tuto_stub Conn_Hello_Tuto_stub - libs += Hello_MyFoo_obj_stub - libpaths += ../../lib - libout = ../../lib - sharedname = Hello_Sender_comp_lem_stub - dynamicflags += HELLO_SENDER_COMP_LEM_STUB_BUILD_DLL - includes += ../../GeneratedCode ../.. - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Sender_compEC.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Sender_compEC.h - ../../GeneratedCode/Hello_Sender_comp_lem_stub_export.h - } - - Inline_Files { - ../../GeneratedCode/Hello_Sender_compEC.inl - } -} - -project(AMI_Hello_Tuto_Hello_Sender_stub) : ccm_stub, ami { - after += AMI_Hello_Tuto_Hello_Sender_idl_gen AMI_Hello_Tuto_stub Conn_Hello_Tuto_stub - libs += Hello_MyFoo_obj_stub - libpaths += ../../lib - libout = ../../lib - sharedname = Hello_Sender_comp_stub - dynamicflags += HELLO_SENDER_COMP_STUB_BUILD_DLL - includes += ../../GeneratedCode - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Sender_compC.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Sender_compC.h - ../../GeneratedCode/Hello_Sender_comp_stub_export.h - } - - Inline_Files { - ../../GeneratedCode/Hello_Sender_compC.inl - } -} - -project(AMI_Hello_Tuto_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub { - after += AMI_Hello_Tuto_Hello_Sender_lem_stub AMI_Hello_Tuto_Hello_Sender_stub\ - AMI_Hello_Tuto_exec Conn_Hello_Tuto_stub AMI_Hello_Tuto_lem_stub - sharedname = Hello_Sender_comp_exec - libs += Hello_Sender_comp_stub Hello_Sender_comp_lem_stub Hello_MyFoo_obj_stub\ - Hello_MyFoo_obj_stub Hello_MyFoo_obj_lem_stub Hello_common_defn_stub - libpaths += ../../lib - libout = ../../lib - dynamicflags += HELLO_SENDER_COMP_EXEC_BUILD_DLL - includes += ../..\ - ../../GeneratedCode - IDL_Files { - } - - Source_Files { - Hello_Sender_comp_exec.cpp - } - - Header_Files { - Hello_Sender_comp_exec.h - ../../GeneratedCode/Hello_Sender_comp_exec_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Tuto_Hello_Sender_svnt) : ciao_servant, ami { - after += AMI_Hello_Tuto_skel AMI_Hello_Tuto_Hello_Sender_lem_stub\ - AMI_Hello_Tuto_Hello_Sender_stub AMI_Hello_Tuto_exec AMI_Hello_Tuto_skel - sharedname = Hello_Sender_comp_svnt - libs += Hello_Sender_comp_stub Hello_Sender_comp_lem_stub \ - Hello_MyFoo_obj_skel \ - Hello_MyFoo_obj_stub - libpaths += ../../lib - libout = ../../lib - dynamicflags += HELLO_SENDER_COMP_SVNT_BUILD_DLL - includes += ../..\ - ../../GeneratedCode - IDL_Files { - } - - Source_Files { - ../../GeneratedCode/Hello_Sender_compS.cpp - ../../GeneratedCode/Hello_Sender_comp_svnt.cpp - } - - Header_Files { - ../../GeneratedCode/Hello_Sender_compS.h - ../../GeneratedCode/Hello_Sender_comp_svnt.h - ../../GeneratedCode/Hello_Sender_comp_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp deleted file mode 100644 index f725ef893ad..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp +++ /dev/null @@ -1,342 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Sender_comp_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::Hello::CCM_Sender_comp_Context_ptr context) - : context_(::Hello::CCM_Sender_comp_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (2); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - ::Hello::AMI4CCM_MyFoo_obj_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Sender (ASYNCH) :") - ACE_TEXT("\tfoo_ami is NIL !!!\n"))); - return 1; - } - ::Hello::CCM_AMI4CCM_MyFoo_objReplyHandler_var cb = - new AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (); - - for (int i = 0; i < 5; ++i) - { - my_foo_ami_->sendc_foo (cb.in (), - "Do something asynchronous"); - my_foo_ami_->sendc_hello (cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), - 15); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked 5 Asynchronous calls\n"))); - } - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") - ACE_TEXT("to test except handling\n"))); - my_foo_ami_->sendc_foo (cb.in (), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked 2 Asynchronous call.\n"))); - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::Hello::CCM_Sender_comp_Context_ptr context) - : context_(::Hello::CCM_Sender_comp_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (2); - ::Hello::MyFoo_obj_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - // run synch calls - CORBA::String_var out_str; - for (int i = 0; i < 2; ++i) - { - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call (foo)\n"))); - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - out_str.out()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (foo)\n") - ACE_TEXT(" result <%u> answer <%C>\n"), - result, out_str.in())); - - CORBA::Long answer; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (hello)\n"))); - my_foo_ami_->hello (answer); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous ") - ACE_TEXT("call (hello) result <%u>\n"), answer)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call ") - ACE_TEXT("(rw_attrib())\n"))); - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(rw_attrib()) return <%u>\n"), rw_attrib)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (rw_attrib(15))\n"))); - my_foo_ami_->rw_attrib (15); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(rw_attrib(15))\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (ro_attrib())\n"))); - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(ro_attrib) return <%u>\n"), ro_attrib)); - } - catch (const Hello::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("Sender (SYNCH) :\tERROR: ") - ACE_TEXT("Unexpected Exception caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - } - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_comp_exec_i - //============================================================ - Sender_comp_exec_i::Sender_comp_exec_i (void) : - asynch_foo_gen (0), - synch_foo_gen (0) - { - } - - Sender_comp_exec_i::~Sender_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Sender_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in ()); - this->asynch_foo_gen ->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in ()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_remove (void) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * answer) - { - /* Your code here. */ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from foo:") - ACE_TEXT("result <%u> answer <%C>\n"), - ami_return_val, answer)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo Expected excception AMI Callback ") - ACE_TEXT("from foo: id <%u> error_string <%C>\n"), - ex.id, ex.error_string.in ())); - } - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from hello:") - ACE_TEXT(" answer <%u>\n"), answer)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo Exception AMI Callback from hello:\n") - ACE_TEXT(" id <%u> error_string <%C>\n"), - ex.id, ex.error_string.in ())); - } - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short rw_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from get_rw_attrib:") - ACE_TEXT(" result <%u>\n"), rw_attrib)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from ") - ACE_TEXT("set_rw_attrib.\n"))); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short ro_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from ") - ACE_TEXT("get_ro_attrib: result <%u>\n"), ro_attrib)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h deleted file mode 100644 index c297a5ed9ff..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.h +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ -#define CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Sender_compEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Hello_Sender_comp_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::Hello::CCM_Sender_comp_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_comp_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::Hello::CCM_Sender_comp_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_comp_Context_var context_; - }; - - //============================================================ - // Component Executor Implementation Class: Sender_comp_exec_i - //============================================================ - - class Sender_comp_exec_i - : public virtual Sender_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_comp_exec_i (void); - virtual ~Sender_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. *///@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - //@} - - private: - ::Hello::CCM_Sender_comp_Context_var ciao_context_; - }; - - class AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i - : public ::Hello::CCM_AMI4CCM_MyFoo_objReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM.emx b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM.emx deleted file mode 100644 index 06d0d094491..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM.emx +++ /dev/null @@ -1,398 +0,0 @@ - - -?> -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM_Hello.jpg b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM_Hello.jpg deleted file mode 100644 index c41e0017639..00000000000 Binary files a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/doc/AMI4CCM_Hello.jpg and /dev/null differ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl deleted file mode 100644 index 21272c84699..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.idl +++ /dev/null @@ -1,17 +0,0 @@ -//============================================================================== -/// @file Hello_Common_defn.idl -//============================================================================== - -#ifndef HELLO_COMMON_DEFN_IDL -#define HELLO_COMMON_DEFN_IDL - -module Hello -{ - exception InternalError - { - long id; - string error_string; - }; -}; - -#endif diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc deleted file mode 100644 index 91c28603c02..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_Common_defn.mpc +++ /dev/null @@ -1,34 +0,0 @@ -project(AMI_Hello_Tuto_defn_idl_gen) : taoidldefaults, typecode { - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_COMMON_DEFN_STUB_Export \ - -Wb,stub_export_include=Hello_common_defn_stub_export.h \ - -SS -Gxhst \ - -o ../GeneratedCode - - IDL_Files { - Hello_Common_defn.idl - gendir=../GeneratedCode - } -} - -project(AMI_Hello_Tuto_defn_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_Hello_Tuto_defn_idl_gen - libpaths += ../lib - libout = ../lib - includes += ../GeneratedCode - sharedname = Hello_common_defn_stub - dynamicflags = HELLO_COMMON_DEFN_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_Common_defnC.cpp - } - - Header_Files { - ../GeneratedCode/Hello_Common_defnC.h - ../GeneratedCode/Hello_Common_defn_stub_export.h - } - -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl deleted file mode 100644 index d1475e43d08..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl +++ /dev/null @@ -1,35 +0,0 @@ -//============================================================================== -/// @file Hello_MyFoo_obj.idl -//============================================================================== - -#ifndef HELLO_MYFOO_OBJ_IDL -#define HELLO_MYFOO_OBJ_IDL - -#include "Hello_Common_defn.idl" - -#pragma ciao lem "Hello_MyFoo_objE.idl" -#pragma ciao ami4ccm interface "Hello::MyFoo_obj" -#pragma ciao lem "Hello_MyFoo_objAE.idl" -//needed for 'uses multiple', not used in this example -#pragma ciao ami4ccm idl "Hello_MyFoo_objA.idl" - -module Hello -{ - // Sender/Receiver interface - interface MyFoo_obj - { - 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/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc deleted file mode 100644 index f0b73c260d5..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc +++ /dev/null @@ -1,204 +0,0 @@ -project(AMI_Hello_Tuto_idl_gen) : componentidldefaults, ami, ami4ccm_stub { - after += AMI_Hello_Tuto_defn_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_MYFOO_OBJ_STUB_Export \ - -Wb,stub_export_include=Hello_MyFoo_obj_stub_export.h \ - -Wb,skel_export_macro=HELLO_MYFOO_OBJ_SKEL_Export \ - -Wb,skel_export_include=Hello_MyFoo_obj_skel_export.h \ - -Wb,conn_export_macro=HELLO_MYFOO_OBJ_CONN_Export \ - -Wb,conn_export_include=Hello_MyFoo_obj_conn_export.h \ - -Wb,exec_export_macro=HELLO_MYFOO_OBJ_EXEC_Export \ - -Wb,exec_export_include=Hello_MyFoo_obj_exec_export.h \ - -o ../GeneratedCode\ - -GM -Gxhcn - - IDL_Files { - Hello_MyFoo_obj.idl - gendir=../GeneratedCode - } -} - -project(AMI_Hello_Tuto_lem_gen) : ciaoidldefaults { - after += AMI_Hello_Tuto_idl_gen AMI_Hello_Tuto_lema_gen - custom_only = 1 - idlflags += -Wb,export_macro=HELLO_MYFOO_OBJ_LEM_STUB_Export \ - -Wb,export_include=Hello_MyFoo_obj_lem_stub_export.h \ - -I ../GeneratedCode\ - -o ../GeneratedCode\ - -SS -Gxhst - - IDL_Files { - ../GeneratedCode/Hello_MyFoo_objE.idl - gendir=../GeneratedCode - } -} - -project(AMI_Hello_Tuto_lema_gen) : ciaoidldefaults, typecode { - after += AMI_Hello_Tuto_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_MYFOO_OBJ_STUB_Export \ - -Wb,stub_export_include=Hello_MyFoo_obj_stub_export.h \ - -Wb,conn_export_macro=HELLO_MYFOO_OBJ_CONN_Export \ - -Wb,conn_export_include=Hello_MyFoo_obj_conn_export.h \ - -Wb,svnt_export_macro=HELLO_MYFOO_OBJ_SVNT_Export \ - -Wb,svnt_export_include=Hello_MyFoo_obj_svnt_export.h \ - -Wb,skel_export_macro=HELLO_MYFOO_OBJ_SKEL_Export \ - -Wb,skel_export_include=Hello_MyFoo_obj_skel_export.h \ - -I ../GeneratedCode\ - -o ../GeneratedCode\ - -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv - - IDL_Files { - ../GeneratedCode/Hello_MyFoo_objA.idl - gendir=../GeneratedCode - } -} - -project(AMI_Hello_Tuto_lemae_gen) : ciaoidldefaults { - after += AMI_Hello_Tuto_lema_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_MYFOO_OBJ_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_MyFoo_obj_lem_stub_export.h \ - -I ../GeneratedCode\ - -o ../GeneratedCode\ - -SS - - IDL_Files { - ../GeneratedCode/Hello_MyFoo_objAE.idl - gendir=../GeneratedCode - } -} - -project(AMI_Hello_Tuto_stub) : ccm_stub, ami, ami4ccm_stub { - after += AMI_Hello_Tuto_lem_gen AMI_Hello_Tuto_defn_stub - libs += Hello_common_defn_stub - libout = ../lib - libpaths += ../lib - includes += . ../GeneratedCode - - sharedname = Hello_MyFoo_obj_stub - dynamicflags = HELLO_MYFOO_OBJ_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_MyFoo_objC.cpp - ../GeneratedCode/Hello_MyFoo_objAC.cpp - } - - Header_Files { - ../GeneratedCode/Hello_MyFoo_objC.h - ../GeneratedCode/Hello_MyFoo_stub_export.h -} - - Inline_Files { - ../GeneratedCode/Hello_MyFoo_objC.inl - } -} - -project(AMI_Hello_Tuto_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { - after += AMI_Hello_Tuto_lem_gen AMI_Hello_Tuto_stub AMI_Hello_Tuto_lemae_gen AMI_Hello_Tuto_skel - libs += Hello_MyFoo_obj_stub Hello_MyFoo_obj_skel - libout = ../lib - libpaths += ../lib - includes += . ../GeneratedCode - - sharedname = Hello_MyFoo_obj_lem_stub - dynamicflags = HELLO_MYFOO_OBJ_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_MyFoo_objEC.cpp - ../GeneratedCode/Hello_MyFoo_objAEC.cpp - } - - Header_Files { - ../Hello_MyFoo_objEC.h - ../Hello_MyFoo_obj_lem_stub_export.h -} - - Inline_Files { - ../GeneratedCode/Hello_MyFoo_objEC.inl - } -} - -project(AMI_Hello_Tuto_skel) : ciao_executor, ami, ami4ccm_servant { - after += AMI_Hello_Tuto_stub AMI_Hello_Tuto_defn_stub - sharedname = Hello_MyFoo_obj_skel - libs += Hello_MyFoo_obj_stub Hello_common_defn_stub - libout = ../lib - libpaths += ../lib - includes += . ../GeneratedCode - - dynamicflags = HELLO_MYFOO_OBJ_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_MyFoo_objS.cpp - ../GeneratedCode/Hello_MyFoo_objAS.cpp - } - - Header_Files { - ../GeneratedCode/Hello_MyFoo_objS.h - ../GeneratedCode/Hello_MyFoo_obj_skel_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Tuto_conn) : ciao_executor, ami, ami4ccm_lem_stub { - after += AMI_Hello_Tuto_lem_stub AMI_Hello_Tuto_skel AMI_Hello_Tuto_lema_gen AMI_Hello_Tuto_lemae_gen - sharedname = Hello_MyFoo_obj_conn - libs += Hello_MyFoo_obj_stub Hello_MyFoo_obj_skel Hello_MyFoo_obj_lem_stub - libpaths += ../lib - libout = ../lib - dynamicflags = HELLO_MYFOO_OBJ_CONN_BUILD_DLL - includes += . ../GeneratedCode - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_MyFoo_objA_conn.cpp - } - - Header_Files { - ../GeneratedCode/Hello_MyFoo_objA_conn.h - ../GeneratedCode/Hello_MyFoo_obj_conn_export.h - } - - Inline_Files { - } -} - -project(AMI_Hello_Tuto_svnt) : ciao_servant, ami, ami4ccm_servant { - after += AMI_Hello_Tuto_lem_stub AMI_Hello_Tuto_skel AMI_Hello_Tuto_lema_gen AMI_Hello_Tuto_lemae_gen\ - AMI_Hello_Tuto_conn AMI_Hello_Tuto_defn_stub - sharedname = Hello_MyFoo_obj_svnt - libs += Hello_MyFoo_obj_stub Hello_MyFoo_obj_skel Hello_MyFoo_obj_lem_stub\ - Hello_MyFoo_obj_conn Hello_common_defn_stub - libpaths += ../lib - libout = ../lib - dynamicflags = HELLO_MYFOO_OBJ_SVNT_BUILD_DLL - includes += . ../GeneratedCode - IDL_Files { - } - - Source_Files { - ../GeneratedCode/Hello_MyFoo_objA_svnt.cpp - } - - Header_Files { - ../GeneratedCode/Hello_MyFoo_objA_svnt.h - ../GeneratedCode/Hello_MyFoo_objA_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html deleted file mode 100644 index d0288a042c8..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/01_general.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - AMI4CCM Hello Tutorial - General - - - - - - - - -
 Next
-
-

General

-

This tutorial explains how to use Asynchronous Method -Invocation for CCM (AMI4CCM). The AMI Connector component handles the -asynchronous invocation using CORBA AMI.

- -

System

-

The system consists of three components:

-
    -
  • A Sender component
    • -
  • A Receiver component
    • -
  • An AMI connector
    • -
-

In this tutorial a Sender wants to invoke methods on the -Receiver asynchronously and synchronously. Therefor the Sender and the Receiver -are connected via an AMI connector for the asynchronously invoked methods and -via a direct connection for the synchronously invoked methods. The AMI connector -itself will be completely generated by IDL and will handle details of executing -the asynchronous invocation and callback to the user component. The Receiver -(Server side) isn't aware of any AMI clients.

-

-

There are different methods used in this example in -order to show different aspects:

-
    -
  • method with return value, in- and out argument:
    - long foo (in string in_str, out string answer);
    • -
  • void method with out argument:
    - void hello (out long answer);
    • -
  • - attribute short rw_attrib
    -    getraises(InternalError)
    -    setraises (InternalError);
    • -
  • method to get an readonly attribute:
    - readonly attribute short ro_attrib raises (InternalError);
    • -
- -

Directory structure

-

The following convention is used:

-
    -
  • |--*_asm          - : Directory contains an assembly.
    • -
  •     |--ports        : C:\ACE\latest\ACE_wrappers\TAO\CIAO\connectors\ami4ccm\tutorials\Hello\Tutorial\02_idl.html - Directory contains common IDL code for the assembly.
    • -
  •     |--*_comp    : Directory contains an - component.
    • -
  •         |-- - ports   : Directory contains common IDL code for the component.
    • -
  •         |-- src       : Directory contains the IDL - and *_exec-files for the component.
- -

File naming convention

-

The following convention is used:

-
    -
  • *_defn.idl - These files will contain definitions, - like enumerations, constants and so on. Typically located in *_asm/ports.
    • -
  • *_obj.idl - These files will contain the interfaces - between components. Typically located in *_asm/ports.
    • -
  • *_comp.idl - These files will contain the component declaration. Typically located in *_asm/*_comp/src. -
    • -
-

Additional conventions

-
    -
  • MPC files are located in - the same directory as the IDL for the common mpc files and in the same - directory as the executor files for the component mpc files.
    • -
  • Files that were generated by the TAO IDL compiler - should all be located in one subdirectory. In this tutorial the name of this - subdirectory is "GeneratedCode".
    • -
- - - - - - -
 Next
-



- - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html deleted file mode 100644 index 2b6c812e44c..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/02_idl.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - AMI4CCM Tutorial Hello - IDL - - - - - - - - -
PreviousNext
-
-

IDL files

-

The IDL files are generated by the modelling tools. To -understand this example better, it'll give an overview of which IDL files are -generated.

- -

Common IDL files

-

Below a simplied represenation of the common IDL files. -Use the links to view the file itself. The following IDL files can be found in -Hello_asm/ports:

-
    -
  • Hello_Common_defn.idl - :
    for common includes and IDL definitions. -
    • -
  • Hello_MyFoo_obj.idl - :
    for IDL interfaces. This IDL contains the #pragma's - for enabling AMI4CCM , needed by the TAO_IDL compiler:

    -
      -
    • #pragma ciao lem "Hello_MyFoo_objE.idl"
      • -
    • #pragma ciao lem "Hello_MyFoo_objAE.idl"
      • -
    • Pragma needed per interface for implying ami.
      - #pragma ciao ami4ccm interface "Hello::MyFoo_obj"
      • -
    • Name implied IDL file, used by IDL compiler to generate ami4ccm functionality:
      - #pragma ciao ami4ccm idl "Hello_MyFoo_objA.idl"
      • -
    -
    • -
- -

Also this IDL contains the interface between Sender and Receiver

-

interface MyFoo_obj
-{
-  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);
-};

- -

Component IDL files:

-

Sender component IDL file

-

The Hello_Sender_comp.idl -file in the Sender_comp/src directory defines the asynchronous and -synchronous connections.
For synchronous invocations, the Sender component uses the -MyFoo_obj interface (which the Receiver provides):

-component Sender
{
-  // For synchronous invocation
-  uses MyFoo run_my_foo;
}; -

-

For asynchronous invocations, the Sender component uses the -AMI_MyFoo_obj interface of the AMI component and provides the -AMI_MyFoo_objReplyHandler interface to the AMI component.
This is indicated with the following pragma:

-#pragma ciao ami4ccm receptacle "Hello::Sender_comp::run_my_foo" -

- -

Receiver component IDL file

-

The Hello_Receiver_comp.idl -file in the Receiver_comp/src directory indicates the port the -receiver provide.

-

component Receiver
-{
-  //Provides
 -  provides MyFoo_obj do_my_foo;
-};

-The receiver isn't aware of the calls that were invoked by the sender were asynchronous -or synchronous.

- - - - - -
PreviousNext
-



- - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html deleted file mode 100644 index 7671e72d91a..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/03_executors.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - AMI4CCM Tutorial Hello - Executors - - - - - - -
PreviousNext
-
-

Executors

-

Once the IDL files are created, the business logic for -the components should be implemented. Since components can be complex, we can -use the IDL compiler to create empty executor files. This part of the tutorial -explains how this can be done.

-

Sender

-

In a command shell windows, navigate to the -Hello_asm/Sender_comp/src and invoke the TAO IDL compiler by running the -following command:

-

tao_idl --I../../ports -I../../GeneratedCode -I%TAO_ROOT% -I%TAO_ROOT%/tao -I%CIAO_ROOT% --I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao -Gex Hello_Sender_comp.idl

-An example of the generated code can be found -here. An -example of the implemented executor can be found -here.
-Be aware that running this command, -will overwrite the already implemented exec code in the Hello_asm/Sender_comp -directory. A copy of the implemented executor can be found -here.

-

Receiver

-

Navigate to the Hello_asm/Receiver_comp/src and invoke the TAO IDL compiler -by running the following command:

-

tao_idl -I../../ports -I../../GeneratedCode -I%TAO_ROOT% --I%TAO_ROOT%/tao -I%CIAO_ROOT% -I%CIAO_ROOT%/ccm -I%CIAO_ROOT%/ciao -Gex -Hello_Receiver_comp.idl

-An example of the generated code can be found here. -An example of the implemented executor can be found here.
-Be aware that running this command, -will overwrite the already implemented exec code in the Hello_asm/Receiver_comp -directory. A copy of the implemented executor can be found here.

-



- - - -
PreviousNext
-



 - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html deleted file mode 100644 index f60fe364d2e..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/04_ami4ccm.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - AMICCM Tutorial Hello - Implementation exec - - - - - - - -
PreviousNext
-
-

Implementation executors

-

AMI4CCM basics

-
    -

  • The writer has basically only to write 3 idl files, first the - one that defines the common interface between the Sender and - Receiver , second the interface for the Sender and third the - interface for the Receiver. In this tutorial are that the IDL files - Hello_MyFoo_obj.idl, Hello_Sender_comp.idl and the - Hello_Receiver_comp.idl.
    - Naturally, it is possible that there are more IDL-files - to be used, as in this example the Hello_Common_defn.idl file for the common - definitions.

    • -

  • The Receiver component ('server') has no idea which - component (AMI connector or Sender) uses his interface.

    • -

  • The Connector, the AMI-Component, will be generated by - the IDL compiler by implying ami4ccm.idl

    • -

  • In the Sender executor the handling of the AMI - callbacks and also the asynchronous and synchronous invocations must be - coded.

    • -
-

Example

-

The Sender component of this Hello tutorial invokes some -asynchronous methods and some synchronous methods. For asynchronous invocations, -the Sender component uses the AMI4CCM_MyFoo_obj interface of the AMI component -and provides the AMI4CCM_MyFoo_objReplyHandler interface to the AMI -component.

-

For synchronous invocations, the Sender component uses -the MyFoo_obj interface (which the Receiver provides).

-

The receiver just implements -the interface provided by the application programmer. The Receiver should have -no idea which component (in this case Sender or AMI) uses his interface!

-

Sender_comp_exec.cpp

-In de ccm_activate method, first retrieve the -receptacles:
-Asynchronous:
::Hello::AMI4CCM_MyFoo_obj_var asynch_foo = this->context_-> -get_connection_sendc_run_my_foo();
-Synchronous:
-::Hello::MyFoo_obj_var synch_foo = this->context_->get_connection_run_my_foo (); -

-

After retrieving the receptacles, make the desired -asynchronus and synchronous invocations.
-The asynchronous methods have the prefix sendc_. The first -argument is the Reply handler.
-my_foo_ami_->sendc_foo (new AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (), "Do something -asynchronous");
-The same synchronous method:
-CORBA::Long result = my_foo_ami_->foo("Do something synchronous", out_str.out());

- -

For the asynchronus methods the implied Reply Handler -interface for each method must be coded.

-

Example foo callback:
-void
 -AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo (::CORBA::Long -ami_return_val, const char * answer)
-{
-  /*Your code here. */
 - -   ACE_DEBUG -((LM_DEBUG,
-      ACE_TEXT("Sender:\tMyFoo AMI Callback from -foo:");
      ACE_TEXT("result <%u> answer -<%C>\n"),
      ami_return_val,answer));
-}

-void
 -AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo_excep (::CCM_AMI::ExceptionHolder * excep_holder)
-{
-    /* Your code here. */
-}

- -

Receiver_comp_exec.cpp

-

In this file the interface methods must be programmed.

-Example foo method:
-::CORBA::Long MyFoo_obj_exec_i::foo (const char * in_str, ::CORBA::String_out answer)
-{
   /* Your code here. */
-   answer = CORBA::string_dup ("This is my answer : Hi");
-   return ACE_OS::rand () % 100;
-} -

- - - - - -
PreviousNext
-



- - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html deleted file mode 100644 index f9adaea6d3b..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/05_compilation.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - AMI4CCM Tutorial Hello - Compilation and deployment - - - - - - - - - -
Previous
-
-

Compilation and deployment

-

Compilation

-

Once all the code has been - written, compilation of the code would be the next step.
MPC is used in order to - create the Makefiles and projects files. All MPC files that are needed for this - tutorial are in the same directory as the accompanying IDL or executor files.
In - order to make the GNU make files or the Visual Studio project files, the - following steps should be performed : -

    -
  • Start a command shell and navigate to :
    %CIAO_ROOT%/connectors/ami4ccm/tutorials/Hello/Hello_asm -
  • Run
    -
      -
    • perl %ACE_ROOT%/bin/mwc.pl -type vc9 to create Visual Studio 2008 project files.
      • -
    • perl %ACE_ROOT%/bin/mwc.pl -type gnuace to create the GNU make files.
      • -
    -
  • Now compile the code like you're used to.
    • -
-

If all went well, all libraries are in the Hello_asm/lib directory.

- -

Deployment

-

Once all binaries are compiled, they're ready to be deployed.
In this tutorial we are using DAnCE to -deploy our system. DAnCE starts a system in two phases :

-
    -
  1. configuration_complete
    2. -
  2. ccm_activate
    3. -
- DAnCE shuts down a system again in two phases : -
    -
  1. passivate
    2. -
  2. ccm_remove
    3. -
-

Each component should have -these four methods implemented. The business logic implemented in each step -depends on you implementation. There're several processes taking care of the -total deployment process. See the DAnCE documentation for more information about -which processes there are and what their responsibilities are. DAnCE will start -and shutdown a system with the aid of a deployment plan. A deployment plan -describes which artifacts must run on which nodes and which components are -connected to eachother via which interface (more on this later). All connections -between components are made before 'configuration_complete' is called.

-

The deployment plan will be -generated by the modelling tools but we take a brief look at the most important -items of a deployment plan. A deployment plan is a XML based file which is -devided into the following (main) sections:

-
    -
  • Implementations
    • -
  • Entry points
    • -
  • Instances
    • -
  • Connections
    • -
  • Artifacts
    • -
-

All deployment code fragments mentioned in the rest of this -tutorial are *NO* exports of any modelling tool.

- -

Implementations and Entry Points

-

This defines which executor and servant -artifacts (binaries) should be used. Implementations also defines -which entry points in the binaries should be used. In this example -there are neeede 3 implementation sections, for the Sender Receiver -and AMI connector. This file -shows the implementation section of the AMI connector. Beware that artifacts and -entry points are exact otherwise deployment will fail.

- -Instances -

Instances define which artifacts run on -which node. Every fysical artifact in the system results in one -instance. The <node> section refers to the fysical node on -which this instance will be deployed. An instance always refers to an -implementation. It's possible that more than one instance refers to -the same implementation. The instance section also provide the -initial values of all attributes defined on the component. This -file shows the instance section of the Sender, Receiver and AMI -connector.The instance of the AMI connector -uses the same node as the Sender!

- -

Connections

-

A connection section defines -which components are connected together. The connection is 'local' since a -connector and a component are always running in the same process. Now that we -have got all the data we need to know to make a connection for the asynchronous -methods between the Sender and AMI connector (1) and between the AMI connector -and the receiver (2). For the synchronous methods we need a connection between -the Sender and the receiver. (3)

- -

(1)

-

<connection>
-//unique name of the connection
-  <name>run_asynch_foo_connection</name>
-  <deployRequirement>
-    <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-    <resourceType>Local_Interface</resourceType>
-  </deployRequirement>
-  <internalEndpoint>//First endpoint (the Sender component)
-// PortName is defined as "sendc_" + name of port defined in Hello_Sender_comp.idl
-    <portName>sendc_run_my_foo</portName>
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-   <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" -/> //The reference to the sender instance.
-  </internalEndpoint>
-  <internalEndpoint>//Second endpoint (the AMI connector component);
 -    <portName>ami4ccm_port_ami4ccm_provides</portName> -//PortName alsways the same 
 -    <provider>true</provider>
-    <kind>Facet</kind>
-    <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" -/> //The reference to the connector instance
 -  </internalEndpoint>
-</connection> -

- -

(2)

-

<connection>
-  <name>do_foo_connection</name>//unique name of the connection
-  <internalEndpoint>//First endpoint (the Receiver component)
-    <portName>do_my_foo</portName> -  </internalEndpoint>
-  <internalEndpoint>//Second endpoint (the AMI component)
-    <portName>ami4ccm_port_ami4ccm_uses</portName>// PortName alsways the same 
-    <provider>false</provider>
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
-  </internalEndpoint>
-</connection> -

- -

(3)

-

<connection>
-  <name>synch_foo_connection</name>
-  <internalEndpoint>
-     <portName>do_my_foo</portName>// PortName is defined as name of port -defined in Hello_Receiver_comp.idl
-    <provider>true</provider>// The receiver provides this port
-    <kind>Facet</kind>
-    <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver" />
-  </internalEndpoint>
-  <internalEndpoint>
-    <portName>run_my_foo</portName>// PortName is defined as name of port -defined in Hello_Sender_comp.idl
-    <provider>false</provider>// The sender uses this port
-    <kind>SimplexReceptacle</kind>
-    <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
-  </internalEndpoint>
-</connection> -

- -

Take a look at this file to -see which connection should be made by DAnCE in order to run the Hello tutorial -properly.

- -

When the deployment tools (in this case DAnCE) deploys this -system, it'll connect all defined connectors before the system is started (i.e. -before configuration_complete is called on a component).

- -

Coding connections

-

Every component has got a context. The context is set by -DAnCE and is the 'gateway' to all other component your component is connected -to. The context caches all these connections so that the user doesn't need to -cache those in his/her component.

-

Sender:
The following code retrieves the -connection to the AMI connector interface from the context:
-::Hello::AMI4CCM_MyFoo_obj_var asynch_foo = this->context_->get_connection_sendc_run_my_foo(); -

-The following code retrieves the connection to the Receiver -interface from the context:
-::Hello::MyFoo_obj_var synch_foo = this->context_->get_connection_run_my_foo (); -

-

Receiver:
-The Receiver provide one facet for the AMI connector and for the sender.
-::Hello::CCM_MyFoo_obj_ptr
-Receiver_exec_i::get_do_my_foo (void)
-{
  return new MyFoo_exec_i ();
-}

- -

Artifacts

-

Artifacts sections contains the names of the binaries. See -this files for an overview of all artifacts in the Hello tutorial.

- -

Complete plan

-

This file shows the complete deployment -plan.

- -


-
-



- - - - -
Previous
- - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp deleted file mode 100644 index 4c4f5b54a95..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/Plan.cdp +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 6D382DAE-9024-4C4D-B91B-A0F9176AFACF - - - Hello_ReceiverHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Receiver_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_comp_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - - - - - Hello_SenderHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI_Sender_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - - - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_MyFoo_obj_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_MyFoo_obj_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Receiver_comp_exec - - - Hello_Receiver_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/artifacts.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/artifacts.cdp deleted file mode 100644 index f812be31d00..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/artifacts.cdp +++ /dev/null @@ -1,108 +0,0 @@ - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - Hello_MyFoo_obj_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - Hello_MyFoo_obj_conn - - entryPoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - - - Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt - - - Hello_Receiver_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Servant - - - - - - - Receiver_comp_exec - - - Hello_Receiver_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_ReceiverHome_Impl - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt - - - Hello_Sender_comp_svnt - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Servant - - - - - - - Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec - - - Hello_Sender_comp_exec - - entryPoint - - - tk_string - - - create_Hello_AMI_SenderHome_Impl - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/connections.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/connections.cdp deleted file mode 100644 index 20b74edc2bc..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/connections.cdp +++ /dev/null @@ -1,53 +0,0 @@ - - - run_asynch_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sendc_run_my_foo - false - SimplexReceptacle - - - - ami4ccm_port_ami4ccm_provides - true - Facet - - - - - - do_foo_connection - - do_my_foo - true - Facet - - - - ami4ccm_port_ami4ccm_uses - false - SimplexReceptacle - - - - - - synch_foo_connection - - do_my_foo - true - Facet - - - - run_my_foo - false - SimplexReceptacle - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/implementation.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/implementation.cdp deleted file mode 100644 index 638313ddfe6..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/implementation.cdp +++ /dev/null @@ -1,51 +0,0 @@ - - - Hello_AMIHomeImplementation - - - - - component factory - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_AMI4CCM_MyFoo_obj_Connector_AMI4CCM_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/instance.cdp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/instance.cdp deleted file mode 100644 index 7b757c118a3..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/Deployment/descriptors/instance.cdp +++ /dev/null @@ -1,55 +0,0 @@ - - - Hello.ComponentImplementations.HelloImplementation.Hello.Receiver - Receiver - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.Sender - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - Hello.ComponentImplementations.HelloImplementation.Hello.AMI - Sender - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - AMI.ior - - - - - diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp deleted file mode 100644 index b3aabfcf428..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Receiver_comp_exec.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Facet Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_comp_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::Hello::MyFoo_obj - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * /* in_str */, - ::CORBA::String_out /* answer */) - { - /* Your code here. */ - return 0; - } - - void - do_my_foo_exec_i::hello (::CORBA::Long_out /* answer */) - { - /* Your code here. */ - } - - ::CORBA::Short - MyFoo_obj_exec_i::rw_attrib (void) - { - /* Your code here. */ - return 0; - } - - void - MyFoo_obj_exec_i::rw_attrib (::CORBA::Short /* rw_attrib */) - { - /* Your code here. */ - } - - ::CORBA::Short - MyFoo_obj_exec_i::ro_attrib (void) - { - /* Your code here. */ - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - Receiver_comp_exec_i::Receiver_comp_exec_i (void){ - } - - Receiver_comp_exec_i::~Receiver_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Hello::CCM_MyFoo_obj_ptr - Receiver_comp_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::Hello::CCM_MyFoo_obj::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::Hello::CCM_MyFoo_obj::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Receiver_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h deleted file mode 100644 index 08ffb5bca86..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h +++ /dev/null @@ -1,124 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ -#define CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Receiver_compEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Provider Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - class do_my_foo_exec_i - : public virtual ::Hello::CCM_MyFoo_obj, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - // Operations and attributes from Hello::MyFoo_obj - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - - virtual - void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (void); - - virtual void rw_attrib (::CORBA::Short rw_attrib); - - virtual ::CORBA::Short ro_attrib (void); - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - }; - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - class Receiver_comp_exec_i - : public virtual Receiver_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_comp_exec_i (void); - virtual ~Receiver_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Hello::CCM_MyFoo_obj_ptr - get_do_my_foo (void);//@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - - //@} - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - ::Hello::CCM_MyFoo_obj_var ciao_do_my_foo_; - }; - - extern "C" ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp deleted file mode 100644 index 05066a540ba..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp +++ /dev/null @@ -1,175 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Sender_comp_exec.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - /** - * Component Executor Implementation Class: Sender_comp_exec_i - */ - - Sender_comp_exec_i::Sender_comp_exec_i (void){ - } - - Sender_comp_exec_i::~Sender_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Sender_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long /* ami_return_val */, - const char * /* answer */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long /* answer */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short /* rw_attrib */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short /* ro_attrib */) - { - /* Your code here. */ - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr /* excep_holder */) - { - /* Your code here. */ - } - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h deleted file mode 100644 index 28fce65d55c..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h +++ /dev/null @@ -1,150 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ -#define CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Sender_compEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Hello_Sender_comp_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - /** - * Component Executor Implementation Class: Sender_comp_exec_i - */ - - class Sender_comp_exec_i - : public virtual Sender_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_comp_exec_i (void); - virtual ~Sender_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Hello::CCM_Sender_comp_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - class AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i - : public ::Hello::CCM_AMI4CCM_MyFoo_objReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp deleted file mode 100644 index 303697cae44..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Receiver_comp_exec.h" -#include "ace/OS_NS_unistd.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Facet Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - do_my_foo_exec_i::do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_comp_Context::_duplicate (ctx)) - { - } - - do_my_foo_exec_i::~do_my_foo_exec_i (void) - { - } - - // Operations from ::Hello::MyFoo_obj - - ::CORBA::Long - do_my_foo_exec_i::foo (const char * in_str, - ::CORBA::String_out answer) - { - // for test purposes : throw an exception. - if (ACE_OS::strlen (in_str) == 0) - { - Hello::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 ACE_OS::rand () % 100; - } - } - - void - do_my_foo_exec_i::hello (::CORBA::Long_out answer) - { - /* Your code here. */ - ACE_OS::sleep (ACE_OS::rand () % 2); - answer = ACE_OS::rand () % 100; - } - - ::CORBA::Short - do_my_foo_exec_i::rw_attrib (void) - { - /* Your code here. */ - return ACE_OS::rand () % 100; - } - - void - do_my_foo_exec_i::rw_attrib (::CORBA::Short /* rw_attrib */) - { - /* Your code here. */ - } - - ::CORBA::Short - do_my_foo_exec_i::ro_attrib (void) - { - /* Your code here. */ - return ACE_OS::rand () % 100; - } - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - Receiver_comp_exec_i::Receiver_comp_exec_i (void){ - } - - Receiver_comp_exec_i::~Receiver_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Hello::CCM_MyFoo_obj_ptr - Receiver_comp_exec_i::get_do_my_foo (void) - { - if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) - { - do_my_foo_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - do_my_foo_exec_i ( - this->ciao_context_.in ()), - ::Hello::CCM_MyFoo_obj::_nil ()); - - this->ciao_do_my_foo_ = tmp; - } - - return - ::Hello::CCM_MyFoo_obj::_duplicate ( - this->ciao_do_my_foo_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Receiver_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h deleted file mode 100644 index 49292bc1852..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h +++ /dev/null @@ -1,126 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ -#define CIAO__________TUTORIAL_CODE_GENERATEDEXEC_HELLO_RECEIVER_COMP_EXEC_IHOFDC_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Receiver_compEC.h" -#include "Hello_Receiver_comp_exec_export.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Hello_Receiver_comp_Impl -{ - - //============================================================ - // Provider Executor Implementation Class: do_my_foo_exec_i - //============================================================ - - class do_my_foo_exec_i - : public virtual ::Hello::CCM_MyFoo_obj, - public virtual ::CORBA::LocalObject - { - public: - do_my_foo_exec_i ( - ::Hello::CCM_Receiver_comp_Context_ptr ctx); - virtual ~do_my_foo_exec_i (void); - - // Operations and attributes from Hello::MyFoo_obj - - virtual - ::CORBA::Long foo (const char * in_str, - ::CORBA::String_out answer); - - virtual - void hello (::CORBA::Long_out answer); - - virtual ::CORBA::Short rw_attrib (void); - - virtual void rw_attrib (::CORBA::Short rw_attrib); - - virtual ::CORBA::Short ro_attrib (void); - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - }; - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - class Receiver_comp_exec_i - : public virtual Receiver_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_comp_exec_i (void); - virtual ~Receiver_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Hello::CCM_MyFoo_obj_ptr - get_do_my_foo (void);//@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - - //@} - - private: - ::Hello::CCM_Receiver_comp_Context_var ciao_context_; - ::Hello::CCM_MyFoo_obj_var ciao_do_my_foo_; - }; - - extern "C" HELLO_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp deleted file mode 100644 index b1dee373d11..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Hello_Sender_comp_exec.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - //============================================================ - // Worker thread for asynchronous invocations for MyFoo - //============================================================ - asynch_foo_generator::asynch_foo_generator ( - ::Hello::CCM_Sender_comp_Context_ptr context) - : context_(::Hello::CCM_Sender_comp_Context::_duplicate (context)) - { - } - - int asynch_foo_generator::svc () - { - ACE_OS::sleep (2); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :") - ACE_TEXT("\tInvoke Asynchronous calls\n"))); - ::Hello::AMI4CCM_MyFoo_obj_var my_foo_ami_ = - this->context_->get_connection_sendc_run_my_foo(); - - if (CORBA::is_nil (my_foo_ami_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("ERROR Sender (ASYNCH) :") - ACE_TEXT("\tfoo_ami is NIL !!!\n"))); - return 1; - } - ::Hello::CCM_AMI4CCM_MyFoo_objReplyHandler_var cb = - new AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (); - - for (int i = 0; i < 5; ++i) - { - my_foo_ami_->sendc_foo (cb.in (), - "Do something asynchronous"); - my_foo_ami_->sendc_hello (cb.in ()); - my_foo_ami_->sendc_get_rw_attrib(cb.in ()); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), - 15); - my_foo_ami_->sendc_get_ro_attrib(cb.in ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked 5 Asynchronous calls\n"))); - } - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") - ACE_TEXT("to test except handling\n"))); - my_foo_ami_->sendc_foo (cb.in (), ""); - my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (ASYNCH) :\tInvoked 2 Asynchronous call.\n"))); - return 0; - } - - //============================================================ - // Worker thread for synchronous invocations for MyFoo - //============================================================ - synch_foo_generator::synch_foo_generator ( - ::Hello::CCM_Sender_comp_Context_ptr context) - : context_(::Hello::CCM_Sender_comp_Context::_duplicate (context)) - { - } - - int synch_foo_generator::svc () - { - ACE_OS::sleep (2); - ::Hello::MyFoo_obj_var my_foo_ami_ = - this->context_->get_connection_run_my_foo (); - // run synch calls - CORBA::String_var out_str; - for (int i = 0; i < 2; ++i) - { - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call (foo)\n"))); - CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", - out_str.out()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (foo)\n") - ACE_TEXT(" result <%u> answer <%C>\n"), - result, out_str.in())); - - CORBA::Long answer; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (hello)\n"))); - my_foo_ami_->hello (answer); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous ") - ACE_TEXT("call (hello) result <%u>\n"), answer)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call ") - ACE_TEXT("(rw_attrib())\n"))); - CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(rw_attrib()) return <%u>\n"), rw_attrib)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (rw_attrib(15))\n"))); - my_foo_ami_->rw_attrib (15); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(rw_attrib(15))\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call") - ACE_TEXT(" (ro_attrib())\n"))); - CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") - ACE_TEXT("(ro_attrib) return <%u>\n"), ro_attrib)); - } - catch (const Hello::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("Sender (SYNCH) :\tERROR: ") - ACE_TEXT("Unexpected Exception caught :") - ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); - } - } - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_comp_exec_i - //============================================================ - Sender_comp_exec_i::Sender_comp_exec_i (void){ - } - - Sender_comp_exec_i::~Sender_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Sender_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_activate (void) - { - this->asynch_foo_gen = - new asynch_foo_generator (this->ciao_context_.in ()); - this->asynch_foo_gen ->activate (THR_NEW_LWP | THR_JOINABLE, 1); - - this->synch_foo_gen = - new synch_foo_generator (this->ciao_context_.in ()); - this->synch_foo_gen->activate (THR_NEW_LWP | THR_JOINABLE, 1); - } - - void - Sender_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_remove (void) - { - delete this->asynch_foo_gen; - this->asynch_foo_gen = 0; - delete this->synch_foo_gen; - this->synch_foo_gen = 0; - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void) - { - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo ( - ::CORBA::Long ami_return_val, - const char * answer) - { - /* Your code here. */ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from foo:") - ACE_TEXT("result <%u> answer <%C>\n"), - ami_return_val, answer)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::foo_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo Expected excception AMI Callback ") - ACE_TEXT("from foo: id <%u> error_string <%C>\n"), - ex.id, ex.error_string.in ())); - } - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello ( - ::CORBA::Long answer) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from hello:") - ACE_TEXT(" answer <%u>\n"), answer)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - try - { - excep_holder->raise_exception (); - } - catch (const Hello::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo Exception AMI Callback from hello:\n") - ACE_TEXT(" id <%u> error_string <%C>\n"), - ex.id, ex.error_string.in ())); - } - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib ( - ::CORBA::Short rw_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from get_rw_attrib:") - ACE_TEXT(" result <%u>\n"), rw_attrib)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib (void) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from ") - ACE_TEXT("set_rw_attrib.\n"))); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib ( - ::CORBA::Short ro_attrib) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Sender:\tMyFoo AMI Callback from ") - ACE_TEXT("get_ro_attrib: result <%u>\n"), ro_attrib)); - } - - void - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i::get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder) - { - excep_holder->raise_exception (); - } - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h deleted file mode 100644 index c297a5ed9ff..00000000000 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.h +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ -#define CIAO_______GENERATEDCODE_HELLO_SENDER_COMP_EXEC_WFK79V_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_Sender_compEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Hello_Sender_comp_exec_export.h" -#include "tao/LocalObject.h" -#include "ace/Task.h" - -namespace CIAO_Hello_Sender_comp_Impl -{ - - /// Worker thread for asynchronous invocations - class asynch_foo_generator : public virtual ACE_Task_Base - { - public: - asynch_foo_generator (::Hello::CCM_Sender_comp_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_comp_Context_var context_; - }; - - /// Worker thread for synchronous invocations - class synch_foo_generator : public virtual ACE_Task_Base - { - public: - synch_foo_generator (::Hello::CCM_Sender_comp_Context_ptr context); - - virtual int svc (void); - - private: - ::Hello::CCM_Sender_comp_Context_var context_; - }; - - //============================================================ - // Component Executor Implementation Class: Sender_comp_exec_i - //============================================================ - - class Sender_comp_exec_i - : public virtual Sender_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_comp_exec_i (void); - virtual ~Sender_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. *///@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - asynch_foo_generator* asynch_foo_gen; - synch_foo_generator* synch_foo_gen; - //@} - - private: - ::Hello::CCM_Sender_comp_Context_var ciao_context_; - }; - - class AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i - : public ::Hello::CCM_AMI4CCM_MyFoo_objReplyHandler, - public virtual ::CORBA::LocalObject - { - public: - AMI4CCM_MyFoo_objReplyHandler_run_my_foo_i (void); - virtual ~AMI4CCM_MyFoo_objReplyHandler_run_my_foo_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 - hello ( - ::CORBA::Long answer); - - virtual void - hello_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_rw_attrib ( - ::CORBA::Short rw_attrib); - - virtual void - get_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - set_rw_attrib (void); - - virtual void - set_rw_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - - virtual void - get_ro_attrib ( - ::CORBA::Short ro_attrib); - - virtual void - get_ro_attrib_excep ( - ::CCM_AMI::ExceptionHolder_ptr excep_holder); - }; - - extern "C" HELLO_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_comp_Impl (void); - } - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/images.png b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/images.png deleted file mode 100644 index 74c8b80912c..00000000000 Binary files a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/images.png and /dev/null differ diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/system.png b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/system.png deleted file mode 100644 index 42148beaaae..00000000000 Binary files a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/images/system.png and /dev/null differ diff --git a/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html b/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html deleted file mode 100644 index d0ac2877f3c..00000000000 --- a/CIAO/connectors/dds4ccm/DDS4CCM-INSTALL.html +++ /dev/null @@ -1,199 +0,0 @@ - - - - Building and Installing DDS4CCM - - -
-

Introduction

-

The DDS4CCM connector implements the DDS4LwCCM specification. - DDS4CCM is part of CIAO and integrates DDS into CCM, - which can be easily deployed, using DAnCE. - The CIAO DDS4CCM connector implementation supports - RTI DDS and - OpenDDS as underlying DDS vendors. -

-

Building and Installing DDS4CCM on Linux

-DDS4CCM is used frequently on linux. Before building DDS4CCM make sure that perl, make, gcc-g++, and libxerces-c-devel are installed -as packages. -

Building and Installing DDS4CCM with OpenDDS on Linux

- -Building DDS4CCM with OpenDDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and OpenDDS -the build has to be configured. For this integration we need 3 configuration files. For controlling the MPC makefile generation -we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler -which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/include/makeinclude/platform_macros.GNU to define -the settings for GNU make, and as last we create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can -tweak more settings in these 3 files, but we do recommend to do a full rebuild when changing any of these files. -

-The steps below download ATCD and OpenDDS, create all needed environment variables and configuration -files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this -example which dumps shapes information to the console. -

-wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2
-wget http://download.ociweb.com/OpenDDS/OpenDDS-3.5.tar.gz
-tar xvf ACE+TAO+CIAO-src.tar.bz2
-tar xvf OpenDDS-3.5.tar.gz
-export DOC_ROOT=`pwd`
-export ACE_ROOT=$DOC_ROOT/ACE_wrappers
-export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
-export DDS_ROOT=$DOC_ROOT/DDS
-export LD_LIBRARY_PATH=$ACE_ROOT/lib:$DDS_ROOT/lib:$LD_LIBRARY_PATH
-echo -e '#include "ace/config-linux.h"' > $ACE_ROOT/ace/config.h
-echo -e 'dds4ccm_opendds=1\nxerces3=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
-echo -e 'dds4ccm_opendds=1\ndds_suppress_anys=0\nxerces3=1\n' > $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-cd $CIAO_ROOT && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4 CIAO_TAO_DAnCE_OpenDDS.mwc
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4
-cd $CIAO_ROOT && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes/descriptors && perl run_test.pl
-
-

Building and Installing DDS4CCM with RTI DDS on Linux

- -Building DDS4CCM with RTI DDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and RTI DDS -the build has to be configured. For this integration we need 3 configuration files. For controlling the MPC makefile generation -we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler -which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/include/makeinclude/platform_macros.GNU to define -the settings for GNU make, and as last we create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can -tweak more settings in these 3 files, but we do recommend to do a full rebuild when changing any of these files. -

-The steps below assume that RTI DDS has been obtained from RTI including their CORBA Compatibility Kit (CCK). The environment -variables NDDSHOME and NDDSARCHITECTURE must be defined accordingly the RTI documentation. - -

-The steps below download ATCD, create all needed ATCD environment variables and configuration -files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this -example which dumps shapes information to the console. -

-wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2
-tar xvf ACE+TAO+CIAO-src.tar.bz2
-export DOC_ROOT=`pwd`
-export ACE_ROOT=$DOC_ROOT/ACE_wrappers
-export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
-export LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
-echo -e '#include "ace/config-linux.h"' > $ACE_ROOT/ace/config.h
-echo -e 'dds4ccm_ndds=1\nndds=1\nxerces3=1\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > $ACE_ROOT/include/makeinclude/platform_macros.GNU
-echo -e 'dds4ccm_ndds=1\nndds=1\nxerces3=1\n' > $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-cd $CIAO_ROOT && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4 CIAO_TAO_DAnCE.mwc
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && $ACE_ROOT/bin/mwc.pl -type gnuace -workers 4
-cd $CIAO_ROOT && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes && make
-cd $CIAO_ROOT/connectors/dds4ccm/examples/Shapes/descriptors && perl run_test.pl
-
-

Building and Installing DDS4CCM with RTI DDS on Windows

- -Building DDS4CCM with RTI DDS integration takes a few manual steps to get the job done. Besides downloading ACE+TAO+CIAO+DAnCE and RTI DDS -the build has to be configured. For this integration we need 2 configuration files. For controlling the MPC makefile generation -we need to create $ACE_ROOT/bin/MakeProjectCreator/config/default.features. This is needed because each DDS vendor has its own IDL compiler -which has to be triggered during the build step. Secondly we need to create $ACE_ROOT/ace/config.h to control the compiler settings. After initial compilation you can -tweak more settings in these 2 files, but we do recommend to do a full rebuild when changing any of these files. -

-The steps below assume that RTI DDS has been obtained from RTI including their CORBA Compatibility Kit (CCK). The environment -variables NDDSHOME and NDDSARCHITECTURE must be defined accordingly the RTI documentation. -Make sure that when you have -a path with spaces in it you don't use double quotes around the path when setting the environment variable. -

-These instructions assume that you have cygwin installed including wget and unzip and that these utilities are in your path. -For perl we advice to use ActiveState perl. You also need -to obtain and install xerces3, the XERCESCROOT environment variable should point to the location of your xerces3 tree. -

-The steps below download ATCD, create all needed ATCD environment variables and configuration -files and compiles all core code and the DDS4CCM shapes example. As last step it deploys this -example which dumps shapes information to the console. Run the commands from a Visual Studio command -prompt. In the steps where devenv is used, the IDE will start and you can use -the IDE to compile the project. Compiling the code will take some time, we can recommend Incredibuild -to speed up compilation using distribution compilation. When the full solution has compiled, close the IDE -and perform the next step. -

-\cygwin\bin\wget http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.zip
-\cygwin\bin\unzip ACE+TAO+CIAO-src.zip
-set DOC_ROOT=%CD%
-set ACE_ROOT=%DOC_ROOT%\ACE_wrappers
-set TAO_ROOT=%ACE_ROOT%\TAO
-set CIAO_ROOT=%TAO_ROOT%\CIAO
-set DANCE_ROOT=%TAO_ROOT%\DAnCE
-set PATH=%ACE_ROOT%\lib;%XERCESCROOT%\bin;%NDDSHOME%\lib\%NDDSARCHITECTURE%;%PATH%
-echo #include "ace/config-win32.h" > %ACE_ROOT%/ace/config.h
-echo dds4ccm_ndds=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-echo ndds=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-echo xerces3=1 > %ACE_ROOT%/bin/MakeProjectCreator/config/default.features
-
-

Building and Installing DDS4CCM on Windows using Visual Studio 2010

-When you want to compile now using Visual Studio 2010 you can use the following steps -
-cd %CIAO_ROOT% && perl %ACE_ROOT%\bin\mwc.pl -type vc10 -workers 4 CIAO_TAO_DAnCE.mwc
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && perl %ACE_ROOT%\bin\mwc.pl -type vc10 -workers 4
-cd %CIAO_ROOT% && devenv CIAO_TAO_DAnCE.sln
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && devenv Shapes.sln
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes\descriptors && perl run_test.pl
-
-

Building and Installing DDS4CCM on Windows using nmake

-When using nmake you can use the following steps. At the moment you want to compile for Windows x86_64, add --value_template platforms=x64 to the mwc.pl commands below. - -
-cd %CIAO_ROOT% && perl %ACE_ROOT%\bin\mwc.pl -type nmake -workers 4 CIAO_TAO_DAnCE.mwc
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && perl %ACE_ROOT%\bin\mwc.pl -type nmake -workers 4
-cd %CIAO_ROOT% && nmake
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes && nmake
-cd %CIAO_ROOT%\connectors\dds4ccm\examples\Shapes\descriptors && perl run_test.pl
-
-

Additionally Building and Installing DDS4CCM

-

- If you already have a configuration of CIAO, the instruction below - explain which additional settings are needed in order to compile - DDS4CCM.For compiling DDS4CCM the correct flags need to be in the default.features and platform_macros.GNU files.. - For compiling and installing CIAO see CIAO-INSTALL.html. - DDS4CCM uses DAnCE as deployement tool in all of the examples and tests. - Therefor one should also be sure that DAnCE is build and installed - in order to run the DDS4CCM examples.
-

-

Setting up default.features and platform_macros.GNU

-

Besided the flags needed to build ACE, TAO, CIAO, and, DAnCE, the following - flags should be added for DDS4CCM. -

-

$ACE_ROOT/bin/MakeProjectCreator/config/default.features should contain at least the following flags for RTI DDS:
-

    -
  • ndds=1
    • -
  • dds4ccm_ndds=1
    • -
-

-

$ACE_ROOT/bin/MakeProjectCreator/config/default.features should contain at least the following flags for OpenDDS:
-

    -
  • dds4ccm_opendds=1
    • -
  • dds_suppress_anys=0
    • -
-

-

$ACE_ROOT/include/makeinclude/platform_macros.GNU should contain at least the following flags for RTI DDS:
-

    -
  • ndds=1
    • -
  • dds4ccm_ndds=1
    • -
-

-

$ACE_ROOT/include/makeinclude/platform_macros.GNU should contain at least the following flags for OpenDDS:
-

    -
  • dds4ccm_opendds=1
    • -
-

-

- To be sure that CIAO, DAnCE and DDS4CCM are build correctly, one might - use the $CIAO_ROOT/CIAO_TAO_DAnCE.mwc workspace for RTI DDS. -

-

- When using DDS4CCM with OpenDDS we commend you to use the $CIAO_ROOT/CIAO_TAO_DAnCE_OpenDDS.mwc workspace. This workspace - will compile all needed parts of ACE, TAO, CIAO, DAnCE, and OpenDDS. OpenDDS has to be compiled before compiling DDS4CCM - because we are using several of the OpenDDS libraries and the OpenDDS IDL compiler. -

-
-

Supported Platforms for DDS4CCM

-

DDS4CCM is daily compiled and tested on Linux with RTI DDS and OpenDDS. It does compile on Windows with Microsoft Visual Studio 10 but - we have not validated all tests. -

-
-

Back to the CIAO install page

- - diff --git a/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf b/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf deleted file mode 100644 index 2c2182eb1da..00000000000 --- a/CIAO/connectors/dds4ccm/docs/DDS4CCM Cheat Sheet.rtf +++ /dev/null @@ -1,331 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1043\deflangfe1043\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\f36\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;} -{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} -{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f42\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\f44\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f45\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f46\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f47\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\f48\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f49\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f381\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f382\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} -{\f384\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f385\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f388\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f401\fbidi \froman\fcharset238\fprq2 Cambria CE;} -{\f402\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f404\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f405\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\f408\fbidi \froman\fcharset186\fprq2 Cambria Baltic;} -{\f411\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f412\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f414\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f415\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} -{\f418\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;} -{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;} -{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} -{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} -{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0; -\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128; -\red192\green192\blue192;\caccentone\ctint255\cshade191\red54\green95\blue145;\caccenttwo\ctint255\cshade191\red148\green54\blue52;\ctexttwo\ctint153\cshade255\red84\green141\blue212;}{\*\defchp \f31506\fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 -\ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 \styrsid15026008 Normal;}{\s1\ql \li0\ri0\sb480\sl276\slmult1 -\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af31503\afs28\alang1025 \ltrch\fcs0 \b\fs28\cf17\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 -\sbasedon0 \snext0 \slink15 \sqformat \spriority9 \styrsid9653913 heading 1;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1043\langfe1043\cgrid\langnp1043\langfenp1043 \snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{\*\cs15 -\additive \rtlch\fcs1 \ab\af31503\afs28 \ltrch\fcs0 \b\fs28\cf17\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid9653913 Heading 1 Char;}{\s16\ql \li720\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 -\sbasedon0 \snext16 \sqformat \spriority34 \styrsid11697437 List Paragraph;}}{\*\listtable{\list\listtemplateid-53073786\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext -\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext -\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext -\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext -\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext -\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext -\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext -\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext -\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext -\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid1728650877}}{\*\listoverridetable{\listoverride\listid1728650877\listoverridecount0\ls1}}{\*\pgptbl {\pgp\ipgp5 -\itap0\li13\ri3206\sb0\sa0}{\pgp\ipgp1\itap0\li0\ri3068\sb0\sa250}{\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp7\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp3\itap0 -\li0\ri0\sb0\sa0}{\pgp\ipgp7\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid8454\rsid15315\rsid67679\rsid77780\rsid84957\rsid87025\rsid153986\rsid203886\rsid275853\rsid278286\rsid328307\rsid345313\rsid347212\rsid415250\rsid471019\rsid598854\rsid808264\rsid929963 -\rsid1209787\rsid1256658\rsid1269269\rsid1270632\rsid1271289\rsid1592404\rsid1867106\rsid1974756\rsid1993465\rsid2122301\rsid2235269\rsid2317587\rsid2448722\rsid2491227\rsid2583900\rsid2622451\rsid2776445\rsid2833315\rsid2895496\rsid2969746\rsid3171861 -\rsid3306671\rsid3364695\rsid3540144\rsid3544782\rsid3609585\rsid3627019\rsid3758634\rsid3883925\rsid4016460\rsid4131369\rsid4146898\rsid4203378\rsid4339062\rsid4350283\rsid4457963\rsid4670306\rsid4684338\rsid4725190\rsid4919091\rsid4934880\rsid5263182 -\rsid5383469\rsid5397924\rsid5457871\rsid5714160\rsid5727512\rsid5778033\rsid5973740\rsid6180484\rsid6323867\rsid6383671\rsid6502984\rsid6562354\rsid6574358\rsid6892139\rsid6892932\rsid7096006\rsid7100257\rsid7107184\rsid7157087\rsid7489967\rsid7671569 -\rsid7693542\rsid7752817\rsid7756596\rsid7829550\rsid7883739\rsid7892250\rsid8200726\rsid8203585\rsid8345035\rsid8589070\rsid8724633\rsid8811513\rsid8848805\rsid8855485\rsid8870814\rsid8940962\rsid9124194\rsid9243072\rsid9271489\rsid9384744\rsid9388898 -\rsid9452363\rsid9534822\rsid9653913\rsid9770997\rsid9830716\rsid9915170\rsid10571263\rsid10638047\rsid11080896\rsid11149407\rsid11225654\rsid11286512\rsid11486316\rsid11681155\rsid11697437\rsid11873757\rsid11881575\rsid12137180\rsid12141597\rsid12272359 -\rsid12281811\rsid13047800\rsid13050400\rsid13505611\rsid13526351\rsid13702661\rsid13711679\rsid13721774\rsid13960238\rsid14094245\rsid14297001\rsid14305119\rsid14486031\rsid14564103\rsid14692711\rsid14693039\rsid14765909\rsid14950011\rsid15026008 -\rsid15079565\rsid15087040\rsid15095150\rsid15095400\rsid15295863\rsid15430320\rsid15478184\rsid15560246\rsid15612630\rsid15689730\rsid15800169\rsid15995885\rsid16070791\rsid16476994\rsid16584720\rsid16591234\rsid16594231}{\mmathPr\mmathFont34\mbrkBin0 -\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Marcel Smit}{\operator Johnny}{\creatim\yr2010\mo7\dy26\hr14\min35}{\revtim\yr2010\mo7\dy27\hr7\min31}{\printim\yr2010\mo7\dy26\hr11\min12} -{\version4}{\edmins209}{\nofpages1}{\nofwords346}{\nofchars2002}{\*\company ACE/TAO/CIAO opensource community}{\nofcharsws2311}{\vern32771}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} -\paperw12240\paperh15840\margl1008\margr1008\margt1008\margb1008\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves1\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1 -\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1008\dgvorigin1008\dghshow1\dgvshow1 -\jexpand\viewkind1\viewscale120\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct -\asianbrkrule\rsidroot9653913\newtblstyruls\nogrowautofit\viewbksp1\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0 -{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid16476994\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}} -{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}} -{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9 -\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s1\qc \li0\ri0\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid11080896 \rtlch\fcs1 -\ab\af31503\afs28\alang1025 \ltrch\fcs0 \b\fs28\cf17\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid9653913 \hich\af31502\dbch\af31501\loch\f31502 DDS4CCM Cheat Sheet}{ -\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid15026008 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 1.\tab}}\pard\plain \ltrpar\s16\ql \fi-360\li720\ri0\sb120\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14765909\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 -\ltrch\fcs0 \b\ul\insrsid2448722 Where the DDS4CCM connector lives -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sb120\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14765909\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722 Implementation: }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid2448722\charrsid1592404 -$CIAO_ROOT/connectors/dds4ccm/impl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722\charrsid2448722 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2448722 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722 IDL Definitions: }{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid2448722\charrsid1592404 $CIAO_ROOT/connectors/dds4ccm/idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2448722\charrsid1592404 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 2.\tab}}\pard \ltrpar -\s16\ql \fi-360\li720\ri0\sb120\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11681155 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid11681155\charrsid14692711 RTI\rquote s actual DDS objects -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11681155\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid11681155\charrsid15079565 Naming}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid11681155 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11681155\charrsid1592404 DDS*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155\charrsid5714160 - or}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11681155 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11681155\charrsid1592404 DDS_*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155\charrsid5714160 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\i\insrsid11681155\charrsid5714160 using RTI\rquote s \'93no namespace}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155 \'94}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155\charrsid5714160 version of }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\i\insrsid11681155 entity }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155\charrsid5714160 names}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11681155 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11681155 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11681155 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11681155 Objects created on demand. -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7892250\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 3.\tab}}\pard \ltrpar -\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7892250\charrsid14692711 DDS }{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \b\ul\insrsid8848805 entities }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7157087 defined in IDL}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7892250\charrsid14692711 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid15079565\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3306671 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid15079565\charrsid15079565 Naming}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \ul\insrsid278286 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid1270632 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid1270632\charrsid1592404 ::DDS::*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid1270632 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\i\insrsid1270632 - definitions in }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid1270632\charrsid1270632 idl/dds_rtf2_dcps.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid1270632\charrsid1270632 (modified DDS spec IDL)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\i\insrsid1270632 use DDS module}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15430320 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7892250 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11697437\charrsid14692711 \hich\af31506\dbch\af0\loch\f31506 4.\tab}}\pard \ltrpar -\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid11697437\charrsid14692711 DDS \'93proxy\'94 - classes}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\ul\insrsid4457963\charrsid4457963 (implement DDS entities defined in IDL)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\ul\insrsid11697437\charrsid4457963 :}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\ul\insrsid14486031\charrsid14692711 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid278286\charrsid15079565 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3540144\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid278286\charrsid15079565 Naming}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid278286 :}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid278286 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid278286\charrsid929963 ::CIAO::DDS4CCM}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf18\insrsid278286\charrsid929963 ::}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\cf18\insrsid278286\charrsid929963 CCM_DDS_*}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\cf18\insrsid278286\charrsid929963 <}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\cf18\insrsid153986\charrsid929963 XXX}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\i\cf18\insrsid278286\charrsid929963 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid278286 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4684338 -\par }\pard\plain \ltrpar\ql \li1440\ri0\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin1440\itap0\pararsid3540144 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 { -\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid153986\charrsid929963 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 -}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14692711 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid14692711\charrsid3540144 -class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid14692711\charrsid3540144 and}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid6323867\charrsid3540144 some (not all)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid14692711\charrsid3540144 - filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid6323867\charrsid3540144 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14305119\charrsid929963 \hich\af31506\dbch\af0\loch\f31506 1.\tab}}\pard\plain \ltrpar -\s16\ql \fi-360\li2333\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl3\adjustright\rin0\lin2333\itap0\pararsid3540144\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 -\f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14305119\charrsid929963 _Base}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 for non-typed code from which typed code derives -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14305119\charrsid929963 \hich\af31506\dbch\af0\loch\f31506 2.\tab}}\pard \ltrpar -\s16\ql \fi-360\li2333\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl3\adjustright\rin0\lin2333\itap0\pararsid7489967\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14305119\charrsid929963 _T}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \insrsid14305119 - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6383671 for }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14305119 typed code -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid8855485 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11697437\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 Have data member (}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\cf19\insrsid1256658\charrsid2583900 Marcel }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid4131369\charrsid2583900 think}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid1256658\charrsid2583900 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\cf19\insrsid4131369\charrsid2583900 it is always a}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid8855485\charrsid2583900 pointer}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 ) with the RTI equivalent entity object. -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5457871 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5457871 Inherit}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \insrsid2776445 s}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5457871 from}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11697437 DDS }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7096006 spec }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid11697437 name (i.e. }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11697437\charrsid6892139 DDS::Subscriber}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11697437 )}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8811513 generated by idl compiler}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7096006 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid7096006\charrsid11873757 (See #2 above)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid11873757 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8855485 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2833315 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid3306671\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315 Has}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14094245 public}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid9534822 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid14094245\charrsid6892139 get_i}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid2833315\charrsid6892139 mpl()}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315 method }{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8345035 for other classes }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15430320 to access raw RTI object by its RTI type.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4016460 \hich\af31506\dbch\af0\loch\f31506 e.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid11286512\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 Has }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4016460\charrsid6892139 impl()} -{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 method used internally which t}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2895496 hrows }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11149407\charrsid6892139 CORBA::BAD_INV}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid11149407 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2895496 exception if RT}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4016460 I object not set.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2833315 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid1209787 \hich\af31506\dbch\af0\loch\f31506 f.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid598854 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid1209787 Lifecycle: }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 Some }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid4670306 (}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 like the }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 DataReader}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 - proxy) are created when the basic port for the }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 Reader}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 is created. Other proxies (like for instance the }{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 Query}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 /}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid598854\charrsid6892139 ReadCondition}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 - proxies) are created }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4350283 as}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid598854 needed -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5727512 \hich\af31506\dbch\af0\loch\f31506 5.\tab}}\pard \ltrpar\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid5727512 Local Interfaces (basic ports) -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid5727512\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid5727512\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid5727512\charrsid9915170 Naming:}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \insrsid5727512 }{\rtlch\fcs1 \ab\af31507 \ltrch\fcs0 \b\cf18\insrsid5727512\charrsid6892139 ::CCM_DDS::CCM_}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid5727512\charrsid6892139 *}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid5727512\charrsid9915170 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4934880 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880 -Inherits from equivalently named interfaces }{\rtlch\fcs1 \ab\af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 ::CCM_DDS::}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 * in .idl}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid5727512\charrsid4934880 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid4934880\charrsid4934880 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid4934880\charrsid4934880 Gener}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880 ated by }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid8203585\charrsid12141597 tao_idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8203585 }{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid4934880 compiler into }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid4934880\charrsid6892139 E.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid4934880\charrsid4934880 -}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid4934880 local executor classes}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid4934880\charrsid15095150 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \i\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid9770997 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid9770997 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid9770997 Both connector code and user components should use these types}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\i\insrsid15095150 to access connector interfaces.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid15095150\charrsid4934880 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7100257 \hich\af31506\dbch\af0\loch\f31506 6.\tab}}\pard \ltrpar\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid7100257 Interface}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid9384744\charrsid67679 - (basic ports)}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932 Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid14692711\charrsid67679 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid9915170\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14692711\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid9915170\charrsid9915170 Naming:}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid9915170 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid9915170\charrsid13721774 *_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13960238 - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\cf19\insrsid13960238\charrsid14692711 class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid13960238\charrsid13050400 and filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid9915170\charrsid9915170 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid13526351 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13526351 -Inherits from IDL generated interface class.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5397924 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid5397924 See }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid5397924\charrsid5397924 ccm_dds.idl}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \b\i\insrsid2122301 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid13711679 and other .idl files in same directory}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid7752817 .}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14692711 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid8724633 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid8724633 -When users make calls to the connector, these classes methods are invoked. -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid10571263 \hich\af31506\dbch\af0\loch\f31506 d.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14692711 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10571263 These live in the extended ports. -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid471019\charrsid471019 \hich\af31506\dbch\af0\loch\f31506 7.\tab}}\pard \ltrpar -\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid471019\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid471019\charrsid471019 Port type (extended ports)}{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932\charrsid6892932 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932 Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid471019\charrsid471019 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid7671569\charrsid9915170 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid6574358\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \ul\insrsid7671569\charrsid9915170 Naming:}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \insrsid7671569 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid3544782\charrsid13721774 DDS_}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid7671569\charrsid13721774 *_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid7671569 }{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7671569 - }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \cf19\insrsid7671569\charrsid14692711 class }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf19\insrsid7671569\charrsid13050400 and filename}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid471019\charrsid6574358 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid6574358 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid2122301\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 All their basic port types \'93used\'94 by user component are/should be }{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \b\insrsid6574358\charrsid5778033 data members by value}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358\charrsid2122301 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid2122301\charrsid2122301 \hich\af31506\dbch\af0\loch\f31506 c.\tab}}\pard \ltrpar -\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid6574358 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2122301\charrsid2122301 Defined}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid2122301 in }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid2122301\charrsid5397924 ccm_dds.idl}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2122301\charrsid2122301 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid15612630\charrsid15612630 \hich\af31506\dbch\af0\loch\f31506 8.\tab}}\pard \ltrpar -\s16\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid14486031\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid15612630\charrsid15612630 Connector}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \b\ul\insrsid6892932\charrsid6892932 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\ul\insrsid6892932 Implementations}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14486031\charrsid15612630 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316 \hich\af31506\dbch\af0\loch\f31506 a.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid14564103\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 Inheritance Hierarchy}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791 }{ -\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid16070791\charrsid11225654 (Defined in}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\i\insrsid16070791\charrsid5397924 ccm_dds.id}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\i\insrsid16070791 l}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\insrsid16070791\charrsid14950011 )}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316\charrsid13721774 \hich\af31506\dbch\af0\loch\f31506 i.\tab}}\pard \ltrpar -\s16\ql \fi-180\li2160\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl2\adjustright\rin0\lin2160\itap0\pararsid11486316\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 -DDS_State_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316\charrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_TopicBase_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_Base_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \b\f31506\fs22\cf18\lang1033\langfe1033\langnp1033\langfenp1033\insrsid11486316\charrsid13721774 \hich\af31506\dbch\af0\loch\f31506 ii.\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\cf18\insrsid11486316\charrsid13721774 DDS_Event_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 -\af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 > }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\cf18\insrsid11486316\charrsid13721774 DDS_TopicBase_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\insrsid11486316\charrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6574358 =}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316\charrsid6574358 >}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid11486316 }{\rtlch\fcs1 \af31507 \ltrch\fcs0 -\b\cf18\insrsid11486316\charrsid13721774 DDS_Base_Connector_T}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid11486316 -\par {\listtext\pard\plain\ltrpar \s16 \rtlch\fcs1 \af0\afs22 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\langnp1033\langfenp1033\insrsid14564103 \hich\af31506\dbch\af0\loch\f31506 b.\tab}}\pard \ltrpar\s16\ql \fi-360\li1440\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin1440\itap0\pararsid16070791\contextualspace {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid14564103 All }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12272359 their}{\rtlch\fcs1 \af31507 -\ltrch\fcs0 \insrsid14564103 extended port types are }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\insrsid14564103\charrsid5778033 data members by value}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid16070791\charrsid14486031 -\par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8 -72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7 -2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b -44d7a07a83c82f308ac7b0a0f0fbf90c2480980b58abc733615aa2d210c2e02cb04430076a7ee833dfb6ce62e3ed7e14693e8317d8cd0433bf5c60f53fea2fe7 -065bd80facb647e9e25c7fc421fd2ddb526b2e9373fed4bb902e182e97b7b461e6bfad3f010000ffff0300504b030414000600080000002100a5d6a7e7c00000 -00360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4fc7060abb08 -84a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b63095120f88d94fbc -52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462a1a82fe353 -bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f7468656d652f7468 -656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b4b0d592c9c -070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b4757e8d3f7 -29e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f7468656d65 -312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87615b8116d8 -a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad79482a9c04 -98f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b5d8a314d3c -94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab999fb7b471 -7509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9699640f671 -9e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd5868b37a088d1 -e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d60cf03ac1a5 -193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f9e7ef3f2d1 -17d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be15c308d3f2 -8acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a99793849c26ae6 -6252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d32a423279a -668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2af074481847 -bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86e877f0034e -16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb44f95d843b -5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a6409fb44d0 -8741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c3d9058edf2 -c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db02565e85f3b966 -0d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276b9f7dec44b -7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8c33585b5fb -9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e51440ca2e0 -088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95b21be5ceaf -8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff6dce591a26 -ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec69ffb9e65d0 -28d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239b75a5bb1e6 -345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a44959d366ad93 -b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e82db8df9f30 -254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f74 -68656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f24 -51eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198 -720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528 -a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc13fa0000001c0200001300000000000000000000000000 -000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b000000000000000000000000 -002b0100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000140200007468 -656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b000016000000000000000000 -00000000d10200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b010000270000000000 -00000000000000009b0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000960a00000000} -{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d -617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 -6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 -656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} -{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; -\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9; -\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7; -\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 010500000200000018000000 -4d73786d6c322e534158584d4c5265616465722e352e30000000000000000000000e0000 -d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -fffffffffffffffffdffffff04000000feffffff05000000fefffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff01000000ec69d9888b8b3d4c859eaf6cd158be0f00000000000000000000000070bd -0f50552dcb010300000080020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff02000000000000000000000000000000000000000000000070bd0f50552dcb01 -70bd0f50552dcb010000000000000000000000005300d500c5004b003300c000d100d200590045005700d800dc00cc00df00c900cf004c00c4005500c600d0003d003d000000000000000000000000000000000032000101ffffffffffffffff03000000000000000000000000000000000000000000000070bd0f50552d -cb0170bd0f50552dcb010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000 -00000000000000000000000000000000cf00000000000000010000000200000003000000feffffff0500000006000000070000000800000009000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c623a536f757263657320786d6c6e733a623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f6772617068792220786d6c6e733d -22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222053656c65637465645374796c653d225c4150412e58534c22205374796c654e616d653d22415041222f3e0d0a2020203c78733a646f63756d65 -6e746174696f6e3e0d0a20202020202053656520687474703a2f2f7777772e77332e6f723c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b37363441 -353934422d373230432d343536302d423846322d4346453942434239313439427d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573746f6d586d6c223e3c64733a736368656d61526566733e3c -64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000 -0000000000000000000000000000000000000000000000000000000000000400000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f -72654974656d3e656c6f772077696c6c2068617665207468652064657369726564206566666563742c20652e672e0d0a202020202020266c743b74797065202e202e202e3e0d0a2020202020202e202e202e0d0a202020202020266c743b61747472696275746547726f7570207265663d22786d6c3a7370656369616c41 -74747273222f3e0d0a20202020202077696c6c20646566696e65206120747970652077686963682077696c6c20736368656d612d76616c6964617465206120696e7374616e63650d0a202020202020656c656d656e74207769746820616e79206f662074686f736520617474726962757465733c2f78733a646f63756d65 -6e746174696f6e3e0d0a202020203c2f78733a616e6e6f746174696f6e3e0d0a202020203c78733a617474726962757465206e616d653d226c616e672220747970653d2278733a6c616e6775616765223e0d0a2020202020203c78733a616e6e6f746174696f6e3e0d0a20202020202020203c78733a646f63756d656e74 -6174696f6e3e0d0a20202020202020202020496e2064756520636f757273652c2077652073686f756c6420696e7374616c6c2074686520720105000000000000}} \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods b/CIAO/connectors/dds4ccm/docs/TestCoverage.ods deleted file mode 100644 index 44bbab04d1d..00000000000 Binary files a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods and /dev/null differ diff --git a/CIAO/connectors/dds4ccm/docs/details.txt b/CIAO/connectors/dds4ccm/docs/details.txt deleted file mode 100644 index 118ccf9c8ea..00000000000 --- a/CIAO/connectors/dds4ccm/docs/details.txt +++ /dev/null @@ -1,5 +0,0 @@ - - -For more information regarding DDS4CCM also check the CCM tutoral, see -$CIAO_ROOT/docs/OMG-CCM-Tutorial.ppt - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore deleted file mode 100644 index 0dc742545c6..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/Hello_Base.cxx -/Hello_Base.h -/Hello_BaseC.cpp -/Hello_BaseC.h -/Hello_BaseC.inl -/Hello_BasePlugin.cxx -/Hello_BasePlugin.h -/Hello_BaseS.h -/Hello_BaseSupport.cxx -/Hello_BaseSupport.h -/Hello_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl deleted file mode 100644 index 3a0996040f4..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Hello_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef HELLO_BASE_IDL -#define HELLO_BASE_IDL - -#pragma ndds typesupport "Base/Hello_BaseSupport.h" -#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "DDSHello" - -struct DDSHello { - string hello; - short iterator; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence DDSHelloSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc deleted file mode 100644 index dcd326b1c14..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Hello_Base_stub - dynamicflags += HELLO_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ - -Wb,stub_export_include=Hello_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Hello_Base.idl - } - - opendds_ts_flags += --export=HELLO_BASE_STUB_Export - - DDSGenerator_Files { - Hello_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl deleted file mode 100644 index c71a797fa36..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Hello_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef HELLO_CONNECTOR_IDL_ -#define HELLO_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Hello_Base.idl" - -#pragma ciao lem "Connector/Hello_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Hello_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Hello; - -#endif /* HELLO_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc deleted file mode 100644 index ab3fa393504..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc +++ /dev/null @@ -1,149 +0,0 @@ -project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Hello_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Hello_Connector_stub_export.h \ - -Wb,skel_export_macro=HELLO_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Hello_Connector_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Hello_Connector_svnt_export.h \ - -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Hello_Connector_conn_export.h \ - -I .. - - IDL_Files { - Hello_Connector.idl - } -} - -project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Hello_Connector_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Hello_ConnectorE.idl - } -} - -project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Hello_Connector_lem_gen \ - DDS_Hello_Connector_stub \ - DDS_Hello_Base_stub - libs += DDS_Hello_Base_stub \ - DDS_Hello_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Hello_Connector_lem_stub - dynamicflags += HELLO_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorEC.cpp - } - - Header_Files { - Hello_ConnectorEC.h - Hello_Connector_lem_stub_export.h - } - - Inline_Files { - Hello_ConnectorEC.inl - } -} - -project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Hello_Connector_idl_gen DDS_Hello_Base_stub - libs += DDS_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Hello_Connector_stub - dynamicflags += HELLO_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorC.cpp - } - - Header_Files { - Hello_ConnectorC.h - Hello_Connector_stub_export.h - } - - Inline_Files { - Hello_ConnectorC.inl - } -} - -project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Hello_Connector_lem_stub \ - DDS_Hello_Connector_stub \ - DDS_Hello_Base_stub - sharedname = DDS_Hello_Connector_exec - libs += DDS_Hello_Connector_stub \ - DDS_Hello_Connector_lem_stub \ - DDS_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector_conn.cpp - } - - Header_Files { - Hello_Connector_conn.h - Hello_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Hello_Connector_lem_stub \ - DDS_Hello_Connector_exec \ - DDS_Hello_Connector_stub - sharedname = DDS_Hello_Connector_svnt - libs += DDS_Hello_Connector_stub \ - DDS_Hello_Connector_lem_stub \ - DDS_Hello_Base_stub \ - DDS_Hello_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorS.cpp - Hello_Connector_svnt.cpp - } - - Header_Files { - Hello_ConnectorS.h - Hello_Connector_svnt.h - Hello_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc deleted file mode 100644 index bb2ed9a7a7d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_Receiver.mpc +++ /dev/null @@ -1,9 +0,0 @@ -project(*hello_receiver) : nddslib, acelib { - exename = DDS_receiver - avoids += ace_for_tao - - Source_Files { - Hello_Receiver.cpp - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp deleted file mode 100644 index f3cd10094a5..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "ace/OS_main.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_stdlib.h" -#include "ace/Date_Time.h" -#include "ace/SString.h" - -#include - -/* By default DDS::String type manage strings up to 1k */ -#define MAX_STRING_SIZE 1024 - -bool shutdown_flag = false; -long num_samples = 0; -long received_samples = 0; - -/* The listener of events and data from the middleware */ -class HelloListener: public ::DDS::DataReaderListener { -public: - void on_data_available(::DDS::DataReader *reader); -}; - - -int ACE_TMAIN(int argc, ACE_TCHAR** argv) { - HelloListener listener; - int main_result = 1; /* error by default */ - ::DDS::Topic * topic = 0; - ::DDS::DataReader *data_reader = 0; - - if (argc == 2) - { - ACE_TCHAR *end = 0; - num_samples = ACE_OS::strtol (argv[1], &end, 10); - - if (end == argv[1] && num_samples < 0) - { - ACE_ERROR ((LM_ERROR, "Error: provided argument not a valid integer over zero\n")); - return -1; - } - } - - /* Create the domain participant on domain ID 0 */ - ::DDS::DomainParticipant *participant = ::DDS::DomainParticipantFactory::get_instance()-> - create_participant( - 0, /* Domain ID */ - DDS_PARTICIPANT_QOS_DEFAULT, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Create the topic "Hello, World" for the String type */ - topic = participant->create_topic( - "Hello, World", /* Topic name*/ - ::DDS::StringTypeSupport::get_type_name(), /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - /* Create the data writer using the default publisher */ - data_reader = participant->create_datareader( - topic, - DDS_DATAREADER_QOS_DEFAULT, /* QoS */ - &listener, /* Listener */ - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* --- Sleep During Asynchronous Reception ---------------------------- */ - - /* This thread sleeps forever. When a sample is received, RTI Data - * Distribution Service will call the on_data_available_callback function. - */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n"))); - for (;;) { - ACE_OS::sleep (1); - if(shutdown_flag){ - break; - } - } - - /* --- Clean Up ------------------------------------------------------- */ - - main_result = 0; - clean_exit: - ::DDS::ReturnCode_t retcode; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - - return main_result; -} - - -/* This method gets called back by DDS when one or more data samples have been - * received. - */ -void HelloListener::on_data_available(::DDS::DataReader *reader) { - /* Perform a safe type-cast from a generic data reader into a - * specific data reader for the type "DDS::String" - */ - ::DDS::StringDataReader * string_reader = ::DDS::StringDataReader::narrow(reader); - if (!string_reader) { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n"))); - return; - } - - /* Loop until there are messages available in the queue */ - char sample[MAX_STRING_SIZE]; - char *ptr_sample = &sample[0]; - for(;;) { - ::DDS::SampleInfo info; - ::DDS::ReturnCode_t retcode = string_reader->take_next_sample( - ptr_sample, - info); - if (retcode == DDS_RETCODE_NO_DATA) { - /* No more samples */ - break; - } else if (retcode != DDS_RETCODE_OK) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), retcode)); - return; - } - if (info.valid_data) { - // Valid (this isn't just a lifecycle sample): print it - ++received_samples; - ACE_CString rec (sample); - ACE_Date_Time now; - int sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() ); - if (sec_rec > 0) - { - int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ()); - if (sec_rec != now.second ()) - usec_rec += 10000000; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%C duration <%d>\n"), sample, now.microsec () - usec_rec)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%C\n"), sample)); - } - if(received_samples == num_samples || ACE_OS::strlen(sample) == 0){ - shutdown_flag = true; - } - } - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc deleted file mode 100644 index 665a26daacc..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender.mpc +++ /dev/null @@ -1,9 +0,0 @@ -project(*hello_sender) : nddslib, acelib { - exename = DDS_Sender - avoids += ace_for_tao - - Source_Files { - Hello_Sender.cpp - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp deleted file mode 100644 index c050afbab37..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp +++ /dev/null @@ -1,150 +0,0 @@ -#include "ace/OS_main.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" -#include "ace/OS_NS_stdio.h" -#include "ace/Date_Time.h" -#include "ace/SString.h" -#include - -int number_of_iterations = 100; -bool log_time = false; -const char* send_string = "This is a DDS sender"; - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:s:t")); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 's': - send_string = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()); - break; - case 'i': - number_of_iterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 't': - log_time = true; - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-s " - "-i " - "-t log timing" - "\n", - argv [0]), - -1); - } - // Indicates successful parsing of the command line - return 0; -} - -int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { - ::DDS::ReturnCode_t retcode; - ::DDS::StringDataWriter *string_writer = 0; - ::DDS::Topic *topic = 0; - ::DDS::DataWriter *data_writer = 0; - int main_result = 1; /* error by default */ - - if (parse_args (argc, argv) != 0) - return 1; - - ACE_Time_Value tv (0, 1000); //1 msec - /* Create the domain participant */ - ::DDS::DomainParticipant *participant = ::DDS::DomainParticipantFactory::get_instance()-> - create_participant( - 0, /* Domain ID */ - DDS_PARTICIPANT_QOS_DEFAULT, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Create the topic "Hello, World" for the String type */ - topic = participant->create_topic( - "Hello, World", /* Topic name*/ - ::DDS::StringTypeSupport::get_type_name(), /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - /* Create the data writer using the default publisher */ - data_writer = participant->create_datawriter( - topic, - DDS_DATAWRITER_QOS_DEFAULT, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_writer) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Perform a safe type-cast from a generic data writer into a - * specific data writer for the type "DDS::String" - */ - string_writer = ::DDS::StringDataWriter::narrow(data_writer); - if (!string_writer) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n"))); - /* In this specific case, this will never fail */ - goto clean_exit; - } - - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (1); - - /* --- Write Data ----------------------------------------------------- */ - - for (int i = 0; i < number_of_iterations; i++) - { - char timestamp[16]; - ACE_CString msg (send_string); - ACE_CString ret; - ACE_Date_Time now; - ACE_OS::sprintf (timestamp, - "%02d.%d", - static_cast (now.second()), - static_cast (now.microsec ())); - ret.set (timestamp); - ret = ret + " " + msg; - retcode = string_writer->write( - ret.c_str (), - DDS_HANDLE_NIL); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Write failed: %d.\n"), retcode)); - } - ACE_OS::sleep (tv); - } - - /* --- Clean Up ------------------------------------------------------- */ - - main_result = 0; -clean_exit: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - return main_result; -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore deleted file mode 100644 index f185a14049e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/DDS_Hello_Receiver_idl_gen.mk -/DDS_Hello_Receiver_lem_gen.mk -/Hello_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl deleted file mode 100644 index 82f637ba6bd..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef HELLO_RECEIVER_IDL -#define HELLO_RECEIVER_IDL - -#include "Connector/Hello_Connector.idl" - -module Hello -{ - component Receiver - { - port Hello::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - - attribute string name; - attribute unsigned long expected_samples; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc deleted file mode 100644 index e58fc7bac02..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc +++ /dev/null @@ -1,141 +0,0 @@ -project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm { - avoids += ace_for_tao - custom_only = 1 - after += DDS_Hello_Connector_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - Hello_Receiver.idl - } -} - -project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - avoids += ace_for_tao - after += DDS_Hello_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Hello_ReceiverE.idl - } -} - -project(DDS_Hello_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - avoids += ace_for_tao - after += DDS_Hello_Receiver_lem_gen DDS_Hello_Receiver_stub DDS_Hello_Connector_stub DDS_Hello_Base_stub - libs += Receiver_stub DDS_Hello_Connector_stub DDS_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += HELLO_RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ReceiverEC.cpp - } - - Header_Files { - Hello_ReceiverEC.h - Hello_Receiver_lem_stub_export.h - } - - Inline_Files { - Hello_ReceiverEC.inl - } -} - -project(DDS_Hello_Receiver_stub) : ccm_stub, dds4ccm_base { - avoids += ace_for_tao - after += DDS_Hello_Receiver_idl_gen DDS_Hello_Connector_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_gen - libs += DDS_Hello_Connector_stub DDS_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += HELLO_RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ReceiverC.cpp - } - - Header_Files { - Hello_ReceiverC.h - Hello_Receiver_stub_export.h - } - - Inline_Files { - Hello_ReceiverC.inl - } -} - -project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - avoids += ace_for_tao - after += DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Receiver_exec.cpp - } - - Header_Files { - Hello_Receiver_exec.h - Hello_Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - avoids += ace_for_tao - after += DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt Receiver_exec DDS_Hello_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ReceiverS.cpp - Hello_Receiver_svnt.cpp - } - - Header_Files { - Hello_ReceiverS.h - Hello_Receiver_svnt.h - Hello_Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp deleted file mode 100644 index f3a64fc4cba..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp +++ /dev/null @@ -1,376 +0,0 @@ -// -*- C++ -*- -// TAO_IDL - Generated from -// be/be_codegen.cpp:1344 - -#include "Hello_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/Date_Time.h" - -namespace CIAO_Hello_Receiver_Impl -{ - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exs.cpp:75 - //============================================================ - // Facet Executor Implementation Class: info_out_data_listener_exec_i - //============================================================ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received, - const ACE_CString &name) - : ciao_context_ ( - ::Hello::CCM_Receiver_Context::_duplicate (ctx)), - received_ (received), - name_ (name) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_data_listener_exec_i\n"))); - } - - // Operations from ::Hello::Listener - - void - info_out_data_listener_exec_i::on_one_data ( - const ::DDSHello & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->received_; - ACE_CString rec (datum.hello.in ()); - ACE_Date_Time now; - int const sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() ); - if (sec_rec > 0) - { - int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ()); - if (sec_rec != now.second ()) - { - usec_rec += 10000000; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%C> received <%C> - <%d>. difference <%d>\n"), - this->name_.c_str (), - datum.hello.in (), - datum.iterator, - now.microsec () - usec_rec)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("<%C> received <%C> - <%d>.\n"), - this->name_.c_str (), - datum.hello.in (), - datum.iterator)); - } - } - - void - info_out_data_listener_exec_i::on_many_data ( - const ::DDSHelloSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exs.cpp:75 - //============================================================ - // Facet Executor Implementation Class: info_out_status_exec_i - //============================================================ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &lost) - : ciao_context_ ( - ::Hello::CCM_Receiver_Context::_duplicate (ctx)), - lost_ (lost) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_status_exec_i\n"))); - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - ++this->lost_; - ACE_DEBUG ((LM_ERROR, ACE_TEXT("port status listener::on_sample_lost\n"))); - } - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exs.cpp:75 - //============================================================ - // Facet Executor Implementation Class: info_out_connector_status_exec_i - //============================================================ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~info_out_connector_status_exec_i\n"))); - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_inconsistent_topic\n"))); - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"))); - } - - void - info_out_connector_status_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_sample_rejected\n"))); - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"))); - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"))); - } - - void - info_out_connector_status_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind /* status_kind */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver: ") - ACE_TEXT ("ConnectorStatusListener_exec_i::on_unexpected_status\n"))); - } - - //============================================================ - // Component Executor Implementation Class: Receiver_exec_i - //============================================================ - - Receiver_exec_i::Receiver_exec_i (void) - : expected_ (0), - received_ (0), - lost_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Receiver_exec_i\n"))); - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Hello::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new DDSHello RAW listener\n"))); - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->received_, - this->name_), - ::Hello::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Hello::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in (), - this->lost_), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ConnectorStatusListener\n"))); - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - char * - Receiver_exec_i::name (void) - { - return CORBA::string_dup (this->name_.c_str ()); - } - - void - Receiver_exec_i::name ( - const char * name) - { - this->name_ = name; - } - - ::CORBA::ULong - Receiver_exec_i::expected_samples (void) - { - return this->expected_; - } - - void - Receiver_exec_i::expected_samples ( - ::CORBA::ULong expected_samples) - { - this->expected_ = expected_samples; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, - ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - - throw ::CORBA::INTERNAL (); - } - lc->mode ( ::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_INFO, - "Receiver_exec_i summary: received <%u> - expected <%d> - lost <%u>\n", - this->received_.value (), - this->expected_, - this->lost_.value ())); - if (this->lost_ > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR : Lost %u samples\n", - this->lost_.value ())); - } - if (this->received_ < this->expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n", - this->expected_, this->received_.value ())); - } - } - - extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h deleted file mode 100644 index 0ff9e79448a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ /dev/null @@ -1,213 +0,0 @@ -// -*- C++ -*- -// TAO_IDL - Generated from -// be/be_codegen.cpp:1283 - -#ifndef CIAO_HELLO_RECEIVER_EXEC_0PTXJW_H_ -#define CIAO_HELLO_RECEIVER_EXEC_0PTXJW_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Hello_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - class HELLO_RECEIVER_EXEC_Export info_out_data_listener_exec_i - : public virtual ::Hello::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received, - const ACE_CString &name); - - virtual ~info_out_data_listener_exec_i (void); - - // Operations and attributes from Hello::Listener - - virtual - void on_one_data ( - const ::DDSHello & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::DDSHelloSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - Atomic_ULong &received_; - const ACE_CString &name_; - }; - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - class HELLO_RECEIVER_EXEC_Export info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &lost); - virtual ~info_out_status_exec_i (void); - - // Operations and attributes from CCM_DDS::PortStatusListener - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - Atomic_ULong &lost_; - }; - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - class HELLO_RECEIVER_EXEC_Export info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Hello::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_connector_status_exec_i (void); - - // Operations and attributes from CCM_DDS::ConnectorStatusListener - - virtual - void on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - }; - - class HELLO_RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - - virtual ::Hello::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual char * - name (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - name ( - const char * name); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual ::CORBA::ULong - expected_samples (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - expected_samples ( - ::CORBA::ULong expected_samples); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - private: - ::Hello::CCM_Receiver_Context_var ciao_context_; - ::Hello::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - CORBA::ULong expected_; - Atomic_ULong received_; - Atomic_ULong lost_; - ACE_CString name_; - }; - - extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore b/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore deleted file mode 100644 index 6600e59d890..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/DDS_Hello_Sender_idl_gen.mk -/DDS_Hello_Sender_lem_gen.mk -/Hello_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl deleted file mode 100644 index 4674cf34f6d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_SENDER_IDL -#define DDS_SENDER_IDL - -#include "Connector/Hello_Connector.idl" - -module Hello -{ - component Sender - { - port Hello::DDS_Write info_in; - attribute unsigned long rate; - attribute unsigned long iterations; - attribute string message; - attribute boolean log_time; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc deleted file mode 100644 index b653dc864b7..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ /dev/null @@ -1,141 +0,0 @@ -project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm { - avoids += ace_for_tao - after += DDS_Hello_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Hello_Sender.idl - } -} - -project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - avoids += ace_for_tao - after += DDS_Hello_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Hello_SenderE.idl - } -} - -project(DDS_Hello_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - avoids += ace_for_tao - after += DDS_Hello_Sender_lem_gen DDS_Hello_Sender_stub DDS_Hello_Base_stub - libs += DDS_Hello_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderEC.cpp - } - - Header_Files { - Hello_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Hello_SenderEC.inl - } -} - -project(DDS_Hello_Sender_stub) : ccm_stub, dds4ccm_base { - avoids += ace_for_tao - after += DDS_Hello_Sender_idl_gen DDS_Hello_Base_stub DDS_Hello_Connector_stub - libs += DDS_Hello_Base_stub DDS_Hello_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += HELLO_SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderC.cpp - } - - Header_Files { - Hello_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Hello_SenderC.inl - } -} - -project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Sender_exec.cpp - } - - Header_Files { - Hello_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - avoids += ace_for_tao - after += DDS_Hello_Base_stub DDS_Hello_Sender_lem_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderS.cpp - Hello_Sender_svnt.cpp - } - - Header_Files { - Hello_SenderS.h - Hello_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp deleted file mode 100644 index 7c4e6634ee7..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp +++ /dev/null @@ -1,383 +0,0 @@ -// -*- C++ -*- -#include "Hello_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/Date_Time.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Reactor.h" - -namespace CIAO_Hello_Sender_Impl -{ - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exs.cpp:75 - //============================================================ - // Facet Executor Implementation Class: connector_status_exec_i - //============================================================ - - connector_status_exec_i::connector_status_exec_i ( - ::Hello::CCM_Sender_Context_ptr ctx, - Atomic_Boolean &ready_to_start) - : ciao_context_ ( - ::Hello::CCM_Sender_Context::_duplicate (ctx)), - ready_to_start_(ready_to_start) - { - } - - connector_status_exec_i::~connector_status_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~connector_status_exec_i\n"))); - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - connector_status_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind status_kind) - { - if (status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - // be aware that when only the sender runs, ready_to_start will never - // be true. - this->ready_to_start_ = true; - } - } - - //============================================================ - // Pulse generator - //============================================================ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, - const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1), - iteration_ (0), - iterations_ (1000), - log_time_ (false), - msg_ ("Hello World!"), - ready_to_start_(false) - { - this->ticker_ = new pulse_Generator (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CORBA::ULong - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - ::CORBA::ULong rate) - { - if (rate == 0) - { - rate = 1; - } - else - { - this->rate_ = rate; - } - } - - ::CORBA::ULong - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - ::CORBA::ULong iterations) - { - this->iterations_ = iterations; - } - - char * - Sender_exec_i::message (void) - { - return CORBA::string_dup (this->msg_.c_str()); - } - - void - Sender_exec_i::message ( - const char * message) - { - this->msg_ = message; - } - - ::CORBA::Boolean - Sender_exec_i::log_time (void) - { - return this->log_time_; - } - - void - Sender_exec_i::log_time ( - ::CORBA::Boolean log_time) - { - this->log_time_ = log_time; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_connector_status_.in ())) - { - connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - connector_status_exec_i ( - this->ciao_context_.in (), - this->ready_to_start_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_connector_status_.in ()); - } - - ACE_CString - Sender_exec_i::create_message (const ACE_CString &msg) - { - if (!this->log_time_) - return msg; - char timestamp[16]; - ACE_Date_Time now; - ACE_OS::sprintf (timestamp, - "%02d.%06d", - static_cast (now.second()), - static_cast (now.microsec ())); - ACE_CString ret (timestamp); - ret = ret + " " + msg; - return ret.c_str (); - } - - void - Sender_exec_i::tick () - { - // Start writing after DataWriter find first DataReader that matched the - // Topic It is still possible that other Readers aren't yet ready to - // receive data, for that case in the profile the durability is set to - // TRANSIENT_DURABILITY_QOS, so each Reader should receive each message. - if(this->ready_to_start_.value()) - { - if (this->iteration_ < this->iterations_) - { - Hello::Writer_var writer = - this->ciao_context_->get_connection_info_in_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - DDSHello new_msg; - ACE_CString msg = create_message (this->msg_); - new_msg.hello = msg.c_str (); - new_msg.iterator = ++this->iteration_; - writer->write_one (new_msg, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::tick - " - "Written sample: <%C> - <%u>\n", - msg.c_str (), - new_msg.iterator)); - } - } - else - { - // We are done - this->stop (); - } - } - } - - void - Sender_exec_i::start (void) - { - ACE_Reactor* reactor = 0; - - ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object(); - if (!::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (!::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - - if (reactor) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (reactor->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (3, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - else - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::stop (void) - { - ACE_Reactor* reactor = 0; - - ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object(); - if (!::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (!::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - - if (reactor) - { - reactor->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - else - { - throw ::CORBA::INTERNAL (); - } - - if (!this->ready_to_start_.value()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ") - ACE_TEXT ("Sender never got ready to start\n"))); - } - } - - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h deleted file mode 100644 index 5b6c508df0c..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ /dev/null @@ -1,196 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_ -#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" -#include - -namespace CIAO_Hello_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - class HELLO_SENDER_EXEC_Export connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - connector_status_exec_i ( - ::Hello::CCM_Sender_Context_ptr ctx, - Atomic_Boolean &ready_to_start); - virtual ~connector_status_exec_i (void); - - // Operations and attributes from CCM_DDS::ConnectorStatusListener - - virtual - void on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - - private: - ::Hello::CCM_Sender_Context_var ciao_context_; - Atomic_Boolean &ready_to_start_; - }; - - class Sender_exec_i; - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - - class HELLO_SENDER_EXEC_Export Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - void start (void); - - void stop (void); - - void tick (); - - //@} - - //@{ - /** Component attributes and port operations. */ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual ::CORBA::ULong - rate (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - rate ( - ::CORBA::ULong rate); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual ::CORBA::ULong - iterations (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - iterations ( - ::CORBA::ULong iterations); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual char * - message (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - message ( - const char * message); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual ::CORBA::Boolean - log_time (void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:36 - - virtual void - log_time ( - ::CORBA::Boolean log_time); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - private: - ::Hello::CCM_Sender_Context_var ciao_context_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_; - pulse_Generator * ticker_; - CORBA::ULong rate_; - CORBA::ULong iteration_, iterations_; - CORBA::Boolean log_time_; - ACE_CString msg_; - - ACE_CString create_message (const ACE_CString &msg); - Atomic_Boolean ready_to_start_; - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp deleted file mode 100644 index 4444fa41604..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp +++ /dev/null @@ -1,1049 +0,0 @@ - - - - Hello_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - Hello_ReceiverComponentOne - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverOne - - - - - name - - - tk_string - - - ReceiverOne - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - - - Hello_ReceiverConnectorComponentOne - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorOne - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentTwo - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverTwo - - - - - name - - - tk_string - - - ReceiverTwo - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - - - Hello_ReceiverConnectorComponentTwo - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorTwo - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentThree - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverThree - - - - - name - - - tk_string - - - ReceiverThree - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - - - Hello_ReceiverConnectorComponentThree - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorThree - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentFour - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverFour - - - - - name - - - tk_string - - - ReceiverFour - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - - - - Hello_ReceiverConnectorComponentFour - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorFour - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentFive - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverFive - - - - - name - - - tk_string - - - ReceiverFive - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - - - Hello_ReceiverConnectorComponentFive - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorFive - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - - Hello_SenderConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS - - - - - log_time - - - tk_boolean - - - true - - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - _listenercontrolOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - - - _portstatuslistenerOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - - - - _listenerOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp deleted file mode 100644 index 16a942d257e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp +++ /dev/null @@ -1,1042 +0,0 @@ - - - - Hello_DDS_Deployment_5_Receivers - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - Hello_ReceiverComponentOne - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverOne - - - - - name - - - tk_string - - - ReceiverOne - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - Hello_ReceiverConnectorComponentOne - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverConnectorHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorOne - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentTwo - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverTwo - - - - - name - - - tk_string - - - ReceiverTwo - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - Hello_ReceiverConnectorComponentTwo - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverConnectorHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorTwo - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentThree - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverThree - - - - - name - - - tk_string - - - ReceiverThree - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - Hello_ReceiverConnectorComponentThree - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverConnectorHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorThree - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentFour - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverFour - - - - - name - - - tk_string - - - ReceiverFour - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - Hello_ReceiverConnectorComponentFour - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverConnectorHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorFour - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_ReceiverComponentFive - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverFive - - - - - name - - - tk_string - - - ReceiverFive - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - Hello_ReceiverConnectorComponentFive - ReceiverNode - - - - - edu.vanderbilt.dre.DAnCE.ExplicitHome - - - tk_string - - - Hello_ReceiverConnectorHome - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverConnectorFive - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - _listenercontrolOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listenercontrolFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - - - _portstatuslistenerOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistenerFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - - - - _listenerOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - _listenerFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp deleted file mode 100644 index f44e39849cc..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp +++ /dev/null @@ -1,883 +0,0 @@ - - - - Hello_DDS_Deployment_5_Senders - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - Hello_SenderComponentOne - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderOne - - - - - message - - - tk_string - - - Hi, I'm sender One! - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - - - Hello_SenderConnectorComponentOne - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorOne - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - Hello_SenderComponentTwo - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderTwo - - - - - message - - - tk_string - - - Hi, I'm sender Two! - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - - - Hello_SenderConnectorComponentTwo - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorTwo - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentThree - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderThree - - - - - message - - - tk_string - - - Hi, I'm sender Three! - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - - - Hello_SenderConnectorComponentThree - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorThree - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentFour - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderFour - - - - - message - - - tk_string - - - Hi, I'm sender Four! - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - - - - Hello_SenderConnectorComponentFour - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorFour - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentFive - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderFive - - - - - message - - - tk_string - - - Hi, I'm sender Five! - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - - - Hello_SenderConnectorComponentFive - SenderNode - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorFive - - - - - topic_name - - - tk_string - - - hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - info_write_dataOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp deleted file mode 100644 index 23225b3ead8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp +++ /dev/null @@ -1,1044 +0,0 @@ - - - - Hello_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - Hello_SenderComponentOne - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS Sender One - - - - - log_time - - - tk_boolean - - - true - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderOne - - - - - - - Hello_SenderConnectorComponentOne - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorOne - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentTwo - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS Sender Two - - - - - log_time - - - tk_boolean - - - true - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderTwo - - - - - - - Hello_SenderConnectorComponentTwo - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorTwo - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentThree - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS Sender Three - - - - - log_time - - - tk_boolean - - - true - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderThree - - - - - - - Hello_SenderConnectorComponentThree - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorThree - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentFour - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS Sender Four - - - - - log_time - - - tk_boolean - - - true - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderFour - - - - - - - Hello_SenderConnectorComponentFour - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorFour - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - Hello_SenderComponentFive - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS Sender Five - - - - - log_time - - - tk_boolean - - - true - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderFive - - - - - - - Hello_SenderConnectorComponentFive - SenderNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - SenderConnectorFive - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - - - - Hello_ReceiverConnectorComponent - ReceiverNode - - - - - topic_name - - - tk_string - - - DDS_Hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - ReceiverComponent - ReceiverNode - - - - - expected_samples - - - tk_ulong - - - 500 - - - - - - - info_write_dataOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderOne - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderTwo - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderThree - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderFour - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - info_write_dataFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_senderFive - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp deleted file mode 100644 index df6a164c7e7..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp +++ /dev/null @@ -1,464 +0,0 @@ - - - - Hello_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - expected_samples - - - tk_ulong - - - 100 - - - - - name - - - tk_string - - - Receiver1 - - - - - - Hello_ReceiverConnectorComponent - ReceiverNode - - - - - topic_name - - - tk_string - - - Hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - Hello_SenderConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Hello - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ulong - - - 10 - - - - - iterations - - - tk_ulong - - - 100 - - - - - message - - - tk_string - - - Hello, World via DDS - - - - - log_time - - - tk_boolean - - - true - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml deleted file mode 100644 index 9295f565474..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/HelloTest_Library.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp deleted file mode 100644 index 2252a8e2e86..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp +++ /dev/null @@ -1,249 +0,0 @@ - - - - Hello_DDS_Deployment_1 - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - name - - - tk_string - - - Receiver1 - - - - - - Hello_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Hello - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp deleted file mode 100644 index 837f99ae63b..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp +++ /dev/null @@ -1,200 +0,0 @@ - - - - Hello_DDS_Deployment_1 - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - Hello_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Hello_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Hello_Connector_exec - - - - - - SenderComponent - SenderNode - - - - - - Hello_ConnectorComponent2 - SenderNode - - - - - topic_name - - - tk_string - - - Hello - - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Hello_Connector_exec - - - DDS_Hello_Connector_exec - - - Hello_Connector_svnt - - - DDS_Hello_Connector_svnt - - - Hello_Connector_stub - - - DDS_Hello_Connector_stub - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 0175a48be5c..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl deleted file mode 100755 index 3cc3272485e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 = "1_to_5.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl deleted file mode 100755 index 5b24efcba40..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 = "5_to_1.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl deleted file mode 100755 index 6e37446fbf4..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl +++ /dev/null @@ -1,251 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns.ior"; -$ior_nsfile = 0; -$ior_embase = "EM.ior"; -$ior_emfile = 0; - -# Processes -$E = 0; -$E2 = 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 = "5_Senders.cdp"; -$cdp_file_two = "5_Receivers.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $tg_executor->ProcessStartWaitInterval ()); - -if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; -} - -print "Start dance_plan_launcher.exe with -x $cdp_file_two -k file://$ior_emfile\n"; -$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file_two -k file://$ior_emfile"); -$E2->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); - -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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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 -s\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ()); - -print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_two -s\n"; - -$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file_two -s"); -$E2->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ()); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl deleted file mode 100755 index 52b6717f27a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60002 ); -@iorbases = ( "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# ior files other than daemon -# 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 = "ReceiverOnly.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl deleted file mode 100755 index a4aabfcb9f6..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Sender.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# ior files other than daemon -# 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 = "SenderOnly.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl deleted file mode 100755 index f7af673c0cd..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl +++ /dev/null @@ -1,245 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 = "DeploymentPlan.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl deleted file mode 100755 index e45a367e630..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl +++ /dev/null @@ -1,25 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - - -print "Start receiver\n"; -$R = $tg_receiver->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/examples/Hello/DDS_Receiver/DDS_receiver", ""); -$R->Spawn(); -print "Start sender\n"; -$S = $tg_sender->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/examples/Hello/DDS_Sender/DDS_Sender", - "-i 10000 -t -s \"Hello, World\""); -$S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval ()); -$R->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl deleted file mode 100644 index 7ac916b5ae1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file I2C_ShapeType.idl - * @author - */ - -#ifndef I2C_SHAPE_TYPE_IDL_ -#define I2C_SHAPE_TYPE_IDL_ - -#include "connectors/dds4ccm/idl/dds4ccm_Entity.idl" - -#include "Base/I2C_Shapes_Base.idl" - -#pragma ciao lem "Base/I2C_ShapeTypeE.idl" - -module I2C_Typed TSeq> { - alias DDS_Entity DDS_Typed_Entity; - typedef DDS_Typed_Entity::DataReader DataReader; - typedef DDS_Typed_Entity::DataWriter DataWriter; -}; - -module ::I2C_Typed < ::ShapeType, ::ShapeTypeSeq> I2C_Shapes; - -#endif /* #ifndef I2C_SHAPE_TYPE_IDL_ - */ - - diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc deleted file mode 100644 index e1db7db6f9a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc +++ /dev/null @@ -1,81 +0,0 @@ -project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds_idltocpp_stub { - after += DDS4CCM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=I2C_ShapeType_stub_export.h \ - -I.. - idlflags -= -Gcn -Gxhcn - IDL_Files { - I2C_ShapeType.idl - } -} - -project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_idltocpp_stub { - custom_only = 1 - after += I2C_ShapeType_idl_gen - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=I2C_ShapeType_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - I2C_ShapeTypeE.idl - } -} - -project(I2C_ShapeType_lem_stub) : ndds_idltocpp_lem_stub { - after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub I2C_ShapeType_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_ShapeType_lem_stub - dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - I2C_ShapeTypeEC.cpp - } - - Header_Files { - I2C_ShapeTypeEC.h - I2C_ShapeType_lem_stub_export.h - } - - Inline_Files { - I2C_ShapeTypeEC.inl - } -} - -project(I2C_ShapeType_stub) : ndds_idltocpp_stub { - after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_ShapeType_stub - dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL - - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - I2C_ShapeTypeC.cpp - } - - Header_Files { - I2C_ShapeTypeC.h - I2C_ShapeType_stub_export.h - I2C_Shapes_Traits.h - } - - Inline_Files { - I2C_ShapeTypeC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl deleted file mode 100644 index 1e7cd3a5555..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file I2C_Shapes_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef I2C_SHAPES_BASE_IDL -#define I2C_SHAPES_BASE_IDL - -struct ShapeType { - string color; //@key - long x; - long y; - long shapesize; -}; - -struct Attributes { - string shape; //@key - string color; //@key - float speed; -}; -typedef sequence ShapeTypeSeq; - -#endif /* I2C_SHAPES_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc deleted file mode 100644 index 4396c262684..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc +++ /dev/null @@ -1,22 +0,0 @@ -project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_idltocpp_ts_defaults { - sharedname = I2C_Shapes_Base_stub - dynamicflags += SHAPES_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \ - -Wb,stub_export_include=Shapes_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - I2C_Shapes_Base.idl - } - - DDSGenerator_Files { - I2C_Shapes_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h deleted file mode 100644 index 14afeadd3c1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h +++ /dev/null @@ -1,21 +0,0 @@ -// -*- C++ -*- -#ifndef I2C_SHAPES_TRAITS_H_ -#define I2C_SHAPES_TRAITS_H_ - -#include "Base/I2C_Shapes_BaseSupport.h" -#include "Base/I2C_ShapeTypeC.h" - -struct ShapeType_DDS_Traits -{ - typedef ::ShapeType value_type; - typedef ::ShapeTypeRTISeq dds_seq_type; - typedef ::ShapeTypeTypeSupport type_support; - typedef ::DDS_SampleInfoSeq sampleinfo_seq_type; - typedef ::DDS_SampleInfo sampleinfo_type; - typedef ::ShapeTypeDataWriter datawriter_type; - typedef ::ShapeTypeDataReader datareader_type; - typedef ::I2C_Shapes::DataWriter typed_writer_type; - typedef ::I2C_Shapes::DataReader typed_reader_type; -}; - -#endif /* I2C_SHAPES_TRAITS_H_ */ diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp deleted file mode 100644 index 14bc5aadd30..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "I2C_Shapes_Common.h" - -#include "ace/Env_Value_T.h" - -#include "connectors/dds4ccm/impl/ndds/DomainParticipant.h" -#include "connectors/dds4ccm/impl/logger/Log_Macros.h" - -#define TOPIC_NAME "Square" - -I2C_Shapes_Common::I2C_Shapes_Common (void) - : factory_ (0) -{ - ACE_Env_Value trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0); - if (trace) - { - DDS4CCM_ENABLE_TRACE (); - } - else - { - DDS4CCM_DISABLE_TRACE (); - } - -} - -I2C_Shapes_Common::~I2C_Shapes_Common (void) -{ - delete this->factory_; -} - -int -I2C_Shapes_Common::get_domain_id (void) -{ - int domain_id = 0; - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); - return id; -} - -void -I2C_Shapes_Common::initialize (void) -{ - this->participant_ = this->participant_factory_.create_participant_with_profile ( - this->get_domain_id (), - QOS_PROFILE, - ::DDS::DomainParticipantListener::_nil (), - 0); - - ::CIAO::NDDS::DDS_DomainParticipant_i *part = - dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (this->participant_.in ()); - if (!part) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "I2C_Shapes_Common::initialize - Unable to cast the " - "DomainParticipant proxy to its internal representation.\n")); - throw ::CORBA::INTERNAL (); - } - - ACE_NEW_THROW_EX (this->factory_, - dds_type_factory (), - ::CORBA::NO_MEMORY ()); - - const char* typesupport_name = ShapeType_DDS_Traits::type_support::get_type_name (); - - if (! ::CIAO::NDDS::DDS_TypeSupport_i::register_type (this->participant_, - typesupport_name, - this->factory_)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "I2C_Shapes_Common::initialize - Unable to register type factory\n")); - throw ::CORBA::INTERNAL (); - } - - ::DDS::ReturnCode_t retcode = ShapeType_DDS_Traits::type_support::register_type ( - part->get_rti_entity (), - typesupport_name); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "I2C_Shapes_Common::initialize - Unable to register type\n")); - throw ::CORBA::INTERNAL (); - } - this->topic_ = this->participant_->create_topic_with_profile (TOPIC_NAME, - typesupport_name, - QOS_PROFILE, - ::DDS::TopicListener::_nil (), - 0); - if (::CORBA::is_nil (this->topic_.in ())) - { - ACE_ERROR ((LM_ERROR, "I2C_Shapes_Common::initialize - " - "Topic seems to be nil\n")); - throw ::CORBA::INTERNAL (); - } -} - -::DDS::Topic_ptr -I2C_Shapes_Common::get_topic (void) -{ - return ::DDS::Topic::_duplicate (this->topic_.in ()); -} - -::DDS::Publisher_ptr -I2C_Shapes_Common::create_publisher (void) -{ - if (::CORBA::is_nil (participant_.in ())) - { - initialize(); - } - ::DDS::Publisher_var publisher = participant_->create_publisher_with_profile ( - QOS_PROFILE, - ::DDS::PublisherListener::_nil (), - 0); - return publisher._retn (); -} - -::DDS::Subscriber_ptr -I2C_Shapes_Common::create_subscriber (void) -{ - if (::CORBA::is_nil (participant_.in ())) - { - initialize(); - } - ::DDS::Subscriber_var subscriber = participant_->create_subscriber_with_profile ( - QOS_PROFILE, - ::DDS::SubscriberListener::_nil (), - 0); - return subscriber._retn (); -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h deleted file mode 100644 index 9e42f379a6a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef I2C_SHAPES_COMMON_H_ -#define I2C_SHAPES_COMMON_H_ - -#include "I2C_Shapes_Common_export.h" -#include "connectors/dds4ccm/impl/ndds/DomainParticipant.h" -#include "connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h" -#include "connectors/dds4ccm/impl/ndds/TypeSupport.h" -#include "Base/I2C_Shapes_Traits.h" - -/** - * Pulse generator - */ - -#define QOS_PROFILE "Shapes_Library#ShapesProfile" - -class I2C_SHAPES_Export I2C_Shapes_Common -{ -public: - I2C_Shapes_Common (); - ~I2C_Shapes_Common (); - - //@{ - /** Public methods. */ - ::DDS::Publisher_ptr create_publisher (void); - ::DDS::Subscriber_ptr create_subscriber (void); - //@} - - //@{ - /** Getters. */ - ::DDS::Topic_ptr get_topic (void); - //@} - -private: - typedef ::CIAO::NDDS::DDS_TypeFactory_T dds_type_factory; - - //@{ - /** Members. */ - ::CIAO::NDDS::DDS_DomainParticipantFactory_i participant_factory_; - ::DDS::DomainParticipant_var participant_; - ::CIAO::NDDS::DDS_TypeFactory_i * factory_; - ::DDS::Topic_var topic_; - //@} - - //@{ - /** Private methods. */ - int get_domain_id (void); - void initialize (void); - //@} -}; - -#endif /* I2C_SHAPES_COMMON_H_ */ diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc deleted file mode 100644 index e7af95e6cf7..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc +++ /dev/null @@ -1,23 +0,0 @@ -project(I2C_Shapes_Common) : dds4ccm_logger, ndds_idltocpp_impl { - sharedname = I2C_Shapes_Common - dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL - - after += I2C_Shapes_Base_stub I2C_ShapeType_stub - libs += I2C_Shapes_Base_stub I2C_ShapeType_stub - - libout = ../lib - libpaths += ../lib - - requires += dds4ccm_ndds - - includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - - Header_Files { - I2C_Shapes_Common.h - I2C_Shapes_Common_export.h - } - - Source_Files { - I2C_Shapes_Common.cpp - } -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h deleted file mode 100644 index 259357cb5d0..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common_export.h +++ /dev/null @@ -1,35 +0,0 @@ -// -*- C++ -*- -// Definition for Win32 Export directives. -// ------------------------------ -#ifndef I2C_SHAPES_COMMON_EXPORT_H -#define I2C_SHAPES_COMMON_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (I2C_SHAPES_HAS_DLL) -# define I2C_SHAPES_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && I2C_SHAPES_HAS_DLL */ - -#if !defined (I2C_SHAPES_HAS_DLL) -# define I2C_SHAPES_HAS_DLL 1 -#endif /* ! I2C_SHAPES_HAS_DLL */ - -#if defined (I2C_SHAPES_HAS_DLL) && (I2C_SHAPES_HAS_DLL == 1) -# if defined (I2C_SHAPES_COMMON_BUILD_DLL) -# define I2C_SHAPES_Export ACE_Proper_Export_Flag -# define I2C_SHAPES_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* I2C_SHAPES_COMMON_BUILD_DLL */ -# define I2C_SHAPES_Export ACE_Proper_Import_Flag -# define I2C_SHAPES_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* I2C_SHAPES_COMMON_BUILD_DLL */ -#else /* I2C_SHAPES_HAS_DLL == 1 */ -# define I2C_SHAPES_Export -# define I2C_SHAPES_SINGLETON_DECLARATION(T) -# define I2C_SHAPES_COMMON_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* I2C_SHAPES_HAS_DLL == 1 */ - -#endif /* I2C_SHAPES_COMMON_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp deleted file mode 100644 index 3b15db7c2bc..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "Common/I2C_Shapes_Common.h" -#include "connectors/dds4ccm/impl/ndds/DataReader_T.h" - -#include "ace/OS_NS_unistd.h" - -typedef ::I2C_Shapes::DataReader TypedDataReader; - -void -read (TypedDataReader::_ptr_type shapes_dr) -{ - int samples_received = 0; - if (shapes_dr) - { - while (samples_received < 1000) - { - // Start to read - ShapeTypeSeq data; - ::DDS::SampleInfoSeq info; - ::DDS::ReturnCode_t retcode = shapes_dr->take ( - data, - info, - ::DDS::LENGTH_UNLIMITED, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::ANY_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE); - samples_received += data.length (); - if (retcode == ::DDS::RETCODE_OK) - { - for (::CORBA::ULong i = 0; i < data.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "read - " - "Received sample: x <%u> - y <%u>\n", - data[i].x, - data[i].y)); - } - } - else if (retcode != ::DDS::RETCODE_NO_DATA) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - " - "ERROR: Error during read\n")); - } - ACE_Time_Value tv (0, 50); - ACE_OS::sleep (tv); - } - ACE_DEBUG ((LM_DEBUG, "read - Ready\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "read- ERROR: DataReader seems to be nil\n")); - } -} - -int ACE_TMAIN (int , ACE_TCHAR *[]) -{ - int main_result = 0; - - I2C_Shapes_Common common; - - try - { - ::DDS::Subscriber_var subscriber; - subscriber = common.create_subscriber (); - if (::CORBA::is_nil (subscriber.in ())) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Subscriber seems to be nil\n")); - throw ::CORBA::INTERNAL (); - } - - ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile ( - topic.in (), - QOS_PROFILE, - ::DDS::DataReaderListener::_nil (), - 0); - - TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ()); - if (shapes_dr->enable () != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Unable to enable the datareader.\n")); - throw ::CORBA::INTERNAL (); - } - read (shapes_dr.in ()); - } - catch (::CORBA::Exception &e) - { - e._tao_print_exception ("ACE_TMAIN RECEIVER"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN RECEIVER - " - "Error: unexpected exception caught\n")); - } - - return main_result; -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc deleted file mode 100644 index 141295aa128..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc +++ /dev/null @@ -1,21 +0,0 @@ -project(*i2c_shapes_rec) : dds4ccm_logger, ndds_idltocpp_impl { - exename = I2C_Shapes_Receiver - after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common - - includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - - requires += dds4ccm_ndds - - libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub - libpaths += ../lib - - exeout += ../lib - - Source_Files { - I2C_Shapes_Receiver.cpp - } - - Header_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp deleted file mode 100644 index 9db989a3b61..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include "Common/I2C_Shapes_Common.h" -#include "connectors/dds4ccm/impl/ndds/DataWriter_T.h" - -#include "ace/OS_NS_unistd.h" - -#define MAX_X_Y 250 - -typedef ::I2C_Shapes::DataWriter TypedDataWriter; - -void -write (TypedDataWriter::_ptr_type shapes_dw) -{ - if (shapes_dw) - { - ShapeType square; - square.color = "GREEN"; - square.x = ACE_OS::rand () % MAX_X_Y; - square.y = ACE_OS::rand () % MAX_X_Y; - square.shapesize = 25; - bool x_increasing = true; - bool y_increasing = true; - for (::CORBA::ULong i = 0; i < 1000; ++i) - { - if (x_increasing) - { - ++square.x; - x_increasing = square.x + 1 <= MAX_X_Y; - } - else - { - --square.x; - x_increasing = square.x - 1 < 0; - } - if (y_increasing) - { - ++square.y; - y_increasing = square.y + 1 <= MAX_X_Y; - } - else - { - --square.y; - y_increasing = square.y - 1 < 0; - } - ::DDS::ReturnCode_t retcode = shapes_dw->write (square, ::DDS::HANDLE_NIL); - if (retcode == ::DDS::RETCODE_OK) - { - ACE_DEBUG ((LM_DEBUG, "Updated square - " - "x: <%u> - y: <%u>\n", - square.x, square.y)); - } - ACE_Time_Value tv (0, 500000); - ACE_OS::sleep (tv); - } - ACE_DEBUG ((LM_DEBUG, "write - Ready. Written 1000 samples.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "write - ERROR: DataWriter seems to be nil\n")); - } -} - -int ACE_TMAIN (int , ACE_TCHAR *[]) -{ - int main_result = 0; - I2C_Shapes_Common common; - try - { - ::DDS::Publisher_var publisher = common.create_publisher (); - if (::CORBA::is_nil (publisher.in ())) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Publisher seems to be nil\n")); - throw ::CORBA::INTERNAL (); - } - - ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataWriter_var dw = publisher->create_datawriter_with_profile ( - topic.in (), - QOS_PROFILE, - ::DDS::DataWriterListener::_nil (), - 0); - - TypedDataWriter::_var_type shapes_dw = TypedDataWriter::_narrow (dw.in ()); - if (shapes_dw->enable () != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Unable to enable the datawriter.\n")); - throw ::CORBA::INTERNAL (); - } - write (shapes_dw); - } - catch (::CORBA::Exception &e) - { - e._tao_print_exception ("ACE_TMAIN SENDER"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN SENDER - " - "Error: unexpected exception caught\n")); - } - - return main_result; -} - diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc deleted file mode 100644 index 4de969ba030..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc +++ /dev/null @@ -1,19 +0,0 @@ -project(*i2c_shapes_sender) : dds4ccm_logger, ndds_idltocpp_impl, ndds_cck_ts_defaults { - exename = I2C_Shapes_Sender - after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common - - includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - - exeout += ../lib - libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub - libpaths += ../lib - - requires += dds4ccm_ndds - - Source_Files { - I2C_Shapes_Sender.cpp - } - - Header_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 315cf33da4d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl deleted file mode 100755 index 84dce36ee0f..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/run_test.pl +++ /dev/null @@ -1,32 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_sender->AddLibPath ('../lib'); -$tg_receiver->AddLibPath ('../lib'); - - -print "Start receiver\n"; -$R = $tg_receiver->CreateProcess ("../lib/I2C_Shapes_Receiver", ""); -$R->Spawn(); - -sleep (1); - -print "Start sender\n"; -$S = $tg_sender->CreateProcess ("../lib/I2C_Shapes_Sender", ""); -$S->Spawn (); - - -sleep (80); - -$R->Kill (); -$S->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore deleted file mode 100644 index 434fd0a2d00..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Common.cxx -/Common.h -/CommonPlugin.cxx -/CommonPlugin.h -/CommonSupport.cxx -/CommonSupport.h -/Large_Deployment_Common_stub_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl deleted file mode 100644 index f1228b5852b..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef LARGE_COMMON_IDL -#define LARGE_COMMON_IDL - -#pragma ndds typesupport "Common/CommonSupport.h" -#pragma opendds typesupport "Common/CommonTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "LargeType" -#pragma DCPS_DATA_KEY "LargeType value" - -struct LargeType { - string value; //@key -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence LargeTypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc deleted file mode 100644 index 5cf821a62c1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc +++ /dev/null @@ -1,22 +0,0 @@ -project (Large_Deployment_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = Large_Deployment_stub - dynamicflags += LARGE_DEPLOYMENT_COMMON_STUB_BUILD_DLL - libout = ../lib - - idlflags += -Gxhst \ - -Wb,export_macro=LARGE_DEPLOYMENT_COMMON_STUB_Export \ - -Wb,export_include=Large_Deployment_Common_stub_export.h - - IDL_Files { - Common.idl - } - - opendds_ts_flags += --export=LARGE_DEPLOYMENT_COMMON_STUB_Export - - DDSGenerator_Files { - Common.idl - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl deleted file mode 100644 index 4d09d57664c..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef SINGLE_SERVICE_COMMON_IDL_ -#define SINGLE_SERVICE_COMMON_IDL_ - -#pragma ciao lem "Common/Single_Service_CommonE.idl" - -interface Simple_Service -{ - oneway void ping (); -}; - -#endif /* SINGLE_SERVICE_COMMON_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc deleted file mode 100644 index 199292d2aae..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc +++ /dev/null @@ -1,104 +0,0 @@ -project(Single_Service_Common_idl_gen) : taoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_STUB_Export \ - -Wb,stub_export_include=Single_Service_Common_stub_export.h \ - -Wb,skel_export_macro=SINGLE_SERVICE_COMMON_SKEL_Export \ - -Wb,skel_export_include=Single_Service_Common_skel_export.h \ - -Gxhst -Gxhsk -Gsv -Glem - - IDL_Files { - Single_Service_Common.idl - } -} - -project(Single_Service_Common_idl_lem_gen) : ciaoidldefaults { - after += Single_Service_Common_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_LEM_STUB_Export \ - -Wb,stub_export_include=Single_Service_Common_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Single_Service_CommonE.idl - } -} - -project(Single_Service_Common_lem_stub) : ccm_svnt { - after += Single_Service_Common_idl_lem_gen \ - Single_Service_Common_stub - libs += Single_Service_Common_stub - - libpaths += ../lib - libout = ../lib - - sharedname = Single_Service_Common_lem_stub - dynamicflags += SINGLE_SERVICE_COMMON_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_Service_CommonEC.cpp - } - - Header_Files { - Single_Service_CommonEC.h - Single_Service_Common_lem_stub_export.h - } - - Inline_Files { - Single_Service_CommonEC.inl - } -} - -project(Single_Service_Common_stub) : ccm_stub { - after += Single_Service_Common_idl_gen - - libpaths += ../lib - libout = ../lib - - sharedname = Single_Service_Common_stub - dynamicflags += SINGLE_SERVICE_COMMON_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_Service_CommonC.cpp - } - - Header_Files { - Single_Service_CommonC.h - Single_Service_Common_stub_export.h - } - - Inline_Files { - Single_Service_CommonC.inl - } -} - -project(Single_Service_Common_skel) : ccm_svnt { - after += Single_Service_Common_stub - libs += Single_Service_Common_stub - - libpaths += ../lib - libout = ../lib - - sharedname = Single_Service_Common_skel - dynamicflags += SINGLE_SERVICE_COMMON_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_Service_CommonS.cpp - } - - Header_Files { - Single_Service_CommonS.h - Single_Service_Common_skel_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore deleted file mode 100644 index 852b25767b6..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/LARGE_Connector_conn_export.h -/Large_ConnectorE.idl -/Large_Connector_conn.cpp -/Large_Connector_conn.h -/Large_Connector_exec_export.h -/Large_Connector_lem_stub_export.h -/Large_Connector_stub_export.h -/Large_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl deleted file mode 100644 index 5ebdec65340..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef LARGE_CONNECTOR_IDL -#define LARGE_CONNECTOR_IDL - -#include -#include - -#include "Common/Common.idl" - -#pragma ciao lem "Connector/Large_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Common/CommonTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::LargeType, ::LargeTypeSeq> LargeTypeConn; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc deleted file mode 100644 index 9579a4fe6dc..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large Large_Connector" - -project(Large_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Large_Deployment_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Large_Connector_stub_export.h \ - -Wb,skel_export_macro=LARGE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Large_Connector_svnt_export.h \ - -Wb,exec_export_macro=LARGE_CONNECTOR_EXEC_Export \ - -Wb,exec_export_include=Large_Connector_exec_export.h \ - -Wb,conn_export_macro=LARGE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LARGE_Connector_conn_export.h \ - -Gxhex -Gxhsk -Gxhst -I.. - - IDL_Files { - Large_Connector.idl - } -} - -project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base { - after += Large_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Large_Connector_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Large_ConnectorE.idl - } -} - -project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Large_Connector_lem_gen Large_Connector_stub Large_Deployment_stub - libs += Large_Connector_stub Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Large_Connector_lem_stub - dynamicflags += LARGE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Large_ConnectorEC.cpp - } - - Header_Files { - Large_ConnectorEC.h - Large_Connector_lem_stub_export.h - } - - Inline_Files { - Large_ConnectorEC.inl - } -} - -project(Large_Connector_stub) : ccm_stub, dds4ccm_base { - after += Large_Connector_idl_gen Large_Deployment_stub - libs += Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Large_Connector_stub - dynamicflags += LARGE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Large_ConnectorC.cpp - } - - Header_Files { - Large_ConnectorC.h - Large_Connector_stub_export.h - } - - Inline_Files { - Large_ConnectorC.inl - } -} - -project(Large_Connector_exec) : ciao_executor, dds4ccm_impl { - after += Large_Connector_lem_stub Large_Connector_stub - sharedname = Large_Connector_exec - libs += Large_Connector_stub Large_Connector_lem_stub Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LARGE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Large_Connector_conn.cpp - } - - Header_Files { - Large_Connector_conn.h - Large_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(Large_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Large_Connector_lem_stub Large_Connector_exec Large_Connector_stub - sharedname = Large_Connector_svnt - libs += Large_Connector_stub Large_Connector_lem_stub Large_Connector_exec Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LARGE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Large_ConnectorS.cpp - Large_Connector_svnt.cpp - } - - Header_Files { - Large_ConnectorS.h - Large_Connector_svnt.h - Large_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore deleted file mode 100644 index 259c7437324..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/DDS_PubE.idl -/DDS_Pub_exec_export.h -/DDS_Pub_lem_stub_export.h -/DDS_Pub_stub_export.h -/DDS_Pub_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl deleted file mode 100644 index 2d9312de929..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.idl +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef DDS_PUB_IDL -#define DDS_PUB_IDL - -#include "Common/Single_Service_Common.idl" -#include "Connector/Large_Connector.idl" - -component DDS_Pub -{ - port LargeTypeConn::DDS_Write info; - uses Simple_Service ping_one; - uses Simple_Service ping_two; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc deleted file mode 100644 index df88edcce88..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Pub" - -project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += Large_Deployment_stub - idlflags += -Wb,stub_export_macro=DDS_PUB_STUB_Export \ - -Wb,stub_export_include=DDS_Pub_stub_export.h \ - -Wb,skel_export_macro=DDS_PUB_SVNT_Export \ - -Wb,skel_export_include=DDS_Pub_svnt_export.h \ - -Wb,exec_export_macro=DDS_PUB_EXEC_Export \ - -Wb,exec_export_include=DDS_Pub_exec_export.h \ - -Gxhex -Gxhsk -Gxhst -I.. - - IDL_Files { - DDS_Pub.idl - } -} - -project(Large_DDS_Pub_lem_gen) : ciaoidldefaults, dds4ccm { - after += Large_DDS_Pub_idl_gen Large_Connector_idl_gen \ - Single_Service_Common_lem_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=DDS_PUB_LEM_STUB_Export \ - -Wb,stub_export_include=DDS_Pub_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - DDS_PubE.idl - } -} - -project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base { - after += Large_DDS_Pub_lem_gen Large_DDS_Pub_stub Large_Deployment_stub - libs += DDS_Pub_stub Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Pub_lem_stub - dynamicflags += DDS_PUB_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_PubEC.cpp - } - - Header_Files { - DDS_PubEC.h - DDS_Pub_lem_stub_export.h - } - - Inline_Files { - DDS_PubEC.inl - } -} - -project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base { - after += Large_DDS_Pub_idl_gen Large_Deployment_stub Single_Service_Common_stub - libs += Large_Deployment_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Pub_stub - dynamicflags += DDS_PUB_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_PubC.cpp - } - - Header_Files { - DDS_PubC.h - DDS_Pub_stub_export.h - } - - Inline_Files { - DDS_PubC.inl - } -} - -project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_lem_stub { - after += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub - sharedname = DDS_Pub_exec - libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DDS_PUB_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_Pub_exec.cpp - } - - Header_Files { - DDS_Pub_exec.h - DDS_Pub_exec_export.h - } - - Inline_Files { - } -} - - -project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base { - after += Large_DDS_Pub_lem_stub Large_Connector_stub Single_Service_Common_stub - sharedname = DDS_Pub_svnt - libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Single_Service_Common_stub - libs += Large_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DDS_PUB_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_PubS.cpp - DDS_Pub_svnt.cpp - } - - Header_Files { - DDS_PubS.h - DDS_Pub_svnt.h - DDS_Pub_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp deleted file mode 100644 index 4371b10e038..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- -#include "DDS_Pub_exec.h" - -namespace CIAO_DDS_Pub_Impl -{ - //============================================================ - // Component Executor Implementation Class: DDS_Pub_exec_i - //============================================================ - - DDS_Pub_exec_i::DDS_Pub_exec_i (void) - { - } - - DDS_Pub_exec_i::~DDS_Pub_exec_i (void) - { - } - - // Operations from Components::SessionComponent. - - void - DDS_Pub_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CCM_DDS_Pub_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - DDS_Pub_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - DDS_Pub_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - DDS_Pub_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - DDS_Pub_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DDS_Pub_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - DDS_Pub_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h deleted file mode 100644 index a73f16144fe..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_DDS_PUB_EXEC_MKL1YH_H_ -#define CIAO_DDS_PUB_EXEC_MKL1YH_H_ - -#include /**/ "ace/pre.h" - -#include "DDS_PubEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "DDS_Pub_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_DDS_Pub_Impl -{ - class DDS_PUB_EXEC_Export DDS_Pub_exec_i - : public virtual DDS_Pub_Exec, - public virtual ::CORBA::LocalObject - { - public: - DDS_Pub_exec_i (void); - virtual ~DDS_Pub_exec_i (void); - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - - private: - ::CCM_DDS_Pub_Context_var context_; - }; - - extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DDS_Pub_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore deleted file mode 100644 index dc9f40e4d41..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/DDS_SubE.idl -/DDS_Sub_exec_export.h -/DDS_Sub_lem_stub_export.h -/DDS_Sub_stub_export.h -/DDS_Sub_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl deleted file mode 100644 index ca811ce932a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef DDS_SUB_IDL -#define DDS_SUB_IDL - -#include "Common/Single_Service_Common.idl" -#include "Connector/Large_Connector.idl" - -component DDS_Sub -{ - port LargeTypeConn::DDS_Listen info_in; - port LargeTypeConn::DDS_Get ingo_get; - uses Simple_Service ping_port; -}; -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc deleted file mode 100644 index 7a5cb320bb1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc +++ /dev/null @@ -1,136 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large DDS_Sub" - -project(Large_DDS_Sub_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += Large_Deployment_stub - idlflags += -Wb,stub_export_macro=DDS_SUB_STUB_Export \ - -Wb,stub_export_include=DDS_Sub_stub_export.h \ - -Wb,skel_export_macro=DDS_SUB_SVNT_Export \ - -Wb,skel_export_include=DDS_Sub_svnt_export.h \ - -Wb,exec_export_macro=DDS_SUB_EXEC_Export \ - -Wb,exec_export_include=DDS_Sub_exec_export.h \ - -Gxhex -Gxhsk -Gxhst -I.. - - IDL_Files { - DDS_Sub.idl - } -} - -project(Large_DDS_Sub_lem_gen) : ciaoidldefaults, dds4ccm { - after += Large_DDS_Sub_idl_gen Large_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=DDS_SUB_LEM_STUB_Export \ - -Wb,stub_export_include=DDS_Sub_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - DDS_SubE.idl - } -} - -project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base { - after += Large_DDS_Sub_lem_gen Large_DDS_Sub_stub Large_Deployment_stub - libs += DDS_Sub_stub Large_Deployment_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Sub_lem_stub - dynamicflags += DDS_SUB_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_SubEC.cpp - } - - Header_Files { - DDS_SubEC.h - DDS_Sub_lem_stub_export.h - } - - Inline_Files { - DDS_SubEC.inl - } -} - -project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base { - after += Large_DDS_Sub_idl_gen Large_Deployment_stub Single_Service_Common_stub - libs += Large_Deployment_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Sub_stub - dynamicflags += DDS_SUB_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_SubC.cpp - } - - Header_Files { - DDS_SubC.h - DDS_Sub_stub_export.h - } - - Inline_Files { - DDS_SubC.inl - } -} - -project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_lem_stub { - after += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub - sharedname = DDS_Sub_exec - libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DDS_SUB_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_Sub_exec.cpp - } - - Header_Files { - DDS_Sub_exec.h - DDS_Sub_exec_export.h - } - - Inline_Files { - } -} - - -project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base { - after += Large_DDS_Sub_lem_stub Large_Connector_stub Single_Service_Common_stub - sharedname = DDS_Sub_svnt - libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DDS_SUB_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DDS_SubS.cpp - DDS_Sub_svnt.cpp - } - - Header_Files { - DDS_SubS.h - DDS_Sub_svnt.h - DDS_Sub_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp deleted file mode 100644 index ae7b567ead4..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp +++ /dev/null @@ -1,180 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1277 - -#include "DDS_Sub_exec.h" - -namespace CIAO_DDS_Sub_Impl -{ - //============================================================ - // Facet Executor Implementation Class: Listener_exec_i - //============================================================ - - Listener_exec_i::Listener_exec_i (void) - { - } - - Listener_exec_i::~Listener_exec_i (void) - { - } - - // Operations from ::LargeTypeConn::Listener - - void - Listener_exec_i::on_one_data ( - const ::LargeType & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - void - Listener_exec_i::on_many_data ( - const ::LargeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - //============================================================ - // Facet Executor Implementation Class: PortStatusListener_exec_i - //============================================================ - - PortStatusListener_exec_i::PortStatusListener_exec_i (void) - { - } - - PortStatusListener_exec_i::~PortStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - PortStatusListener_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - PortStatusListener_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - //============================================================ - // Component Executor Implementation Class: DDS_Sub_exec_i - //============================================================ - - DDS_Sub_exec_i::DDS_Sub_exec_i (void) - { - } - - DDS_Sub_exec_i::~DDS_Sub_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::LargeTypeConn::CCM_Listener_ptr - DDS_Sub_exec_i::get_info_in_data_listener (void) - { - /* Your code here. */ - return ::LargeTypeConn::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - DDS_Sub_exec_i::get_info_in_status (void) - { - /* Your code here. */ - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - DDS_Sub_exec_i::get_ingo_get_status (void) - { - /* Your code here. */ - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - - void - DDS_Sub_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CCM_DDS_Sub_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - DDS_Sub_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - DDS_Sub_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - DDS_Sub_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - DDS_Sub_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" DDS_SUB_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DDS_Sub_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - DDS_Sub_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h deleted file mode 100644 index 61cea1dcd92..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h +++ /dev/null @@ -1,158 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.7 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1216 - -#ifndef CIAO_DDS_SUB_EXEC_NW9STU_H_ -#define CIAO_DDS_SUB_EXEC_NW9STU_H_ - -#include /**/ "ace/pre.h" - -#include "DDS_SubEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "DDS_Sub_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_DDS_Sub_Impl -{ - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - - class DDS_SUB_EXEC_Export Listener_exec_i - : public virtual ::LargeTypeConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - Listener_exec_i (void); - virtual ~Listener_exec_i (void); - - // Operations and attributes from LargeTypeConn::Listener - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:37 - - virtual void - on_one_data ( - const ::LargeType & datum, - const ::CCM_DDS::ReadInfo & info) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:37 - - virtual void - on_many_data ( - const ::LargeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos) = 0; - }; - - // TAO_IDL - Generated from - // be/be_visitor_component/facet_exh.cpp:53 - - class DDS_SUB_EXEC_Export PortStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - PortStatusListener_exec_i (void); - virtual ~PortStatusListener_exec_i (void); - - // Operations and attributes from CCM_DDS::PortStatusListener - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:37 - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:37 - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status) = 0; - }; - - class DDS_SUB_EXEC_Export DDS_Sub_exec_i - : public virtual DDS_Sub_Exec, - public virtual ::CORBA::LocalObject - { - public: - DDS_Sub_exec_i (void); - virtual ~DDS_Sub_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - - virtual ::LargeTypeConn::CCM_Listener_ptr - get_info_in_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_in_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_ingo_get_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - - private: - ::CCM_DDS_Sub_Context_var context_; - }; - - extern "C" DDS_SUB_EXEC_Export ::Components::EnterpriseComponent_ptr - create_DDS_Sub_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore deleted file mode 100644 index ac427c54200..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Single_ServiceE.idl -/Single_Service_exec_export.h -/Single_Service_lem_stub_export.h -/Single_Service_stub_export.h -/Single_Service_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl deleted file mode 100644 index 9fde2b41c5d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.idl +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef SINGLE_SERVICE_IDL -#define SINGLE_SERVICE_IDL - -#include -#include "Common/Single_Service_Common.idl" - -component Single_Service -{ - provides Simple_Service ping_port; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc deleted file mode 100644 index 8292e9267b5..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -o ../lib -l ../lib Single_Service" - -project(Single_Service_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_STUB_Export \ - -Wb,stub_export_include=Single_Service_stub_export.h \ - -Wb,skel_export_macro=SINGLE_SERVICE_SVNT_Export \ - -Wb,skel_export_include=Single_Service_svnt_export.h \ - -Wb,exec_export_macro=SINGLE_SERVICE_EXEC_Export \ - -Wb,exec_export_include=Single_Service_exec_export.h \ - -Gxhex -Gxhsk -Gxhst -I.. -Gex - - IDL_Files { - Single_Service.idl - } -} - -project(Single_Service_lem_gen) : ciaoidldefaults { - after += Single_Service_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_LEM_STUB_Export \ - -Wb,stub_export_include=Single_Service_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Single_ServiceE.idl - } -} - -project(Single_Service_lem_stub) : ccm_svnt { - after += Single_Service_lem_gen Single_Service_stub Single_Service_Common_stub - libs += Single_Service_stub Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Single_Service_lem_stub - dynamicflags += SINGLE_SERVICE_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_ServiceEC.cpp - } - - Header_Files { - Single_ServiceEC.h - Single_Service_lem_stub_export.h - } - - Inline_Files { - Single_ServiceEC.inl - } -} - -project(Single_Service_stub) : ccm_stub { - after += Single_Service_idl_gen Single_Service_Common_stub - libs += Single_Service_Common_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Single_Service_stub - dynamicflags += SINGLE_SERVICE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_ServiceC.cpp - } - - Header_Files { - Single_ServiceC.h - Single_Service_stub_export.h - } - - Inline_Files { - Single_ServiceC.inl - } -} - -project(Single_Service_exec) : ciao_executor { - after += Single_Service_lem_stub \ - Single_Service_stub \ - Single_Service_Common_stub \ - Single_Service_Common_lem_stub - sharedname = Single_Service_exec - libs += Single_Service_stub \ - Single_Service_lem_stub \ - Single_Service_Common_stub \ - Single_Service_Common_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SINGLE_SERVICE_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_Service_exec.cpp - } - - Header_Files { - Single_Service_exec.h - Single_Service_exec_export.h - } - - Inline_Files { - } -} - - -project(Single_Service_svnt) : ciao_servant { - after += Single_Service_lem_stub \ - Single_Service_Common_skel \ - Single_Service_Common_stub \ - Single_Service_Common_lem_stub - sharedname = Single_Service_svnt - libs += Single_Service_stub \ - Single_Service_lem_stub \ - Single_Service_Common_skel \ - Single_Service_Common_stub \ - Single_Service_Common_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SINGLE_SERVICE_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Single_ServiceS.cpp - Single_Service_svnt.cpp - } - - Header_Files { - Single_ServiceS.h - Single_Service_svnt.h - Single_Service_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp deleted file mode 100644 index bde3c3fef10..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/LargePlan.cdp +++ /dev/null @@ -1,90685 +0,0 @@ - - - - Large_Plan - - - Large_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LargeTypeConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LargeTypeConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Large_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Large_Connector_exec - - - - - - Single_ServiceComponentImplementation - - - - - - component factory - - - tk_string - - - create_Single_Service_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Single_Service_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Single_Service_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Single_Service_exec - - - - - - DDS_PubComponentImplementation - - - - - - component factory - - - tk_string - - - create_DDS_Pub_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_DDS_Pub_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Pub_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Pub_exec - - - - - - DDS_SubComponentImplementation - - - - - - component factory - - - tk_string - - - create_DDS_Sub_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_DDS_Sub_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Sub_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Sub_exec - - - - - - Pub_Node_0_0_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_0_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_0_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_0_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_195 - - - - - - - - - Pub_Node_0_0_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_0_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_0_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_0_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_195 - - - - - - - - - Sub_Node_0_0_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_0_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_0_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_0_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_171 - - - - - - - - - Sub_Node_0_0_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_0_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_0_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_0_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Pub_Node_0_1_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_1_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_1_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_1_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_66 - - - - - - - - - Pub_Node_0_1_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_1_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_1_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_1_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_14 - - - - - - - - - Sub_Node_0_1_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_1_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_1_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_1_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_71 - - - - - - - - - Sub_Node_0_1_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_1_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_1_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_1_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_159 - - - - - - - - - Pub_Node_0_2_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_2_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_2_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_2_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Pub_Node_0_2_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_2_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_2_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_2_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_102 - - - - - - - - - Sub_Node_0_2_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_2_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_2_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_2_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Sub_Node_0_2_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_2_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_2_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_2_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_95 - - - - - - - - - Pub_Node_0_3_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_3_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_3_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_3_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Pub_Node_0_3_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_3_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_3_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_3_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Sub_Node_0_3_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_3_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_3_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_3_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_41 - - - - - - - - - Sub_Node_0_3_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_3_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_3_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_3_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Pub_Node_0_4_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_4_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_4_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_4_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_123 - - - - - - - - - Pub_Node_0_4_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_4_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_4_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_4_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_0_4_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_4_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_4_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_4_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_141 - - - - - - - - - Sub_Node_0_4_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_4_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_4_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_4_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Pub_Node_0_5_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_5_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_5_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_5_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Pub_Node_0_5_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_5_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_5_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_5_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_169 - - - - - - - - - Sub_Node_0_5_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_5_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_5_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_5_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_75 - - - - - - - - - Sub_Node_0_5_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_5_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_5_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_5_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_91 - - - - - - - - - Pub_Node_0_6_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_6_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_6_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_6_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Pub_Node_0_6_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_6_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_6_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_6_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_74 - - - - - - - - - Sub_Node_0_6_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_6_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_6_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_6_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_46 - - - - - - - - - Sub_Node_0_6_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_6_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_6_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_6_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_123 - - - - - - - - - Pub_Node_0_7_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_7_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_7_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_7_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_198 - - - - - - - - - Pub_Node_0_7_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_7_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_7_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_7_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Sub_Node_0_7_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_7_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_7_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_7_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_17 - - - - - - - - - Sub_Node_0_7_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_7_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_7_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_7_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_61 - - - - - - - - - Pub_Node_0_8_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_8_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_8_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_8_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_166 - - - - - - - - - Pub_Node_0_8_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_8_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_8_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_8_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_170 - - - - - - - - - Sub_Node_0_8_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_8_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_8_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_8_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_38 - - - - - - - - - Sub_Node_0_8_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_8_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_8_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_8_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Pub_Node_0_9_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_9_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_9_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_9_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_233 - - - - - - - - - Pub_Node_0_9_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_9_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_9_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_9_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Sub_Node_0_9_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_9_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_9_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_9_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_0_9_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_9_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_9_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_9_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_92 - - - - - - - - - Pub_Node_0_10_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_10_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_10_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_10_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_161 - - - - - - - - - Pub_Node_0_10_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_10_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_10_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_10_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Sub_Node_0_10_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_10_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_10_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_10_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_27 - - - - - - - - - Sub_Node_0_10_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_10_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_10_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_10_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Pub_Node_0_11_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_11_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_11_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_11_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_219 - - - - - - - - - Pub_Node_0_11_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_11_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_11_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_11_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_0_11_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_11_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_11_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_11_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_153 - - - - - - - - - Sub_Node_0_11_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_11_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_11_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_11_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_185 - - - - - - - - - Pub_Node_0_12_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_12_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_12_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_12_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_67 - - - - - - - - - Pub_Node_0_12_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_12_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_12_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_12_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_148 - - - - - - - - - Sub_Node_0_12_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_12_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_12_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_12_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_163 - - - - - - - - - Sub_Node_0_12_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_12_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_12_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_12_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_179 - - - - - - - - - Pub_Node_0_13_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_13_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_13_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_13_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_20 - - - - - - - - - Pub_Node_0_13_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_13_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_13_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_13_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_210 - - - - - - - - - Sub_Node_0_13_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_13_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_13_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_13_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Sub_Node_0_13_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_13_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_13_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_13_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_100 - - - - - - - - - Pub_Node_0_14_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_14_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_14_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_14_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Pub_Node_0_14_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_14_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_14_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_14_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_169 - - - - - - - - - Sub_Node_0_14_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_14_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_14_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_14_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_11 - - - - - - - - - Sub_Node_0_14_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_14_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_14_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_14_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_166 - - - - - - - - - Pub_Node_0_15_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_15_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_15_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_15_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_87 - - - - - - - - - Pub_Node_0_15_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_15_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_15_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_15_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_93 - - - - - - - - - Sub_Node_0_15_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_15_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_15_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_15_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_87 - - - - - - - - - Sub_Node_0_15_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_15_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_15_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_15_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_143 - - - - - - - - - Pub_Node_0_16_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_16_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_16_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_16_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_179 - - - - - - - - - Pub_Node_0_16_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_16_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_16_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_16_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Sub_Node_0_16_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_16_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_16_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_16_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_119 - - - - - - - - - Sub_Node_0_16_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_16_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_16_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_16_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_0_17_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_17_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_17_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_17_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_159 - - - - - - - - - Pub_Node_0_17_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_17_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_17_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_17_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Sub_Node_0_17_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_17_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_17_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_17_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Sub_Node_0_17_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_17_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_17_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_17_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_185 - - - - - - - - - Pub_Node_0_18_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_18_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_18_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_18_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Pub_Node_0_18_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_18_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_18_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_18_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_120 - - - - - - - - - Sub_Node_0_18_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_18_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_18_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_18_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_75 - - - - - - - - - Sub_Node_0_18_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_18_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_18_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_18_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_213 - - - - - - - - - Pub_Node_0_19_0_Component - Node_0 - - - - - - - - - - Pub_Node_0_19_0__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_19_0__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_19_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_39 - - - - - - - - - Pub_Node_0_19_1_Component - Node_0 - - - - - - - - - - Pub_Node_0_19_1__prov1Component - Node_0 - - - - - - - - - - Pub_Node_0_19_1__prov2Component - Node_0 - - - - - - - - - - Pub_Node_0_19_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_14 - - - - - - - - - Sub_Node_0_19_0_Component - Node_0 - - - - - - - - - - Sub_Node_0_19_0__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_19_0__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_19_0_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_106 - - - - - - - - - Sub_Node_0_19_1_Component - Node_0 - - - - - - - - - - Sub_Node_0_19_1__prov1Component - Node_0 - - - - - - - - - - Sub_Node_0_19_1__prov2Component - Node_0 - - - - - - - - - - Sub_Node_0_19_1_DDSConnectorComponent - Node_0 - - - - - - topic_name - - - tk_string - - - Topic_18 - - - - - - - - - Pub_Node_1_0_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_0_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_0_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_0_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_38 - - - - - - - - - Pub_Node_1_0_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_0_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_0_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_0_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_159 - - - - - - - - - Sub_Node_1_0_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_0_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_0_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_0_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Sub_Node_1_0_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_0_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_0_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_0_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_74 - - - - - - - - - Pub_Node_1_1_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_1_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_1_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_1_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_1_1_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_1_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_1_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_1_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_146 - - - - - - - - - Sub_Node_1_1_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_1_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_1_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_1_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_69 - - - - - - - - - Sub_Node_1_1_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_1_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_1_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_1_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_116 - - - - - - - - - Pub_Node_1_2_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_2_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_2_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_2_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Pub_Node_1_2_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_2_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_2_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_2_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_238 - - - - - - - - - Sub_Node_1_2_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_2_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_2_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_2_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_44 - - - - - - - - - Sub_Node_1_2_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_2_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_2_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_2_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_49 - - - - - - - - - Pub_Node_1_3_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_3_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_3_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_3_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_10 - - - - - - - - - Pub_Node_1_3_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_3_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_3_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_3_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_190 - - - - - - - - - Sub_Node_1_3_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_3_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_3_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_3_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_120 - - - - - - - - - Sub_Node_1_3_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_3_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_3_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_3_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_1_4_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_4_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_4_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_4_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_149 - - - - - - - - - Pub_Node_1_4_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_4_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_4_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_4_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_36 - - - - - - - - - Sub_Node_1_4_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_4_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_4_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_4_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_174 - - - - - - - - - Sub_Node_1_4_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_4_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_4_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_4_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Pub_Node_1_5_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_5_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_5_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_5_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_111 - - - - - - - - - Pub_Node_1_5_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_5_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_5_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_5_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Sub_Node_1_5_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_5_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_5_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_5_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_172 - - - - - - - - - Sub_Node_1_5_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_5_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_5_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_5_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Pub_Node_1_6_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_6_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_6_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_6_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_38 - - - - - - - - - Pub_Node_1_6_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_6_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_6_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_6_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_210 - - - - - - - - - Sub_Node_1_6_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_6_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_6_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_6_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Sub_Node_1_6_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_6_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_6_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_6_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Pub_Node_1_7_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_7_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_7_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_7_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Pub_Node_1_7_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_7_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_7_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_7_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Sub_Node_1_7_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_7_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_7_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_7_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_18 - - - - - - - - - Sub_Node_1_7_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_7_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_7_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_7_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_2 - - - - - - - - - Pub_Node_1_8_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_8_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_8_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_8_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_126 - - - - - - - - - Pub_Node_1_8_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_8_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_8_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_8_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_30 - - - - - - - - - Sub_Node_1_8_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_8_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_8_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_8_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Sub_Node_1_8_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_8_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_8_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_8_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_178 - - - - - - - - - Pub_Node_1_9_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_9_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_9_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_9_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_183 - - - - - - - - - Pub_Node_1_9_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_9_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_9_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_9_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Sub_Node_1_9_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_9_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_9_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_9_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_247 - - - - - - - - - Sub_Node_1_9_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_9_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_9_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_9_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_101 - - - - - - - - - Pub_Node_1_10_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_10_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_10_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_10_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_51 - - - - - - - - - Pub_Node_1_10_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_10_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_10_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_10_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_144 - - - - - - - - - Sub_Node_1_10_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_10_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_10_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_10_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_55 - - - - - - - - - Sub_Node_1_10_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_10_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_10_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_10_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_96 - - - - - - - - - Pub_Node_1_11_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_11_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_11_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_11_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_203 - - - - - - - - - Pub_Node_1_11_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_11_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_11_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_11_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_238 - - - - - - - - - Sub_Node_1_11_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_11_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_11_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_11_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Sub_Node_1_11_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_11_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_11_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_11_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_217 - - - - - - - - - Pub_Node_1_12_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_12_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_12_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_12_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Pub_Node_1_12_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_12_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_12_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_12_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_169 - - - - - - - - - Sub_Node_1_12_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_12_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_12_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_12_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_15 - - - - - - - - - Sub_Node_1_12_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_12_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_12_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_12_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_87 - - - - - - - - - Pub_Node_1_13_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_13_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_13_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_13_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_29 - - - - - - - - - Pub_Node_1_13_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_13_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_13_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_13_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Sub_Node_1_13_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_13_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_13_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_13_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_28 - - - - - - - - - Sub_Node_1_13_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_13_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_13_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_13_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_171 - - - - - - - - - Pub_Node_1_14_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_14_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_14_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_14_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_81 - - - - - - - - - Pub_Node_1_14_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_14_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_14_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_14_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_60 - - - - - - - - - Sub_Node_1_14_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_14_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_14_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_14_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_54 - - - - - - - - - Sub_Node_1_14_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_14_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_14_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_14_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_80 - - - - - - - - - Pub_Node_1_15_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_15_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_15_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_15_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_208 - - - - - - - - - Pub_Node_1_15_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_15_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_15_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_15_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_48 - - - - - - - - - Sub_Node_1_15_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_15_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_15_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_15_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_122 - - - - - - - - - Sub_Node_1_15_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_15_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_15_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_15_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Pub_Node_1_16_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_16_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_16_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_16_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_98 - - - - - - - - - Pub_Node_1_16_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_16_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_16_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_16_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_12 - - - - - - - - - Sub_Node_1_16_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_16_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_16_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_16_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_117 - - - - - - - - - Sub_Node_1_16_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_16_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_16_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_16_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_247 - - - - - - - - - Pub_Node_1_17_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_17_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_17_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_17_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_181 - - - - - - - - - Pub_Node_1_17_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_17_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_17_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_17_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_19 - - - - - - - - - Sub_Node_1_17_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_17_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_17_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_17_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_62 - - - - - - - - - Sub_Node_1_17_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_17_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_17_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_17_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Pub_Node_1_18_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_18_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_18_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_18_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_199 - - - - - - - - - Pub_Node_1_18_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_18_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_18_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_18_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_192 - - - - - - - - - Sub_Node_1_18_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_18_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_18_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_18_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_92 - - - - - - - - - Sub_Node_1_18_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_18_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_18_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_18_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_36 - - - - - - - - - Pub_Node_1_19_0_Component - Node_1 - - - - - - - - - - Pub_Node_1_19_0__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_19_0__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_19_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_14 - - - - - - - - - Pub_Node_1_19_1_Component - Node_1 - - - - - - - - - - Pub_Node_1_19_1__prov1Component - Node_1 - - - - - - - - - - Pub_Node_1_19_1__prov2Component - Node_1 - - - - - - - - - - Pub_Node_1_19_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_16 - - - - - - - - - Sub_Node_1_19_0_Component - Node_1 - - - - - - - - - - Sub_Node_1_19_0__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_19_0__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_19_0_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_148 - - - - - - - - - Sub_Node_1_19_1_Component - Node_1 - - - - - - - - - - Sub_Node_1_19_1__prov1Component - Node_1 - - - - - - - - - - Sub_Node_1_19_1__prov2Component - Node_1 - - - - - - - - - - Sub_Node_1_19_1_DDSConnectorComponent - Node_1 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Pub_Node_2_0_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_0_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_0_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_0_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_31 - - - - - - - - - Pub_Node_2_0_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_0_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_0_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_0_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_85 - - - - - - - - - Sub_Node_2_0_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_0_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_0_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_0_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_134 - - - - - - - - - Sub_Node_2_0_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_0_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_0_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_0_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_138 - - - - - - - - - Pub_Node_2_1_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_1_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_1_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_1_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_40 - - - - - - - - - Pub_Node_2_1_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_1_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_1_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_1_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_202 - - - - - - - - - Sub_Node_2_1_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_1_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_1_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_1_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_131 - - - - - - - - - Sub_Node_2_1_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_1_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_1_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_1_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_123 - - - - - - - - - Pub_Node_2_2_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_2_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_2_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_2_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_193 - - - - - - - - - Pub_Node_2_2_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_2_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_2_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_2_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_147 - - - - - - - - - Sub_Node_2_2_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_2_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_2_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_2_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_142 - - - - - - - - - Sub_Node_2_2_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_2_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_2_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_2_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_215 - - - - - - - - - Pub_Node_2_3_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_3_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_3_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_3_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_143 - - - - - - - - - Pub_Node_2_3_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_3_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_3_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_3_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_5 - - - - - - - - - Sub_Node_2_3_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_3_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_3_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_3_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_157 - - - - - - - - - Sub_Node_2_3_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_3_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_3_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_3_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_240 - - - - - - - - - Pub_Node_2_4_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_4_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_4_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_4_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Pub_Node_2_4_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_4_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_4_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_4_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_59 - - - - - - - - - Sub_Node_2_4_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_4_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_4_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_4_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Sub_Node_2_4_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_4_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_4_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_4_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_123 - - - - - - - - - Pub_Node_2_5_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_5_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_5_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_5_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_45 - - - - - - - - - Pub_Node_2_5_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_5_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_5_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_5_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_174 - - - - - - - - - Sub_Node_2_5_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_5_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_5_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_5_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_0 - - - - - - - - - Sub_Node_2_5_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_5_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_5_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_5_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_6 - - - - - - - - - Pub_Node_2_6_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_6_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_6_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_6_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_87 - - - - - - - - - Pub_Node_2_6_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_6_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_6_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_6_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_249 - - - - - - - - - Sub_Node_2_6_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_6_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_6_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_6_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_0 - - - - - - - - - Sub_Node_2_6_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_6_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_6_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_6_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_206 - - - - - - - - - Pub_Node_2_7_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_7_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_7_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_7_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_2_7_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_7_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_7_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_7_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_216 - - - - - - - - - Sub_Node_2_7_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_7_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_7_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_7_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Sub_Node_2_7_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_7_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_7_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_7_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_51 - - - - - - - - - Pub_Node_2_8_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_8_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_8_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_8_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_102 - - - - - - - - - Pub_Node_2_8_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_8_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_8_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_8_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Sub_Node_2_8_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_8_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_8_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_8_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_10 - - - - - - - - - Sub_Node_2_8_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_8_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_8_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_8_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_194 - - - - - - - - - Pub_Node_2_9_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_9_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_9_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_9_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_123 - - - - - - - - - Pub_Node_2_9_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_9_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_9_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_9_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_159 - - - - - - - - - Sub_Node_2_9_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_9_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_9_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_9_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_153 - - - - - - - - - Sub_Node_2_9_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_9_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_9_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_9_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Pub_Node_2_10_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_10_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_10_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_10_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_61 - - - - - - - - - Pub_Node_2_10_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_10_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_10_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_10_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Sub_Node_2_10_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_10_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_10_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_10_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Sub_Node_2_10_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_10_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_10_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_10_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_15 - - - - - - - - - Pub_Node_2_11_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_11_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_11_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_11_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_135 - - - - - - - - - Pub_Node_2_11_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_11_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_11_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_11_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_2_11_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_11_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_11_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_11_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_2 - - - - - - - - - Sub_Node_2_11_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_11_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_11_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_11_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_90 - - - - - - - - - Pub_Node_2_12_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_12_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_12_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_12_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_246 - - - - - - - - - Pub_Node_2_12_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_12_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_12_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_12_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Sub_Node_2_12_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_12_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_12_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_12_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Sub_Node_2_12_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_12_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_12_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_12_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Pub_Node_2_13_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_13_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_13_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_13_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_44 - - - - - - - - - Pub_Node_2_13_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_13_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_13_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_13_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_161 - - - - - - - - - Sub_Node_2_13_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_13_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_13_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_13_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_144 - - - - - - - - - Sub_Node_2_13_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_13_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_13_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_13_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Pub_Node_2_14_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_14_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_14_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_14_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_181 - - - - - - - - - Pub_Node_2_14_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_14_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_14_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_14_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_50 - - - - - - - - - Sub_Node_2_14_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_14_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_14_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_14_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_74 - - - - - - - - - Sub_Node_2_14_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_14_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_14_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_14_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Pub_Node_2_15_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_15_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_15_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_15_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_218 - - - - - - - - - Pub_Node_2_15_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_15_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_15_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_15_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_63 - - - - - - - - - Sub_Node_2_15_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_15_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_15_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_15_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Sub_Node_2_15_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_15_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_15_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_15_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_227 - - - - - - - - - Pub_Node_2_16_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_16_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_16_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_16_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_105 - - - - - - - - - Pub_Node_2_16_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_16_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_16_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_16_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Sub_Node_2_16_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_16_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_16_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_16_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_205 - - - - - - - - - Sub_Node_2_16_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_16_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_16_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_16_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_145 - - - - - - - - - Pub_Node_2_17_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_17_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_17_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_17_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Pub_Node_2_17_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_17_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_17_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_17_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_239 - - - - - - - - - Sub_Node_2_17_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_17_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_17_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_17_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_19 - - - - - - - - - Sub_Node_2_17_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_17_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_17_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_17_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_106 - - - - - - - - - Pub_Node_2_18_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_18_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_18_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_18_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_214 - - - - - - - - - Pub_Node_2_18_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_18_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_18_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_18_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_184 - - - - - - - - - Sub_Node_2_18_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_18_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_18_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_18_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_233 - - - - - - - - - Sub_Node_2_18_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_18_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_18_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_18_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_152 - - - - - - - - - Pub_Node_2_19_0_Component - Node_2 - - - - - - - - - - Pub_Node_2_19_0__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_19_0__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_19_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_113 - - - - - - - - - Pub_Node_2_19_1_Component - Node_2 - - - - - - - - - - Pub_Node_2_19_1__prov1Component - Node_2 - - - - - - - - - - Pub_Node_2_19_1__prov2Component - Node_2 - - - - - - - - - - Pub_Node_2_19_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Sub_Node_2_19_0_Component - Node_2 - - - - - - - - - - Sub_Node_2_19_0__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_19_0__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_19_0_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_127 - - - - - - - - - Sub_Node_2_19_1_Component - Node_2 - - - - - - - - - - Sub_Node_2_19_1__prov1Component - Node_2 - - - - - - - - - - Sub_Node_2_19_1__prov2Component - Node_2 - - - - - - - - - - Sub_Node_2_19_1_DDSConnectorComponent - Node_2 - - - - - - topic_name - - - tk_string - - - Topic_89 - - - - - - - - - Pub_Node_3_0_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_0_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_0_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_0_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Pub_Node_3_0_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_0_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_0_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_0_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Sub_Node_3_0_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_0_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_0_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_0_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_100 - - - - - - - - - Sub_Node_3_0_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_0_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_0_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_0_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_58 - - - - - - - - - Pub_Node_3_1_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_1_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_1_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_1_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_237 - - - - - - - - - Pub_Node_3_1_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_1_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_1_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_1_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_56 - - - - - - - - - Sub_Node_3_1_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_1_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_1_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_1_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Sub_Node_3_1_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_1_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_1_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_1_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_89 - - - - - - - - - Pub_Node_3_2_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_2_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_2_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_2_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_58 - - - - - - - - - Pub_Node_3_2_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_2_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_2_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_2_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_3_2_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_2_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_2_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_2_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_40 - - - - - - - - - Sub_Node_3_2_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_2_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_2_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_2_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_23 - - - - - - - - - Pub_Node_3_3_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_3_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_3_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_3_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_136 - - - - - - - - - Pub_Node_3_3_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_3_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_3_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_3_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_162 - - - - - - - - - Sub_Node_3_3_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_3_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_3_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_3_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_72 - - - - - - - - - Sub_Node_3_3_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_3_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_3_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_3_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_236 - - - - - - - - - Pub_Node_3_4_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_4_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_4_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_4_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Pub_Node_3_4_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_4_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_4_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_4_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_113 - - - - - - - - - Sub_Node_3_4_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_4_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_4_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_4_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Sub_Node_3_4_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_4_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_4_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_4_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_183 - - - - - - - - - Pub_Node_3_5_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_5_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_5_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_5_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_93 - - - - - - - - - Pub_Node_3_5_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_5_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_5_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_5_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_21 - - - - - - - - - Sub_Node_3_5_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_5_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_5_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_5_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Sub_Node_3_5_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_5_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_5_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_5_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_99 - - - - - - - - - Pub_Node_3_6_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_6_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_6_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_6_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_2 - - - - - - - - - Pub_Node_3_6_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_6_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_6_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_6_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_237 - - - - - - - - - Sub_Node_3_6_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_6_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_6_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_6_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Sub_Node_3_6_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_6_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_6_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_6_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_159 - - - - - - - - - Pub_Node_3_7_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_7_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_7_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_7_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_12 - - - - - - - - - Pub_Node_3_7_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_7_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_7_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_7_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Sub_Node_3_7_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_7_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_7_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_7_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Sub_Node_3_7_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_7_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_7_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_7_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_109 - - - - - - - - - Pub_Node_3_8_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_8_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_8_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_8_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Pub_Node_3_8_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_8_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_8_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_8_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Sub_Node_3_8_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_8_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_8_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_8_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_61 - - - - - - - - - Sub_Node_3_8_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_8_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_8_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_8_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_218 - - - - - - - - - Pub_Node_3_9_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_9_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_9_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_9_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_35 - - - - - - - - - Pub_Node_3_9_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_9_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_9_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_9_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_188 - - - - - - - - - Sub_Node_3_9_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_9_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_9_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_9_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_42 - - - - - - - - - Sub_Node_3_9_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_9_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_9_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_9_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Pub_Node_3_10_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_10_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_10_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_10_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_116 - - - - - - - - - Pub_Node_3_10_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_10_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_10_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_10_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_244 - - - - - - - - - Sub_Node_3_10_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_10_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_10_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_10_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_125 - - - - - - - - - Sub_Node_3_10_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_10_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_10_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_10_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_193 - - - - - - - - - Pub_Node_3_11_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_11_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_11_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_11_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_188 - - - - - - - - - Pub_Node_3_11_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_11_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_11_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_11_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Sub_Node_3_11_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_11_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_11_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_11_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_93 - - - - - - - - - Sub_Node_3_11_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_11_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_11_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_11_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_94 - - - - - - - - - Pub_Node_3_12_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_12_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_12_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_12_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_152 - - - - - - - - - Pub_Node_3_12_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_12_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_12_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_12_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Sub_Node_3_12_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_12_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_12_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_12_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_76 - - - - - - - - - Sub_Node_3_12_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_12_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_12_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_12_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_3_13_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_13_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_13_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_13_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_233 - - - - - - - - - Pub_Node_3_13_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_13_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_13_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_13_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Sub_Node_3_13_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_13_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_13_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_13_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_145 - - - - - - - - - Sub_Node_3_13_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_13_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_13_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_13_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Pub_Node_3_14_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_14_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_14_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_14_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Pub_Node_3_14_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_14_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_14_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_14_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_21 - - - - - - - - - Sub_Node_3_14_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_14_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_14_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_14_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_64 - - - - - - - - - Sub_Node_3_14_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_14_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_14_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_14_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_230 - - - - - - - - - Pub_Node_3_15_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_15_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_15_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_15_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_246 - - - - - - - - - Pub_Node_3_15_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_15_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_15_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_15_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_76 - - - - - - - - - Sub_Node_3_15_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_15_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_15_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_15_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Sub_Node_3_15_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_15_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_15_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_15_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_82 - - - - - - - - - Pub_Node_3_16_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_16_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_16_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_16_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_3_16_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_16_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_16_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_16_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_193 - - - - - - - - - Sub_Node_3_16_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_16_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_16_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_16_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_128 - - - - - - - - - Sub_Node_3_16_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_16_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_16_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_16_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_198 - - - - - - - - - Pub_Node_3_17_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_17_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_17_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_17_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_5 - - - - - - - - - Pub_Node_3_17_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_17_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_17_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_17_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_114 - - - - - - - - - Sub_Node_3_17_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_17_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_17_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_17_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_112 - - - - - - - - - Sub_Node_3_17_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_17_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_17_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_17_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_71 - - - - - - - - - Pub_Node_3_18_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_18_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_18_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_18_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_176 - - - - - - - - - Pub_Node_3_18_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_18_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_18_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_18_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_190 - - - - - - - - - Sub_Node_3_18_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_18_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_18_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_18_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Sub_Node_3_18_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_18_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_18_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_18_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_130 - - - - - - - - - Pub_Node_3_19_0_Component - Node_3 - - - - - - - - - - Pub_Node_3_19_0__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_19_0__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_19_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_183 - - - - - - - - - Pub_Node_3_19_1_Component - Node_3 - - - - - - - - - - Pub_Node_3_19_1__prov1Component - Node_3 - - - - - - - - - - Pub_Node_3_19_1__prov2Component - Node_3 - - - - - - - - - - Pub_Node_3_19_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_15 - - - - - - - - - Sub_Node_3_19_0_Component - Node_3 - - - - - - - - - - Sub_Node_3_19_0__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_19_0__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_19_0_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Sub_Node_3_19_1_Component - Node_3 - - - - - - - - - - Sub_Node_3_19_1__prov1Component - Node_3 - - - - - - - - - - Sub_Node_3_19_1__prov2Component - Node_3 - - - - - - - - - - Sub_Node_3_19_1_DDSConnectorComponent - Node_3 - - - - - - topic_name - - - tk_string - - - Topic_165 - - - - - - - - - Pub_Node_4_0_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_0_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_0_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_0_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_195 - - - - - - - - - Pub_Node_4_0_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_0_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_0_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_0_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_11 - - - - - - - - - Sub_Node_4_0_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_0_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_0_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_0_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_71 - - - - - - - - - Sub_Node_4_0_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_0_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_0_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_0_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_34 - - - - - - - - - Pub_Node_4_1_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_1_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_1_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_1_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_153 - - - - - - - - - Pub_Node_4_1_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_1_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_1_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_1_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_248 - - - - - - - - - Sub_Node_4_1_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_1_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_1_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_1_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_72 - - - - - - - - - Sub_Node_4_1_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_1_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_1_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_1_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Pub_Node_4_2_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_2_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_2_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_2_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_4_2_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_2_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_2_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_2_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_145 - - - - - - - - - Sub_Node_4_2_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_2_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_2_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_2_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_176 - - - - - - - - - Sub_Node_4_2_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_2_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_2_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_2_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_97 - - - - - - - - - Pub_Node_4_3_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_3_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_3_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_3_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_193 - - - - - - - - - Pub_Node_4_3_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_3_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_3_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_3_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_4 - - - - - - - - - Sub_Node_4_3_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_3_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_3_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_3_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_102 - - - - - - - - - Sub_Node_4_3_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_3_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_3_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_3_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Pub_Node_4_4_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_4_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_4_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_4_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_129 - - - - - - - - - Pub_Node_4_4_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_4_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_4_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_4_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_174 - - - - - - - - - Sub_Node_4_4_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_4_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_4_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_4_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_174 - - - - - - - - - Sub_Node_4_4_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_4_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_4_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_4_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_176 - - - - - - - - - Pub_Node_4_5_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_5_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_5_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_5_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_190 - - - - - - - - - Pub_Node_4_5_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_5_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_5_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_5_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_76 - - - - - - - - - Sub_Node_4_5_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_5_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_5_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_5_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_11 - - - - - - - - - Sub_Node_4_5_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_5_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_5_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_5_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_169 - - - - - - - - - Pub_Node_4_6_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_6_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_6_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_6_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Pub_Node_4_6_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_6_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_6_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_6_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_74 - - - - - - - - - Sub_Node_4_6_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_6_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_6_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_6_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_141 - - - - - - - - - Sub_Node_4_6_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_6_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_6_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_6_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_227 - - - - - - - - - Pub_Node_4_7_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_7_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_7_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_7_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_28 - - - - - - - - - Pub_Node_4_7_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_7_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_7_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_7_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_214 - - - - - - - - - Sub_Node_4_7_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_7_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_7_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_7_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_4_7_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_7_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_7_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_7_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_11 - - - - - - - - - Pub_Node_4_8_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_8_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_8_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_8_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_178 - - - - - - - - - Pub_Node_4_8_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_8_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_8_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_8_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_207 - - - - - - - - - Sub_Node_4_8_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_8_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_8_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_8_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_39 - - - - - - - - - Sub_Node_4_8_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_8_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_8_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_8_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_178 - - - - - - - - - Pub_Node_4_9_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_9_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_9_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_9_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Pub_Node_4_9_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_9_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_9_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_9_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_102 - - - - - - - - - Sub_Node_4_9_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_9_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_9_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_9_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_142 - - - - - - - - - Sub_Node_4_9_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_9_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_9_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_9_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_158 - - - - - - - - - Pub_Node_4_10_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_10_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_10_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_10_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_82 - - - - - - - - - Pub_Node_4_10_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_10_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_10_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_10_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Sub_Node_4_10_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_10_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_10_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_10_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Sub_Node_4_10_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_10_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_10_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_10_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_170 - - - - - - - - - Pub_Node_4_11_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_11_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_11_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_11_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_69 - - - - - - - - - Pub_Node_4_11_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_11_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_11_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_11_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_115 - - - - - - - - - Sub_Node_4_11_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_11_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_11_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_11_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_146 - - - - - - - - - Sub_Node_4_11_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_11_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_11_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_11_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Pub_Node_4_12_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_12_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_12_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_12_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_226 - - - - - - - - - Pub_Node_4_12_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_12_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_12_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_12_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_179 - - - - - - - - - Sub_Node_4_12_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_12_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_12_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_12_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_14 - - - - - - - - - Sub_Node_4_12_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_12_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_12_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_12_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_218 - - - - - - - - - Pub_Node_4_13_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_13_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_13_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_13_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_145 - - - - - - - - - Pub_Node_4_13_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_13_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_13_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_13_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_97 - - - - - - - - - Sub_Node_4_13_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_13_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_13_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_13_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_119 - - - - - - - - - Sub_Node_4_13_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_13_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_13_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_13_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_98 - - - - - - - - - Pub_Node_4_14_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_14_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_14_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_14_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Pub_Node_4_14_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_14_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_14_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_14_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_119 - - - - - - - - - Sub_Node_4_14_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_14_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_14_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_14_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_59 - - - - - - - - - Sub_Node_4_14_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_14_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_14_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_14_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_196 - - - - - - - - - Pub_Node_4_15_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_15_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_15_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_15_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_157 - - - - - - - - - Pub_Node_4_15_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_15_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_15_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_15_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_6 - - - - - - - - - Sub_Node_4_15_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_15_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_15_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_15_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_237 - - - - - - - - - Sub_Node_4_15_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_15_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_15_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_15_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_130 - - - - - - - - - Pub_Node_4_16_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_16_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_16_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_16_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_210 - - - - - - - - - Pub_Node_4_16_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_16_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_16_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_16_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Sub_Node_4_16_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_16_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_16_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_16_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_128 - - - - - - - - - Sub_Node_4_16_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_16_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_16_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_16_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_218 - - - - - - - - - Pub_Node_4_17_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_17_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_17_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_17_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Pub_Node_4_17_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_17_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_17_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_17_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_156 - - - - - - - - - Sub_Node_4_17_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_17_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_17_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_17_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_178 - - - - - - - - - Sub_Node_4_17_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_17_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_17_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_17_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Pub_Node_4_18_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_18_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_18_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_18_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_161 - - - - - - - - - Pub_Node_4_18_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_18_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_18_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_18_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_188 - - - - - - - - - Sub_Node_4_18_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_18_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_18_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_18_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_166 - - - - - - - - - Sub_Node_4_18_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_18_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_18_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_18_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_229 - - - - - - - - - Pub_Node_4_19_0_Component - Node_4 - - - - - - - - - - Pub_Node_4_19_0__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_19_0__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_19_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Pub_Node_4_19_1_Component - Node_4 - - - - - - - - - - Pub_Node_4_19_1__prov1Component - Node_4 - - - - - - - - - - Pub_Node_4_19_1__prov2Component - Node_4 - - - - - - - - - - Pub_Node_4_19_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_6 - - - - - - - - - Sub_Node_4_19_0_Component - Node_4 - - - - - - - - - - Sub_Node_4_19_0__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_19_0__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_19_0_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_71 - - - - - - - - - Sub_Node_4_19_1_Component - Node_4 - - - - - - - - - - Sub_Node_4_19_1__prov1Component - Node_4 - - - - - - - - - - Sub_Node_4_19_1__prov2Component - Node_4 - - - - - - - - - - Sub_Node_4_19_1_DDSConnectorComponent - Node_4 - - - - - - topic_name - - - tk_string - - - Topic_1 - - - - - - - - - Pub_Node_5_0_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_0_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_0_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_0_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_3 - - - - - - - - - Pub_Node_5_0_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_0_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_0_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_0_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_23 - - - - - - - - - Sub_Node_5_0_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_0_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_0_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_0_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_185 - - - - - - - - - Sub_Node_5_0_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_0_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_0_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_0_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_117 - - - - - - - - - Pub_Node_5_1_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_1_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_1_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_1_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_21 - - - - - - - - - Pub_Node_5_1_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_1_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_1_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_1_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Sub_Node_5_1_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_1_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_1_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_1_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_5_1_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_1_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_1_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_1_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_150 - - - - - - - - - Pub_Node_5_2_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_2_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_2_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_2_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_1 - - - - - - - - - Pub_Node_5_2_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_2_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_2_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_2_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_31 - - - - - - - - - Sub_Node_5_2_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_2_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_2_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_2_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_149 - - - - - - - - - Sub_Node_5_2_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_2_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_2_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_2_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_92 - - - - - - - - - Pub_Node_5_3_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_3_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_3_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_3_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_67 - - - - - - - - - Pub_Node_5_3_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_3_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_3_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_3_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_201 - - - - - - - - - Sub_Node_5_3_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_3_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_3_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_3_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_5 - - - - - - - - - Sub_Node_5_3_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_3_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_3_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_3_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_150 - - - - - - - - - Pub_Node_5_4_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_4_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_4_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_4_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_242 - - - - - - - - - Pub_Node_5_4_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_4_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_4_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_4_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_65 - - - - - - - - - Sub_Node_5_4_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_4_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_4_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_4_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Sub_Node_5_4_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_4_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_4_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_4_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_65 - - - - - - - - - Pub_Node_5_5_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_5_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_5_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_5_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_21 - - - - - - - - - Pub_Node_5_5_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_5_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_5_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_5_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_168 - - - - - - - - - Sub_Node_5_5_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_5_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_5_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_5_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_5_5_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_5_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_5_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_5_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_104 - - - - - - - - - Pub_Node_5_6_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_6_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_6_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_6_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_146 - - - - - - - - - Pub_Node_5_6_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_6_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_6_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_6_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_23 - - - - - - - - - Sub_Node_5_6_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_6_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_6_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_6_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_203 - - - - - - - - - Sub_Node_5_6_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_6_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_6_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_6_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_228 - - - - - - - - - Pub_Node_5_7_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_7_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_7_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_7_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_207 - - - - - - - - - Pub_Node_5_7_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_7_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_7_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_7_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_226 - - - - - - - - - Sub_Node_5_7_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_7_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_7_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_7_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_215 - - - - - - - - - Sub_Node_5_7_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_7_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_7_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_7_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_165 - - - - - - - - - Pub_Node_5_8_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_8_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_8_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_8_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_144 - - - - - - - - - Pub_Node_5_8_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_8_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_8_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_8_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_71 - - - - - - - - - Sub_Node_5_8_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_8_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_8_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_8_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_99 - - - - - - - - - Sub_Node_5_8_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_8_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_8_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_8_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_121 - - - - - - - - - Pub_Node_5_9_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_9_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_9_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_9_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_110 - - - - - - - - - Pub_Node_5_9_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_9_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_9_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_9_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_116 - - - - - - - - - Sub_Node_5_9_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_9_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_9_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_9_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_12 - - - - - - - - - Sub_Node_5_9_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_9_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_9_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_9_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Pub_Node_5_10_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_10_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_10_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_10_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_80 - - - - - - - - - Pub_Node_5_10_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_10_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_10_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_10_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_78 - - - - - - - - - Sub_Node_5_10_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_10_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_10_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_10_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_196 - - - - - - - - - Sub_Node_5_10_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_10_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_10_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_10_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_115 - - - - - - - - - Pub_Node_5_11_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_11_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_11_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_11_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_196 - - - - - - - - - Pub_Node_5_11_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_11_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_11_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_11_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_183 - - - - - - - - - Sub_Node_5_11_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_11_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_11_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_11_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_230 - - - - - - - - - Sub_Node_5_11_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_11_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_11_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_11_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_3 - - - - - - - - - Pub_Node_5_12_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_12_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_12_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_12_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_201 - - - - - - - - - Pub_Node_5_12_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_12_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_12_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_12_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_162 - - - - - - - - - Sub_Node_5_12_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_12_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_12_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_12_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_62 - - - - - - - - - Sub_Node_5_12_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_12_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_12_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_12_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Pub_Node_5_13_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_13_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_13_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_13_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_56 - - - - - - - - - Pub_Node_5_13_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_13_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_13_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_13_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_169 - - - - - - - - - Sub_Node_5_13_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_13_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_13_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_13_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_147 - - - - - - - - - Sub_Node_5_13_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_13_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_13_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_13_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_132 - - - - - - - - - Pub_Node_5_14_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_14_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_14_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_14_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Pub_Node_5_14_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_14_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_14_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_14_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_133 - - - - - - - - - Sub_Node_5_14_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_14_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_14_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_14_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_122 - - - - - - - - - Sub_Node_5_14_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_14_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_14_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_14_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_132 - - - - - - - - - Pub_Node_5_15_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_15_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_15_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_15_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Pub_Node_5_15_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_15_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_15_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_15_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Sub_Node_5_15_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_15_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_15_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_15_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_42 - - - - - - - - - Sub_Node_5_15_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_15_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_15_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_15_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_30 - - - - - - - - - Pub_Node_5_16_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_16_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_16_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_16_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_202 - - - - - - - - - Pub_Node_5_16_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_16_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_16_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_16_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_230 - - - - - - - - - Sub_Node_5_16_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_16_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_16_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_16_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_147 - - - - - - - - - Sub_Node_5_16_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_16_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_16_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_16_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Pub_Node_5_17_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_17_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_17_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_17_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_32 - - - - - - - - - Pub_Node_5_17_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_17_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_17_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_17_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_233 - - - - - - - - - Sub_Node_5_17_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_17_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_17_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_17_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_53 - - - - - - - - - Sub_Node_5_17_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_17_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_17_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_17_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Pub_Node_5_18_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_18_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_18_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_18_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_138 - - - - - - - - - Pub_Node_5_18_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_18_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_18_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_18_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Sub_Node_5_18_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_18_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_18_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_18_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Sub_Node_5_18_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_18_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_18_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_18_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_230 - - - - - - - - - Pub_Node_5_19_0_Component - Node_5 - - - - - - - - - - Pub_Node_5_19_0__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_19_0__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_19_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_75 - - - - - - - - - Pub_Node_5_19_1_Component - Node_5 - - - - - - - - - - Pub_Node_5_19_1__prov1Component - Node_5 - - - - - - - - - - Pub_Node_5_19_1__prov2Component - Node_5 - - - - - - - - - - Pub_Node_5_19_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_9 - - - - - - - - - Sub_Node_5_19_0_Component - Node_5 - - - - - - - - - - Sub_Node_5_19_0__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_19_0__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_19_0_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_206 - - - - - - - - - Sub_Node_5_19_1_Component - Node_5 - - - - - - - - - - Sub_Node_5_19_1__prov1Component - Node_5 - - - - - - - - - - Sub_Node_5_19_1__prov2Component - Node_5 - - - - - - - - - - Sub_Node_5_19_1_DDSConnectorComponent - Node_5 - - - - - - topic_name - - - tk_string - - - Topic_125 - - - - - - - - - Pub_Node_6_0_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_0_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_0_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_0_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_175 - - - - - - - - - Pub_Node_6_0_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_0_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_0_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_0_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_205 - - - - - - - - - Sub_Node_6_0_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_0_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_0_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_0_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_10 - - - - - - - - - Sub_Node_6_0_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_0_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_0_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_0_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_57 - - - - - - - - - Pub_Node_6_1_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_1_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_1_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_1_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_208 - - - - - - - - - Pub_Node_6_1_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_1_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_1_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_1_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_172 - - - - - - - - - Sub_Node_6_1_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_1_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_1_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_1_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_216 - - - - - - - - - Sub_Node_6_1_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_1_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_1_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_1_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Pub_Node_6_2_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_2_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_2_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_2_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_244 - - - - - - - - - Pub_Node_6_2_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_2_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_2_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_2_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_216 - - - - - - - - - Sub_Node_6_2_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_2_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_2_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_2_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_90 - - - - - - - - - Sub_Node_6_2_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_2_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_2_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_2_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_241 - - - - - - - - - Pub_Node_6_3_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_3_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_3_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_3_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_73 - - - - - - - - - Pub_Node_6_3_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_3_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_3_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_3_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_224 - - - - - - - - - Sub_Node_6_3_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_3_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_3_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_3_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_38 - - - - - - - - - Sub_Node_6_3_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_3_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_3_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_3_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_149 - - - - - - - - - Pub_Node_6_4_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_4_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_4_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_4_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_192 - - - - - - - - - Pub_Node_6_4_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_4_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_4_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_4_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_128 - - - - - - - - - Sub_Node_6_4_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_4_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_4_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_4_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_235 - - - - - - - - - Sub_Node_6_4_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_4_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_4_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_4_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_86 - - - - - - - - - Pub_Node_6_5_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_5_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_5_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_5_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_183 - - - - - - - - - Pub_Node_6_5_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_5_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_5_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_5_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_144 - - - - - - - - - Sub_Node_6_5_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_5_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_5_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_5_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_199 - - - - - - - - - Sub_Node_6_5_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_5_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_5_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_5_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Pub_Node_6_6_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_6_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_6_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_6_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Pub_Node_6_6_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_6_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_6_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_6_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_199 - - - - - - - - - Sub_Node_6_6_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_6_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_6_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_6_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Sub_Node_6_6_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_6_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_6_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_6_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_53 - - - - - - - - - Pub_Node_6_7_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_7_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_7_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_7_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_224 - - - - - - - - - Pub_Node_6_7_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_7_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_7_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_7_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_6_7_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_7_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_7_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_7_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_190 - - - - - - - - - Sub_Node_6_7_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_7_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_7_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_7_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_122 - - - - - - - - - Pub_Node_6_8_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_8_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_8_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_8_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_78 - - - - - - - - - Pub_Node_6_8_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_8_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_8_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_8_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_85 - - - - - - - - - Sub_Node_6_8_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_8_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_8_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_8_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_60 - - - - - - - - - Sub_Node_6_8_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_8_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_8_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_8_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_84 - - - - - - - - - Pub_Node_6_9_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_9_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_9_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_9_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_166 - - - - - - - - - Pub_Node_6_9_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_9_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_9_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_9_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_88 - - - - - - - - - Sub_Node_6_9_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_9_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_9_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_9_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_193 - - - - - - - - - Sub_Node_6_9_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_9_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_9_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_9_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Pub_Node_6_10_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_10_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_10_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_10_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Pub_Node_6_10_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_10_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_10_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_10_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_229 - - - - - - - - - Sub_Node_6_10_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_10_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_10_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_10_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_6_10_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_10_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_10_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_10_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_116 - - - - - - - - - Pub_Node_6_11_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_11_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_11_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_11_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_135 - - - - - - - - - Pub_Node_6_11_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_11_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_11_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_11_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_142 - - - - - - - - - Sub_Node_6_11_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_11_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_11_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_11_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_106 - - - - - - - - - Sub_Node_6_11_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_11_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_11_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_11_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_214 - - - - - - - - - Pub_Node_6_12_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_12_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_12_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_12_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_175 - - - - - - - - - Pub_Node_6_12_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_12_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_12_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_12_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Sub_Node_6_12_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_12_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_12_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_12_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_165 - - - - - - - - - Sub_Node_6_12_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_12_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_12_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_12_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_185 - - - - - - - - - Pub_Node_6_13_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_13_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_13_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_13_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_52 - - - - - - - - - Pub_Node_6_13_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_13_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_13_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_13_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_59 - - - - - - - - - Sub_Node_6_13_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_13_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_13_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_13_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_78 - - - - - - - - - Sub_Node_6_13_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_13_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_13_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_13_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_239 - - - - - - - - - Pub_Node_6_14_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_14_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_14_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_14_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_225 - - - - - - - - - Pub_Node_6_14_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_14_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_14_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_14_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_36 - - - - - - - - - Sub_Node_6_14_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_14_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_14_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_14_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_66 - - - - - - - - - Sub_Node_6_14_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_14_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_14_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_14_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_163 - - - - - - - - - Pub_Node_6_15_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_15_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_15_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_15_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Pub_Node_6_15_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_15_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_15_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_15_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Sub_Node_6_15_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_15_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_15_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_15_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_217 - - - - - - - - - Sub_Node_6_15_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_15_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_15_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_15_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_196 - - - - - - - - - Pub_Node_6_16_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_16_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_16_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_16_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Pub_Node_6_16_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_16_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_16_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_16_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_7 - - - - - - - - - Sub_Node_6_16_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_16_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_16_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_16_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_18 - - - - - - - - - Sub_Node_6_16_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_16_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_16_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_16_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_73 - - - - - - - - - Pub_Node_6_17_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_17_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_17_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_17_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Pub_Node_6_17_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_17_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_17_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_17_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_127 - - - - - - - - - Sub_Node_6_17_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_17_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_17_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_17_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_73 - - - - - - - - - Sub_Node_6_17_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_17_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_17_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_17_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_87 - - - - - - - - - Pub_Node_6_18_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_18_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_18_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_18_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_203 - - - - - - - - - Pub_Node_6_18_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_18_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_18_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_18_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Sub_Node_6_18_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_18_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_18_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_18_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_151 - - - - - - - - - Sub_Node_6_18_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_18_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_18_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_18_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_136 - - - - - - - - - Pub_Node_6_19_0_Component - Node_6 - - - - - - - - - - Pub_Node_6_19_0__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_19_0__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_19_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_92 - - - - - - - - - Pub_Node_6_19_1_Component - Node_6 - - - - - - - - - - Pub_Node_6_19_1__prov1Component - Node_6 - - - - - - - - - - Pub_Node_6_19_1__prov2Component - Node_6 - - - - - - - - - - Pub_Node_6_19_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Sub_Node_6_19_0_Component - Node_6 - - - - - - - - - - Sub_Node_6_19_0__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_19_0__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_19_0_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Sub_Node_6_19_1_Component - Node_6 - - - - - - - - - - Sub_Node_6_19_1__prov1Component - Node_6 - - - - - - - - - - Sub_Node_6_19_1__prov2Component - Node_6 - - - - - - - - - - Sub_Node_6_19_1_DDSConnectorComponent - Node_6 - - - - - - topic_name - - - tk_string - - - Topic_12 - - - - - - - - - Pub_Node_7_0_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_0_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_0_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_0_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_110 - - - - - - - - - Pub_Node_7_0_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_0_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_0_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_0_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_229 - - - - - - - - - Sub_Node_7_0_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_0_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_0_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_0_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_237 - - - - - - - - - Sub_Node_7_0_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_0_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_0_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_0_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_91 - - - - - - - - - Pub_Node_7_1_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_1_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_1_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_1_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Pub_Node_7_1_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_1_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_1_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_1_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_24 - - - - - - - - - Sub_Node_7_1_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_1_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_1_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_1_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_187 - - - - - - - - - Sub_Node_7_1_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_1_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_1_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_1_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_40 - - - - - - - - - Pub_Node_7_2_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_2_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_2_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_2_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_105 - - - - - - - - - Pub_Node_7_2_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_2_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_2_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_2_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_7_2_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_2_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_2_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_2_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_93 - - - - - - - - - Sub_Node_7_2_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_2_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_2_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_2_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_95 - - - - - - - - - Pub_Node_7_3_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_3_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_3_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_3_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_99 - - - - - - - - - Pub_Node_7_3_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_3_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_3_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_3_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Sub_Node_7_3_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_3_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_3_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_3_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_175 - - - - - - - - - Sub_Node_7_3_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_3_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_3_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_3_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_4 - - - - - - - - - Pub_Node_7_4_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_4_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_4_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_4_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_143 - - - - - - - - - Pub_Node_7_4_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_4_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_4_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_4_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_205 - - - - - - - - - Sub_Node_7_4_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_4_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_4_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_4_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_152 - - - - - - - - - Sub_Node_7_4_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_4_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_4_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_4_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_128 - - - - - - - - - Pub_Node_7_5_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_5_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_5_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_5_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_135 - - - - - - - - - Pub_Node_7_5_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_5_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_5_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_5_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Sub_Node_7_5_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_5_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_5_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_5_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_126 - - - - - - - - - Sub_Node_7_5_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_5_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_5_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_5_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_27 - - - - - - - - - Pub_Node_7_6_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_6_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_6_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_6_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_7_6_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_6_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_6_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_6_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_118 - - - - - - - - - Sub_Node_7_6_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_6_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_6_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_6_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_145 - - - - - - - - - Sub_Node_7_6_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_6_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_6_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_6_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_101 - - - - - - - - - Pub_Node_7_7_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_7_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_7_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_7_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_143 - - - - - - - - - Pub_Node_7_7_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_7_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_7_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_7_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_148 - - - - - - - - - Sub_Node_7_7_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_7_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_7_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_7_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_22 - - - - - - - - - Sub_Node_7_7_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_7_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_7_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_7_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_131 - - - - - - - - - Pub_Node_7_8_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_8_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_8_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_8_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_7_8_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_8_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_8_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_8_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_206 - - - - - - - - - Sub_Node_7_8_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_8_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_8_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_8_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_221 - - - - - - - - - Sub_Node_7_8_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_8_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_8_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_8_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_64 - - - - - - - - - Pub_Node_7_9_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_9_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_9_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_9_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Pub_Node_7_9_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_9_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_9_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_9_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_117 - - - - - - - - - Sub_Node_7_9_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_9_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_9_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_9_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_117 - - - - - - - - - Sub_Node_7_9_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_9_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_9_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_9_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_27 - - - - - - - - - Pub_Node_7_10_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_10_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_10_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_10_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_106 - - - - - - - - - Pub_Node_7_10_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_10_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_10_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_10_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_112 - - - - - - - - - Sub_Node_7_10_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_10_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_10_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_10_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Sub_Node_7_10_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_10_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_10_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_10_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_60 - - - - - - - - - Pub_Node_7_11_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_11_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_11_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_11_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_167 - - - - - - - - - Pub_Node_7_11_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_11_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_11_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_11_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_224 - - - - - - - - - Sub_Node_7_11_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_11_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_11_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_11_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_165 - - - - - - - - - Sub_Node_7_11_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_11_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_11_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_11_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_64 - - - - - - - - - Pub_Node_7_12_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_12_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_12_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_12_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Pub_Node_7_12_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_12_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_12_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_12_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_209 - - - - - - - - - Sub_Node_7_12_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_12_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_12_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_12_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_203 - - - - - - - - - Sub_Node_7_12_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_12_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_12_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_12_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_200 - - - - - - - - - Pub_Node_7_13_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_13_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_13_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_13_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_156 - - - - - - - - - Pub_Node_7_13_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_13_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_13_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_13_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_10 - - - - - - - - - Sub_Node_7_13_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_13_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_13_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_13_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_235 - - - - - - - - - Sub_Node_7_13_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_13_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_13_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_13_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_78 - - - - - - - - - Pub_Node_7_14_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_14_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_14_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_14_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_177 - - - - - - - - - Pub_Node_7_14_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_14_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_14_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_14_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_115 - - - - - - - - - Sub_Node_7_14_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_14_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_14_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_14_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_13 - - - - - - - - - Sub_Node_7_14_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_14_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_14_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_14_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_143 - - - - - - - - - Pub_Node_7_15_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_15_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_15_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_15_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_154 - - - - - - - - - Pub_Node_7_15_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_15_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_15_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_15_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_142 - - - - - - - - - Sub_Node_7_15_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_15_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_15_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_15_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_212 - - - - - - - - - Sub_Node_7_15_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_15_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_15_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_15_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_156 - - - - - - - - - Pub_Node_7_16_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_16_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_16_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_16_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_96 - - - - - - - - - Pub_Node_7_16_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_16_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_16_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_16_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_26 - - - - - - - - - Sub_Node_7_16_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_16_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_16_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_16_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_48 - - - - - - - - - Sub_Node_7_16_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_16_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_16_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_16_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_124 - - - - - - - - - Pub_Node_7_17_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_17_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_17_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_17_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_84 - - - - - - - - - Pub_Node_7_17_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_17_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_17_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_17_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_99 - - - - - - - - - Sub_Node_7_17_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_17_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_17_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_17_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_224 - - - - - - - - - Sub_Node_7_17_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_17_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_17_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_17_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_18 - - - - - - - - - Pub_Node_7_18_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_18_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_18_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_18_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_78 - - - - - - - - - Pub_Node_7_18_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_18_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_18_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_18_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_63 - - - - - - - - - Sub_Node_7_18_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_18_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_18_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_18_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_246 - - - - - - - - - Sub_Node_7_18_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_18_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_18_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_18_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_49 - - - - - - - - - Pub_Node_7_19_0_Component - Node_7 - - - - - - - - - - Pub_Node_7_19_0__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_19_0__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_19_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_103 - - - - - - - - - Pub_Node_7_19_1_Component - Node_7 - - - - - - - - - - Pub_Node_7_19_1__prov1Component - Node_7 - - - - - - - - - - Pub_Node_7_19_1__prov2Component - Node_7 - - - - - - - - - - Pub_Node_7_19_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_89 - - - - - - - - - Sub_Node_7_19_0_Component - Node_7 - - - - - - - - - - Sub_Node_7_19_0__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_19_0__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_19_0_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_19 - - - - - - - - - Sub_Node_7_19_1_Component - Node_7 - - - - - - - - - - Sub_Node_7_19_1__prov1Component - Node_7 - - - - - - - - - - Sub_Node_7_19_1__prov2Component - Node_7 - - - - - - - - - - Sub_Node_7_19_1_DDSConnectorComponent - Node_7 - - - - - - topic_name - - - tk_string - - - Topic_10 - - - - - - - - - Pub_Node_8_0_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_0_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_0_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_0_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_204 - - - - - - - - - Pub_Node_8_0_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_0_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_0_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_0_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_107 - - - - - - - - - Sub_Node_8_0_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_0_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_0_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_0_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_65 - - - - - - - - - Sub_Node_8_0_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_0_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_0_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_0_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_74 - - - - - - - - - Pub_Node_8_1_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_1_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_1_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_1_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_0 - - - - - - - - - Pub_Node_8_1_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_1_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_1_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_1_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_56 - - - - - - - - - Sub_Node_8_1_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_1_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_1_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_1_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_212 - - - - - - - - - Sub_Node_8_1_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_1_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_1_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_1_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_8_2_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_2_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_2_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_2_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Pub_Node_8_2_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_2_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_2_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_2_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_170 - - - - - - - - - Sub_Node_8_2_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_2_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_2_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_2_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_211 - - - - - - - - - Sub_Node_8_2_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_2_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_2_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_2_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_185 - - - - - - - - - Pub_Node_8_3_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_3_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_3_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_3_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_249 - - - - - - - - - Pub_Node_8_3_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_3_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_3_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_3_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_219 - - - - - - - - - Sub_Node_8_3_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_3_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_3_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_3_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_31 - - - - - - - - - Sub_Node_8_3_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_3_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_3_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_3_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_247 - - - - - - - - - Pub_Node_8_4_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_4_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_4_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_4_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_170 - - - - - - - - - Pub_Node_8_4_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_4_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_4_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_4_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_141 - - - - - - - - - Sub_Node_8_4_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_4_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_4_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_4_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_148 - - - - - - - - - Sub_Node_8_4_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_4_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_4_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_4_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_75 - - - - - - - - - Pub_Node_8_5_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_5_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_5_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_5_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_222 - - - - - - - - - Pub_Node_8_5_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_5_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_5_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_5_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_240 - - - - - - - - - Sub_Node_8_5_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_5_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_5_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_5_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_173 - - - - - - - - - Sub_Node_8_5_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_5_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_5_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_5_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_136 - - - - - - - - - Pub_Node_8_6_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_6_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_6_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_6_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_85 - - - - - - - - - Pub_Node_8_6_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_6_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_6_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_6_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_217 - - - - - - - - - Sub_Node_8_6_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_6_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_6_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_6_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_16 - - - - - - - - - Sub_Node_8_6_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_6_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_6_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_6_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_68 - - - - - - - - - Pub_Node_8_7_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_7_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_7_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_7_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_19 - - - - - - - - - Pub_Node_8_7_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_7_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_7_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_7_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_95 - - - - - - - - - Sub_Node_8_7_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_7_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_7_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_7_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_75 - - - - - - - - - Sub_Node_8_7_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_7_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_7_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_7_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_32 - - - - - - - - - Pub_Node_8_8_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_8_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_8_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_8_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_42 - - - - - - - - - Pub_Node_8_8_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_8_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_8_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_8_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_158 - - - - - - - - - Sub_Node_8_8_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_8_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_8_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_8_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_148 - - - - - - - - - Sub_Node_8_8_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_8_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_8_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_8_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_192 - - - - - - - - - Pub_Node_8_9_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_9_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_9_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_9_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_152 - - - - - - - - - Pub_Node_8_9_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_9_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_9_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_9_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_238 - - - - - - - - - Sub_Node_8_9_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_9_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_9_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_9_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Sub_Node_8_9_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_9_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_9_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_9_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_36 - - - - - - - - - Pub_Node_8_10_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_10_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_10_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_10_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_122 - - - - - - - - - Pub_Node_8_10_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_10_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_10_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_10_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_111 - - - - - - - - - Sub_Node_8_10_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_10_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_10_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_10_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_15 - - - - - - - - - Sub_Node_8_10_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_10_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_10_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_10_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_138 - - - - - - - - - Pub_Node_8_11_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_11_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_11_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_11_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_181 - - - - - - - - - Pub_Node_8_11_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_11_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_11_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_11_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_155 - - - - - - - - - Sub_Node_8_11_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_11_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_11_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_11_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_179 - - - - - - - - - Sub_Node_8_11_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_11_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_11_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_11_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_170 - - - - - - - - - Pub_Node_8_12_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_12_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_12_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_12_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_51 - - - - - - - - - Pub_Node_8_12_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_12_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_12_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_12_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Sub_Node_8_12_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_12_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_12_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_12_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_234 - - - - - - - - - Sub_Node_8_12_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_12_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_12_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_12_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_50 - - - - - - - - - Pub_Node_8_13_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_13_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_13_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_13_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_245 - - - - - - - - - Pub_Node_8_13_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_13_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_13_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_13_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_153 - - - - - - - - - Sub_Node_8_13_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_13_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_13_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_13_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_44 - - - - - - - - - Sub_Node_8_13_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_13_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_13_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_13_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_100 - - - - - - - - - Pub_Node_8_14_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_14_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_14_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_14_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_121 - - - - - - - - - Pub_Node_8_14_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_14_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_14_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_14_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_127 - - - - - - - - - Sub_Node_8_14_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_14_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_14_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_14_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_49 - - - - - - - - - Sub_Node_8_14_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_14_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_14_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_14_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_230 - - - - - - - - - Pub_Node_8_15_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_15_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_15_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_15_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_125 - - - - - - - - - Pub_Node_8_15_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_15_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_15_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_15_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_181 - - - - - - - - - Sub_Node_8_15_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_15_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_15_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_15_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_60 - - - - - - - - - Sub_Node_8_15_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_15_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_15_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_15_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_214 - - - - - - - - - Pub_Node_8_16_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_16_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_16_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_16_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_38 - - - - - - - - - Pub_Node_8_16_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_16_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_16_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_16_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Sub_Node_8_16_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_16_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_16_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_16_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_89 - - - - - - - - - Sub_Node_8_16_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_16_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_16_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_16_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Pub_Node_8_17_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_17_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_17_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_17_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_217 - - - - - - - - - Pub_Node_8_17_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_17_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_17_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_17_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_160 - - - - - - - - - Sub_Node_8_17_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_17_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_17_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_17_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_82 - - - - - - - - - Sub_Node_8_17_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_17_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_17_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_17_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_233 - - - - - - - - - Pub_Node_8_18_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_18_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_18_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_18_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Pub_Node_8_18_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_18_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_18_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_18_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_212 - - - - - - - - - Sub_Node_8_18_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_18_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_18_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_18_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_248 - - - - - - - - - Sub_Node_8_18_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_18_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_18_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_18_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Pub_Node_8_19_0_Component - Node_8 - - - - - - - - - - Pub_Node_8_19_0__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_19_0__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_19_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_120 - - - - - - - - - Pub_Node_8_19_1_Component - Node_8 - - - - - - - - - - Pub_Node_8_19_1__prov1Component - Node_8 - - - - - - - - - - Pub_Node_8_19_1__prov2Component - Node_8 - - - - - - - - - - Pub_Node_8_19_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_178 - - - - - - - - - Sub_Node_8_19_0_Component - Node_8 - - - - - - - - - - Sub_Node_8_19_0__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_19_0__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_19_0_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_198 - - - - - - - - - Sub_Node_8_19_1_Component - Node_8 - - - - - - - - - - Sub_Node_8_19_1__prov1Component - Node_8 - - - - - - - - - - Sub_Node_8_19_1__prov2Component - Node_8 - - - - - - - - - - Sub_Node_8_19_1_DDSConnectorComponent - Node_8 - - - - - - topic_name - - - tk_string - - - Topic_76 - - - - - - - - - Pub_Node_9_0_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_0_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_0_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_0_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_114 - - - - - - - - - Pub_Node_9_0_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_0_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_0_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_0_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_7 - - - - - - - - - Sub_Node_9_0_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_0_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_0_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_0_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_129 - - - - - - - - - Sub_Node_9_0_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_0_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_0_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_0_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_59 - - - - - - - - - Pub_Node_9_1_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_1_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_1_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_1_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_84 - - - - - - - - - Pub_Node_9_1_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_1_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_1_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_1_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_247 - - - - - - - - - Sub_Node_9_1_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_1_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_1_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_1_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_0 - - - - - - - - - Sub_Node_9_1_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_1_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_1_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_1_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_179 - - - - - - - - - Pub_Node_9_2_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_2_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_2_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_2_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_210 - - - - - - - - - Pub_Node_9_2_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_2_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_2_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_2_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_11 - - - - - - - - - Sub_Node_9_2_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_2_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_2_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_2_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_19 - - - - - - - - - Sub_Node_9_2_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_2_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_2_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_2_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_72 - - - - - - - - - Pub_Node_9_3_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_3_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_3_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_3_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_94 - - - - - - - - - Pub_Node_9_3_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_3_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_3_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_3_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_116 - - - - - - - - - Sub_Node_9_3_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_3_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_3_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_3_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_182 - - - - - - - - - Sub_Node_9_3_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_3_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_3_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_3_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_138 - - - - - - - - - Pub_Node_9_4_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_4_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_4_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_4_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_30 - - - - - - - - - Pub_Node_9_4_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_4_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_4_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_4_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_83 - - - - - - - - - Sub_Node_9_4_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_4_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_4_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_4_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_206 - - - - - - - - - Sub_Node_9_4_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_4_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_4_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_4_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_110 - - - - - - - - - Pub_Node_9_5_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_5_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_5_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_5_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_37 - - - - - - - - - Pub_Node_9_5_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_5_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_5_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_5_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_9 - - - - - - - - - Sub_Node_9_5_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_5_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_5_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_5_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_2 - - - - - - - - - Sub_Node_9_5_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_5_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_5_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_5_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_50 - - - - - - - - - Pub_Node_9_6_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_6_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_6_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_6_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_197 - - - - - - - - - Pub_Node_9_6_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_6_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_6_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_6_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_13 - - - - - - - - - Sub_Node_9_6_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_6_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_6_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_6_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_52 - - - - - - - - - Sub_Node_9_6_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_6_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_6_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_6_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_9_7_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_7_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_7_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_7_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_22 - - - - - - - - - Pub_Node_9_7_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_7_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_7_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_7_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_33 - - - - - - - - - Sub_Node_9_7_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_7_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_7_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_7_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_101 - - - - - - - - - Sub_Node_9_7_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_7_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_7_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_7_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_205 - - - - - - - - - Pub_Node_9_8_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_8_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_8_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_8_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_243 - - - - - - - - - Pub_Node_9_8_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_8_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_8_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_8_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_157 - - - - - - - - - Sub_Node_9_8_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_8_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_8_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_8_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_240 - - - - - - - - - Sub_Node_9_8_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_8_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_8_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_8_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_60 - - - - - - - - - Pub_Node_9_9_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_9_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_9_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_9_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_164 - - - - - - - - - Pub_Node_9_9_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_9_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_9_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_9_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_241 - - - - - - - - - Sub_Node_9_9_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_9_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_9_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_9_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_129 - - - - - - - - - Sub_Node_9_9_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_9_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_9_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_9_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_31 - - - - - - - - - Pub_Node_9_10_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_10_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_10_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_10_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_218 - - - - - - - - - Pub_Node_9_10_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_10_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_10_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_10_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_168 - - - - - - - - - Sub_Node_9_10_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_10_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_10_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_10_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_92 - - - - - - - - - Sub_Node_9_10_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_10_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_10_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_10_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_20 - - - - - - - - - Pub_Node_9_11_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_11_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_11_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_11_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_6 - - - - - - - - - Pub_Node_9_11_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_11_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_11_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_11_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_7 - - - - - - - - - Sub_Node_9_11_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_11_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_11_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_11_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_49 - - - - - - - - - Sub_Node_9_11_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_11_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_11_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_11_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_186 - - - - - - - - - Pub_Node_9_12_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_12_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_12_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_12_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_162 - - - - - - - - - Pub_Node_9_12_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_12_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_12_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_12_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_89 - - - - - - - - - Sub_Node_9_12_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_12_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_12_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_12_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_96 - - - - - - - - - Sub_Node_9_12_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_12_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_12_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_12_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_47 - - - - - - - - - Pub_Node_9_13_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_13_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_13_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_13_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_238 - - - - - - - - - Pub_Node_9_13_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_13_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_13_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_13_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_137 - - - - - - - - - Sub_Node_9_13_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_13_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_13_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_13_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_238 - - - - - - - - - Sub_Node_9_13_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_13_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_13_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_13_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_8 - - - - - - - - - Pub_Node_9_14_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_14_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_14_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_14_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_222 - - - - - - - - - Pub_Node_9_14_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_14_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_14_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_14_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_135 - - - - - - - - - Sub_Node_9_14_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_14_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_14_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_14_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_232 - - - - - - - - - Sub_Node_9_14_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_14_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_14_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_14_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_202 - - - - - - - - - Pub_Node_9_15_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_15_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_15_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_15_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_180 - - - - - - - - - Pub_Node_9_15_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_15_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_15_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_15_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_132 - - - - - - - - - Sub_Node_9_15_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_15_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_15_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_15_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_88 - - - - - - - - - Sub_Node_9_15_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_15_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_15_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_15_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_213 - - - - - - - - - Pub_Node_9_16_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_16_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_16_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_16_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_229 - - - - - - - - - Pub_Node_9_16_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_16_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_16_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_16_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_108 - - - - - - - - - Sub_Node_9_16_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_16_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_16_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_16_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_59 - - - - - - - - - Sub_Node_9_16_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_16_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_16_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_16_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_174 - - - - - - - - - Pub_Node_9_17_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_17_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_17_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_17_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_191 - - - - - - - - - Pub_Node_9_17_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_17_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_17_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_17_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_168 - - - - - - - - - Sub_Node_9_17_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_17_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_17_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_17_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_175 - - - - - - - - - Sub_Node_9_17_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_17_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_17_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_17_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_49 - - - - - - - - - Pub_Node_9_18_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_18_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_18_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_18_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_93 - - - - - - - - - Pub_Node_9_18_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_18_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_18_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_18_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_68 - - - - - - - - - Sub_Node_9_18_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_18_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_18_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_18_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_217 - - - - - - - - - Sub_Node_9_18_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_18_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_18_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_18_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_140 - - - - - - - - - Pub_Node_9_19_0_Component - Node_9 - - - - - - - - - - Pub_Node_9_19_0__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_19_0__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_19_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_18 - - - - - - - - - Pub_Node_9_19_1_Component - Node_9 - - - - - - - - - - Pub_Node_9_19_1__prov1Component - Node_9 - - - - - - - - - - Pub_Node_9_19_1__prov2Component - Node_9 - - - - - - - - - - Pub_Node_9_19_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_120 - - - - - - - - - Sub_Node_9_19_0_Component - Node_9 - - - - - - - - - - Sub_Node_9_19_0__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_19_0__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_19_0_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_65 - - - - - - - - - Sub_Node_9_19_1_Component - Node_9 - - - - - - - - - - Sub_Node_9_19_1__prov1Component - Node_9 - - - - - - - - - - Sub_Node_9_19_1__prov2Component - Node_9 - - - - - - - - - - Sub_Node_9_19_1_DDSConnectorComponent - Node_9 - - - - - - topic_name - - - tk_string - - - Topic_9 - - - - - - - - Pub_Node_0_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_0_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_0_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_0_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_0_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_0_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_0_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_1_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_1_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_1_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_1_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_1_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_1_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_2_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_2_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_2_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_2_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_2_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_2_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_3_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_3_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_3_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_3_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_3_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_3_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_4_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_4_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_4_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_4_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_4_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_4_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_5_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_5_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_5_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_5_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_5_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_5_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_6_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_6_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_6_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_6_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_6_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_6_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_7_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_7_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_7_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_7_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_7_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_7_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_8_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_8_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_8_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_8_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_8_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_8_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_0_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_0_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_0_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_0_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_0_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_0_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_1_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_1_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_1_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_1_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_1_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_1_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_2_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_2_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_2_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_2_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_2_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_2_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_3_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_3_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_3_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_3_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_3_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_3_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_4_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_4_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_4_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_4_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_4_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_4_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_5_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_5_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_5_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_5_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_5_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_5_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_6_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_6_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_6_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_6_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_6_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_6_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_7_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_7_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_7_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_7_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_7_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_7_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_8_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_8_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_8_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_8_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_8_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_8_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_9_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_9_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_9_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_9_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_9_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_9_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_10_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_10_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_10_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_10_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_10_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_10_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_11_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_11_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_11_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_11_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_11_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_11_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_12_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_12_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_12_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_12_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_12_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_12_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_13_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_13_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_13_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_13_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_13_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_13_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_14_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_14_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_14_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_14_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_14_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_14_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_15_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_15_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_15_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_15_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_15_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_15_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_16_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_16_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_16_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_16_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_16_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_16_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_17_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_17_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_17_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_17_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_17_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_17_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_18_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_18_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_18_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_18_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_18_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_18_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Pub_Node_9_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Pub_Node_9_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Pub_Node_9_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_19_0_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_19_0_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_19_0_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Sub_Node_9_19_1_service1 - - - ping_port - true - Facet - - - - - ping_one - false - SimplexReceptacle - - - - - - Sub_Node_9_19_1_service2 - - - ping_port - true - Facet - - - - - ping_two - false - SimplexReceptacle - - - - - - Sub_Node_9_19_1_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - - info_data - false - SimplexReceptacle - - - - - supplier_data - true - Facet - - - - - - Large_Connector_exec - - - Large_Connector_exec - - - Large_Connector_svnt - - - Large_Connector_svnt - - - Large_Connector_stub - - - Large_Connector_stub - - - Single_Service_exec - - - Single_Service_exec - - - Single_Service_svnt - - - Single_Service_svnt - - - Single_Service_stub - - - Single_Service_stub - - - DDS_Pub_exec - - - DDS_Pub_exec - - - DDS_Pub_svnt - - - DDS_Pub_svnt - - - DDS_Pub_stub - - - DDS_Pub_stub - - - DDS_Sub_exec - - - DDS_Sub_exec - - - DDS_Sub_svnt - - - DDS_Sub_svnt - - - DDS_Sub_stub - - - DDS_Sub_stub - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py deleted file mode 100755 index 5cb30f832ff..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/generate_large_plan.py +++ /dev/null @@ -1,247 +0,0 @@ -#!/usr/bin/python -import sys, os, math - -sys.path.append (os.getenv ("DANCE_ROOT") + "/bin") - -from PythonDAnCE import generator - -nodes = 10 -processes = 200 -proc_per_node = processes / 10 -single_service_components = 1000 -dds_pub_components = 250 -dds_pub_per_proc = 2 -dds_sub_components = 375 -dds_sub_per_proc = 2 -topics = 250 - -namespace = "" - - -def create_names (prefix, number): - retval = [] - - for x in range(number): - retval.append (prefix + "_" + str(x)) - return retval - -def add_sub_connector (name, topic, node) : - comp = "" - conn = "" - - config_prop = "" - config_prop += generator.config_prop ("topic_name", "string", topic) - - comp += generator.comp_inst (name + "DDSConnector", config_prop, ) - - deploy_req = generator.deploy_requirement ("edu.dre.vanderbilt.DAnCE.ConnectionType", - "Local_Interface") - conn += generator.connection (name + "info_out_data", - deploy_req, - generator.internal_endpoint ("info_out_data", - "false", - "SimplexReceptacle", - name + "ComponentInstance"), - generator.internal_endpoint ("push_consumer_data", - "true", - "Facet", - name + "DDSConnector" + "ComponentInstance")) - - conn += generator.connection (name + "listenercontrol", - deploy_req, - generator.internal_endpoint ("info_out_data_control", - "false", - "SimplexReceptacle", - name + "ComponentInstance"), - generator.internal_endpoint ("push_consumer_data_control", - "true", - "Facet", - name + "DDSConnector" + "ComponentInstance")) - - conn += generator.connection (name + "portstatuslistener", - deploy_req, - generator.internal_endpoint ("info_out_status", - "false", - "SimplexReceptacle", - name + "ComponentInstance"), - generator.internal_endpoint ("push_consumer_status", - "true", - "Facet", - name + "DDSConnector" + "ComponentInstance")) - - conn += generator.connection (name + "listener", - deploy_req, - generator.internal_endpoint ("info_out_data_listener", - "false", - "SimplexReceptacle", - name + "ComponentInstance"), - generator.internal_endpoint ("push_consumer_data_listener", - "true", - "Facet", - name + "DDSConnector" + "ComponentInstance")) - return (comp, conn) - -def add_pub_connector (name, topic, node) : - comp = "" - conn = "" - - config_prop = "" - config_prop += generator.config_prop.template ("topic_name", "string", topic) - - comp += generator.comp_inst.template (name + "DDSConnector", config_prop, "Large_ConnectorComponentImplementation", node) - - deploy_req = generator.deploy_requirement.template ("edu.dre.vanderbilt.DAnCE.ConnectionType", - "Local_Interface") - - conn += generator.connection.template (name + "writer", - deploy_req, - generator.internal_endpoint.template ("info_data", - "false", - "SimplexReceptacle", - name + "ComponentInstance"), - generator.internal_endpoint.template ("supplier_data", - "true", - "Facet", - name + "DDSConnector" + "ComponentInstance")) - - return (comp, conn) - -def add_provide_component (name, node) : - retval = "" - - retval += generator.comp_inst.template (name, "", "Single_ServiceComponentImplementation", node) - - return retval - -def add_dds_pub_component (name, topic, node) : - comps = "" - conns = "" - - comps += generator.comp_inst.template (name, "", "DDS_PubComponentImplementation", node) - - compname = name + "_prov1" - comps += add_provide_component (compname, node) - conns += generator.connection.template (name + "service1", - "", - generator.internal_endpoint.template ("ping_port", - "true", - "Facet", - compname+ "ComponentInstance"), - generator.internal_endpoint.template ("ping_one", - "false", - "SimplexReceptacle", - name + "ComponentInstance")) - compname = name + "_prov2" - comps += add_provide_component (compname, node) - conns += generator.connection.template (name + "service2", - "", - generator.internal_endpoint.template ("ping_port", - "true", - "Facet", - compname+ "ComponentInstance"), - generator.internal_endpoint.template ("ping_two", - "false", - "SimplexReceptacle", - name + "ComponentInstance" )) - - - (tmpcomp, tmpconn) = add_pub_connector (name, topic, node) - - comps += tmpcomp - conns += tmpconn - - return (comps, conns) - -def add_dds_sub_component (name, topic, node) : - comps = "" - conns = "" - - comps += generator.comp_inst (name, "", "DDS_PubComponentImplementation", node) - - compname = name + "_prov" - comps += add_provide_component (compname, node) - conns += generator.connection (name + "service", - "", - generator.internal_endpoint ("ping_port", - "true", - "Facet", - compname + "ComponentInstance"), - generator.internal_endpoint ("ping_one", - "false", - "SimplexReceptacle", - name + "ComponentInstance")) - - (tmpcomp, tmpconn) = add_sub_connector (name, topic, node) - - comps += tmpcomp - conns += tmpconn - - return (comps, conns) - -def main (): - - import random - - retval = "" - - retval += generator.header.template ("Large_Plan") - - retval += generator.comp_impl.template ("Large_Connector", "") - retval += generator.comp_impl.template ("Single_Service", "") - retval += generator.comp_impl.template ("DDS_Pub", "") - retval += generator.comp_impl.template ("DDS_Sub", "") - - conns = "" - comps = "" - - nodenames = create_names ("Node", nodes) - print nodenames - topicnames = create_names ("Topic", topics) - print topicnames - - pub_count = 0 - sub_count = 0 - service_count = 0 - - for name in nodenames: - for proc in range (proc_per_node): - for comp in range (dds_pub_per_proc): - (tmpcomp, tmpconn) = add_dds_pub_component ('Pub' + '_' + name + '_' + str(proc) + '_' + str(comp) + '_', - random.choice (topicnames), - name) - conns += tmpconn - comps += tmpcomp - pub_count += 1 - service_count += 2 - - for comp in range (dds_sub_per_proc): - (tmpcomp, tmpconn) = add_dds_pub_component ('Sub' + '_' + name + '_' + str(proc) + '_' + str(comp) + '_', - random.choice (topicnames), - name) - - conns += tmpconn - comps += tmpcomp - - sub_count += 1 - service_count += 1 - - retval += comps - retval += conns - - retval += generator.artifact.template ("Large_Connector") - retval += generator.artifact.template ("Single_Service") - retval += generator.artifact.template ("DDS_Pub") - retval += generator.artifact.template ("DDS_Sub") - retval += generator.footer.template () - - print "Writing a plan with " + str(pub_count) + " publish components, " + str (sub_count) + " subscribe components, and " + str(service_count) + " service components." - - outfile = open ("LargePlan.cdp", 'w') - outfile.write (retval) - outfile.close () - -if __name__ == "__main__": - main () - - - diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl deleted file mode 100755 index 1a1128aec3f..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl +++ /dev/null @@ -1,235 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 10; -@ports = ( 60001, 60002, 60003, 60004, 60005, 60006, 60007, 60008, 60009, 60010); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior", "NodeApp4.ior", "NodeApp5.ior", "NodeApp6.ior", "NodeApp7.ior", "NodeApp8.ior", "NodeApp9.ior", "NodeApp10.ior" ); -@iorfiles = 0; -@nodenames = ( "Node_0", "Node_1", "Node_2", "Node_3", "Node_4", "Node_5", "Node_6", "Node_7", "Node_8", "Node_9", "Node_10"); - -$status = 0; -$cdp_file = "LargePlan.cdp"; - -$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; - -# 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; - -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 daemon $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_daemons { - for ($i = 0; $i < $nr_daemon; ++$i) { - $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); - } -} - -sub kill_open_processes { - if ($daemons_running == 1) { - kill_node_daemons (); - } - - 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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; - $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService --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/tao_cosnaming", "-m 0 -ORBEndpoint iiop://localhost:60013 -o $ior_nsfile"); - -print STDERR "Starting Naming Service with -m 0 -ORBEndpoint iiop://localhost:60013 -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:60013/NameService"; - -# Invoke node daemon. -print "Invoking node daemon\n"; -$status = run_node_daemons (); - -if ($status != 0) { - print STDERR "ERROR: Unable to execute the node daemons\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->Spawn (); - -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 -l\n"; -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file -k file://$ior_emfile -l"); -$E->SpawnWaitKill (600); - -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 "Invoking the controller ($controller_exec -k file://Sender.ior)\n"; -# $CTRL = $tg_executor->CreateProcess ("$controller_exec", "-k file://Sender.ior"); -# $result = $CTRL->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); - -# if ($result != 0) { -# print STDERR "ERROR: The controller returned $result\n"; -# $status = 1; -# } - -# 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 -s\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (600); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore deleted file mode 100644 index b3680ac0a10..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Quoter_Base.cxx -/Quoter_Base.h -/Quoter_BasePlugin.cxx -/Quoter_BasePlugin.h -/Quoter_BaseSupport.cxx -/Quoter_BaseSupport.h -/Quoter_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl deleted file mode 100644 index d1090b3c338..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file Quoter_Base.idl - * @author William R. Otte - */ - -#ifndef QUOTER_BASE_IDL -#define QUOTER_BASE_IDL - -#pragma ndds typesupport "Base/Quoter_BaseSupport.h" -#pragma opendds typesupport "Base/Quoter_BaseTypeSupportImpl.h" -#pragma coredx typesupport "Base/Quoter_BaseTypeSupport.hh" - -#pragma DCPS_DATA_TYPE "Quoter::Stock_Info" -#pragma DCPS_DATA_KEY "Quoter::Stock_Info symbol" - -module Quoter -{ - struct Stock_Info - { - unsigned long low; - unsigned long high; - unsigned long current; - string symbol; //@key - }; - #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED - typedef sequence Stock_InfoSeq; - #endif -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc deleted file mode 100644 index 34749fe2c06..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Quoter_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Quoter_Base_stub - dynamicflags += QUOTER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUOTER_BASE_STUB_Export \ - -Wb,stub_export_include=Quoter_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Quoter_Base.idl - } - - opendds_ts_flags += --export=QUOTER_BASE_STUB_Export - - DDSGenerator_Files { - Quoter_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore deleted file mode 100644 index e8f702114ed..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/BrokerE.idl -/Broker_exec_export.h -/Broker_lem_stub_export.h -/Broker_stub_export.h -/Broker_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl deleted file mode 100644 index 5f2082f60fb..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file Broker.idl - * @author William R. Otte - */ - -#ifndef BROKER_IDL -#define BROKER_IDL - -#include "Connector/Quoter_Connector.idl" - -module Quoter -{ - component Broker - { - port ::Quoter::DDS_Listen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc deleted file mode 100644 index da2e9084a36..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Broker" - -project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Quoter_Connector_idl_gen - idlflags += -Wb,stub_export_macro=BROKER_STUB_Export \ - -Wb,stub_export_include=Broker_stub_export.h \ - -Wb,skel_export_macro=BROKER_SVNT_Export \ - -Wb,skel_export_include=Broker_svnt_export.h \ - -Wb,svnt_export_macro=BROKER_SVNT_Export \ - -Wb,svnt_export_include=Broker_svnt_export.h \ - -Wb,exec_export_macro=BROKER_EXEC_Export \ - -Wb,exec_export_include=Broker_exec_export.h \ - -I.. - - IDL_Files { - Broker.idl - } -} - -project(DDS_Broker_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Broker_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=BROKER_LEM_STUB_Export \ - -Wb,stub_export_include=Broker_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - BrokerE.idl - } -} - -project(DDS_Broker_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Broker_lem_gen DDS_Broker_stub DDS_Quoter_Connector_stub DDS_Quoter_Base_stub - libs += Broker_stub DDS_Quoter_Connector_stub DDS_Quoter_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Broker_lem_stub - dynamicflags += BROKER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BrokerEC.cpp - } - - Header_Files { - BrokerEC.h - Broker_lem_stub_export.h - } - - Inline_Files { - BrokerEC.inl - } -} - -project(DDS_Broker_stub) : ccm_stub, dds4ccm_base { - after += DDS_Broker_idl_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_gen - libs += DDS_Quoter_Connector_stub DDS_Quoter_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Broker_stub - dynamicflags += BROKER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BrokerC.cpp - } - - Header_Files { - BrokerC.h - Broker_stub_export.h - } - - Inline_Files { - BrokerC.inl - } -} - -project(DDS_Broker_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Broker_lem_stub DDS_Broker_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub - sharedname = Broker_exec - libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += BROKER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Broker_exec.cpp - } - - Header_Files { - Broker_exec.h - Broker_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Broker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub - sharedname = Broker_svnt - libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += BROKER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BrokerS.cpp - Broker_svnt.cpp - } - - Header_Files { - BrokerS.h - Broker_svnt.h - Broker_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp deleted file mode 100644 index 32bbd9aa010..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp +++ /dev/null @@ -1,218 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Broker_exec.h" -#include "ace/OS_NS_time.h" - -namespace CIAO_Quoter_Broker_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Quoter::CCM_Broker_Context_ptr ctx) - : ciao_context_ ( - ::Quoter::CCM_Broker_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Quoter::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::Quoter::Stock_Info & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, "Stock_Info_Listener: received a stock_info for <%C> at %u:%u:%u\n", - datum.symbol.in (), - datum.low, - datum.current, - datum.high)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::Quoter::Stock_InfoSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Quoter::CCM_Broker_Context_ptr ctx) - : ciao_context_ ( - ::Quoter::CCM_Broker_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - ACE_DEBUG ((LM_DEBUG, "####### deadline missed ######\n")); - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & status) - { - ACE_DEBUG ((LM_DEBUG, "####### sample lost ######\n")); - ACE_DEBUG ((LM_DEBUG, " status.total_count = %d\n", status.total_count)); - ACE_DEBUG ((LM_DEBUG, " status.total_count_change = %d\n", status.total_count_change)); - } - - /** - * Component Executor Implementation Class: Broker_exec_i - */ - - Broker_exec_i::Broker_exec_i (void) - { - ACE_OS::srand (static_cast (ACE_OS::time ())); - } - - Broker_exec_i::~Broker_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, "Broker_exec_i::~Broker_exec_i\n")); - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Quoter::CCM_Listener_ptr - Broker_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Quoter::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Quoter::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Broker_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Broker_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Quoter::CCM_Broker_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Broker_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::configuration_complete\n")); - } - - void - Broker_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_activate\n")); - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Error: Listener control receptacle is null!\n")); - throw ::CORBA::INTERNAL (); - } - lc->mode ( ::CCM_DDS::ONE_BY_ONE); - } - - void - Broker_exec_i::ccm_passivate (void) - { - ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_passivate\n")); - } - - void - Broker_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::ccm_remove\n")); - } - - extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Broker_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Broker_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h deleted file mode 100644 index ea11e9a2173..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h +++ /dev/null @@ -1,167 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_BROKER_EXEC_ULWEAH_H_ -#define CIAO_BROKER_EXEC_ULWEAH_H_ - -#include /**/ "ace/pre.h" - -#include "BrokerEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Broker_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Quoter_Broker_Impl -{ - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Quoter::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Quoter::CCM_Broker_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Quoter::Listener. */ - - virtual - void on_one_data (const ::Quoter::Stock_Info & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::Quoter::Stock_InfoSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Quoter::CCM_Broker_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Quoter::CCM_Broker_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Quoter::CCM_Broker_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Broker_exec_i - */ - - class Broker_exec_i - : public virtual Broker_Exec, - public virtual ::CORBA::LocalObject - { - public: - Broker_exec_i (void); - virtual ~Broker_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Quoter::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Quoter::CCM_Broker_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Quoter::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Broker_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore deleted file mode 100644 index 81c98544e51..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Quoter_ConnectorE.idl -/Quoter_Connector_conn.cpp -/Quoter_Connector_conn.h -/Quoter_Connector_conn_export.h -/Quoter_Connector_lem_stub_export.h -/Quoter_Connector_stub_export.h -/Quoter_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl deleted file mode 100644 index a09fe6a0bee..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Quoter_Connector.idl - * @author William R. Otte - */ - -#ifndef QUOTER_CONNECTOR_IDL_ -#define QUOTER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Quoter_Base.idl" - -#pragma ciao lem "Connector/Quoter_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Quoter_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::Quoter::Stock_Info, ::Quoter::Stock_InfoSeq> Quoter; - -#endif /* QUOTER_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc deleted file mode 100644 index 12ca1d082aa..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector" - -project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Quoter_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Quoter_Connector_stub_export.h \ - -Wb,skel_export_macro=QUOTER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Quoter_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUOTER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Quoter_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUOTER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Quoter_Connector_conn_export.h \ - -I .. - - IDL_Files { - Quoter_Connector.idl - } -} - -project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Quoter_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Quoter_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Quoter_ConnectorE.idl - } -} - -project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub - libs += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Quoter_Connector_lem_stub - dynamicflags += QUOTER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Quoter_ConnectorEC.cpp - } - - Header_Files { - Quoter_ConnectorEC.h - Quoter_Connector_lem_stub_export.h - } - - Inline_Files { - Quoter_ConnectorEC.inl - } -} - -project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Quoter_Connector_idl_gen DDS_Quoter_Base_stub - libs += DDS_Quoter_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Quoter_Connector_stub - dynamicflags += QUOTER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Quoter_ConnectorC.cpp - } - - Header_Files { - Quoter_ConnectorC.h - Quoter_Connector_stub_export.h - } - - Inline_Files { - Quoter_ConnectorC.inl - } -} - -project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub - sharedname = DDS_Quoter_Connector_exec - libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUOTER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Quoter_Connector_conn.cpp - } - - Header_Files { - Quoter_Connector_conn.h - Quoter_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub - sharedname = DDS_Quoter_Connector_svnt - libs += DDS_Quoter_Connector_stub \ - DDS_Quoter_Connector_lem_stub \ - DDS_Quoter_Base_stub \ - DDS_Quoter_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUOTER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Quoter_ConnectorS.cpp - Quoter_Connector_svnt.cpp - } - - Header_Files { - Quoter_ConnectorS.h - Quoter_Connector_svnt.h - Quoter_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore deleted file mode 100644 index 79a9a6501cb..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/DistributorE.idl -/Distributor_exec_export.h -/Distributor_lem_stub_export.h -/Distributor_stub_export.h -/Distributor_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl deleted file mode 100644 index 5b693131598..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file Distributor.idl - * @author William R. Otte - */ - -#ifndef DDS_DISTRIBUTOR_IDL -#define DDS_DISTRIBUTOR_IDL - -#include "Connector/Quoter_Connector.idl" - -module Quoter -{ - interface Trigger - { - void add_stock (in string stock); - void del_stock (in string stock); - void start (); - void stop (); - }; - - component Distributor supports Trigger - { - port Quoter::DDS_Write info_in; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - attribute unsigned long rate; - }; -}; - -#endif - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc deleted file mode 100644 index 1d7809a7bd1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l ../lib -o ../lib -c controller -u DDS Distributor" - -project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Quoter_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \ - -Wb,stub_export_include=Distributor_stub_export.h \ - -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export \ - -Wb,skel_export_include=Distributor_svnt_export.h \ - -Wb,svnt_export_macro=DISTRIBUTOR_SVNT_Export \ - -Wb,svnt_export_include=Distributor_svnt_export.h \ - -Wb,exec_export_macro=DISTRIBUTOR_EXEC_Export \ - -Wb,exec_export_include=Distributor_exec_export.h \ - -I.. - - IDL_Files { - Distributor.idl - } -} - -project(DDS_Distributor_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Distributor_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=DISTRIBUTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Distributor_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - DistributorE.idl - } -} - -project(DDS_Distributor_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Distributor_lem_gen DDS_Distributor_stub DDS_Quoter_Base_stub - libs += DDS_Quoter_Base_stub Distributor_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Distributor_lem_stub - dynamicflags += DISTRIBUTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DistributorEC.cpp - } - - Header_Files { - DistributorEC.h - Distributor_lem_stub_export.h - } - - Inline_Files { - DistributorEC.inl - } -} - -project(DDS_Distributor_stub) : ccm_stub, dds4ccm_base { - after += DDS_Distributor_idl_gen DDS_Quoter_Base_stub DDS_Quoter_Connector_stub - libs += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Distributor_stub - dynamicflags += DISTRIBUTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DistributorC.cpp - } - - Header_Files { - DistributorC.h - Distributor_stub_export.h - } - - Inline_Files { - DistributorC.inl - } -} - -project(DDS_Distributor_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Distributor_lem_stub DDS_Distributor_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub - sharedname = Distributor_exec - libs += Distributor_stub Distributor_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += DISTRIBUTOR_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Distributor_exec.cpp - } - - Header_Files { - Distributor_exec.h - Distributor_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Quoter_Base_stub DDS_Distributor_lem_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub - sharedname = Distributor_svnt - libs += Distributor_stub Distributor_lem_stub \ - DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DISTRIBUTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DistributorS.cpp - Distributor_svnt.cpp - } - - Header_Files { - DistributorS.h - Distributor_svnt.h - Distributor_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp deleted file mode 100644 index 9554eaaa413..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp +++ /dev/null @@ -1,354 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Distributor_exec.h" -#include "ace/OS_NS_time.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Quoter_Distributor_Impl -{ - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Distributor_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Trigger the write action - this->pulse_callback_.tick (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Quoter::CCM_Distributor_Context_ptr ctx) - : ciao_context_ ( - ::Quoter::CCM_Distributor_Context::_duplicate (ctx)) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind /* status_kind */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Distributor_exec_i - */ - - Distributor_exec_i::Distributor_exec_i (void) - : rate_ (1) - { - ACE_OS::srand (static_cast (ACE_OS::time ())); - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Distributor_exec_i::~Distributor_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Distributor_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Distributor_exec_i::tick (void) - { - ACE_DEBUG ((LM_DEBUG, "Ticking\n")); - - for (Stock_Table::iterator i = this->stocks_.begin (); - i != this->stocks_.end (); - ++i) - { - if (ACE_OS::rand () % 2) - { - int const delta = (ACE_OS::rand () % 10) - 2; - - i->second->current += delta; - - if (i->second->current > i->second->high) - i->second->high = i->second->current; - - if (i->second->current < i->second->low) - i->second->low = i->second->current; - - ::Quoter::Writer_var writer = - this->ciao_context_->get_connection_info_in_data (); - - if (! ::CORBA::is_nil (writer.in ())) { - ACE_DEBUG ((LM_DEBUG, "WRITE AND CREATE stock_info for <%C> %u:%u:%u\n", - i->first.c_str (), - i->second->low, - i->second->current, - i->second->high)); - try - { - writer->write_one (i->second, ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "Internal Error while writing Stock_info for <%C>.\n", - i->first.c_str ())); - } - } - else - ACE_ERROR ((LM_ERROR, "Writer reference is nil!\n")); - } - } - } - - void - Distributor_exec_i::add_stock (const char * stock) - { - ACE_DEBUG ((LM_DEBUG, "Distributor_exec_i::add_stock - Adding stock: %C\n", stock)); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - Quoter::Stock_Info *new_stock = new Quoter::Stock_Info; - - new_stock->low = 50; - new_stock->high = 50; - new_stock->current = 50; - new_stock->symbol = stock; - - this->stocks_[stock] = new_stock; - } - - void - Distributor_exec_i::del_stock (const char * stock) - { - ACE_DEBUG ((LM_DEBUG, - "Distributor_exec_i::del_stock - Removing stock: %C\n", stock)); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - Stock_Table::iterator pos = this->stocks_.find (stock); - - if (pos != this->stocks_.end ()) - { - this->stocks_.erase (pos); - } - else - { - ACE_ERROR ((LM_ERROR, - "Distributor_exec_i::del_stock - Stock not present: %C\n", - stock)); - } - } - - void - Distributor_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Distributor_exec_i::start : error scheduling timer\n")); - } - } - - void - Distributor_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, "Distributor_exec_i::stop\n")); - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Distributor_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CORBA::ULong - Distributor_exec_i::rate (void) - { - return this->rate_; - } - - void - Distributor_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - // Operations from Components::SessionComponent. - - void - Distributor_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Quoter::CCM_Distributor_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Distributor_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Distributor_exec_i::ccm_activate (void) - { - this->start (); - this->add_stock ("MSFT"); - this->add_stock ("IBM"); - this->add_stock ("HP"); - this->add_stock ("DELL"); - this->add_stock ("ACER"); - this->add_stock ("ASUS"); - } - - void - Distributor_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Distributor_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Distributor_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Distributor_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h deleted file mode 100644 index 9e4e2fb5bce..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h +++ /dev/null @@ -1,196 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_DISTRIBUTOR_EXEC_SBNFU0_H_ -#define CIAO_DISTRIBUTOR_EXEC_SBNFU0_H_ - -#include /**/ "ace/pre.h" - -#include "DistributorEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Distributor_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Quoter_Distributor_Impl -{ - class Distributor_exec_i; - - /** - * @class pulse generator - * - * @brief An active object used by StockDistributor to perform periodical - * write action to DDS - * - */ - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Distributor_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Distributor_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Quoter::CCM_Distributor_Context_ptr ctx); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Quoter::CCM_Distributor_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Distributor_exec_i - */ - - class Distributor_exec_i - : public virtual Distributor_Exec, - public virtual ::CORBA::LocalObject - { - public: - Distributor_exec_i (void); - virtual ~Distributor_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - virtual void add_stock (const char * stock); - - virtual void del_stock (const char * stock); - - virtual void start (void); - - virtual void stop (void); - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - - //@} - - private: - ::Quoter::CCM_Distributor_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - - ::CORBA::ULong rate_; - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Stock_Table; - Stock_Table stocks_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Quoter_Distributor_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp deleted file mode 100644 index 26c8216ada8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp +++ /dev/null @@ -1,426 +0,0 @@ - - - - Quoter_Depl_1 - - - BrokerComponentImplementation - - - - - - component factory - - - tk_string - - - create_Quoter_Broker_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_Broker_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Broker_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Broker_exec - - - - - - - Quoter_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Quoter_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Quoter_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Quoter_Connector_exec - - - - - - DistributorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Quoter_Distributor_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Quoter_Distributor_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Distributor_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Distributor_exec - - - - - - BrokerComponent - BrokerNode - - - - - - Quoter_ConnectorComponent - DistributorNode - - - - - topic_name - - - tk_string - - - Quoter - - - - - - Quoter_ConnectorComponent2 - BrokerNode - - - - - topic_name - - - tk_string - - - Quoter - - - - - - DistributorComponent - DistributorNode - - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - _datareader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_dds_entity - false - SimplexReceptacle - - - - push_consumer_dds_entity - true - Facet - - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - _connectorstatuslistener_distributor - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_in_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - - Distributor_exec - - - Distributor_exec - - - Distributor_svnt - - - Distributor_svnt - - - Distributor_stub - - - Distributor_stub - - - Quoter_Connector_exec - - - DDS_Quoter_Connector_exec - - - Quoter_Connector_svnt - - - DDS_Quoter_Connector_svnt - - - Quoter_Connector_stub - - - DDS_Quoter_Connector_stub - - - Broker_exec - - - Broker_exec - - - Broker_svnt - - - Broker_svnt - - - Broker_stub - - - Broker_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl deleted file mode 100755 index 7abf104c710..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "DistributorNode", "BrokerNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore deleted file mode 100644 index d7628eb7cc6..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Shapes_Base.cxx -/Shapes_Base.h -/Shapes_BasePlugin.cxx -/Shapes_BasePlugin.h -/Shapes_BaseSupport.cxx -/Shapes_BaseSupport.h -/Shapes_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl deleted file mode 100644 index 49f178f6d4e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @file Shapes_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHAPES_BASE_IDL -#define SHAPES_BASE_IDL - -#pragma ndds typesupport "Base/Shapes_BaseSupport.h" -#pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "org::omg::dds::demo::ShapeType" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::ShapeType color" - -module org { - module omg { - module dds { - module demo { - struct ShapeType { - string color; //@key - long x; - long y; - long shapesize; - }; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED - typedef sequence ShapeTypeSeq; -#endif - }; - }; - }; -}; - - -#pragma keylist ShapeType color - -#pragma DCPS_DATA_TYPE "org::omg::dds::demo::Attributes" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes shape" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes color" - -module org { - module omg { - module dds { - module demo { - struct Attributes { - string shape; //@key - string color; //@key - float speed; - }; - }; - }; - }; -}; - -// #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq" -// typedef sequence AttributesSeq; - -#pragma keylist Attributes shape color - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc deleted file mode 100644 index c370655b160..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Shapes_Base_stub - dynamicflags += SHAPES_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \ - -Wb,stub_export_include=Shapes_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Shapes_Base.idl - } - - opendds_ts_flags += --export=SHAPES_BASE_STUB_Export - - DDSGenerator_Files { - Shapes_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore deleted file mode 100644 index b4bfd04182c..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Shapes_ConnectorE.idl -/Shapes_Connector_conn.cpp -/Shapes_Connector_conn.h -/Shapes_Connector_conn_export.h -/Shapes_Connector_lem_stub_export.h -/Shapes_Connector_stub_export.h -/Shapes_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl deleted file mode 100644 index 9669a787727..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Shapes_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHAPES_CONNECTOR_IDL_ -#define SHAPES_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Shapes_Base.idl" - -#pragma ciao lem "Connector/Shapes_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Shapes_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::org::omg::dds::demo::ShapeType, ::org::omg::dds::demo::ShapeTypeSeq> Shapes; - -#endif /* SHAPES_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc deleted file mode 100644 index c0f218bea41..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector" - -project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Shapes_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Shapes_Connector_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Shapes_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Connector_svnt_export.h \ - -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Shapes_Connector_conn_export.h \ - -I .. - - IDL_Files { - Shapes_Connector.idl - } -} - -project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Shapes_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Shapes_ConnectorE.idl - } -} - -project(DDS_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub - libs += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Shapes_Connector_lem_stub - dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorEC.cpp - } - - Header_Files { - Shapes_ConnectorEC.h - Shapes_Connector_lem_stub_export.h - } - - Inline_Files { - Shapes_ConnectorEC.inl - } -} - -project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Shapes_Connector_idl_gen DDS_Shapes_Base_stub - libs += DDS_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Shapes_Connector_stub - dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorC.cpp - } - - Header_Files { - Shapes_ConnectorC.h - Shapes_Connector_stub_export.h - } - - Inline_Files { - Shapes_ConnectorC.inl - } -} - -project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub - sharedname = DDS_Shapes_Connector_exec - libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Connector_conn.cpp - } - - Header_Files { - Shapes_Connector_conn.h - Shapes_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub - sharedname = DDS_Shapes_Connector_svnt - libs += DDS_Shapes_Connector_stub \ - DDS_Shapes_Connector_lem_stub \ - DDS_Shapes_Base_stub \ - DDS_Shapes_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorS.cpp - Shapes_Connector_svnt.cpp - } - - Header_Files { - Shapes_ConnectorS.h - Shapes_Connector_svnt.h - Shapes_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore deleted file mode 100644 index 23750473699..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/Shapes_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl deleted file mode 100644 index b152d0228d4..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Shapes_Connector.idl" - -module Shapes -{ - component Receiver - { - 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. - attribute boolean raw_listen; //if true, raw listen port is enabled. - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc deleted file mode 100644 index 87c757c3463..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver" - -project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Shapes_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Shapes_Receiver.idl - } -} - -project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Shapes_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Shapes_ReceiverE.idl - } -} - -project(DDS_Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Shapes_Receiver_lem_gen DDS_Shapes_Receiver_stub DDS_Shapes_Connector_stub DDS_Shapes_Base_stub - libs += Receiver_stub DDS_Shapes_Connector_stub DDS_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverEC.cpp - } - - Header_Files { - Shapes_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Shapes_ReceiverEC.inl - } -} - -project(DDS_Shapes_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Shapes_Receiver_idl_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_lem_gen - libs += DDS_Shapes_Connector_stub DDS_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverC.cpp - } - - Header_Files { - Shapes_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Shapes_ReceiverC.inl - } -} - -project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Receiver_exec.cpp - } - - Header_Files { - Shapes_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverS.cpp - Shapes_Receiver_svnt.cpp - } - - Header_Files { - Shapes_ReceiverS.h - Shapes_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp deleted file mode 100644 index f64d740e019..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp +++ /dev/null @@ -1,577 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Shapes_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/TimeUtilities.h" - -namespace CIAO_Shapes_Receiver_Impl -{ - - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - if (pulse_callback_.read_data ()) - { - this->pulse_callback_.read_one(); - this->pulse_callback_.read_all(); - } - if (pulse_callback_.get_data ()) - { - this->pulse_callback_.get_one (); - } - return 0; - } - - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Shapes::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - datum.color.in (), - datum.x, - datum.y, - datum.shapesize)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (0) - , get_data_ (true) - , read_data_ (true) - , raw_listen_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_one (void) - { - ShapeType shape_info; - shape_info.color = "GREEN"; - ::CCM_DDS::ReadInfo readinfo; - - try - { - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (! ::CORBA::is_nil (reader.in ())) - { - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); - ACE_Time_Value time; - time <<= readinfo.source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") - ACE_TEXT (" -> date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_info.color.in (), - shape_info.x, - shape_info.y, - shape_info.shapesize)); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - " - "ERROR: reader seems to be nil.\n")); - } - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: ") - ACE_TEXT ("no shape_info received\n"))); - } - } - - void - Receiver_exec_i::read_all (void) - { - ShapeTypeSeq shape_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (! ::CORBA::is_nil (reader.in ())) - { - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - reader->read_all(shape_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) - { - ACE_Time_Value time; - time <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date = %#T\n"), &time)); - } - for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_infos[i].color.in (), - shape_infos[i].x, - shape_infos[i].y, - shape_infos[i].shapesize)); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "ERROR: reader seems to be nil.\n")); - } - } - - void - Receiver_exec_i::get_one (void) - { - ShapeType_var shape_info; - ::CCM_DDS::ReadInfo_var readinfo; - - try - { - ::Shapes::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (! ::CORBA::is_nil (getter.in ())) - { - ::CORBA::Object_var cmp = getter->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - if (getter->get_one (shape_info.out (), readinfo.out ())) - { - ACE_Time_Value time; - time <<= readinfo->source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") - ACE_TEXT ("date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), - shape_info->color.in ())); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " - "ERROR: Getter seems nil\n")); - } - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n"))); - } - } - - // Component attributes and port operations. - - ::Shapes::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Shapes::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Shapes::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::CORBA::ULong - Receiver_exec_i::rate (void) - { - return this->rate_; - } - - void - Receiver_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::Boolean - Receiver_exec_i::get_data (void) - { - return this->get_data_; - } - - void - Receiver_exec_i::get_data ( - const ::CORBA::Boolean get_data) - { - this->get_data_ = get_data; - } - - ::CORBA::Boolean - Receiver_exec_i::read_data (void) - { - return this->read_data_; - } - - void - Receiver_exec_i::read_data ( - const ::CORBA::Boolean read_data) - { - this->read_data_ = read_data; - } - - ::CORBA::Boolean - Receiver_exec_i::raw_listen (void) - { - return this->raw_listen_; - } - - void - Receiver_exec_i::raw_listen ( - const ::CORBA::Boolean raw_listen) - { - this->raw_listen_ = raw_listen; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - - lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED); - - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(0, usec), - ACE_Time_Value(0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h deleted file mode 100644 index 5b4ee0068f5..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h +++ /dev/null @@ -1,260 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ -#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -// 2013 version of the DDS shapes example moves -// the ShapeType to a nested module -using org::omg::dds::demo::ShapeType; -using org::omg::dds::demo::ShapeTypeSeq; -using org::omg::dds::demo::ShapeType_var; - -namespace CIAO_Shapes_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * @class reader activity generator - * - * @brief an active object used by Receiver to perform a periodical read action - * - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Shapes::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Shapes::Listener. */ - - virtual - void on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ShapeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Shapes::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::Boolean get_data (void); - - virtual void get_data (::CORBA::Boolean get_data); - - virtual ::CORBA::Boolean read_data (void); - - virtual void read_data (::CORBA::Boolean read_data); - - virtual ::CORBA::Boolean raw_listen (void); - - virtual void raw_listen (::CORBA::Boolean raw_listen); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_one (void); - void read_all (void); - void get_one (void); - - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Shapes::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - - ::CORBA::ULong rate_; - - ::CORBA::Boolean get_data_; - - ::CORBA::Boolean read_data_; - - ::CORBA::Boolean raw_listen_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore deleted file mode 100644 index 8df0b59631f..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/Shapes_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl deleted file mode 100644 index d0ea6a9c8a1..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_SHAPES_SENDER_IDL -#define DDS_SHAPES_SENDER_IDL - -#include "Connector/Shapes_Connector.idl" - -module Shapes -{ - component Sender - { - port Shapes::DDS_Write info_write; - attribute unsigned long rate; - attribute unsigned short max_x; - attribute unsigned short max_y; - attribute unsigned short max_size; - attribute boolean resize_shape; - attribute string color; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc deleted file mode 100644 index fadc1c3c0e9..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Shapes_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Shapes_Sender.idl - } -} - -project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Shapes_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Shapes_SenderE.idl - } -} - -project(DDS_Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Shapes_Sender_lem_gen DDS_Shapes_Sender_stub DDS_Shapes_Base_stub - libs += DDS_Shapes_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderEC.cpp - } - - Header_Files { - Shapes_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Shapes_SenderEC.inl - } -} - -project(DDS_Shapes_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Shapes_Sender_idl_gen DDS_Shapes_Base_stub DDS_Shapes_Connector_stub - libs += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderC.cpp - } - - Header_Files { - Shapes_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Shapes_SenderC.inl - } -} - -project(DDS_Shapes_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_Shapes_Sender_lem_stub DDS_Shapes_Sender_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Sender_exec.cpp - } - - Header_Files { - Shapes_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Shapes_Base_stub DDS_Shapes_Sender_lem_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderS.cpp - Shapes_Sender_svnt.cpp - } - - Header_Files { - Shapes_SenderS.h - Shapes_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp deleted file mode 100644 index 22da2de39d9..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp +++ /dev/null @@ -1,407 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Shapes_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Sender_Impl -{ - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1) - , max_x_ (100) - , max_y_ (100) - , max_size_ (25) - , resize_shape_ (false) - , color_ ("CYAN") - , x_increasing_ (false) - , y_increasing_ (false) - , size_increasing_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->square_, - ShapeType, - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - delete this->square_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - if (this->x_increasing_) - { - ++this->square_->x; - this->x_increasing_ = this->square_->x + 1 <= this->max_x_; - } - else - { - --this->square_->x; - this->x_increasing_ = this->square_->x - 1 < 0; - } - if (this->y_increasing_) - { - ++this->square_->y; - this->y_increasing_ = this->square_->y + 1 <= this->max_y_; - } - else - { - --this->square_->y; - this->y_increasing_ = this->square_->y - 1 < 0; - } - if (resize_shape ()) - { - if (this->size_increasing_) - { - ++this->square_->shapesize; - this->size_increasing_ = this->square_->shapesize + 1 <= this->max_size_; - } - else - { - --this->square_->shapesize; - this->size_increasing_ = this->square_->shapesize - 1 < 0; - } - } - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - writer->write_one (*this->square_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info <%C> for <%C> %u:%u:%u\n"), - topic.in (), - this->square_->color.in (), - this->square_->x, - this->square_->y, - this->square_->shapesize)); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not updated: didn't exist.\n"), - this->square_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - this->square_->color.in ())); - } - } - - void - Sender_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - writer->unregister_instance (*this->square_, - this->instance_handle_); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - this->square_->color.in (), this->square_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - this->square_->color.in ())); - } - } - - // Component attributes and port operations. - - ::CORBA::ULong - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::max_x (void) - { - return this->max_x_; - } - - void - Sender_exec_i::max_x ( - const ::CORBA::UShort max_x) - { - this->max_x_ = max_x; - } - - ::CORBA::UShort - Sender_exec_i::max_y (void) - { - return this->max_y_; - } - - void - Sender_exec_i::max_y ( - const ::CORBA::UShort max_y) - { - this->max_y_ = max_y; - } - - ::CORBA::UShort - Sender_exec_i::max_size (void) - { - return this->max_size_; - } - - void - Sender_exec_i::max_size ( - const ::CORBA::UShort max_size) - { - this->max_size_ = max_size; - } - - ::CORBA::Boolean - Sender_exec_i::resize_shape (void) - { - return this->resize_shape_; - } - - void - Sender_exec_i::resize_shape ( - const ::CORBA::Boolean resize_shape) - { - this->resize_shape_ = resize_shape; - } - - char* - Sender_exec_i::color (void) - { - return ::CORBA::string_dup (this->color_); - } - - void - Sender_exec_i::color (const char* color) - { - this->color_ = ::CORBA::string_dup (color); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - // Set the square properties right now - this->square_->x = ACE_OS::rand () % this->max_x_; - this->square_->y = ACE_OS::rand () % this->max_y_; - this->square_->shapesize = this->max_size_; - this->square_->color = CORBA::string_dup(this->color_); - } - - void - Sender_exec_i::ccm_activate (void) - { - this->start (); - - // Register shape with dds. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - this->square_->color.in (), - this->square_->x, - this->square_->y, - this->square_->shapesize)); - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - this->instance_handle_ = - writer->register_instance (*this->square_); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::AlreadyCreated& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - this->square_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - this->square_->color.in ())); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h deleted file mode 100644 index fdbc6bef248..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h +++ /dev/null @@ -1,177 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ -#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -// 2013 version of the DDS shapes example moves -// the ShapeType to a nested module -using org::omg::dds::demo::ShapeType; -using org::omg::dds::demo::ShapeTypeSeq; -using org::omg::dds::demo::ShapeType_var; - -namespace CIAO_Shapes_Sender_Impl -{ - class Sender_exec_i; - - /** - * Write action generator - */ - - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::UShort max_x (void); - - virtual void max_x (::CORBA::UShort max_x); - - virtual ::CORBA::UShort max_y (void); - - virtual void max_y (::CORBA::UShort max_y); - - virtual ::CORBA::UShort max_size (void); - - virtual void max_size (::CORBA::UShort max_size); - - virtual ::CORBA::Boolean resize_shape (void); - - virtual void resize_shape (::CORBA::Boolean resize_shape); - - virtual char *color (void); - - virtual void color (const char* color); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - - //@} - - private: - ::Shapes::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::ULong rate_; - - ::CORBA::UShort max_x_; - - ::CORBA::UShort max_y_; - - ::CORBA::UShort max_size_; - - ::CORBA::Boolean resize_shape_; - - ::CORBA::String_var color_; - //@} - - //@{ - /** User defined members. */ - void start (void); - void stop (void); - - pulse_Generator * ticker_; - - bool x_increasing_; - bool y_increasing_; - bool size_increasing_; - - ShapeType* square_; - - ::DDS::InstanceHandle_t instance_handle_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp deleted file mode 100644 index 88ef3a83c34..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.cdp +++ /dev/null @@ -1,498 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - Shapes_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl deleted file mode 100755 index 3c66fb771f8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_1.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_1.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp deleted file mode 100644 index 49379039587..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.cdp +++ /dev/null @@ -1,1123 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - TriangleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_2#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_2#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_2#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_2#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_2#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_2#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - TriangleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - triangle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - triangle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - triangle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - triangle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl deleted file mode 100755 index ce146787830..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_2.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml deleted file mode 100644 index d4fb8fcce40..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_2.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp deleted file mode 100644 index d3e6b58e216..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.cdp +++ /dev/null @@ -1,1123 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - TriangleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_3#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_3#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_3#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_3#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_3#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_3#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - TriangleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - triangle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - triangle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - triangle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - triangle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl deleted file mode 100755 index 41b8d20a33b..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_3.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml deleted file mode 100644 index 18bcdceb388..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_3.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - SHARED_OWNERSHIP_QOS - - - - - SHARED_OWNERSHIP_QOS - - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - SHARED_OWNERSHIP_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp deleted file mode 100644 index 6924e4745ae..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.cdp +++ /dev/null @@ -1,520 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_4#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - Shapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_4#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SenderComponent - SenderNode - - - - - color - - - tk_string - - - CYAN - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl deleted file mode 100755 index c473392791b..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_4.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml deleted file mode 100644 index 8840d92ca72..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_4.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 100 - - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 100 - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp deleted file mode 100644 index 1d9e102818e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.cdp +++ /dev/null @@ -1,1123 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - TriangleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_6#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_6#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_6#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_6#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_6#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_6#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - TriangleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - triangle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - triangle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - triangle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - triangle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl deleted file mode 100755 index 96d90a577dc..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_6.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml deleted file mode 100644 index d526f8785fd..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_6.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - A - - - - - - - A - - - - - - - - - B - - - - - - - A - - - - - - - - - * - - - - - - - A - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp deleted file mode 100644 index 6856a4bbdc7..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.cdp +++ /dev/null @@ -1,520 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_7#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - Shapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_7#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SenderComponent - SenderNode - - - - - color - - - tk_string - - - MAGENTA - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl deleted file mode 100755 index 636abccd514..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_7.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml deleted file mode 100644 index 584fa8abc5e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_7.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - 10 - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp deleted file mode 100644 index 4627540e501..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.cdp +++ /dev/null @@ -1,840 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_6#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_6#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_6#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_6#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - false - - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl deleted file mode 100755 index 951988bf471..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_8.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml deleted file mode 100644 index 584fa8abc5e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_8.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - 10 - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp deleted file mode 100644 index 6924e4745ae..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.cdp +++ /dev/null @@ -1,520 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - run_4#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - Shapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - run_4#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SenderComponent - SenderNode - - - - - color - - - tk_string - - - CYAN - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl deleted file mode 100755 index 80d69fd0310..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 = "run_9.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml deleted file mode 100644 index c1cde9f28eb..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/2013_interop_demo/run_9.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp deleted file mode 100644 index b9af4bbfb65..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp +++ /dev/null @@ -1,498 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - Shapes_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SenderComponent - SenderNode - - - - - color - - - tk_string - - - CYAN - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 50 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_Shapes_Connector_exec - - - Shapes_Connector_svnt - - - DDS_Shapes_Connector_svnt - - - Shapes_Connector_stub - - - DDS_Shapes_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl deleted file mode 100755 index 0d05a1c364d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/examples/Shapes/models/README b/CIAO/connectors/dds4ccm/examples/Shapes/models/README deleted file mode 100644 index ced33c4cdad..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/models/README +++ /dev/null @@ -1,19 +0,0 @@ - - -The follow steps is how you import IDL input PICML for the Shapes -example so that the IDL generator works properly. - -%> idl_to_picml -x Shapes -l $CIAO_ROOT/connectors/dds4ccm/models/dds4ccm -r . - -Please notice the -l command-line option, which is something new -to idl_to_picml. If you type --help, the -l option will be listed. - -What this will do is not only import the IDL in the Shapes directory, -but also attach the dds4ccm.xme file as a GME library to the Shapes -example. Furthermore, it will search the attached library to resolve -any references that it cannot find based on parsing IDL files located -in the Shapes subdirectories (or the one specified at the command-line). - -After doing this, you should be able to import the Shapes example -and generate the IDL files, which there original location retained, -which is also something new to idl_to_picml and the IDL generator. ;-) diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme deleted file mode 100644 index 5b258b4121e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete-delegation.xme +++ /dev/null @@ -1,19753 +0,0 @@ - - - - - Shapes - - - - Shapes - - InterfaceDefinitions - - Shapes_Base - - Base - - - - - - - - - - - - ShapeType - - - - - - 55,13 - - - - - - - - - - - - - - - - - Key - - - color - - - - - - 60,60 - - - - - - x - - - - - - 60,160 - - - - - - y - - - - - - 60,260 - - - - - - shapesize - - - - - - 60,360 - - - - - - - - - - - - Attributes - - - - - - 13,13 - - - - - - - - - - - - - - - - - Key - - - shape - - - - - - 60,60 - - - - - - color - - - - - - 60,160 - - - - - - speed - - - - - - 60,260 - - - - - - - - - - - - - - - - - ShapeTypeSeq - - - - - - 55,55 - - - - - - - - - - - - - - - - - - - - - - Shapes_Connector - - Connector - - - - - - - - - - - - Shapes - - - - - - 14,14 - - - - - TemplateParameterValue - - - - - - 160,60 - - - - - - TemplateParameterValue - - - - - - 260,60 - - - - - - PackageType - - - - - - 60,60 - - - - - - - - Shapes_Receiver - - Receiver - - - - - - - - - - - - Shapes - - - - - - 13,13 - - - - - - - - - - - - - - - - - - - - GenericComponent - - - - - - 13,11 - - - - - - - - - - - - - - 8E6D53FA-A6F1-11DF-8DCF-000C2958D27B - - - - - - - - - rate - - - - - - 13,13 - - - - - - 97,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - get_data - - - - - - 55,13 - - - - - - 55,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - read_data - - - - - - 55,55 - - - - - - 13,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - raw_listen - - - - - - 13,55 - - - - - - 97,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - - 12,11 - - - - - - listen - - - - - - 62,223 - - - - - - 226,16 - - - - - - write - - - - - - 58,156 - - - - - - 226,121 - - - - - - TemplatePackageInstanceDecl - - Ew - - - - - - TemplatePackageInstanceDecl - - Ew - - - - - - - - - Shapes_Sender - - Sender - - - - - - - - - - - - Shapes - - - - - - - - - - - - - - - - - Sender - - - - - - 13,11 - - - - - - - - - - - - - - 8E6FB64A-A6F1-11DF-8000-000C2958D27B - - - - - - - - - rate - - - - - - 97,13 - - - - - - 97,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_x - - - - - - 13,13 - - - - - - 13,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_y - - - - - - 55,55 - - - - - - 55,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_size - - - - - - 55,13 - - - - - - 13,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - resize_shape - - - - - - 13,55 - - - - - - 55,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - - 12,12 - - - - - - info_write - - - - - - 104,160 - - - - - - 97,97 - - - - - - - - - - - - - - - ImplementationArtifacts - - Shapes_ReceiverArtifacts - - Shapes_Receiver_svnt - - - - - - 150,150 - - - - - 8E6FB64A-A6F1-11DF-8001-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Receiver_svnt - - - - - - - Shapes_Receiver_exec - - - - - - 450,150 - - - - - 8E6FB64A-A6F1-11DF-8002-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Receiver_exec - - - - - - - - Shapes_SenderArtifacts - - Shapes_Sender_svnt - - - - - - 150,150 - - - - - 8E6FB64A-A6F1-11DF-8003-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Sender_svnt - - - - - - - Shapes_Sender_exec - - - - - - 450,150 - - - - - 8E6FB64A-A6F1-11DF-8004-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Sender_exec - - - - - - - - DDS_Shapes_ConnectorArtifacts - - Shapes_Connector_exec - - - - - - 13,13 - - - - - 8E6FB64A-A6F1-11DF-8005-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - DDS_Shapes_Connector_exec - - - - - - - Shapes_Connector_svnt - - - - - - 55,13 - - - - - 8E6FB64A-A6F1-11DF-8006-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - DDS_Shapes_Connector_svnt - - - - - - - - - ComponentImplementations - - Shapes_GenericComponent_Impl - - Shapes_GenericComponent_Impl - - - - - - 250,250 - - - - - 8E6FB64A-A6F1-11DF-8007-000C2958D27B - - - 0.0.0.0 - - - - - - - Receiver - - - - - - 188,71 - - - - - - Shapes_Receiver_svnt - - - - - - 506,347 - - - - - create_Shapes_Receiver_Servant - - - - Shapes_Receiver_exec - - - - - - 506,151 - - - - - create_Shapes_Receiver_Impl - - - - - - - - - - - - - - - - - - - - Shapes_SenderImpl - - Shapes_SenderImpl - - - - - - 250,250 - - - - - 8E6FB64A-A6F1-11DF-8008-000C2958D27B - - - 0.0.0.0 - - - - - - - Sender - - - - - - 187,75 - - - - - - Shapes_Sender_svnt - - - - - - 506,347 - - - - - create_Shapes_Sender_Servant - - - - Shapes_Sender_exec - - - - - - 506,151 - - - - - create_Shape_Sender_Impl - - - - - - - - - - - - - - - - - - - - ShapesImpl - - ShapesImpl - - - - - - 376,152 - - - - - 8E6FB64A-A6F1-11DF-8009-000C2958D27B - - - - - - ConnectorInstance - - - - - - 469,91 - - - - - 8E6FB64A-A6F1-11DF-800A-000C2958D27B - - - ConnectorImplementation - - - - - - 367,171 - - - - - - - topic_name - - - - - - 461,13 - - - - - topic_name - - Square - - - - - ConnectorInstance - - - - - - 469,189 - - - - - 8E6FB64A-A6F1-11DF-800B-000C2958D27B - - - ConnectorImplementation - - - - - - 367,171 - - - - - - - topic_name - - - - - - 461,265 - - - - - topic_name - - Square - - - - - Shapes_AssemblyOne_Impl - - - - - - 182,112 - - - - - 8E8EB446-A6F1-11DF-8000-000C2958D27B - - - - - - InstanceA - - 8E8EB446-A6F1-11DF-8001-000C2958D27B - - - Shapes_GenericComponent_Impl - - - rate - - - get_data - - - read_data - - - raw_listen - - - listen - - - write - - - - InstanceB - - 8E8EB446-A6F1-11DF-8002-000C2958D27B - - - Shapes_GenericComponent_Impl - - - rate - - - get_data - - - read_data - - - raw_listen - - - listen - - - write - - - - write - - - listen - - - ExtendedDelegate - - - ExtendedDelegate - - - ExtendedDelegate - - - ExtendedDelegate - - - - Shapes_AssemblyTwo_Impl - - - - - - 651,112 - - - - - 8E8EB446-A6F1-11DF-8003-000C2958D27B - - - - - - InstanceC - - 8E8EB446-A6F1-11DF-8004-000C2958D27B - - - Shapes_GenericComponent_Impl - - - get_data - - - rate - - - read_data - - - raw_listen - - - listen - - - write - - - - InstanceD - - 8E8EB446-A6F1-11DF-8005-000C2958D27B - - - Shapes_GenericComponent_Impl - - - get_data - - - rate - - - read_data - - - raw_listen - - - listen - - - write - - - - listen - - - write - - - ExtendedDelegate - - - ExtendedDelegate - - - ExtendedDelegate - - - ExtendedDelegate - - - - AssemblyConfigProperty - - Ns - - - - - - AssemblyConfigProperty - - Sn - - - - - - supplier - - w - - - - - - push_consumer - - W - - - - - - push_consumer - - E - - - - - - supplier - - e - - - - - - - - Shapes_AssemblyOne_Impl - - Shapes_AssemblyOne_Impl - - - - - - 404,208 - - - - - 8E72189A-A6F1-11DF-8000-000C2958D27B - - - - - - InstanceA - - - - - - 230,120 - - - - - 8E747AEA-A6F1-11DF-8000-000C2958D27B - - - Shapes_GenericComponent_Impl - - - - - - 305,172 - - - - - - rate - - - - - - 97,55 - - - - - - get_data - - - - - - 97,97 - - - - - - read_data - - - - - - 55,111 - - - - - - raw_listen - - - - - - 97,13 - - - - - - listen - - - - - - 387,156 - - - - - - write - - - - - - 387,79 - - - - - - - InstanceB - - - - - - 230,323 - - - - - 8E747AEA-A6F1-11DF-8001-000C2958D27B - - - Shapes_GenericComponent_Impl - - - - - - 347,221 - - - - - - rate - - - - - - 55,55 - - - - - - get_data - - - - - - 55,13 - - - - - - read_data - - - - - - 97,13 - - - - - - raw_listen - - - - - - 97,55 - - - - - - listen - - - - - - 331,177 - - - - - - write - - - - - - 331,219 - - - - - - - write - - - - - - 604,114 - - - - - - listen - - - - - - 604,198 - - - - - - ExtendedDelegate - - w - - - - - - ExtendedDelegate - - w - - - - - - ExtendedDelegate - - w - - - - - - ExtendedDelegate - - w - - - - - - - - Shapes_AssemblyTwoImpl - - Shapes_AssemblyTwo_Impl - - - - - - 404,159 - - - - - 8E747AEA-A6F1-11DF-8002-000C2958D27B - - - - - - InstanceC - - - - - - 531,120 - - - - - 8E747AEA-A6F1-11DF-8003-000C2958D27B - - - Shapes_GenericComponent_Impl - - - - - - 473,165 - - - - - - get_data - - - - - - 447,118 - - - - - - rate - - - - - - 489,118 - - - - - - read_data - - - - - - 503,48 - - - - - - raw_listen - - - - - - 531,118 - - - - - - listen - - - - - - 9,9 - - - - - - write - - - - - - 9,86 - - - - - - - InstanceD - - - - - - 531,288 - - - - - 8E747AEA-A6F1-11DF-8004-000C2958D27B - - - Shapes_GenericComponent_Impl - - - - - - 410,193 - - - - - - get_data - - - - - - 601,90 - - - - - - rate - - - - - - 643,90 - - - - - - read_data - - - - - - 559,90 - - - - - - raw_listen - - - - - - 559,132 - - - - - - listen - - - - - - 44,142 - - - - - - write - - - - - - 44,219 - - - - - - - listen - - - - - - 65,114 - - - - - - write - - - - - - 65,275 - - - - - - ExtendedDelegate - - e - - - - - - ExtendedDelegate - - e - - - - - - ExtendedDelegate - - e - - - - - - ExtendedDelegate - - e - - - - - - - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - Connector Implementations - - DDS_Shapes_Connector - - DDS_Shapes_Connector_Impl - - - - - - 495,320 - - - - - 8E747AEA-A6F1-11DF-8005-000C2958D27B - - - - - - - Shapes_Connector_exec - - - - - - 702,270 - - - - - create_Shapes_DDS_Event_Impl - - - - Shapes_Connector_svnt - - - - - - 702,368 - - - - - create_Shapes_DDS_Event_Servant - - - - ConnectorType - - - - - - 460,110 - - - - - - ConnectorImplements - - Ns - - - - - - MonolithprimaryArtifact - - Ew - - - - - - MonolithprimaryArtifact - - Ew - - - - - - - - Targets - - TestDomain - - 8E747AEA-A6F1-11DF-8006-000C2958D27B - - - - - - ReceiverNode - - - - - - 300,237 - - - - - - - - - - - - - - - SenderNode - - - - - - 510,244 - - - - - - - - - - - - - - - - - DeploymentPlans - - SimpleDeployment - - 8E747AEA-A6F1-11DF-8007-000C2958D27B - - - - - - ReceiverNode - - - - - - 522,60 - - - - - - SenderNode - - - - - - 242,46 - - - - - - Shapes_AssemblyOne_Impl - - - - - - 196,280 - - - - - - Shapes_AssemblyTwo_Impl - - - - - - 497,280 - - - - - - - - - - - - - - - - DefaultGroup - - - - - - 524,188 - - - - - - DefaultGroup - - - - - - 244,174 - - - - - - - - MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga - - ComponentImplementations - - - PredefinedTypes - - WideString - - - String - - - GenericValueObject - - - GenericValue - - - GenericObject - - - LongDoubleNumber - - - DoubleNumber - - - FloatNumber - - - UnsignedLongLongInteger - - - UnsignedLongInteger - - - UnsignedShortInteger - - - LongLongInteger - - - LongInteger - - - ShortInteger - - - WideChar - - - Char - - - Byte - - - Boolean - - - - ImplementationArtifacts - - - InterfaceDefinitions - - dds_rtf2_dcps_i_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - NativeInstanceHandle_t - - - - - - - - - - - - - - isValid - - - - - - 60,260 - - - - - - length - - - - - - 60,160 - - - - - - value - - - - - - 60,60 - - - - - 16 - - - - - InstanceHandle_t - - - - - - - - - - - - - - - InstanceHandleSeq - - - - - - - - - - - - - - - - - - - - dds_rtf2_dcps_instance_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - HANDLE_NIL - - - - - dds_rtf2_dcps - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - SampleInfo - - - - - - - - - - - - - - valid_data - - - - - - 60,1160 - - - - - - absolute_generation_rank - - - - - - 60,1060 - - - - - - generation_rank - - - - - - 60,960 - - - - - - sample_rank - - - - - - 60,860 - - - - - - no_writers_generation_count - - - - - - 60,760 - - - - - - disposed_generation_count - - - - - - 60,660 - - - - - - publication_handle - - - - - - 60,560 - - - - - - instance_handle - - - - - - 60,460 - - - - - - instance_state - - - - - - 60,260 - - - - - - view_state - - - - - - 60,160 - - - - - - sample_state - - - - - - 60,60 - - - - - - source_timestamp - - - - - - 60,360 - - - - - - - TypeSupport - - local - - - - - - - - - - - - - - - false - - - - - - - DomainParticipantFactory - - local - - - - - - - - - - - - - - - false - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_participant_qos - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_participant_qos_with_profile - - - - - - 60,560 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - lookup_participant - - - - - - 60,360 - - - - - - - - - - - domain_id - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_participant - - - - - - 160,60 - - - - - - - create_participant_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_participant - - - - - - 60,60 - - - - - - - - - - - mask - - - - - - 460,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - DomainParticipant - - local - - - - - - - - - - - - - - - false - - - - - - get_current_time - - - - - - 60,3860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - current_time - - - - - - 160,60 - - - - - - - contains_entity - - - - - - 60,3760 - - - - - - - - - - - a_handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_topic_data - - - - - - 60,3660 - - - - - - - - - - - topic_handle - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_data - - - - - - 160,60 - - - - - - - get_discovered_topics - - - - - - 60,3560 - - - - - - - - - - - topic_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participant_data - - - - - - 60,3460 - - - - - - - - - - - participant_handle - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_data - - - - - - 160,60 - - - - - - - get_discovered_participants - - - - - - 60,3360 - - - - - - - - - - - participant_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_topic_qos - - - - - - 60,3260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_topic_qos - - - - - - 60,3160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_subscriber_qos - - - - - - 60,3060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_subscriber_qos - - - - - - 60,2960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_publisher_qos - - - - - - 60,2860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_publisher_qos - - - - - - 60,2760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - assert_liveliness - - - - - - 60,2660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_domain_id - - - - - - 60,2560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_subscription - - - - - - 60,2460 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_publication - - - - - - 60,2360 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_topic - - - - - - 60,2260 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_participant - - - - - - 60,2160 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,2060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,1960 - - - - - - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,1860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_qos - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_multitopic - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_multitopic - - - - - - 160,60 - - - - - - - create_multitopic - - - - - - 60,1460 - - - - - - - - - - - subscription_expression - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - name - - - - - - 160,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contentfilteredtopic - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_contentfilteredtopic - - - - - - 160,60 - - - - - - - create_contentfilteredtopic - - - - - - 60,1260 - - - - - - - - - - - filter_expression - - - - - - 360,60 - - - - - - name - - - - - - 160,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - related_topic - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_topicdescription - - - - - - 60,1160 - - - - - - - - - - - name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - find_topic - - - - - - 60,1060 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - timeout - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_topic - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - - create_topic_with_profile - - - - - - 60,860 - - - - - - - - - - - profile_name - - - - - - 460,60 - - - - - - library_name - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - mask - - - - - - 660,60 - - - - - - a_listener - - - - - - 560,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_topic - - - - - - 60,760 - - - - - - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - qos - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_builtin_subscriber - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_subscriber - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - s - - - - - - 160,60 - - - - - - - create_subscriber_with_profile - - - - - - 60,460 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_subscriber - - - - - - 60,360 - - - - - - - - - - - mask - - - - - - 360,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_publisher - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - p - - - - - - 160,60 - - - - - - - create_publisher_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_publisher - - - - - - 60,60 - - - - - - - - - - - mask - - - - - - 360,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - SubscriptionBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1660 - - - - - - topic_data - - - - - - 60,1560 - - - - - - partition - - - - - - 60,1460 - - - - - - presentation - - - - - - 60,1360 - - - - - - time_based_filter - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - destination_order - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - PublicationBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1860 - - - - - - topic_data - - - - - - 60,1760 - - - - - - partition - - - - - - 60,1660 - - - - - - presentation - - - - - - 60,1560 - - - - - - destination_order - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - reliability - - - - - - 60,960 - - - - - - liveliness - - - - - - 60,860 - - - - - - latency_budget - - - - - - 60,760 - - - - - - deadline - - - - - - 60,660 - - - - - - durability_service - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - TopicBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,260 - - - - - - name - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,1560 - - - - - - ownership - - - - - - 60,1460 - - - - - - resource_limits - - - - - - 60,1360 - - - - - - history - - - - - - 60,1260 - - - - - - destination_order - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability_service - - - - - - 60,460 - - - - - - durability - - - - - - 60,360 - - - - - - key - - - - - - 60,60 - - - - - - - ParticipantBuiltinTopicData - - - - - - - - - - - - - - user_data - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - SubscriberQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataReaderQos - - - - - - - - - - - - - - reader_data_lifecycle - - - - - - 60,1160 - - - - - - time_based_filter - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - user_data - - - - - - 60,860 - - - - - - resource_limits - - - - - - 60,760 - - - - - - history - - - - - - 60,660 - - - - - - destination_order - - - - - - 60,560 - - - - - - reliability - - - - - - 60,460 - - - - - - liveliness - - - - - - 60,360 - - - - - - latency_budget - - - - - - 60,260 - - - - - - deadline - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - PublisherQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataWriterQos - - - - - - - - - - - - - - writer_data_lifecycle - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - resource_limits - - - - - - 60,860 - - - - - - history - - - - - - 60,760 - - - - - - destination_order - - - - - - 60,660 - - - - - - reliability - - - - - - 60,560 - - - - - - liveliness - - - - - - 60,460 - - - - - - latency_budget - - - - - - 60,360 - - - - - - deadline - - - - - - 60,260 - - - - - - durability_service - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - TopicQos - - - - - - - - - - - - - - ownership - - - - - - 60,1260 - - - - - - lifespan - - - - - - 60,1160 - - - - - - transport_priority - - - - - - 60,1060 - - - - - - resource_limits - - - - - - 60,960 - - - - - - history - - - - - - 60,860 - - - - - - destination_order - - - - - - 60,760 - - - - - - reliability - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,460 - - - - - - deadline - - - - - - 60,360 - - - - - - durability_service - - - - - - 60,260 - - - - - - durability - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,60 - - - - - - - DomainParticipantQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,160 - - - - - - user_data - - - - - - 60,60 - - - - - - - DomainParticipantFactoryQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,60 - - - - - - - DurabilityServiceQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,560 - - - - - - max_instances - - - - - - 60,460 - - - - - - max_samples - - - - - - 60,360 - - - - - - history_depth - - - - - - 60,260 - - - - - - history_kind - - - - - - 60,160 - - - - - - service_cleanup_delay - - - - - - 60,60 - - - - - - - ReaderDataLifecycleQosPolicy - - - - - - - - - - - - - - autopurge_disposed_samples_delay - - - - - - 60,160 - - - - - - autopurge_nowriter_samples_delay - - - - - - 60,60 - - - - - - - WriterDataLifecycleQosPolicy - - - - - - - - - - - - - - autodispose_unregistered_instances - - - - - - 60,60 - - - - - - - EntityFactoryQosPolicy - - - - - - - - - - - - - - autoenable_created_entities - - - - - - 60,60 - - - - - - - ResourceLimitsQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,260 - - - - - - max_instances - - - - - - 60,160 - - - - - - max_samples - - - - - - 60,60 - - - - - - - HistoryQosPolicy - - - - - - - - - - - - - - depth - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - HistoryQosPolicyKind - - - - - - - - - - - - - - KEEP_ALL_HISTORY_QOS - - - - - - 60,160 - - - - - - KEEP_LAST_HISTORY_QOS - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicyKind - - - - - - - - - - - - - - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,160 - - - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,60 - - - - - - - ReliabilityQosPolicy - - - - - - - - - - - - - - max_blocking_time - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - ReliabilityQosPolicyKind - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - - 60,160 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - 60,60 - - - - - - - PartitionQosPolicy - - - - - - - - - - - - - - name - - - - - - 60,60 - - - - - - - TimeBasedFilterQosPolicy - - - - - - - - - - - - - - minimum_separation - - - - - - 60,60 - - - - - - - LivelinessQosPolicy - - - - - - - - - - - - - - lease_duration - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - LivelinessQosPolicyKind - - - - - - - - - - - - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - - - - 60,260 - - - - - - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - - - - 60,160 - - - - - - AUTOMATIC_LIVELINESS_QOS - - - - - - 60,60 - - - - - - - OwnershipStrengthQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - OwnershipQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - OwnershipQosPolicyKind - - - - - - - - - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - 60,160 - - - - - - SHARED_OWNERSHIP_QOS - - - - - - 60,60 - - - - - - - LatencyBudgetQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - DeadlineQosPolicy - - - - - - - - - - - - - - period - - - - - - 60,60 - - - - - - - PresentationQosPolicy - - - - - - - - - - - - - - ordered_access - - - - - - 60,260 - - - - - - coherent_access - - - - - - 60,160 - - - - - - access_scope - - - - - - 60,60 - - - - - - - PresentationQosPolicyAccessScopeKind - - - - - - - - - - - - - - GROUP_PRESENTATION_QOS - - - - - - 60,260 - - - - - - TOPIC_PRESENTATION_QOS - - - - - - 60,160 - - - - - - INSTANCE_PRESENTATION_QOS - - - - - - 60,60 - - - - - - - DurabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DurabilityQosPolicyKind - - - - - - - - - - - - - - PERSISTENT_DURABILITY_QOS - - - - - - 60,360 - - - - - - TRANSIENT_DURABILITY_QOS - - - - - - 60,260 - - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - 60,160 - - - - - - VOLATILE_DURABILITY_QOS - - - - - - 60,60 - - - - - - - LifespanQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - TransportPriorityQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - GroupDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TopicDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - UserDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - QueryCondition - - local - - - - - - - - - - - - - - - false - - - - - - set_query_parameters - - - - - - 60,260 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_parameters - - - - - - 60,160 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ReadCondition - - local - - - - - - - - - - - - - - - false - - - - - - get_datareader - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_state_mask - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_view_state_mask - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_state_mask - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - StatusCondition - - local - - - - - - - - - - - - - - - false - - - - - - get_entity - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_enabled_statuses - - - - - - 60,160 - - - - - - - - - - - mask - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_enabled_statuses - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - GuardCondition - - local - - - - - - - - - - - - - - - false - - - - - - set_trigger_value - - - - - - 60,60 - - - - - - - - - - - value - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - WaitSet - - local - - - - - - - - - - - - - - - false - - - - - - get_conditions - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - attached_conditions - - - - - - 160,60 - - - - - - - detach_condition - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - cond - - - - - - 160,60 - - - - - - - attach_condition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - cond - - - - - - 160,60 - - - - - - - wait - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - timeout - - - - - - 260,60 - - - - - - active_conditions - - - - - - 160,60 - - - - - - - - Condition - - local - - - - - - - - - - - - - - - false - - - - - - get_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - DomainParticipantListener - - local - - - - - - - - - - - - - - - false - - - - - - Inherits - - - Inherits - - - Inherits - - - - SubscriberListener - - local - - - - - - - - - - - - - - - false - - - - - - on_data_on_readers - - - - - - 60,60 - - - - - - - - - - - the_subscriber - - - - - - 60,60 - - - - - - - Inherits - - - - DataReaderListener - - local - - - - - - - - - - - - - - - false - - - - - - on_sample_lost - - - - - - 60,660 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_subscription_matched - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_data_available - - - - - - 60,460 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_liveliness_changed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - Inherits - - - - PublisherListener - - local - - - - - - - - - - - - - - - false - - - - - - Inherits - - - - DataWriterListener - - local - - - - - - - - - - - - - - - false - - - - - - on_reliable_reader_activity_changed - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_reliable_writer_cache_changed - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_publication_matched - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_liveliness_lost - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - Inherits - - - - TopicListener - - local - - - - - - - - - - - - - - - false - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - Inherits - - - - Publisher - - local - - - - - - - - - - - - - - - false - - - - - - copy_from_topic_qos - - - - - - 60,1760 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datawriter_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datawriter_qos - - - - - - 60,1660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datawriter_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - end_coherent_changes - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_coherent_changes - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - resume_publications - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - suspend_publications - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,760 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datawriter - - - - - - 60,360 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datawriter - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datawriter - - - - - - 160,60 - - - - - - - create_datawriter_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - probile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datawriter - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - Subscriber - - local - - - - - - - - - - - - - - - false - - - - - - copy_from_topic_qos - - - - - - 60,1660 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datareader_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datareader_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datareader_qos - - - - - - 60,1460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_access - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_access - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - notify_datareaders - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_datareaders - - - - - - 60,560 - - - - - - - - - - - instance_states - - - - - - 460,60 - - - - - - view_states - - - - - - 360,60 - - - - - - sample_states - - - - - - 260,60 - - - - - - readers - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datareader - - - - - - 60,460 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datareader - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datareader - - - - - - 160,60 - - - - - - - create_datareader_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datareader - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - DataReader - - local - - - - - - - - - - - - - - - false - - - - - - get_matched_publication_data - - - - - - 60,1860 - - - - - - - - - - - publication_handle - - - - - - 260,60 - - - - - - publication_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_publications - - - - - - 60,1760 - - - - - - - - - - - publication_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_historical_data - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - get_sample_lost_status - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_subscription_matched_status - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_requested_incompatible_qos_status - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_requested_deadline_missed_status - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_liveliness_changed_status - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_sample_rejected_status - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_subscriber - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topicdescription - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,660 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_readcondition - - - - - - 60,260 - - - - - - - - - - - a_condition - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_querycondition - - - - - - 60,160 - - - - - - - - - - - query_expression - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - query_parameters - - - - - - 560,60 - - - - - - - create_readcondition - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriter - - local - - - - - - - - - - - - - - - false - - - - - - get_matched_subscription_data - - - - - - 60,1360 - - - - - - - - - - - subscription_handle - - - - - - 260,60 - - - - - - subscription_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_subscriptions - - - - - - 60,1260 - - - - - - - - - - - subscription_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publication_matched_status - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_offered_incompatible_qos_status - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_offered_deadline_missed_status - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_liveliness_lost_status - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - get_publisher - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topic - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - MultiTopic - - local - - - - - - - - - - - - - - - false - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ContentFilteredTopic - - local - - - - - - - - - - - - - - - false - - - - - - get_related_topic - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_filter_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - Topic - - local - - - - - - - - - - - - - - - false - - - - - - get_inconsistent_topic_status - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_status - - - - - - 160,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - Inherits - - - - TopicDescription - - local - - - - - - - - - - - - - - - false - - - - - - get_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_name - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_type_name - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Entity - - local - - - - - - - - - - - - - - - false - - - - - - get_instance_handle - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_status_changes - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_statuscondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - enable - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - false - - - - - - - ReliableWriterCacheChangedStatus - - - - - - - - - - - - - - unacknowledged_sample_count_peak - - - - - - 60,560 - - - - - - unacknowledged_sample_count - - - - - - 60,460 - - - - - - high_watermark_reliable_writer_cache - - - - - - 60,360 - - - - - - low_watermark_reliable_writer_cache - - - - - - 60,260 - - - - - - full_reliable_writer_cache - - - - - - 60,160 - - - - - - empty_reliable_writer_cache - - - - - - 60,60 - - - - - - - ReliableWriterCacheEventCount - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - ReliableReaderActivityChangedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,460 - - - - - - inactive_count_change - - - - - - 60,360 - - - - - - active_count_change - - - - - - 60,260 - - - - - - inactive_count - - - - - - 60,160 - - - - - - active_count - - - - - - 60,60 - - - - - - - SubscriptionMatchedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - PublicationMatchedStatus - - - - - - - - - - - - - - last_subscription_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - RequestedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - policies - - - - - - 60,360 - - - - - - - OfferedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - policies - - - - - - 60,360 - - - - - - - QosPolicyCount - - - - - - - - - - - - - - count - - - - - - 60,160 - - - - - - policy_id - - - - - - 60,60 - - - - - - - RequestedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - OfferedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - LivelinessChangedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - not_alive_count_change - - - - - - 60,360 - - - - - - alive_count_change - - - - - - 60,260 - - - - - - not_alive_count - - - - - - 60,160 - - - - - - alive_count - - - - - - 60,60 - - - - - - - LivelinessLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - SampleRejectedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,360 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_reason - - - - - - 60,260 - - - - - - - SampleRejectedStatusKind - - - - - - - - - - - - - - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - - - - - - 60,360 - - - - - - REJECTED_BY_SAMPLES_LIMIT - - - - - - 60,260 - - - - - - REJECTED_BY_INSTANCES_LIMIT - - - - - - 60,160 - - - - - - NOT_REJECTED - - - - - - 60,60 - - - - - - - SampleLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - InconsistentTopicStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - Time_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - Duration_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - BuiltinTopicKey_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 3 - - - - - OctetSeq - - - - - - - - - - - - - - - - - - DURABILITYSERVICE_QOS_POLICY_ID - - - - - - - - 22 - - - - LIFESPAN_QOS_POLICY_ID - - - - - - - - 21 - - - - TRANSPORTPRIORITY_QOS_POLICY_ID - - - - - - - - 20 - - - - GROUPDATA_QOS_POLICY_ID - - - - - - - - 19 - - - - TOPICDATA_QOS_POLICY_ID - - - - - - - - 18 - - - - READERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 17 - - - - WRITERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 16 - - - - ENTITYFACTORY_QOS_POLICY_ID - - - - - - - - 15 - - - - RESOURCELIMITS_QOS_POLICY_ID - - - - - - - - 14 - - - - HISTORY_QOS_POLICY_ID - - - - - - - - 13 - - - - DESTINATIONORDER_QOS_POLICY_ID - - - - - - - - 12 - - - - RELIABILITY_QOS_POLICY_ID - - - - - - - - 11 - - - - PARTITION_QOS_POLICY_ID - - - - - - - - 10 - - - - TIMEBASEDFILTER_QOS_POLICY_ID - - - - - - - - 9 - - - - LIVELINESS_QOS_POLICY_ID - - - - - - - - 8 - - - - OWNERSHIPSTRENGTH_QOS_POLICY_ID - - - - - - - - 7 - - - - OWNERSHIP_QOS_POLICY_ID - - - - - - - - 6 - - - - LATENCYBUDGET_QOS_POLICY_ID - - - - - - - - 5 - - - - DEADLINE_QOS_POLICY_ID - - - - - - - - 4 - - - - PRESENTATION_QOS_POLICY_ID - - - - - - - - 3 - - - - DURABILITY_QOS_POLICY_ID - - - - - - - - 2 - - - - USERDATA_QOS_POLICY_ID - - - - - - - - 1 - - - - INVALID_QOS_POLICY_ID - - - - - - - - 0 - - - - DURABILITYSERVICE_POLICY_NAME - - - - - - - - DurabilityService - - - - LIFESPAN_QOS_POLICY_NAME - - - - - - - - Lifespan - - - - GROUPDATA_QOS_POLICY_NAME - - - - - - - - TransportPriority - - - - TOPICDATA_QOS_POLICY_NAME - - - - - - - - TopicData - - - - READERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - ReaderDataLifecycle - - - - WRITERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - WriterDataLifecycle - - - - ENTITYFACTORY_QOS_POLICY_NAME - - - - - - - - EntityFactory - - - - RESOURCELIMITS_QOS_POLICY_NAME - - - - - - - - ResourceLimits - - - - HISTORY_QOS_POLICY_NAME - - - - - - - - History - - - - DESTINATIONORDER_QOS_POLICY_NAME - - - - - - - - DestinationOrder - - - - RELIABILITY_QOS_POLICY_NAME - - - - - - - - Reliability - - - - PARTITION_QOS_POLICY_NAME - - - - - - - - Partition - - - - TIMEBASEDFILTER_QOS_POLICY_NAME - - - - - - - - TimeBasedFilter - - - - LIVELINESS_QOS_POLICY_NAME - - - - - - - - Liveliness - - - - OWNERSHIPSTRENGTH_QOS_POLICY_NAME - - - - - - - - OwnershipStrength - - - - OWNERSHIP_QOS_POLICY_NAME - - - - - - - - Ownership - - - - LATENCYBUDGET_QOS_POLICY_NAME - - - - - - - - LatencyBudget - - - - DEADLINE_QOS_POLICY_NAME - - - - - - - - Deadline - - - - PRESENTATION_QOS_POLICY_NAME - - - - - - - - Presentation - - - - DURABILITY_QOS_POLICY_NAME - - - - - - - - Durability - - - - USERDATA_QOS_POLICY_NAME - - - - - - - - UserData - - - - NOT_ALIVE_INSTANCE_STATE - - - - - - - - 6 - - - - ANY_INSTANCE_STATE - - - - - - - - 65535 - - - - InstanceStateMask - - - - - - - - - - - - - - - NOT_ALIVE_NO_WRITERS_INSTANCE_STATE - - - - - - - - 4 - - - - NOT_ALIVE_DISPOSED_INSTANCE_STATE - - - - - - - - 2 - - - - ALIVE_INSTANCE_STATE - - - - - - - - 1 - - - - InstanceStateKind - - - - - - - - - - - - - - - ANY_VIEW_STATE - - - - - - - - 65535 - - - - ViewStateMask - - - - - - - - - - - - - - - NOT_NEW_VIEW_STATE - - - - - - - - 2 - - - - NEW_VIEW_STATE - - - - - - - - 1 - - - - ViewStateKind - - - - - - - - - - - - - - - ANY_SAMPLE_STATE - - - - - - - - 65535 - - - - SampleStateMask - - - - - - - - - - - - - - - NOT_READ_SAMPLE_STATE - - - - - - - - 2 - - - - READ_SAMPLE_STATE - - - - - - - - 1 - - - - SampleStateKind - - - - - - - - - - - - - - - RELIABLE_READER_ACTIVITY_CHANGED_STATUS - - - - - - - - 33554432 - - - - RELIABLE_WRITER_CACHE_CHANGED_STATUS - - - - - - - - 16777216 - - - - SUBSCRIPTION_MATCHED_STATUS - - - - - - - - 16384 - - - - PUBLICATION_MATCHED_STATUS - - - - - - - - 8192 - - - - LIVELINESS_CHANGED_STATUS - - - - - - - - 4096 - - - - LIVELINESS_LOST_STATUS - - - - - - - - 2048 - - - - DATA_AVAILABLE_STATUS - - - - - - - - 1024 - - - - DATA_ON_READERS_STATUS - - - - - - - - 512 - - - - SAMPLE_REJECTED_STATUS - - - - - - - - 256 - - - - SAMPLE_LOST_STATUS - - - - - - - - 128 - - - - REQUESTED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 64 - - - - OFFERED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 32 - - - - REQUESTED_DEADLINE_MISSED_STATUS - - - - - - - - 4 - - - - OFFERED_DEADLINE_MISSED_STATUS - - - - - - - - 2 - - - - INCONSISTENT_TOPIC_STATUS - - - - - - - - 1 - - - - StatusMask - - - - - - - - - - - - - - - StatusKind - - - - - - - - - - - - - - - RETCODE_ILLEGAL_OPERATION - - - - - - - - 12 - - - - RETCODE_NO_DATA - - - - - - - - 11 - - - - RETCODE_TIMEOUT - - - - - - - - 10 - - - - RETCODE_ALREADY_DELETED - - - - - - - - 9 - - - - RETCODE_INCONSISTENT_POLICY - - - - - - - - 8 - - - - RETCODE_IMMUTABLE_POLICY - - - - - - - - 7 - - - - RETCODE_NOT_ENABLED - - - - - - - - 6 - - - - RETCODE_OUT_OF_RESOURCES - - - - - - - - 5 - - - - RETCODE_PRECONDITION_NOT_MET - - - - - - - - 4 - - - - RETCODE_BAD_PARAMETER - - - - - - - - 3 - - - - RETCODE_UNSUPPORTED - - - - - - - - 2 - - - - RETCODE_ERROR - - - - - - - - 1 - - - - RETCODE_OK - - - - - - - - 0 - - - - TIME_INVALID_NSEC - - - - - - - - 4294967295 - - - - TIME_INVALID_SEC - - - - - - - - -1 - - - - DURATION_ZERO_NSEC - - - - - - - - 0 - - - - DURATION_ZERO_SEC - - - - - - - - 0 - - - - DURATION_INFINITE_NSEC - - - - - - - - 2147483647 - - - - DURATION_INFINITE_SEC - - - - - - - - 2147483647 - - - - LENGTH_UNLIMITED - - - - - - - - -1 - - - - StringSeq - - - - - - - - - - - - - - - - - - QosPolicyId_t - - - - - - - - - - - - - - - ReturnCode_t - - - - - - - - - - - - - - - DomainId_t - - - - - - - - - - - - - - - SampleInfoSeq - - - - - - - - - - - - - - - - - - ConditionSeq - - - - - - - - - - - - - - - - - - DataReaderSeq - - - - - - - - - - - - - - - - - - QosPolicyCountSeq - - - - - - - - - - - - - - - - - - - - dds4ccm_StateListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - StateListenerControl - - local - - - - - - - - - - - - - - - false - - - - - - is_filter_interpreted - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - - - dds4ccm_PortStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - PortStatusListener - - local - - - - - - - - - - - - - - - false - - - - - - on_sample_lost - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - - - - dds4ccm_DataListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DataListenerControl - - local - - - - - - - - - - - - - - - false - - - - - - max_delivered_data - - - - - - 60,160 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - mode - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_ConnectorStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ConnectorStatusListener - - local - - - - - - - - - - - - - - - false - - - - - - on_unexpected_status - - - - - - 60,560 - - - - - - - - - - - status_kind - - - - - - 160,60 - - - - - - the_entity - - - - - - 60,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - - - - dds4ccm_Connector - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DDS_TopicBase - - - - - - - - - - - C61798A6-7C26-11DF-8003-000C2958D27B - - - - - - key_fields - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - topic_name - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - DDS_Base - - - - - - - - - - - C61798A6-7C26-11DF-8002-000C2958D27B - - - - - - qos_profile - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - domain_id - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - error_listener - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - - - dds4ccm_Base - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ContentFilterSetting - - local - - - - - - - - - - - - - - - false - - - - - - set_filter_parameters - - - - - - 60,60 - - - - - - - - - - - parameters - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - NonChangeable - - - - - - - - - - - - - - - InternalError - - - - - - - - - - - - - - error_code - - - index - - - - NonExistent - - - - - - - - - - - - - - indexes - - - - AlreadyCreated - - - - - - - - - - - - - - indexes - - - - ListenerMode - - - - - - - - - - - - - - MANY_BY_MANY - - - - - - 60,260 - - - - - - ONE_BY_ONE - - - - - - 60,160 - - - - - - NOT_ENABLED - - - - - - 60,60 - - - - - - - QueryFilter - - - - - - - - - - - - - - parameters - - - - - - 60,160 - - - - - - expression - - - - - - 60,60 - - - - - - - ReadInfo - - - - - - - - - - - - - - source_timestamp - - - - - - 60,160 - - - - - - instance_handle - - - - - - 60,60 - - - - - - instance_status - - - - - - 60,360 - - - - - - access_status - - - - - - 60,260 - - - - - - - InstanceStatus - - - - - - - - - - - - - - INSTANCE_DELETED - - - - - - 60,460 - - - - - - INSTANCE_FILTERED_OUT - - - - - - 60,360 - - - - - - INSTANCE_UPDATED - - - - - - 60,260 - - - - - - INSTANCE_FILTERED_IN - - - - - - 60,160 - - - - - - INSTANCE_CREATED - - - - - - 60,60 - - - - - - - AccessStatus - - - - - - - - - - - - - - ALREADY_SEEN - - - - - - 60,160 - - - - - - FRESH_INFO - - - - - - 60,60 - - - - - - - UNLIMITED - - - - - - - - 0 - - - - DataNumber_t - - - - - - - - - - - - - - - ReadInfoSeq - - - - - - - - - - - - - - - - - - DataNumberSeq - - - - - - - - - - - - - - - - - - - - ccm_dds - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - Typed - - - - - - - - - - - - - - - - - DDS_Event - - - - - - - - - - - C61798A6-7C26-11DF-8001-000C2958D27B - - - - - - push_consumer - - - pull_consumer - - - supplier - - - - DDS_State - - - - - - - - - - - C61798A6-7C26-11DF-8000-000C2958D27B - - - - - - push_state_observer - - - push_observer - - - pull_observer - - - passive_observer - - - observable - - - - DDS_StateListen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Listen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Get - - - - - - - - - - - - - - filter - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,560 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,260 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - fresh_data - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Read - - - - - - - - - - - - - - filter - - - - - - 60,360 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,460 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Update - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Write - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - false - - - - - - - - - false - - - false - - - true - - - false - - - - - StateListener - - local - - - - - - - - - - - - - - - false - - - - - - on_deletion - - - - - - 60,360 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_many_updates - - - - - - 60,260 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_update - - - - - - 60,160 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_creation - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - false - - - - - - on_many_data - - - - - - 60,160 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_data - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Getter - - local - - - - - - - - - - - - - - - false - - - - - - max_delivered_data - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - time_out - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - get_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - data - - - - - - 160,60 - - - - - - - get_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 360,60 - - - - - - info - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - Reader - - local - - - - - - - - - - - - - - - false - - - - - - query - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - read_one_all - - - - - - 60,360 - - - - - - - - - - - - - - - - - 560,60 - - - - - - - - - - - - 460,60 - - - - - - instance_handle - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - data - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_one_last - - - - - - 60,260 - - - - - - - - - - - - - - - - - 460,60 - - - - - - - - - - - - 360,60 - - - - - - instance_handle - - - - - - 260,60 - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_all - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - read_last - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - - Updater - - local - - - - - - - - - - - - - - - false - - - - - - is_coherent_write - - - - - - 60,760 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - is_global_scope - - - - - - 60,660 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - delete_many - - - - - - 60,560 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - update_many - - - - - - 60,460 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - create_many - - - - - - 60,360 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - delete_one - - - - - - 60,260 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - update_one - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - create_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - Writer - - local - - - - - - - - - - - - - - - false - - - - - - is_coherent_write - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - write_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - write_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - InstanceHandleManager - - local - - - - - - - - - - - - - - - false - - - - - - unregister_instance - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - register_instance - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - T - - - - - - 60,60 - - - - - - TSeq - - - - - - 160,60 - - - - - - - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme deleted file mode 100644 index 169a0218e3e..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme +++ /dev/null @@ -1,19194 +0,0 @@ - - - - - Shapes - - - - Shapes - - InterfaceDefinitions - - Shapes_Base - - Base - - - - - - - - - - - - ShapeType - - - - - - 55,13 - - - - - - - - - - - - - - - - - Key - - - color - - - - - - 60,60 - - - - - - x - - - - - - 60,160 - - - - - - y - - - - - - 60,260 - - - - - - shapesize - - - - - - 60,360 - - - - - - - - - - - - Attributes - - - - - - 13,13 - - - - - - - - - - - - - - - - - Key - - - shape - - - - - - 60,60 - - - - - - color - - - - - - 60,160 - - - - - - speed - - - - - - 60,260 - - - - - - - - - - - - - - - - - ShapeTypeSeq - - - - - - 55,55 - - - - - - - - - - - - - - - - - - - - - - Shapes_Connector - - Connector - - - - - - - - - - - - Shapes - - - - - - 14,14 - - - - - TemplateParameterValue - - - - - - 160,60 - - - - - - TemplateParameterValue - - - - - - 260,60 - - - - - - PackageType - - - - - - 60,60 - - - - - - - - Shapes_Receiver - - Receiver - - - - - - - - - - - - Shapes - - - - - - 13,13 - - - - - - - - - - - - - - - - - - - - Receiver - - - - - - 13,11 - - - - - - - - - - - - - - 8AA750E8-9B27-11DF-8DCF-000C2958D27B - - - - - - - - - rate - - - - - - 97,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - get_data - - - - - - 55,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - read_data - - - - - - 13,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - raw_listen - - - - - - 97,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - info_out - - - - - - 62,223 - - - - - - info_get - - - - - - 55,146 - - - - - - - - - - - - - - - - - - - Shapes_Sender - - Sender - - - - - - - - - - - - Shapes - - - - - - - - - - - - - - - - - Sender - - - - - - 13,11 - - - - - - - - - - - - - - 8AA9B338-9B27-11DF-8000-000C2958D27B - - - - - - - - - rate - - - - - - 97,13 - - - - - - 97,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_x - - - - - - 13,13 - - - - - - 13,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_y - - - - - - 55,55 - - - - - - 55,55 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_size - - - - - - 55,13 - - - - - - 13,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - resize_shape - - - - - - 13,55 - - - - - - 55,13 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - - 12,12 - - - - - - info_write - - - - - - 104,160 - - - - - - 97,97 - - - - - - - - - - - - - - - ImplementationArtifacts - - Shapes_ReceiverArtifacts - - Shapes_Receiver_svnt - - - - - - 150,150 - - - - - 8AA9B338-9B27-11DF-8001-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Receiver_svnt - - - - - - - Shapes_Receiver_exec - - - - - - 450,150 - - - - - 8AA9B338-9B27-11DF-8002-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Receiver_exec - - - - - - - - Shapes_SenderArtifacts - - Shapes_Sender_svnt - - - - - - 150,150 - - - - - 8AA9B338-9B27-11DF-8003-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Sender_svnt - - - - - - - Shapes_Sender_exec - - - - - - 450,150 - - - - - 8AA9B338-9B27-11DF-8004-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Sender_exec - - - - - - - - DDS_Shapes_ConnectorArtifacts - - Shapes_Connector_exec - - - - - - 13,13 - - - - - 8AA9B338-9B27-11DF-8005-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - DDS_Shapes_Connector_exec - - - - - - - Shapes_Connector_svnt - - - - - - 55,13 - - - - - 8AA9B338-9B27-11DF-8006-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - DDS_Shapes_Connector_svnt - - - - - - - - - ComponentImplementations - - Shapes_ReceiverImpl - - Shapes_ReceiverImpl - - - - - - 250,250 - - - - - 8AA9B338-9B27-11DF-8007-000C2958D27B - - - 0.0.0.0 - - - - - - - Receiver - - - - - - 203,71 - - - - - - Shapes_Receiver_svnt - - - - - - 506,347 - - - - - create_Shapes_Receiver_Servant - - - - Shapes_Receiver_exec - - - - - - 506,151 - - - - - create_Shapes_Receiver_Impl - - - - - - - - - - - - - - - - - - - - Shapes_SenderImpl - - Shapes_SenderImpl - - - - - - 250,250 - - - - - 8AA9B338-9B27-11DF-8008-000C2958D27B - - - 0.0.0.0 - - - - - - - Sender - - - - - - 187,75 - - - - - - Shapes_Sender_svnt - - - - - - 506,347 - - - - - create_Shapes_Sender_Servant - - - - Shapes_Sender_exec - - - - - - 506,151 - - - - - create_Shape_Sender_Impl - - - - - - - - - - - - - - - - - - - - ShapesAssembly - - ComponentAssembly - - - - - - 376,152 - - - - - 8AA9B338-9B27-11DF-8009-000C2958D27B - - - - - - ConnectorInstance - - - - - - 469,98 - - - - - 8AA9B338-9B27-11DF-800A-000C2958D27B - - - ConnectorImplementation - - - - - - 367,171 - - - - - - - topic_name - - - - - - 461,160 - - - - - - - - topic_name - - Square - - - - - max_x - - - - - - 13,174 - - - - - - - - max_x - - 225 - - - - - rate - - - - - - 48,223 - - - - - - - - rate - - 10 - - - - - resize_shape - - - - - - 83,272 - - - - - - - - resize_shape - - true - - - - - max_y - - - - - - 125,321 - - - - - - - - max_y - - 250 - - - - - max_size - - - - - - 167,349 - - - - - - - - max_size - - 25 - - - - - rate - - - - - - 706,251 - - - - - - - - rate - - 1 - - - - - get_data - - - - - - 741,300 - - - - - - - - get_data - - false - - - - - read_data - - - - - - 790,335 - - - - - - - - read_data - - false - - - - - raw_listen - - - - - - 839,363 - - - - - - - - raw_listen - - true - - - - - ReceiverInstance - - - - - - 602,78 - - - - - 8AA9B338-9B27-11DF-800B-000C2958D27B - - - Shapes_ReceiverImpl - - - - - - 326,200 - - - - - - rate - - - - - - 545,153 - - - - - - get_data - - - - - - 545,34 - - - - - - raw_listen - - - - - - 545,202 - - - - - - read_data - - - - - - 545,90 - - - - - - info_out - - - - - - 93,9 - - - - - - info_get - - - - - - 51,51 - - - - - - - SenderInstance - - - - - - 231,78 - - - - - 8AA9B338-9B27-11DF-800C-000C2958D27B - - - Shapes_SenderImpl - - - - - - 333,214 - - - - - - rate - - - - - - 97,13 - - - - - - max_y - - - - - - 55,55 - - - - - - max_size - - - - - - 97,55 - - - - - - resize_shape - - - - - - 13,13 - - - - - - max_x - - - - - - 55,13 - - - - - - info_write - - - - - - 331,177 - - - - - - - AssemblyConfigProperty - - Sn - - - - - - supplier - - w - - - - - - push_consumer - - E - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - AttributeValue - - n - - - - - - - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - Connector Implementations - - DDS_Shapes_Connector - - ConnectorImplementation - - - - - - 495,320 - - - - - 8AAC1588-9B27-11DF-8000-000C2958D27B - - - - - - - Shapes_Connector_exec - - - - - - 702,270 - - - - - create_Shapes_DDS_Event_Impl - - - - Shapes_Connector_svnt - - - - - - 702,368 - - - - - create_Shapes_DDS_Event_Servant - - - - ConnectorType - - - - - - 460,110 - - - - - - ConnectorImplements - - Ns - - - - - - MonolithprimaryArtifact - - Ew - - - - - - MonolithprimaryArtifact - - Ew - - - - - - - - Targets - - TestDomain - - 8AAC1588-9B27-11DF-8001-000C2958D27B - - - - - - ReceiverNode - - - - - - 300,237 - - - - - - - - - - - - - - - SenderNode - - - - - - 510,244 - - - - - - - - - - - - - - - - - DeploymentPlans - - SimpleDeployment - - 8AAC1588-9B27-11DF-8002-000C2958D27B - - - - - - ReceiverNode - - - - - - 522,60 - - - - - - SenderNode - - - - - - 242,46 - - - - - - ReceiverInstance - - - - - - 488,279 - - - - - - SenderInstance - - - - - - 194,279 - - - - - - - - - - - - - - - - DefaultGroup - - - - - - 524,188 - - - - - - DefaultGroup - - - - - - 244,174 - - - - - - - - MGA=E:/proj/vc9/ACE_TAO_CIAO/CIAO/connectors/dds4ccm/models/dds4ccm.mga - - ComponentImplementations - - - PredefinedTypes - - WideString - - - String - - - GenericValueObject - - - GenericValue - - - GenericObject - - - LongDoubleNumber - - - DoubleNumber - - - FloatNumber - - - UnsignedLongLongInteger - - - UnsignedLongInteger - - - UnsignedShortInteger - - - LongLongInteger - - - LongInteger - - - ShortInteger - - - WideChar - - - Char - - - Byte - - - Boolean - - - - ImplementationArtifacts - - - InterfaceDefinitions - - dds_rtf2_dcps_i_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - NativeInstanceHandle_t - - - - - - - - - - - - - - isValid - - - - - - 60,260 - - - - - - length - - - - - - 60,160 - - - - - - value - - - - - - 60,60 - - - - - 16 - - - - - InstanceHandle_t - - - - - - - - - - - - - - - InstanceHandleSeq - - - - - - - - - - - - - - - - - - - - dds_rtf2_dcps_instance_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - HANDLE_NIL - - - - - dds_rtf2_dcps - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - SampleInfo - - - - - - - - - - - - - - valid_data - - - - - - 60,1160 - - - - - - absolute_generation_rank - - - - - - 60,1060 - - - - - - generation_rank - - - - - - 60,960 - - - - - - sample_rank - - - - - - 60,860 - - - - - - no_writers_generation_count - - - - - - 60,760 - - - - - - disposed_generation_count - - - - - - 60,660 - - - - - - publication_handle - - - - - - 60,560 - - - - - - instance_handle - - - - - - 60,460 - - - - - - instance_state - - - - - - 60,260 - - - - - - view_state - - - - - - 60,160 - - - - - - sample_state - - - - - - 60,60 - - - - - - source_timestamp - - - - - - 60,360 - - - - - - - TypeSupport - - local - - - - - - - - - - - - - - - - - - - DomainParticipantFactory - - local - - - - - - - - - - - - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_participant_qos - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_participant_qos_with_profile - - - - - - 60,560 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - lookup_participant - - - - - - 60,360 - - - - - - - - - - - domain_id - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_participant - - - - - - 160,60 - - - - - - - create_participant_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_participant - - - - - - 60,60 - - - - - - - - - - - mask - - - - - - 460,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - DomainParticipant - - local - - - - - - - - - - - - - - - - - - get_current_time - - - - - - 60,3860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - current_time - - - - - - 160,60 - - - - - - - contains_entity - - - - - - 60,3760 - - - - - - - - - - - a_handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_topic_data - - - - - - 60,3660 - - - - - - - - - - - topic_handle - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_data - - - - - - 160,60 - - - - - - - get_discovered_topics - - - - - - 60,3560 - - - - - - - - - - - topic_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participant_data - - - - - - 60,3460 - - - - - - - - - - - participant_handle - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_data - - - - - - 160,60 - - - - - - - get_discovered_participants - - - - - - 60,3360 - - - - - - - - - - - participant_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_topic_qos - - - - - - 60,3260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_topic_qos - - - - - - 60,3160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_subscriber_qos - - - - - - 60,3060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_subscriber_qos - - - - - - 60,2960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_publisher_qos - - - - - - 60,2860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_default_publisher_qos - - - - - - 60,2760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - assert_liveliness - - - - - - 60,2660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_domain_id - - - - - - 60,2560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_subscription - - - - - - 60,2460 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_publication - - - - - - 60,2360 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_topic - - - - - - 60,2260 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_participant - - - - - - 60,2160 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,2060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,1960 - - - - - - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,1860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_qos - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_multitopic - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_multitopic - - - - - - 160,60 - - - - - - - create_multitopic - - - - - - 60,1460 - - - - - - - - - - - subscription_expression - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - name - - - - - - 160,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contentfilteredtopic - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_contentfilteredtopic - - - - - - 160,60 - - - - - - - create_contentfilteredtopic - - - - - - 60,1260 - - - - - - - - - - - filter_expression - - - - - - 360,60 - - - - - - name - - - - - - 160,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - related_topic - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_topicdescription - - - - - - 60,1160 - - - - - - - - - - - name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - find_topic - - - - - - 60,1060 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - timeout - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_topic - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - - create_topic_with_profile - - - - - - 60,860 - - - - - - - - - - - profile_name - - - - - - 460,60 - - - - - - library_name - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - mask - - - - - - 660,60 - - - - - - a_listener - - - - - - 560,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_topic - - - - - - 60,760 - - - - - - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - qos - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_builtin_subscriber - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_subscriber - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - s - - - - - - 160,60 - - - - - - - create_subscriber_with_profile - - - - - - 60,460 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_subscriber - - - - - - 60,360 - - - - - - - - - - - mask - - - - - - 360,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_publisher - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - p - - - - - - 160,60 - - - - - - - create_publisher_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_publisher - - - - - - 60,60 - - - - - - - - - - - mask - - - - - - 360,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - SubscriptionBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1660 - - - - - - topic_data - - - - - - 60,1560 - - - - - - partition - - - - - - 60,1460 - - - - - - presentation - - - - - - 60,1360 - - - - - - time_based_filter - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - destination_order - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - PublicationBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1860 - - - - - - topic_data - - - - - - 60,1760 - - - - - - partition - - - - - - 60,1660 - - - - - - presentation - - - - - - 60,1560 - - - - - - destination_order - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - reliability - - - - - - 60,960 - - - - - - liveliness - - - - - - 60,860 - - - - - - latency_budget - - - - - - 60,760 - - - - - - deadline - - - - - - 60,660 - - - - - - durability_service - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - TopicBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,260 - - - - - - name - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,1560 - - - - - - ownership - - - - - - 60,1460 - - - - - - resource_limits - - - - - - 60,1360 - - - - - - history - - - - - - 60,1260 - - - - - - destination_order - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability_service - - - - - - 60,460 - - - - - - durability - - - - - - 60,360 - - - - - - key - - - - - - 60,60 - - - - - - - ParticipantBuiltinTopicData - - - - - - - - - - - - - - user_data - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - SubscriberQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataReaderQos - - - - - - - - - - - - - - reader_data_lifecycle - - - - - - 60,1160 - - - - - - time_based_filter - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - user_data - - - - - - 60,860 - - - - - - resource_limits - - - - - - 60,760 - - - - - - history - - - - - - 60,660 - - - - - - destination_order - - - - - - 60,560 - - - - - - reliability - - - - - - 60,460 - - - - - - liveliness - - - - - - 60,360 - - - - - - latency_budget - - - - - - 60,260 - - - - - - deadline - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - PublisherQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataWriterQos - - - - - - - - - - - - - - writer_data_lifecycle - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - resource_limits - - - - - - 60,860 - - - - - - history - - - - - - 60,760 - - - - - - destination_order - - - - - - 60,660 - - - - - - reliability - - - - - - 60,560 - - - - - - liveliness - - - - - - 60,460 - - - - - - latency_budget - - - - - - 60,360 - - - - - - deadline - - - - - - 60,260 - - - - - - durability_service - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - TopicQos - - - - - - - - - - - - - - ownership - - - - - - 60,1260 - - - - - - lifespan - - - - - - 60,1160 - - - - - - transport_priority - - - - - - 60,1060 - - - - - - resource_limits - - - - - - 60,960 - - - - - - history - - - - - - 60,860 - - - - - - destination_order - - - - - - 60,760 - - - - - - reliability - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,460 - - - - - - deadline - - - - - - 60,360 - - - - - - durability_service - - - - - - 60,260 - - - - - - durability - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,60 - - - - - - - DomainParticipantQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,160 - - - - - - user_data - - - - - - 60,60 - - - - - - - DomainParticipantFactoryQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,60 - - - - - - - DurabilityServiceQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,560 - - - - - - max_instances - - - - - - 60,460 - - - - - - max_samples - - - - - - 60,360 - - - - - - history_depth - - - - - - 60,260 - - - - - - history_kind - - - - - - 60,160 - - - - - - service_cleanup_delay - - - - - - 60,60 - - - - - - - ReaderDataLifecycleQosPolicy - - - - - - - - - - - - - - autopurge_disposed_samples_delay - - - - - - 60,160 - - - - - - autopurge_nowriter_samples_delay - - - - - - 60,60 - - - - - - - WriterDataLifecycleQosPolicy - - - - - - - - - - - - - - autodispose_unregistered_instances - - - - - - 60,60 - - - - - - - EntityFactoryQosPolicy - - - - - - - - - - - - - - autoenable_created_entities - - - - - - 60,60 - - - - - - - ResourceLimitsQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,260 - - - - - - max_instances - - - - - - 60,160 - - - - - - max_samples - - - - - - 60,60 - - - - - - - HistoryQosPolicy - - - - - - - - - - - - - - depth - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - HistoryQosPolicyKind - - - - - - - - - - - - - - KEEP_ALL_HISTORY_QOS - - - - - - 60,160 - - - - - - KEEP_LAST_HISTORY_QOS - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicyKind - - - - - - - - - - - - - - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,160 - - - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,60 - - - - - - - ReliabilityQosPolicy - - - - - - - - - - - - - - max_blocking_time - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - ReliabilityQosPolicyKind - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - - 60,160 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - 60,60 - - - - - - - PartitionQosPolicy - - - - - - - - - - - - - - name - - - - - - 60,60 - - - - - - - TimeBasedFilterQosPolicy - - - - - - - - - - - - - - minimum_separation - - - - - - 60,60 - - - - - - - LivelinessQosPolicy - - - - - - - - - - - - - - lease_duration - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - LivelinessQosPolicyKind - - - - - - - - - - - - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - - - - 60,260 - - - - - - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - - - - 60,160 - - - - - - AUTOMATIC_LIVELINESS_QOS - - - - - - 60,60 - - - - - - - OwnershipStrengthQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - OwnershipQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - OwnershipQosPolicyKind - - - - - - - - - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - 60,160 - - - - - - SHARED_OWNERSHIP_QOS - - - - - - 60,60 - - - - - - - LatencyBudgetQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - DeadlineQosPolicy - - - - - - - - - - - - - - period - - - - - - 60,60 - - - - - - - PresentationQosPolicy - - - - - - - - - - - - - - ordered_access - - - - - - 60,260 - - - - - - coherent_access - - - - - - 60,160 - - - - - - access_scope - - - - - - 60,60 - - - - - - - PresentationQosPolicyAccessScopeKind - - - - - - - - - - - - - - GROUP_PRESENTATION_QOS - - - - - - 60,260 - - - - - - TOPIC_PRESENTATION_QOS - - - - - - 60,160 - - - - - - INSTANCE_PRESENTATION_QOS - - - - - - 60,60 - - - - - - - DurabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DurabilityQosPolicyKind - - - - - - - - - - - - - - PERSISTENT_DURABILITY_QOS - - - - - - 60,360 - - - - - - TRANSIENT_DURABILITY_QOS - - - - - - 60,260 - - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - 60,160 - - - - - - VOLATILE_DURABILITY_QOS - - - - - - 60,60 - - - - - - - LifespanQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - TransportPriorityQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - GroupDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TopicDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - UserDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - QueryCondition - - local - - - - - - - - - - - - - - - - - - set_query_parameters - - - - - - 60,260 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_parameters - - - - - - 60,160 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ReadCondition - - local - - - - - - - - - - - - - - - - - - get_datareader - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_state_mask - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_view_state_mask - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_state_mask - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - StatusCondition - - local - - - - - - - - - - - - - - - - - - get_entity - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_enabled_statuses - - - - - - 60,160 - - - - - - - - - - - mask - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_enabled_statuses - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - GuardCondition - - local - - - - - - - - - - - - - - - - - - set_trigger_value - - - - - - 60,60 - - - - - - - - - - - value - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - WaitSet - - local - - - - - - - - - - - - - - - - - - get_conditions - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - attached_conditions - - - - - - 160,60 - - - - - - - detach_condition - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - cond - - - - - - 160,60 - - - - - - - attach_condition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - cond - - - - - - 160,60 - - - - - - - wait - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - timeout - - - - - - 260,60 - - - - - - active_conditions - - - - - - 160,60 - - - - - - - - Condition - - local - - - - - - - - - - - - - - - - - - get_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - DomainParticipantListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - Inherits - - - Inherits - - - - SubscriberListener - - local - - - - - - - - - - - - - - - - - - on_data_on_readers - - - - - - 60,60 - - - - - - - - - - - the_subscriber - - - - - - 60,60 - - - - - - - Inherits - - - - DataReaderListener - - local - - - - - - - - - - - - - - - - - - on_sample_lost - - - - - - 60,660 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_subscription_matched - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_data_available - - - - - - 60,460 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_liveliness_changed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - Inherits - - - - PublisherListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - - DataWriterListener - - local - - - - - - - - - - - - - - - - - - on_reliable_reader_activity_changed - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_reliable_writer_cache_changed - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_publication_matched - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_liveliness_lost - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - Inherits - - - - TopicListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - Inherits - - - - Publisher - - local - - - - - - - - - - - - - - - - - - copy_from_topic_qos - - - - - - 60,1760 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datawriter_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datawriter_qos - - - - - - 60,1660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datawriter_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - end_coherent_changes - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_coherent_changes - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - resume_publications - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - suspend_publications - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,760 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datawriter - - - - - - 60,360 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datawriter - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datawriter - - - - - - 160,60 - - - - - - - create_datawriter_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - probile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datawriter - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - Subscriber - - local - - - - - - - - - - - - - - - - - - copy_from_topic_qos - - - - - - 60,1660 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datareader_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datareader_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datareader_qos - - - - - - 60,1460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_access - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_access - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - notify_datareaders - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_datareaders - - - - - - 60,560 - - - - - - - - - - - instance_states - - - - - - 460,60 - - - - - - view_states - - - - - - 360,60 - - - - - - sample_states - - - - - - 260,60 - - - - - - readers - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datareader - - - - - - 60,460 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datareader - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datareader - - - - - - 160,60 - - - - - - - create_datareader_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datareader - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - DataReader - - local - - - - - - - - - - - - - - - - - - get_matched_publication_data - - - - - - 60,1860 - - - - - - - - - - - publication_handle - - - - - - 260,60 - - - - - - publication_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_publications - - - - - - 60,1760 - - - - - - - - - - - publication_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_historical_data - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - get_sample_lost_status - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_subscription_matched_status - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_requested_incompatible_qos_status - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_requested_deadline_missed_status - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_liveliness_changed_status - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_sample_rejected_status - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_subscriber - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topicdescription - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,660 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_readcondition - - - - - - 60,260 - - - - - - - - - - - a_condition - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_querycondition - - - - - - 60,160 - - - - - - - - - - - query_expression - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - query_parameters - - - - - - 560,60 - - - - - - - create_readcondition - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriter - - local - - - - - - - - - - - - - - - - - - get_matched_subscription_data - - - - - - 60,1360 - - - - - - - - - - - subscription_handle - - - - - - 260,60 - - - - - - subscription_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_subscriptions - - - - - - 60,1260 - - - - - - - - - - - subscription_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publication_matched_status - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_offered_incompatible_qos_status - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_offered_deadline_missed_status - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - get_liveliness_lost_status - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - max_wait - - - - - - 160,60 - - - - - - - get_publisher - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topic - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - MultiTopic - - local - - - - - - - - - - - - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ContentFilteredTopic - - local - - - - - - - - - - - - - - - - - - get_related_topic - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_filter_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - Topic - - local - - - - - - - - - - - - - - - - - - get_inconsistent_topic_status - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_status - - - - - - 160,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - Inherits - - - - TopicDescription - - local - - - - - - - - - - - - - - - - - - get_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_name - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_type_name - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Entity - - local - - - - - - - - - - - - - - - - - - get_instance_handle - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_status_changes - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_statuscondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - enable - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - - ReliableWriterCacheChangedStatus - - - - - - - - - - - - - - unacknowledged_sample_count_peak - - - - - - 60,560 - - - - - - unacknowledged_sample_count - - - - - - 60,460 - - - - - - high_watermark_reliable_writer_cache - - - - - - 60,360 - - - - - - low_watermark_reliable_writer_cache - - - - - - 60,260 - - - - - - full_reliable_writer_cache - - - - - - 60,160 - - - - - - empty_reliable_writer_cache - - - - - - 60,60 - - - - - - - ReliableWriterCacheEventCount - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - ReliableReaderActivityChangedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,460 - - - - - - inactive_count_change - - - - - - 60,360 - - - - - - active_count_change - - - - - - 60,260 - - - - - - inactive_count - - - - - - 60,160 - - - - - - active_count - - - - - - 60,60 - - - - - - - SubscriptionMatchedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - PublicationMatchedStatus - - - - - - - - - - - - - - last_subscription_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - RequestedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - policies - - - - - - 60,360 - - - - - - - OfferedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - policies - - - - - - 60,360 - - - - - - - QosPolicyCount - - - - - - - - - - - - - - count - - - - - - 60,160 - - - - - - policy_id - - - - - - 60,60 - - - - - - - RequestedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - OfferedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - LivelinessChangedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - not_alive_count_change - - - - - - 60,360 - - - - - - alive_count_change - - - - - - 60,260 - - - - - - not_alive_count - - - - - - 60,160 - - - - - - alive_count - - - - - - 60,60 - - - - - - - LivelinessLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - SampleRejectedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,360 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_reason - - - - - - 60,260 - - - - - - - SampleRejectedStatusKind - - - - - - - - - - - - - - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - - - - - - 60,360 - - - - - - REJECTED_BY_SAMPLES_LIMIT - - - - - - 60,260 - - - - - - REJECTED_BY_INSTANCES_LIMIT - - - - - - 60,160 - - - - - - NOT_REJECTED - - - - - - 60,60 - - - - - - - SampleLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - InconsistentTopicStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - Time_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - Duration_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - BuiltinTopicKey_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 3 - - - - - OctetSeq - - - - - - - - - - - - - - - - - - DURABILITYSERVICE_QOS_POLICY_ID - - - - - - - - 22 - - - - LIFESPAN_QOS_POLICY_ID - - - - - - - - 21 - - - - TRANSPORTPRIORITY_QOS_POLICY_ID - - - - - - - - 20 - - - - GROUPDATA_QOS_POLICY_ID - - - - - - - - 19 - - - - TOPICDATA_QOS_POLICY_ID - - - - - - - - 18 - - - - READERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 17 - - - - WRITERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 16 - - - - ENTITYFACTORY_QOS_POLICY_ID - - - - - - - - 15 - - - - RESOURCELIMITS_QOS_POLICY_ID - - - - - - - - 14 - - - - HISTORY_QOS_POLICY_ID - - - - - - - - 13 - - - - DESTINATIONORDER_QOS_POLICY_ID - - - - - - - - 12 - - - - RELIABILITY_QOS_POLICY_ID - - - - - - - - 11 - - - - PARTITION_QOS_POLICY_ID - - - - - - - - 10 - - - - TIMEBASEDFILTER_QOS_POLICY_ID - - - - - - - - 9 - - - - LIVELINESS_QOS_POLICY_ID - - - - - - - - 8 - - - - OWNERSHIPSTRENGTH_QOS_POLICY_ID - - - - - - - - 7 - - - - OWNERSHIP_QOS_POLICY_ID - - - - - - - - 6 - - - - LATENCYBUDGET_QOS_POLICY_ID - - - - - - - - 5 - - - - DEADLINE_QOS_POLICY_ID - - - - - - - - 4 - - - - PRESENTATION_QOS_POLICY_ID - - - - - - - - 3 - - - - DURABILITY_QOS_POLICY_ID - - - - - - - - 2 - - - - USERDATA_QOS_POLICY_ID - - - - - - - - 1 - - - - INVALID_QOS_POLICY_ID - - - - - - - - 0 - - - - DURABILITYSERVICE_POLICY_NAME - - - - - - - - DurabilityService - - - - LIFESPAN_QOS_POLICY_NAME - - - - - - - - Lifespan - - - - GROUPDATA_QOS_POLICY_NAME - - - - - - - - TransportPriority - - - - TOPICDATA_QOS_POLICY_NAME - - - - - - - - TopicData - - - - READERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - ReaderDataLifecycle - - - - WRITERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - WriterDataLifecycle - - - - ENTITYFACTORY_QOS_POLICY_NAME - - - - - - - - EntityFactory - - - - RESOURCELIMITS_QOS_POLICY_NAME - - - - - - - - ResourceLimits - - - - HISTORY_QOS_POLICY_NAME - - - - - - - - History - - - - DESTINATIONORDER_QOS_POLICY_NAME - - - - - - - - DestinationOrder - - - - RELIABILITY_QOS_POLICY_NAME - - - - - - - - Reliability - - - - PARTITION_QOS_POLICY_NAME - - - - - - - - Partition - - - - TIMEBASEDFILTER_QOS_POLICY_NAME - - - - - - - - TimeBasedFilter - - - - LIVELINESS_QOS_POLICY_NAME - - - - - - - - Liveliness - - - - OWNERSHIPSTRENGTH_QOS_POLICY_NAME - - - - - - - - OwnershipStrength - - - - OWNERSHIP_QOS_POLICY_NAME - - - - - - - - Ownership - - - - LATENCYBUDGET_QOS_POLICY_NAME - - - - - - - - LatencyBudget - - - - DEADLINE_QOS_POLICY_NAME - - - - - - - - Deadline - - - - PRESENTATION_QOS_POLICY_NAME - - - - - - - - Presentation - - - - DURABILITY_QOS_POLICY_NAME - - - - - - - - Durability - - - - USERDATA_QOS_POLICY_NAME - - - - - - - - UserData - - - - NOT_ALIVE_INSTANCE_STATE - - - - - - - - 6 - - - - ANY_INSTANCE_STATE - - - - - - - - 65535 - - - - InstanceStateMask - - - - - - - - - - - - - - - NOT_ALIVE_NO_WRITERS_INSTANCE_STATE - - - - - - - - 4 - - - - NOT_ALIVE_DISPOSED_INSTANCE_STATE - - - - - - - - 2 - - - - ALIVE_INSTANCE_STATE - - - - - - - - 1 - - - - InstanceStateKind - - - - - - - - - - - - - - - ANY_VIEW_STATE - - - - - - - - 65535 - - - - ViewStateMask - - - - - - - - - - - - - - - NOT_NEW_VIEW_STATE - - - - - - - - 2 - - - - NEW_VIEW_STATE - - - - - - - - 1 - - - - ViewStateKind - - - - - - - - - - - - - - - ANY_SAMPLE_STATE - - - - - - - - 65535 - - - - SampleStateMask - - - - - - - - - - - - - - - NOT_READ_SAMPLE_STATE - - - - - - - - 2 - - - - READ_SAMPLE_STATE - - - - - - - - 1 - - - - SampleStateKind - - - - - - - - - - - - - - - RELIABLE_READER_ACTIVITY_CHANGED_STATUS - - - - - - - - 33554432 - - - - RELIABLE_WRITER_CACHE_CHANGED_STATUS - - - - - - - - 16777216 - - - - SUBSCRIPTION_MATCHED_STATUS - - - - - - - - 16384 - - - - PUBLICATION_MATCHED_STATUS - - - - - - - - 8192 - - - - LIVELINESS_CHANGED_STATUS - - - - - - - - 4096 - - - - LIVELINESS_LOST_STATUS - - - - - - - - 2048 - - - - DATA_AVAILABLE_STATUS - - - - - - - - 1024 - - - - DATA_ON_READERS_STATUS - - - - - - - - 512 - - - - SAMPLE_REJECTED_STATUS - - - - - - - - 256 - - - - SAMPLE_LOST_STATUS - - - - - - - - 128 - - - - REQUESTED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 64 - - - - OFFERED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 32 - - - - REQUESTED_DEADLINE_MISSED_STATUS - - - - - - - - 4 - - - - OFFERED_DEADLINE_MISSED_STATUS - - - - - - - - 2 - - - - INCONSISTENT_TOPIC_STATUS - - - - - - - - 1 - - - - StatusMask - - - - - - - - - - - - - - - StatusKind - - - - - - - - - - - - - - - RETCODE_ILLEGAL_OPERATION - - - - - - - - 12 - - - - RETCODE_NO_DATA - - - - - - - - 11 - - - - RETCODE_TIMEOUT - - - - - - - - 10 - - - - RETCODE_ALREADY_DELETED - - - - - - - - 9 - - - - RETCODE_INCONSISTENT_POLICY - - - - - - - - 8 - - - - RETCODE_IMMUTABLE_POLICY - - - - - - - - 7 - - - - RETCODE_NOT_ENABLED - - - - - - - - 6 - - - - RETCODE_OUT_OF_RESOURCES - - - - - - - - 5 - - - - RETCODE_PRECONDITION_NOT_MET - - - - - - - - 4 - - - - RETCODE_BAD_PARAMETER - - - - - - - - 3 - - - - RETCODE_UNSUPPORTED - - - - - - - - 2 - - - - RETCODE_ERROR - - - - - - - - 1 - - - - RETCODE_OK - - - - - - - - 0 - - - - TIME_INVALID_NSEC - - - - - - - - 4294967295 - - - - TIME_INVALID_SEC - - - - - - - - -1 - - - - DURATION_ZERO_NSEC - - - - - - - - 0 - - - - DURATION_ZERO_SEC - - - - - - - - 0 - - - - DURATION_INFINITE_NSEC - - - - - - - - 2147483647 - - - - DURATION_INFINITE_SEC - - - - - - - - 2147483647 - - - - LENGTH_UNLIMITED - - - - - - - - -1 - - - - StringSeq - - - - - - - - - - - - - - - - - - QosPolicyId_t - - - - - - - - - - - - - - - ReturnCode_t - - - - - - - - - - - - - - - DomainId_t - - - - - - - - - - - - - - - SampleInfoSeq - - - - - - - - - - - - - - - - - - ConditionSeq - - - - - - - - - - - - - - - - - - DataReaderSeq - - - - - - - - - - - - - - - - - - QosPolicyCountSeq - - - - - - - - - - - - - - - - - - - - dds4ccm_StateListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - StateListenerControl - - local - - - - - - - - - - - - - - - - - - is_filter_interpreted - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - - - dds4ccm_PortStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - PortStatusListener - - local - - - - - - - - - - - - - - - - - - on_sample_lost - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - - - - dds4ccm_DataListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DataListenerControl - - local - - - - - - - - - - - - - - - - - - max_delivered_data - - - - - - 60,160 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - mode - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_ConnectorStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ConnectorStatusListener - - local - - - - - - - - - - - - - - - - - - on_unexpected_status - - - - - - 60,560 - - - - - - - - - - - status_kind - - - - - - 160,60 - - - - - - the_entity - - - - - - 60,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - - - - dds4ccm_Connector - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DDS_TopicBase - - - - - - - - - - - C61798A6-7C26-11DF-8003-000C2958D27B - - - - - - key_fields - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - topic_name - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - DDS_Base - - - - - - - - - - - C61798A6-7C26-11DF-8002-000C2958D27B - - - - - - qos_profile - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - domain_id - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - error_listener - - - - - - - - false - - - false - - - true - - - false - - - - - - - dds4ccm_Base - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ContentFilterSetting - - local - - - - - - - - - - - - - - - - - - set_filter_parameters - - - - - - 60,60 - - - - - - - - - - - parameters - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - NonChangeable - - - - - - - - - - - - - - - InternalError - - - - - - - - - - - - - - error_code - - - index - - - - NonExistent - - - - - - - - - - - - - - indexes - - - - AlreadyCreated - - - - - - - - - - - - - - indexes - - - - ListenerMode - - - - - - - - - - - - - - MANY_BY_MANY - - - - - - 60,260 - - - - - - ONE_BY_ONE - - - - - - 60,160 - - - - - - NOT_ENABLED - - - - - - 60,60 - - - - - - - QueryFilter - - - - - - - - - - - - - - parameters - - - - - - 60,160 - - - - - - expression - - - - - - 60,60 - - - - - - - ReadInfo - - - - - - - - - - - - - - source_timestamp - - - - - - 60,160 - - - - - - instance_handle - - - - - - 60,60 - - - - - - instance_status - - - - - - 60,360 - - - - - - access_status - - - - - - 60,260 - - - - - - - InstanceStatus - - - - - - - - - - - - - - INSTANCE_DELETED - - - - - - 60,460 - - - - - - INSTANCE_FILTERED_OUT - - - - - - 60,360 - - - - - - INSTANCE_UPDATED - - - - - - 60,260 - - - - - - INSTANCE_FILTERED_IN - - - - - - 60,160 - - - - - - INSTANCE_CREATED - - - - - - 60,60 - - - - - - - AccessStatus - - - - - - - - - - - - - - ALREADY_SEEN - - - - - - 60,160 - - - - - - FRESH_INFO - - - - - - 60,60 - - - - - - - UNLIMITED - - - - - - - - 0 - - - - DataNumber_t - - - - - - - - - - - - - - - ReadInfoSeq - - - - - - - - - - - - - - - - - - DataNumberSeq - - - - - - - - - - - - - - - - - - - - ccm_dds - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - Typed - - - - - - - - - - - - - - - - - DDS_Event - - - - - - - - - - - C61798A6-7C26-11DF-8001-000C2958D27B - - - - - - push_consumer - - - pull_consumer - - - supplier - - - - DDS_State - - - - - - - - - - - C61798A6-7C26-11DF-8000-000C2958D27B - - - - - - push_state_observer - - - push_observer - - - pull_observer - - - passive_observer - - - observable - - - - DDS_StateListen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Listen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Get - - - - - - - - - - - - - - filter - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,560 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - true - - - false - - - - fresh_data - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Read - - - - - - - - - - - - - - filter - - - - - - 60,360 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Update - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Write - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - StateListener - - local - - - - - - - - - - - - - - - - - - on_deletion - - - - - - 60,360 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_many_updates - - - - - - 60,260 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_update - - - - - - 60,160 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_creation - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - on_many_data - - - - - - 60,160 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_data - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Getter - - local - - - - - - - - - - - - - - - - - - max_delivered_data - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - time_out - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - get_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - data - - - - - - 160,60 - - - - - - - get_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 360,60 - - - - - - info - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - Reader - - local - - - - - - - - - - - - - - - - - - query - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - read_one_all - - - - - - 60,360 - - - - - - - - - - - - - - - - - 560,60 - - - - - - - - - - - - 460,60 - - - - - - instance_handle - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - data - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_one_last - - - - - - 60,260 - - - - - - - - - - - - - - - - - 460,60 - - - - - - - - - - - - 360,60 - - - - - - instance_handle - - - - - - 260,60 - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_all - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - read_last - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - - Updater - - local - - - - - - - - - - - - - - - - - - is_coherent_write - - - - - - 60,760 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - is_global_scope - - - - - - 60,660 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - delete_many - - - - - - 60,560 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - update_many - - - - - - 60,460 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - create_many - - - - - - 60,360 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - delete_one - - - - - - 60,260 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - update_one - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - create_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - Writer - - local - - - - - - - - - - - - - - - - - - is_coherent_write - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - write_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - write_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - InstanceHandleManager - - local - - - - - - - - - - - - - - - - - - unregister_instance - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - register_instance - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - T - - - - - - 60,60 - - - - - - TSeq - - - - - - 160,60 - - - - - - - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme b/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme deleted file mode 100644 index c9e43290a4a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/Shapes/models/Shapes.xme +++ /dev/null @@ -1,37085 +0,0 @@ - - - - - Shapes - - - - - - - Shapes - - InterfaceDefinitions - - Shapes_Base - - Base - - - - - - - - - - - - ShapeType - - - - - - - - - - - - - - color - - - - - - 60,60 - - - - - - x - - - - - - 60,160 - - - - - - y - - - - - - 60,260 - - - - - - shapesize - - - - - - 60,360 - - - - - - Key - - - - - - - - - Attributes - - - - - - - - - - - - - - shape - - - - - - 60,60 - - - - - - color - - - - - - 60,160 - - - - - - speed - - - - - - 60,260 - - - - - - Key - - - - - - - - - - - - - - ShapeTypeSeq - - - - - - - - - - - - - - - - - - - Shapes_Connector - - Connector - - - - - - - - - - - - Shapes - - PackageType - - - - - - 60,60 - - - - - - TemplateParameterValue - - - - - - 160,60 - - - - - - TemplateParameterValue - - - - - - 260,60 - - - - - - - - Shapes_Receiver - - Receiver - - - - - - - - - - - - Shapes - - - - - - - - - - - - - - - - - Receiver - - - - - - - - - - - AA8C9DEE-7CED-11DF-8DCF-000C2958D27B - - - - - - - - - rate - - - - - - - - - - - - - - 60,60 - - - - - - - get_data - - - - - - - - - - - - - - 60,60 - - - - - - - read_data - - - - - - - - - - - - - - 60,60 - - - - - - - raw_listen - - - - - - - - - - - - - - 60,60 - - - - - - - info_out - - - info_get - - - - - - - - - - - - - - - - - - - Shapes_Sender - - Sender - - - - - - - - - - - - Shapes - - - - - - - - - - - - - - - - - Sender - - - - - - - - - - - AA8C9DEE-7CED-11DF-8DD0-000C2958D27B - - - - - - - - - rate - - - - - - - - - - - - - - 60,60 - - - - - - - max_x - - - - - - - - - - - - - - 60,60 - - - - - - - max_y - - - - - - - - - - - - - - 60,60 - - - - - - - max_size - - - - - - - - - - - - - - 60,60 - - - - - - - resize_shape - - - - - - - - - - - - - - 60,60 - - - - - - - info_write - - - - - - - - - - - - - - Shapes_ConnectorE - - Connector - - - Shapes - - CCM_InstanceHandleManager - - local - - - - CCM_Writer - - local - - - - CCM_Updater - - local - - - - CCM_Reader - - local - - - - CCM_Getter - - local - - - - CCM_Listener - - local - - - - CCM_StateListener - - local - - - - CCM_DDS_State - - local - - - get_observable_data - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_observable_dds_entity - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_passive_observer_data - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_passive_observer_dds_entity - - - - - - 60,360 - - - - - ReturnType - - - - - - 60,60 - - - - - - - passive_observer_filter - - - - - - 60,460 - - - - - - - - - - - 60,60 - - - - - - - get_passive_observer_filter_config - - - - - - 60,560 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_observer_data - - - - - - 60,660 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_observer_fresh_data - - - - - - 60,760 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_observer_dds_entity - - - - - - 60,860 - - - - - ReturnType - - - - - - 60,60 - - - - - - - pull_observer_filter - - - - - - 60,960 - - - - - - - - - - - 60,60 - - - - - - - get_pull_observer_filter_config - - - - - - 60,1060 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_observer_data - - - - - - 60,1160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_observer_data_control - - - - - - 60,1260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_observer_dds_entity - - - - - - 60,1360 - - - - - ReturnType - - - - - - 60,60 - - - - - - - push_observer_filter - - - - - - 60,1460 - - - - - - - - - - - 60,60 - - - - - - - get_push_observer_filter_config - - - - - - 60,1560 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_state_observer_data - - - - - - 60,1660 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_state_observer_data_control - - - - - - 60,1760 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_state_observer_dds_entity - - - - - - 60,1860 - - - - - ReturnType - - - - - - 60,60 - - - - - - - push_state_observer_filter - - - - - - 60,1960 - - - - - - - - - - - 60,60 - - - - - - - get_push_state_observer_filter_config - - - - - - 60,2060 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - CCM_DDS_State_Context - - local - - - get_connection_passive_observer_status - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_pull_observer_status - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_push_observer_data_listener - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_push_observer_status - - - - - - 60,360 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_push_state_observer_data_listener - - - - - - 60,460 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_push_state_observer_status - - - - - - 60,560 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - CCM_DDS_Event - - local - - - get_supplier_data - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_supplier_dds_entity - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_consumer_data - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_consumer_fresh_data - - - - - - 60,360 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_pull_consumer_dds_entity - - - - - - 60,460 - - - - - ReturnType - - - - - - 60,60 - - - - - - - pull_consumer_filter - - - - - - 60,560 - - - - - - - - - - - 60,60 - - - - - - - get_pull_consumer_filter_config - - - - - - 60,660 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_consumer_data - - - - - - 60,760 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_consumer_data_control - - - - - - 60,860 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_push_consumer_dds_entity - - - - - - 60,960 - - - - - ReturnType - - - - - - 60,60 - - - - - - - push_consumer_filter - - - - - - 60,1060 - - - - - - - - - - - 60,60 - - - - - - - get_push_consumer_filter_config - - - - - - 60,1160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - CCM_DDS_Event_Context - - local - - - get_connection_pull_consumer_status - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_push_consumer_data_listener - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_push_consumer_status - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - CIAO_Shapes_DDS_State_Impl - - DDS_State_Exec_Context - - - DDS_State_Exec - - local - - - Inherits - - - - - CIAO_Shapes_DDS_Event_Impl - - DDS_Event_Exec_Context - - - DDS_Event_Exec - - local - - - Inherits - - - - - - Shapes_ReceiverE - - Receiver - - - Shapes - - CCM_Receiver - - local - - - get_info_out_data_listener - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_info_out_status - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_info_get_status - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - rate - - - - - - 60,360 - - - - - - - - - - - 60,60 - - - - - - - get_data - - - - - - 60,460 - - - - - - - - - - - 60,60 - - - - - - - read_data - - - - - - 60,560 - - - - - - - - - - - 60,60 - - - - - - - raw_listen - - - - - - 60,660 - - - - - - - - - - - 60,60 - - - - - - - - CCM_Receiver_Context - - local - - - get_connection_info_out_data - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_info_out_data_control - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_info_out_dds_entity - - - - - - 60,260 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_info_out_filter_config - - - - - - 60,360 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_info_get_data - - - - - - 60,460 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_info_get_fresh_data - - - - - - 60,560 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_info_get_dds_entity - - - - - - 60,660 - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_connection_info_get_filter_config - - - - - - 60,760 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - CIAO_Shapes_Receiver_Impl - - Receiver_Exec_Context - - - Receiver_Exec - - local - - - Inherits - - - - - - Shapes_SenderE - - Sender - - - Shapes - - CCM_Sender - - local - - - rate - - - - - - 60,60 - - - - - - - - - - - 60,60 - - - - - - - max_x - - - - - - 60,160 - - - - - - - - - - - 60,60 - - - - - - - max_y - - - - - - 60,260 - - - - - - - - - - - 60,60 - - - - - - - max_size - - - - - - 60,360 - - - - - - - - - - - 60,60 - - - - - - - resize_shape - - - - - - 60,460 - - - - - - - - - - - 60,60 - - - - - - - - CCM_Sender_Context - - local - - - get_connection_info_write_data - - - - - - 60,60 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - - - - get_connection_info_write_dds_entity - - - - - - 60,160 - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - CIAO_Shapes_Sender_Impl - - Sender_Exec_Context - - - Sender_Exec - - local - - - Inherits - - - - - - - ImplementationArtifacts - - Shapes_ReceiverArtifacts - - Shapes_Receiver_svnt - - - - - - 150,150 - - - - - AA8C9DEE-7CED-11DF-8DD1-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Shapes_Receiver_svnt - - - - - - - Shapes_Receiver_exec - - - - - - 450,150 - - - - - AA8C9DEE-7CED-11DF-8DD2-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Shapes_Receiver_exec - - - - - - - - Shapes_SenderArtifacts - - Shapes_Sender_svnt - - - - - - 150,150 - - - - - AA8C9DEE-7CED-11DF-8DD3-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Shapes_Sender_svnt - - - - - - - Shapes_Sender_exec - - - - - - 450,150 - - - - - AA8C9DEE-7CED-11DF-8DD4-000C2958D27B - - - - - - 0.0.0.0 - - - - - - - - - Shapes_Sender_exec - - - - - - - - - ComponentImplementations - - Shapes_ReceiverImpl - - Shapes_ReceiverImpl - - - - - - 250,250 - - - - - AA8C9DEE-7CED-11DF-8DD5-000C2958D27B - - - 0.0.0.0 - - - - - - - Receiver - - - - - - 187,75 - - - - - - Shapes_Receiver_svnt - - - - - - 506,347 - - - - - create_Shapes_Receiver_Servant - - - - Shapes_Receiver_exec - - - - - - 506,151 - - - - - create_Shapes_Receiver_Impl - - - - - - - - - - - - - - - - - - - - Shapes_SenderImpl - - Shapes_SenderImpl - - - - - - 250,250 - - - - - AA8C9DEE-7CED-11DF-8DD6-000C2958D27B - - - 0.0.0.0 - - - - - - - Sender - - - - - - 187,75 - - - - - - Shapes_Sender_svnt - - - - - - 506,347 - - - - - create_Shapes_Sender_Servant - - - - Shapes_Sender_exec - - - - - - 506,151 - - - - - create_Shapes_Sender_Impl - - - - - - - - - - - - - - - - - - - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - MGA=E:\proj\vc9\ACE_TAO_CIAO\CIAO\connectors\dds4ccm\models\dds4ccm.mga - - InterfaceDefinitions - - dds_rtf2_dcps_i_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - NativeInstanceHandle_t - - - - - - - - - - - - - - isValid - - - - - - 60,260 - - - - - - length - - - - - - 60,160 - - - - - - value - - - - - - 60,60 - - - - - 16 - - - - - InstanceHandle_t - - - - - - - - - - - - - - - InstanceHandleSeq - - - - - - - - - - - - - - - - - - - - dds_rtf2_dcps_instance_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - HANDLE_NIL - - - - - dds_rtf2_dcps - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - SampleInfo - - - - - - - - - - - - - - publication_handle - - - - - - 60,560 - - - - - - instance_handle - - - - - - 60,460 - - - - - - valid_data - - - - - - 60,1160 - - - - - - absolute_generation_rank - - - - - - 60,1060 - - - - - - generation_rank - - - - - - 60,960 - - - - - - sample_rank - - - - - - 60,860 - - - - - - no_writers_generation_count - - - - - - 60,760 - - - - - - disposed_generation_count - - - - - - 60,660 - - - - - - source_timestamp - - - - - - 60,360 - - - - - - instance_state - - - - - - 60,260 - - - - - - view_state - - - - - - 60,160 - - - - - - sample_state - - - - - - 60,60 - - - - - - - TypeSupport - - local - - - - - - - - - - - - - - - - - - - DomainParticipantFactory - - local - - - - - - - - - - - - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_participant_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos_with_profile - - - - - - 60,560 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_participant - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - - delete_participant - - - - - - 60,260 - - - - - - - - - - - a_participant - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_participant_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 560,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - - create_participant - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 460,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - - - DomainParticipant - - local - - - - - - - - - - - - - - - - - - get_current_time - - - - - - 60,3860 - - - - - - - - - - - current_time - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - contains_entity - - - - - - 60,3760 - - - - - - - - - - - a_handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_topic_data - - - - - - 60,3660 - - - - - - - - - - - topic_handle - - - - - - 260,60 - - - - - - topic_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_topics - - - - - - 60,3560 - - - - - - - - - - - topic_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participant_data - - - - - - 60,3460 - - - - - - - - - - - participant_handle - - - - - - 260,60 - - - - - - participant_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participants - - - - - - 60,3360 - - - - - - - - - - - participant_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_topic_qos - - - - - - 60,3260 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_topic_qos - - - - - - 60,3160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_subscriber_qos - - - - - - 60,3060 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_subscriber_qos - - - - - - 60,2960 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_publisher_qos - - - - - - 60,2860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_publisher_qos - - - - - - 60,2760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,2660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_domain_id - - - - - - 60,2560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_subscription - - - - - - 60,2460 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_publication - - - - - - 60,2360 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_topic - - - - - - 60,2260 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_participant - - - - - - 60,2160 - - - - - - - - - - - handle - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,2060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,1960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,1860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,1760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_multitopic - - - - - - 60,1560 - - - - - - - - - - - a_multitopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_multitopic - - - - - - 60,1460 - - - - - - - - - - - subscription_expression - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - delete_contentfilteredtopic - - - - - - 60,1360 - - - - - - - - - - - a_contentfilteredtopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_contentfilteredtopic - - - - - - 60,1260 - - - - - - - - - - - filter_expression - - - - - - 360,60 - - - - - - name - - - - - - 160,60 - - - - - - related_topic - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - lookup_topicdescription - - - - - - 60,1160 - - - - - - - - - - - name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - find_topic - - - - - - 60,1060 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - timeout - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_topic - - - - - - 60,960 - - - - - - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_topic_with_profile - - - - - - 60,860 - - - - - - - - - - - profile_name - - - - - - 460,60 - - - - - - library_name - - - - - - 360,60 - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - a_listener - - - - - - 560,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 660,60 - - - - - - - create_topic - - - - - - 60,760 - - - - - - - - - - - type_name - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - qos - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 560,60 - - - - - - - get_builtin_subscriber - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_subscriber - - - - - - 60,560 - - - - - - - - - - - s - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_subscriber_with_profile - - - - - - 60,460 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_subscriber - - - - - - 60,360 - - - - - - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 360,60 - - - - - - - delete_publisher - - - - - - 60,260 - - - - - - - - - - - p - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_publisher_with_profile - - - - - - 60,160 - - - - - - - - - - - profile_name - - - - - - 260,60 - - - - - - library_name - - - - - - 160,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_publisher - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 260,60 - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 360,60 - - - - - - - Inherits - - - - SubscriptionBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1660 - - - - - - topic_data - - - - - - 60,1560 - - - - - - partition - - - - - - 60,1460 - - - - - - presentation - - - - - - 60,1360 - - - - - - time_based_filter - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - destination_order - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - PublicationBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,360 - - - - - - topic_name - - - - - - 60,260 - - - - - - group_data - - - - - - 60,1860 - - - - - - topic_data - - - - - - 60,1760 - - - - - - partition - - - - - - 60,1660 - - - - - - presentation - - - - - - 60,1560 - - - - - - destination_order - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - reliability - - - - - - 60,960 - - - - - - liveliness - - - - - - 60,860 - - - - - - latency_budget - - - - - - 60,760 - - - - - - deadline - - - - - - 60,660 - - - - - - durability_service - - - - - - 60,560 - - - - - - durability - - - - - - 60,460 - - - - - - participant_key - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - TopicBuiltinTopicData - - - - - - - - - - - - - - type_name - - - - - - 60,260 - - - - - - name - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,1560 - - - - - - ownership - - - - - - 60,1460 - - - - - - resource_limits - - - - - - 60,1360 - - - - - - history - - - - - - 60,1260 - - - - - - destination_order - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - reliability - - - - - - 60,860 - - - - - - liveliness - - - - - - 60,760 - - - - - - latency_budget - - - - - - 60,660 - - - - - - deadline - - - - - - 60,560 - - - - - - durability_service - - - - - - 60,460 - - - - - - durability - - - - - - 60,360 - - - - - - key - - - - - - 60,60 - - - - - - - ParticipantBuiltinTopicData - - - - - - - - - - - - - - user_data - - - - - - 60,160 - - - - - - key - - - - - - 60,60 - - - - - - - SubscriberQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataReaderQos - - - - - - - - - - - - - - reader_data_lifecycle - - - - - - 60,1160 - - - - - - time_based_filter - - - - - - 60,1060 - - - - - - ownership - - - - - - 60,960 - - - - - - user_data - - - - - - 60,860 - - - - - - resource_limits - - - - - - 60,760 - - - - - - history - - - - - - 60,660 - - - - - - destination_order - - - - - - 60,560 - - - - - - reliability - - - - - - 60,460 - - - - - - liveliness - - - - - - 60,360 - - - - - - latency_budget - - - - - - 60,260 - - - - - - deadline - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - PublisherQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,360 - - - - - - group_data - - - - - - 60,260 - - - - - - partition - - - - - - 60,160 - - - - - - presentation - - - - - - 60,60 - - - - - - - DataWriterQos - - - - - - - - - - - - - - writer_data_lifecycle - - - - - - 60,1460 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1260 - - - - - - user_data - - - - - - 60,1160 - - - - - - lifespan - - - - - - 60,1060 - - - - - - transport_priority - - - - - - 60,960 - - - - - - resource_limits - - - - - - 60,860 - - - - - - history - - - - - - 60,760 - - - - - - destination_order - - - - - - 60,660 - - - - - - reliability - - - - - - 60,560 - - - - - - liveliness - - - - - - 60,460 - - - - - - latency_budget - - - - - - 60,360 - - - - - - deadline - - - - - - 60,260 - - - - - - durability_service - - - - - - 60,160 - - - - - - durability - - - - - - 60,60 - - - - - - - TopicQos - - - - - - - - - - - - - - ownership - - - - - - 60,1260 - - - - - - lifespan - - - - - - 60,1160 - - - - - - transport_priority - - - - - - 60,1060 - - - - - - resource_limits - - - - - - 60,960 - - - - - - history - - - - - - 60,860 - - - - - - destination_order - - - - - - 60,760 - - - - - - reliability - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,460 - - - - - - deadline - - - - - - 60,360 - - - - - - durability_service - - - - - - 60,260 - - - - - - durability - - - - - - 60,160 - - - - - - topic_data - - - - - - 60,60 - - - - - - - DomainParticipantQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,160 - - - - - - user_data - - - - - - 60,60 - - - - - - - DomainParticipantFactoryQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,60 - - - - - - - DurabilityServiceQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,560 - - - - - - max_instances - - - - - - 60,460 - - - - - - max_samples - - - - - - 60,360 - - - - - - history_depth - - - - - - 60,260 - - - - - - history_kind - - - - - - 60,160 - - - - - - service_cleanup_delay - - - - - - 60,60 - - - - - - - ReaderDataLifecycleQosPolicy - - - - - - - - - - - - - - autopurge_disposed_samples_delay - - - - - - 60,160 - - - - - - autopurge_nowriter_samples_delay - - - - - - 60,60 - - - - - - - WriterDataLifecycleQosPolicy - - - - - - - - - - - - - - autodispose_unregistered_instances - - - - - - 60,60 - - - - - - - EntityFactoryQosPolicy - - - - - - - - - - - - - - autoenable_created_entities - - - - - - 60,60 - - - - - - - ResourceLimitsQosPolicy - - - - - - - - - - - - - - max_samples_per_instance - - - - - - 60,260 - - - - - - max_instances - - - - - - 60,160 - - - - - - max_samples - - - - - - 60,60 - - - - - - - HistoryQosPolicy - - - - - - - - - - - - - - depth - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - HistoryQosPolicyKind - - - - - - - - - - - - - - KEEP_ALL_HISTORY_QOS - - - - - - 60,160 - - - - - - KEEP_LAST_HISTORY_QOS - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DestinationOrderQosPolicyKind - - - - - - - - - - - - - - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,160 - - - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,60 - - - - - - - ReliabilityQosPolicy - - - - - - - - - - - - - - max_blocking_time - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - ReliabilityQosPolicyKind - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - - 60,160 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - 60,60 - - - - - - - PartitionQosPolicy - - - - - - - - - - - - - - name - - - - - - 60,60 - - - - - - - TimeBasedFilterQosPolicy - - - - - - - - - - - - - - minimum_separation - - - - - - 60,60 - - - - - - - LivelinessQosPolicy - - - - - - - - - - - - - - lease_duration - - - - - - 60,160 - - - - - - kind - - - - - - 60,60 - - - - - - - LivelinessQosPolicyKind - - - - - - - - - - - - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - - - - 60,260 - - - - - - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - - - - 60,160 - - - - - - AUTOMATIC_LIVELINESS_QOS - - - - - - 60,60 - - - - - - - OwnershipStrengthQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - OwnershipQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - OwnershipQosPolicyKind - - - - - - - - - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - 60,160 - - - - - - SHARED_OWNERSHIP_QOS - - - - - - 60,60 - - - - - - - LatencyBudgetQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - DeadlineQosPolicy - - - - - - - - - - - - - - period - - - - - - 60,60 - - - - - - - PresentationQosPolicy - - - - - - - - - - - - - - ordered_access - - - - - - 60,260 - - - - - - coherent_access - - - - - - 60,160 - - - - - - access_scope - - - - - - 60,60 - - - - - - - PresentationQosPolicyAccessScopeKind - - - - - - - - - - - - - - GROUP_PRESENTATION_QOS - - - - - - 60,260 - - - - - - TOPIC_PRESENTATION_QOS - - - - - - 60,160 - - - - - - INSTANCE_PRESENTATION_QOS - - - - - - 60,60 - - - - - - - DurabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - DurabilityQosPolicyKind - - - - - - - - - - - - - - PERSISTENT_DURABILITY_QOS - - - - - - 60,360 - - - - - - TRANSIENT_DURABILITY_QOS - - - - - - 60,260 - - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - 60,160 - - - - - - VOLATILE_DURABILITY_QOS - - - - - - 60,60 - - - - - - - LifespanQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - TransportPriorityQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - GroupDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TopicDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - UserDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - QueryCondition - - local - - - - - - - - - - - - - - - - - - set_query_parameters - - - - - - 60,260 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_parameters - - - - - - 60,160 - - - - - - - - - - - query_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ReadCondition - - local - - - - - - - - - - - - - - - - - - get_datareader - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_state_mask - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_view_state_mask - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_state_mask - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - StatusCondition - - local - - - - - - - - - - - - - - - - - - get_entity - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_enabled_statuses - - - - - - 60,160 - - - - - - - - - - - mask - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_enabled_statuses - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - GuardCondition - - local - - - - - - - - - - - - - - - - - - set_trigger_value - - - - - - 60,60 - - - - - - - - - - - value - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - WaitSet - - local - - - - - - - - - - - - - - - - - - get_conditions - - - - - - 60,360 - - - - - - - - - - - attached_conditions - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - detach_condition - - - - - - 60,260 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - attach_condition - - - - - - 60,160 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait - - - - - - 60,60 - - - - - - - - - - - timeout - - - - - - 260,60 - - - - - - active_conditions - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Condition - - local - - - - - - - - - - - - - - - - - - get_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - DomainParticipantListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - Inherits - - - Inherits - - - - SubscriberListener - - local - - - - - - - - - - - - - - - - - - on_data_on_readers - - - - - - 60,60 - - - - - - - - - - - the_subscriber - - - - - - 60,60 - - - - - - - Inherits - - - - DataReaderListener - - local - - - - - - - - - - - - - - - - - - on_sample_lost - - - - - - 60,660 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_subscription_matched - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_data_available - - - - - - 60,460 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_liveliness_changed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - Inherits - - - - PublisherListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - - DataWriterListener - - local - - - - - - - - - - - - - - - - - - on_reliable_reader_activity_changed - - - - - - 60,560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_reliable_writer_cache_changed - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_publication_matched - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_liveliness_lost - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - writer - - - - - - 60,60 - - - - - - - Inherits - - - - TopicListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - Inherits - - - - Publisher - - local - - - - - - - - - - - - - - - - - - copy_from_topic_qos - - - - - - 60,1760 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datawriter_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datawriter_qos - - - - - - 60,1660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datawriter_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,1360 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_coherent_changes - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_coherent_changes - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - resume_publications - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - suspend_publications - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,760 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datawriter - - - - - - 60,360 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datawriter - - - - - - 60,260 - - - - - - - - - - - a_datawriter - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datawriter_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - probile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 560,60 - - - - - - - create_datawriter - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 460,60 - - - - - - - Inherits - - - - Subscriber - - local - - - - - - - - - - - - - - - - - - copy_from_topic_qos - - - - - - 60,1660 - - - - - - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - a_datareader_qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_datareader_qos - - - - - - 60,1560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datareader_qos - - - - - - 60,1460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_access - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_access - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - notify_datareaders - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_datareaders - - - - - - 60,560 - - - - - - - - - - - readers - - - - - - 160,60 - - - - - - instance_states - - - - - - 460,60 - - - - - - view_states - - - - - - 360,60 - - - - - - sample_states - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datareader - - - - - - 60,460 - - - - - - - - - - - topic_name - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_datareader - - - - - - 60,260 - - - - - - - - - - - a_datareader - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_datareader_with_profile - - - - - - 60,160 - - - - - - - - - - - a_listener - - - - - - 460,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - library_name - - - - - - 260,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 560,60 - - - - - - - create_datareader - - - - - - 60,60 - - - - - - - - - - - a_listener - - - - - - 360,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 460,60 - - - - - - - Inherits - - - - DataReader - - local - - - - - - - - - - - - - - - - - - get_matched_publication_data - - - - - - 60,1860 - - - - - - - - - - - publication_handle - - - - - - 260,60 - - - - - - publication_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_publications - - - - - - 60,1760 - - - - - - - - - - - publication_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_historical_data - - - - - - 60,1660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_lost_status - - - - - - 60,1560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_matched_status - - - - - - 60,1460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_incompatible_qos_status - - - - - - 60,1360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_deadline_missed_status - - - - - - 60,1260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_changed_status - - - - - - 60,1160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_rejected_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscriber - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topicdescription - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,660 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,560 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_readcondition - - - - - - 60,260 - - - - - - - - - - - a_condition - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_querycondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_expression - - - - - - 460,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - query_parameters - - - - - - 560,60 - - - - - - - create_readcondition - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - view_states - - - - - - 260,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriter - - local - - - - - - - - - - - - - - - - - - get_matched_subscription_data - - - - - - 60,1360 - - - - - - - - - - - subscription_handle - - - - - - 260,60 - - - - - - subscription_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_subscriptions - - - - - - 60,1260 - - - - - - - - - - - subscription_handles - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publication_matched_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_incompatible_qos_status - - - - - - 60,960 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_deadline_missed_status - - - - - - 60,860 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_lost_status - - - - - - 60,760 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publisher - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topic - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - MultiTopic - - local - - - - - - - - - - - - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ContentFilteredTopic - - local - - - - - - - - - - - - - - - - - - get_related_topic - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - expression_parameters - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_filter_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - Topic - - local - - - - - - - - - - - - - - - - - - get_inconsistent_topic_status - - - - - - 60,460 - - - - - - - - - - - a_status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - Inherits - - - - TopicDescription - - local - - - - - - - - - - - - - - - - - - get_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_name - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_type_name - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Entity - - local - - - - - - - - - - - - - - - - - - get_instance_handle - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_status_changes - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_statuscondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - enable - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - - ReliableWriterCacheChangedStatus - - - - - - - - - - - - - - unacknowledged_sample_count_peak - - - - - - 60,560 - - - - - - unacknowledged_sample_count - - - - - - 60,460 - - - - - - high_watermark_reliable_writer_cache - - - - - - 60,360 - - - - - - low_watermark_reliable_writer_cache - - - - - - 60,260 - - - - - - full_reliable_writer_cache - - - - - - 60,160 - - - - - - empty_reliable_writer_cache - - - - - - 60,60 - - - - - - - ReliableWriterCacheEventCount - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - ReliableReaderActivityChangedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,460 - - - - - - inactive_count_change - - - - - - 60,360 - - - - - - active_count_change - - - - - - 60,260 - - - - - - inactive_count - - - - - - 60,160 - - - - - - active_count - - - - - - 60,60 - - - - - - - SubscriptionMatchedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - PublicationMatchedStatus - - - - - - - - - - - - - - last_subscription_handle - - - - - - 60,460 - - - - - - current_count_change - - - - - - 60,360 - - - - - - current_count - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - RequestedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - policies - - - - - - 60,360 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - OfferedIncompatibleQosStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - policies - - - - - - 60,360 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - QosPolicyCount - - - - - - - - - - - - - - count - - - - - - 60,160 - - - - - - policy_id - - - - - - 60,60 - - - - - - - RequestedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - OfferedDeadlineMissedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - LivelinessChangedStatus - - - - - - - - - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - not_alive_count_change - - - - - - 60,360 - - - - - - alive_count_change - - - - - - 60,260 - - - - - - not_alive_count - - - - - - 60,160 - - - - - - alive_count - - - - - - 60,60 - - - - - - - LivelinessLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - SampleRejectedStatus - - - - - - - - - - - - - - last_instance_handle - - - - - - 60,360 - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - last_reason - - - - - - 60,260 - - - - - - - SampleRejectedStatusKind - - - - - - - - - - - - - - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - - - - - - 60,360 - - - - - - REJECTED_BY_SAMPLES_LIMIT - - - - - - 60,260 - - - - - - REJECTED_BY_INSTANCES_LIMIT - - - - - - 60,160 - - - - - - NOT_REJECTED - - - - - - 60,60 - - - - - - - SampleLostStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - InconsistentTopicStatus - - - - - - - - - - - - - - total_count_change - - - - - - 60,160 - - - - - - total_count - - - - - - 60,60 - - - - - - - Time_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - Duration_t - - - - - - - - - - - - - - nanosec - - - - - - 60,160 - - - - - - sec - - - - - - 60,60 - - - - - - - BuiltinTopicKey_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 3 - - - - - SampleInfoSeq - - - - - - - - - - - - - - - - - - ConditionSeq - - - - - - - - - - - - - - - - - - DataReaderSeq - - - - - - - - - - - - - - - - - - QosPolicyCountSeq - - - - - - - - - - - - - - - - - - OctetSeq - - - - - - - - - - - - - - - - - - DURABILITYSERVICE_QOS_POLICY_ID - - - - - - - - 22 - - - - LIFESPAN_QOS_POLICY_ID - - - - - - - - 21 - - - - TRANSPORTPRIORITY_QOS_POLICY_ID - - - - - - - - 20 - - - - GROUPDATA_QOS_POLICY_ID - - - - - - - - 19 - - - - TOPICDATA_QOS_POLICY_ID - - - - - - - - 18 - - - - READERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 17 - - - - WRITERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 16 - - - - ENTITYFACTORY_QOS_POLICY_ID - - - - - - - - 15 - - - - RESOURCELIMITS_QOS_POLICY_ID - - - - - - - - 14 - - - - HISTORY_QOS_POLICY_ID - - - - - - - - 13 - - - - DESTINATIONORDER_QOS_POLICY_ID - - - - - - - - 12 - - - - RELIABILITY_QOS_POLICY_ID - - - - - - - - 11 - - - - PARTITION_QOS_POLICY_ID - - - - - - - - 10 - - - - TIMEBASEDFILTER_QOS_POLICY_ID - - - - - - - - 9 - - - - LIVELINESS_QOS_POLICY_ID - - - - - - - - 8 - - - - OWNERSHIPSTRENGTH_QOS_POLICY_ID - - - - - - - - 7 - - - - OWNERSHIP_QOS_POLICY_ID - - - - - - - - 6 - - - - LATENCYBUDGET_QOS_POLICY_ID - - - - - - - - 5 - - - - DEADLINE_QOS_POLICY_ID - - - - - - - - 4 - - - - PRESENTATION_QOS_POLICY_ID - - - - - - - - 3 - - - - DURABILITY_QOS_POLICY_ID - - - - - - - - 2 - - - - USERDATA_QOS_POLICY_ID - - - - - - - - 1 - - - - INVALID_QOS_POLICY_ID - - - - - - - - 0 - - - - DURABILITYSERVICE_POLICY_NAME - - - - - - - - DurabilityService - - - - LIFESPAN_QOS_POLICY_NAME - - - - - - - - Lifespan - - - - GROUPDATA_QOS_POLICY_NAME - - - - - - - - TransportPriority - - - - TOPICDATA_QOS_POLICY_NAME - - - - - - - - TopicData - - - - READERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - ReaderDataLifecycle - - - - WRITERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - WriterDataLifecycle - - - - ENTITYFACTORY_QOS_POLICY_NAME - - - - - - - - EntityFactory - - - - RESOURCELIMITS_QOS_POLICY_NAME - - - - - - - - ResourceLimits - - - - HISTORY_QOS_POLICY_NAME - - - - - - - - History - - - - DESTINATIONORDER_QOS_POLICY_NAME - - - - - - - - DestinationOrder - - - - RELIABILITY_QOS_POLICY_NAME - - - - - - - - Reliability - - - - PARTITION_QOS_POLICY_NAME - - - - - - - - Partition - - - - TIMEBASEDFILTER_QOS_POLICY_NAME - - - - - - - - TimeBasedFilter - - - - LIVELINESS_QOS_POLICY_NAME - - - - - - - - Liveliness - - - - OWNERSHIPSTRENGTH_QOS_POLICY_NAME - - - - - - - - OwnershipStrength - - - - OWNERSHIP_QOS_POLICY_NAME - - - - - - - - Ownership - - - - LATENCYBUDGET_QOS_POLICY_NAME - - - - - - - - LatencyBudget - - - - DEADLINE_QOS_POLICY_NAME - - - - - - - - Deadline - - - - PRESENTATION_QOS_POLICY_NAME - - - - - - - - Presentation - - - - DURABILITY_QOS_POLICY_NAME - - - - - - - - Durability - - - - USERDATA_QOS_POLICY_NAME - - - - - - - - UserData - - - - NOT_ALIVE_INSTANCE_STATE - - - - - - - - 6 - - - - ANY_INSTANCE_STATE - - - - - - - - 65535 - - - - InstanceStateMask - - - - - - - - - - - - - - - NOT_ALIVE_NO_WRITERS_INSTANCE_STATE - - - - - - - - 4 - - - - NOT_ALIVE_DISPOSED_INSTANCE_STATE - - - - - - - - 2 - - - - ALIVE_INSTANCE_STATE - - - - - - - - 1 - - - - InstanceStateKind - - - - - - - - - - - - - - - ANY_VIEW_STATE - - - - - - - - 65535 - - - - ViewStateMask - - - - - - - - - - - - - - - NOT_NEW_VIEW_STATE - - - - - - - - 2 - - - - NEW_VIEW_STATE - - - - - - - - 1 - - - - ViewStateKind - - - - - - - - - - - - - - - ANY_SAMPLE_STATE - - - - - - - - 65535 - - - - SampleStateMask - - - - - - - - - - - - - - - NOT_READ_SAMPLE_STATE - - - - - - - - 2 - - - - READ_SAMPLE_STATE - - - - - - - - 1 - - - - SampleStateKind - - - - - - - - - - - - - - - RELIABLE_READER_ACTIVITY_CHANGED_STATUS - - - - - - - - 33554432 - - - - RELIABLE_WRITER_CACHE_CHANGED_STATUS - - - - - - - - 16777216 - - - - SUBSCRIPTION_MATCHED_STATUS - - - - - - - - 16384 - - - - PUBLICATION_MATCHED_STATUS - - - - - - - - 8192 - - - - LIVELINESS_CHANGED_STATUS - - - - - - - - 4096 - - - - LIVELINESS_LOST_STATUS - - - - - - - - 2048 - - - - DATA_AVAILABLE_STATUS - - - - - - - - 1024 - - - - DATA_ON_READERS_STATUS - - - - - - - - 512 - - - - SAMPLE_REJECTED_STATUS - - - - - - - - 256 - - - - SAMPLE_LOST_STATUS - - - - - - - - 128 - - - - REQUESTED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 64 - - - - OFFERED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 32 - - - - REQUESTED_DEADLINE_MISSED_STATUS - - - - - - - - 4 - - - - OFFERED_DEADLINE_MISSED_STATUS - - - - - - - - 2 - - - - INCONSISTENT_TOPIC_STATUS - - - - - - - - 1 - - - - StatusMask - - - - - - - - - - - - - - - StatusKind - - - - - - - - - - - - - - - RETCODE_ILLEGAL_OPERATION - - - - - - - - 12 - - - - RETCODE_NO_DATA - - - - - - - - 11 - - - - RETCODE_TIMEOUT - - - - - - - - 10 - - - - RETCODE_ALREADY_DELETED - - - - - - - - 9 - - - - RETCODE_INCONSISTENT_POLICY - - - - - - - - 8 - - - - RETCODE_IMMUTABLE_POLICY - - - - - - - - 7 - - - - RETCODE_NOT_ENABLED - - - - - - - - 6 - - - - RETCODE_OUT_OF_RESOURCES - - - - - - - - 5 - - - - RETCODE_PRECONDITION_NOT_MET - - - - - - - - 4 - - - - RETCODE_BAD_PARAMETER - - - - - - - - 3 - - - - RETCODE_UNSUPPORTED - - - - - - - - 2 - - - - RETCODE_ERROR - - - - - - - - 1 - - - - RETCODE_OK - - - - - - - - 0 - - - - TIME_INVALID_NSEC - - - - - - - - 4294967295 - - - - TIME_INVALID_SEC - - - - - - - - -1 - - - - DURATION_ZERO_NSEC - - - - - - - - 0 - - - - DURATION_ZERO_SEC - - - - - - - - 0 - - - - DURATION_INFINITE_NSEC - - - - - - - - 2147483647 - - - - DURATION_INFINITE_SEC - - - - - - - - 2147483647 - - - - LENGTH_UNLIMITED - - - - - - - - -1 - - - - StringSeq - - - - - - - - - - - - - - - - - - QosPolicyId_t - - - - - - - - - - - - - - - ReturnCode_t - - - - - - - - - - - - - - - DomainId_t - - - - - - - - - - - - - - - - - dds4ccm_StateListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - StateListenerControl - - local - - - - - - - - - - - - - - - - - - is_filter_interpreted - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - - - dds4ccm_PortStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - PortStatusListener - - local - - - - - - - - - - - - - - - - - - on_sample_lost - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - - - - dds4ccm_DataListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DataListenerControl - - local - - - - - - - - - - - - - - - - - - max_delivered_data - - - - - - 60,160 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - mode - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_ConnectorStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ConnectorStatusListener - - local - - - - - - - - - - - - - - - - - - on_unexpected_status - - - - - - 60,560 - - - - - - - - - - - the_entity - - - - - - 60,60 - - - - - - status_kind - - - - - - 160,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_writer - - - - - - 60,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - the_topic - - - - - - 60,60 - - - - - - - - - - dds4ccm_Connector - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DDS_TopicBase - - - - - - - - - - - C61798A6-7C26-11DF-8003-000C2958D27B - - - - - - key_fields - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - topic_name - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - DDS_Base - - - - - - - - - - - C61798A6-7C26-11DF-8002-000C2958D27B - - - - - - qos_profile - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - domain_id - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - error_listener - - - - - - - - false - - - false - - - true - - - false - - - - - - - dds4ccm_Base - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ContentFilterSetting - - local - - - - - - - - - - - - - - - - - - set_filter_parameters - - - - - - 60,60 - - - - - - - - - - - parameters - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - NonChangeable - - - - - - - - - - - - - - - InternalError - - - - - - - - - - - - - - error_code - - - index - - - - NonExistent - - - - - - - - - - - - - - indexes - - - - AlreadyCreated - - - - - - - - - - - - - - indexes - - - - ListenerMode - - - - - - - - - - - - - - MANY_BY_MANY - - - - - - 60,260 - - - - - - ONE_BY_ONE - - - - - - 60,160 - - - - - - NOT_ENABLED - - - - - - 60,60 - - - - - - - QueryFilter - - - - - - - - - - - - - - parameters - - - - - - 60,160 - - - - - - expression - - - - - - 60,60 - - - - - - - ReadInfo - - - - - - - - - - - - - - source_timestamp - - - - - - 60,160 - - - - - - instance_handle - - - - - - 60,60 - - - - - - instance_status - - - - - - 60,360 - - - - - - access_status - - - - - - 60,260 - - - - - - - InstanceStatus - - - - - - - - - - - - - - INSTANCE_DELETED - - - - - - 60,460 - - - - - - INSTANCE_FILTERED_OUT - - - - - - 60,360 - - - - - - INSTANCE_UPDATED - - - - - - 60,260 - - - - - - INSTANCE_FILTERED_IN - - - - - - 60,160 - - - - - - INSTANCE_CREATED - - - - - - 60,60 - - - - - - - AccessStatus - - - - - - - - - - - - - - ALREADY_SEEN - - - - - - 60,160 - - - - - - FRESH_INFO - - - - - - 60,60 - - - - - - - ReadInfoSeq - - - - - - - - - - - - - - - - - - UNLIMITED - - - - - - - - 0 - - - - DataNumber_t - - - - - - - - - - - - - - - DataNumberSeq - - - - - - - - - - - - - - - - - - - - ccm_dds - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - Typed - - - - - - - - - - - - - - - - - DDS_Event - - - - - - - - - - - C61798A6-7C26-11DF-8001-000C2958D27B - - - - - - push_consumer - - - pull_consumer - - - supplier - - - - DDS_State - - - - - - - - - - - C61798A6-7C26-11DF-8000-000C2958D27B - - - - - - push_state_observer - - - push_observer - - - pull_observer - - - passive_observer - - - observable - - - - DDS_StateListen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Listen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Get - - - - - - - - - - - - - - filter - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,560 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - true - - - false - - - - fresh_data - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Read - - - - - - - - - - - - - - filter - - - - - - 60,360 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - filter_config - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Update - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Write - - - - - - - - - - - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - StateListener - - local - - - - - - - - - - - - - - - - - - on_deletion - - - - - - 60,360 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_many_updates - - - - - - 60,260 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_update - - - - - - 60,160 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - on_creation - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - on_many_data - - - - - - 60,160 - - - - - - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - on_one_data - - - - - - 60,60 - - - - - - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - - Getter - - local - - - - - - - - - - - - - - - - - - max_delivered_data - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - time_out - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - get_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - data - - - - - - 160,60 - - - - - - - get_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 360,60 - - - - - - info - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - Reader - - local - - - - - - - - - - - - - - - - - - query - - - - - - 60,460 - - - - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - read_one_all - - - - - - 60,360 - - - - - - - - - - - - - - - - - 560,60 - - - - - - - - - - - - 460,60 - - - - - - instance_handle - - - - - - 360,60 - - - - - - infos - - - - - - 260,60 - - - - - - data - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_one_last - - - - - - 60,260 - - - - - - - - - - - - - - - - - 460,60 - - - - - - - - - - - - 360,60 - - - - - - instance_handle - - - - - - 260,60 - - - - - - info - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - read_all - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - read_last - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - infos - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - - Updater - - local - - - - - - - - - - - - - - - - - - is_coherent_write - - - - - - 60,760 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - is_global_scope - - - - - - 60,660 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - delete_many - - - - - - 60,560 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - update_many - - - - - - 60,460 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - create_many - - - - - - 60,360 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - delete_one - - - - - - 60,260 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - update_one - - - - - - 60,160 - - - - - - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - create_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - Writer - - local - - - - - - - - - - - - - - - - - - is_coherent_write - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - write_many - - - - - - 60,160 - - - - - - - - - - - - - - - - - 160,60 - - - - - - data - - - - - - 60,60 - - - - - - - write_one - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - Inherits - - - - InstanceHandleManager - - local - - - - - - - - - - - - - - - - - - unregister_instance - - - - - - 60,160 - - - - - - - - - - - - - - - - - 260,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - datum - - - - - - 60,60 - - - - - - - register_instance - - - - - - 60,60 - - - - - - - - - - - - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - datum - - - - - - 160,60 - - - - - - - - T - - - - - - 60,60 - - - - - - TSeq - - - - - - 160,60 - - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - WideString - - - String - - - GenericValueObject - - - GenericValue - - - GenericObject - - - LongDoubleNumber - - - DoubleNumber - - - FloatNumber - - - UnsignedLongLongInteger - - - UnsignedLongInteger - - - UnsignedShortInteger - - - LongLongInteger - - - LongInteger - - - ShortInteger - - - WideChar - - - Char - - - Byte - - - Boolean - - - - - dds4ccm - - InterfaceDefinitions - - ccm_dds - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - Typed - - - - - - - - - - - - - - - - - InstanceHandleManager - - local - - - - - - - - - - - - - - - - - - register_instance - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - 260,60 - - - - - - - unregister_instance - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - Writer - - local - - - - - - - - - - - - - - - - - - write_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - write_many - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - is_coherent_write - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - Updater - - local - - - - - - - - - - - - - - - - - - create_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - update_one - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - delete_one - - - - - - 60,260 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - create_many - - - - - - 60,360 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - update_many - - - - - - 60,460 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - delete_many - - - - - - 60,560 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - is_global_scope - - - - - - 60,660 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - is_coherent_write - - - - - - 60,760 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - Reader - - local - - - - - - - - - - - - - - - - - - read_last - - - - - - 60,60 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - read_all - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - read_one_last - - - - - - 60,260 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - instance_handle - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 460,60 - - - - - - - read_one_all - - - - - - 60,360 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - data - - - - - - 160,60 - - - - - - infos - - - - - - 260,60 - - - - - - instance_handle - - - - - - 360,60 - - - - - - - - - - - - 460,60 - - - - - - - - - - - - 560,60 - - - - - - - query - - - - - - 60,460 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - Getter - - local - - - - - - - - - - - - - - - - - - get_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - info - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - get_many - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - infos - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - time_out - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_delivered_data - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - on_one_data - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_many_data - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - StateListener - - local - - - - - - - - - - - - - - - - - - on_creation - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_one_update - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_many_updates - - - - - - 60,260 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - on_deletion - - - - - - 60,360 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - - DDS_Write - - - - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Update - - - - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Read - - - - - - - - - - - - - - filter - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Get - - - - - - - - - - - - - - filter - - - - - - 60,460 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - fresh_data - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,560 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_Listen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_StateListen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - true - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - true - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - true - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_State - - - - - - - - - - - C61798A6-7C26-11DF-8000-000C2958D27B - - - - - - observable - - - passive_observer - - - pull_observer - - - push_observer - - - push_state_observer - - - - DDS_Event - - - - - - - - - - - C61798A6-7C26-11DF-8001-000C2958D27B - - - - - - supplier - - - pull_consumer - - - push_consumer - - - - T - - - - - - 60,60 - - - - - - TSeq - - - - - - 160,60 - - - - - - - - - dds4ccm_Base - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - AccessStatus - - - - - - - - - - - - - - FRESH_INFO - - - - - - 60,60 - - - - - - ALREADY_SEEN - - - - - - 60,160 - - - - - - - InstanceStatus - - - - - - - - - - - - - - INSTANCE_CREATED - - - - - - 60,60 - - - - - - INSTANCE_FILTERED_IN - - - - - - 60,160 - - - - - - INSTANCE_UPDATED - - - - - - 60,260 - - - - - - INSTANCE_FILTERED_OUT - - - - - - 60,360 - - - - - - INSTANCE_DELETED - - - - - - 60,460 - - - - - - - ReadInfo - - - - - - - - - - - - - - access_status - - - - - - 60,260 - - - - - - instance_status - - - - - - 60,360 - - - - - - instance_handle - - - - - - 60,60 - - - - - - source_timestamp - - - - - - 60,160 - - - - - - - QueryFilter - - - - - - - - - - - - - - expression - - - - - - 60,60 - - - - - - parameters - - - - - - 60,160 - - - - - - - ListenerMode - - - - - - - - - - - - - - NOT_ENABLED - - - - - - 60,60 - - - - - - ONE_BY_ONE - - - - - - 60,160 - - - - - - MANY_BY_MANY - - - - - - 60,260 - - - - - - - AlreadyCreated - - - - - - - - - - - - - - indexes - - - - NonExistent - - - - - - - - - - - - - - indexes - - - - InternalError - - - - - - - - - - - - - - index - - - error_code - - - - NonChangeable - - - - - - - - - - - - - - - ContentFilterSetting - - local - - - - - - - - - - - - - - - - - - set_filter_parameters - - - - - - 60,60 - - - - - - - - - - - - - - - - - 160,60 - - - - - - parameters - - - - - - 60,60 - - - - - - - - ReadInfoSeq - - - - - - - - - - - - - - - - - - DataNumber_t - - - - - - - - - - - - - - - DataNumberSeq - - - - - - - - - - - - - - - - - - UNLIMITED - - - - - - - - 0 - - - - - - dds4ccm_Connector - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DDS_Base - - - - - - - - - - - C61798A6-7C26-11DF-8002-000C2958D27B - - - - - - domain_id - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - qos_profile - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - error_listener - - - - - - - - false - - - false - - - true - - - false - - - - - DDS_TopicBase - - - - - - - - - - - C61798A6-7C26-11DF-8003-000C2958D27B - - - - - - topic_name - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - key_fields - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_ConnectorStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ConnectorStatusListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - the_topic - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,360 - - - - - - - - - - - the_writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,460 - - - - - - - - - - - the_writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_unexpected_status - - - - - - 60,560 - - - - - - - - - - - the_entity - - - - - - 60,60 - - - - - - status_kind - - - - - - 160,60 - - - - - - - - - - dds4ccm_DataListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DataListenerControl - - local - - - - - - - - - - - - - - - - - - mode - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_delivered_data - - - - - - 60,160 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_PortStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - PortStatusListener - - local - - - - - - - - - - - - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_lost - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - - - - dds4ccm_StateListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - StateListenerControl - - local - - - - - - - - - - - - - - - - - - is_filter_interpreted - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - - - dds_rtf2_dcps - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - BuiltinTopicKey_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 3 - - - - - Duration_t - - - - - - - - - - - - - - sec - - - - - - 60,60 - - - - - - nanosec - - - - - - 60,160 - - - - - - - Time_t - - - - - - - - - - - - - - sec - - - - - - 60,60 - - - - - - nanosec - - - - - - 60,160 - - - - - - - InconsistentTopicStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - SampleLostStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - SampleRejectedStatusKind - - - - - - - - - - - - - - NOT_REJECTED - - - - - - 60,60 - - - - - - REJECTED_BY_INSTANCES_LIMIT - - - - - - 60,160 - - - - - - REJECTED_BY_SAMPLES_LIMIT - - - - - - 60,260 - - - - - - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - - - - - - 60,360 - - - - - - - SampleRejectedStatus - - - - - - - - - - - - - - last_reason - - - - - - 60,260 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,360 - - - - - - - LivelinessLostStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - LivelinessChangedStatus - - - - - - - - - - - - - - alive_count - - - - - - 60,60 - - - - - - not_alive_count - - - - - - 60,160 - - - - - - alive_count_change - - - - - - 60,260 - - - - - - not_alive_count_change - - - - - - 60,360 - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - - OfferedDeadlineMissedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - - RequestedDeadlineMissedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - - QosPolicyCount - - - - - - - - - - - - - - policy_id - - - - - - 60,60 - - - - - - count - - - - - - 60,160 - - - - - - - OfferedIncompatibleQosStatus - - - - - - - - - - - - - - policies - - - - - - 60,360 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - RequestedIncompatibleQosStatus - - - - - - - - - - - - - - policies - - - - - - 60,360 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - PublicationMatchedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - current_count - - - - - - 60,260 - - - - - - current_count_change - - - - - - 60,360 - - - - - - last_subscription_handle - - - - - - 60,460 - - - - - - - SubscriptionMatchedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - current_count - - - - - - 60,260 - - - - - - current_count_change - - - - - - 60,360 - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - - ReliableReaderActivityChangedStatus - - - - - - - - - - - - - - active_count - - - - - - 60,60 - - - - - - inactive_count - - - - - - 60,160 - - - - - - active_count_change - - - - - - 60,260 - - - - - - inactive_count_change - - - - - - 60,360 - - - - - - last_instance_handle - - - - - - 60,460 - - - - - - - ReliableWriterCacheEventCount - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - ReliableWriterCacheChangedStatus - - - - - - - - - - - - - - empty_reliable_writer_cache - - - - - - 60,60 - - - - - - full_reliable_writer_cache - - - - - - 60,160 - - - - - - low_watermark_reliable_writer_cache - - - - - - 60,260 - - - - - - high_watermark_reliable_writer_cache - - - - - - 60,360 - - - - - - unacknowledged_sample_count - - - - - - 60,460 - - - - - - unacknowledged_sample_count_peak - - - - - - 60,560 - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - - Entity - - local - - - - - - - - - - - - - - - - - - enable - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_statuscondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_status_changes - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_handle - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - TopicDescription - - local - - - - - - - - - - - - - - - - - - get_type_name - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_name - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Topic - - local - - - - - - - - - - - - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_inconsistent_topic_status - - - - - - 60,460 - - - - - - - - - - - a_status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - Inherits - - - - ContentFilteredTopic - - local - - - - - - - - - - - - - - - - - - get_filter_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - get_related_topic - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - MultiTopic - - local - - - - - - - - - - - - - - - - - - get_subscription_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriter - - local - - - - - - - - - - - - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topic - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publisher - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_lost_status - - - - - - 60,760 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_deadline_missed_status - - - - - - 60,860 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_incompatible_qos_status - - - - - - 60,960 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publication_matched_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_subscriptions - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - subscription_handles - - - - - - 160,60 - - - - - - - get_matched_subscription_data - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - subscription_data - - - - - - 160,60 - - - - - - subscription_handle - - - - - - 260,60 - - - - - - - Inherits - - - - DataReader - - local - - - - - - - - - - - - - - - - - - create_readcondition - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - view_states - - - - - - 260,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - - create_querycondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_expression - - - - - - 460,60 - - - - - - query_parameters - - - - - - 560,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - view_states - - - - - - 260,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - - delete_readcondition - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_condition - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topicdescription - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscriber - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_rejected_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_changed_status - - - - - - 60,1160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_deadline_missed_status - - - - - - 60,1260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_incompatible_qos_status - - - - - - 60,1360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_matched_status - - - - - - 60,1460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_lost_status - - - - - - 60,1560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_historical_data - - - - - - 60,1660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_publications - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - publication_handles - - - - - - 160,60 - - - - - - - get_matched_publication_data - - - - - - 60,1860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - publication_data - - - - - - 160,60 - - - - - - publication_handle - - - - - - 260,60 - - - - - - - Inherits - - - - Subscriber - - local - - - - - - - - - - - - - - - - - - create_datareader - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_datareader_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_datareader - - - - - - 60,260 - - - - - - - - - - - a_datareader - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datareader - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - get_datareaders - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - readers - - - - - - 160,60 - - - - - - sample_states - - - - - - 260,60 - - - - - - view_states - - - - - - 360,60 - - - - - - instance_states - - - - - - 460,60 - - - - - - - notify_datareaders - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_access - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_access - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datareader_qos - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_datareader_qos - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - copy_from_topic_qos - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datareader_qos - - - - - - 160,60 - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - - Inherits - - - - Publisher - - local - - - - - - - - - - - - - - - - - - create_datawriter - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_datawriter_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - probile_name - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_datawriter - - - - - - 60,260 - - - - - - - - - - - a_datawriter - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datawriter - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - suspend_publications - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - resume_publications - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_coherent_changes - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_coherent_changes - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,1360 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datawriter_qos - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_datawriter_qos - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - copy_from_topic_qos - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datawriter_qos - - - - - - 160,60 - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - - Inherits - - - - TopicListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - the_topic - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriterListener - - local - - - - - - - - - - - - - - - - - - on_offered_deadline_missed - - - - - - 60,60 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_liveliness_lost - - - - - - 60,260 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_publication_matched - - - - - - 60,360 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_reliable_writer_cache_changed - - - - - - 60,460 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_reliable_reader_activity_changed - - - - - - 60,560 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - PublisherListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - - DataReaderListener - - local - - - - - - - - - - - - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_liveliness_changed - - - - - - 60,360 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_data_available - - - - - - 60,460 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_subscription_matched - - - - - - 60,560 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_lost - - - - - - 60,660 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - SubscriberListener - - local - - - - - - - - - - - - - - - - - - on_data_on_readers - - - - - - 60,60 - - - - - - - - - - - the_subscriber - - - - - - 60,60 - - - - - - - Inherits - - - - DomainParticipantListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - Inherits - - - Inherits - - - - Condition - - local - - - - - - - - - - - - - - - - - - get_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - WaitSet - - local - - - - - - - - - - - - - - - - - - wait - - - - - - 60,60 - - - - - - - - - - - active_conditions - - - - - - 160,60 - - - - - - timeout - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - attach_condition - - - - - - 60,160 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - detach_condition - - - - - - 60,260 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_conditions - - - - - - 60,360 - - - - - - - - - - - attached_conditions - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - GuardCondition - - local - - - - - - - - - - - - - - - - - - set_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - value - - - - - - 160,60 - - - - - - - Inherits - - - - StatusCondition - - local - - - - - - - - - - - - - - - - - - get_enabled_statuses - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_enabled_statuses - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 160,60 - - - - - - - get_entity - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ReadCondition - - local - - - - - - - - - - - - - - - - - - get_sample_state_mask - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_view_state_mask - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_state_mask - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_datareader - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - QueryCondition - - local - - - - - - - - - - - - - - - - - - get_query_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_parameters - - - - - - 160,60 - - - - - - - set_query_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_parameters - - - - - - 160,60 - - - - - - - Inherits - - - - UserDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TopicDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - GroupDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TransportPriorityQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - LifespanQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - DurabilityQosPolicyKind - - - - - - - - - - - - - - VOLATILE_DURABILITY_QOS - - - - - - 60,60 - - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - 60,160 - - - - - - TRANSIENT_DURABILITY_QOS - - - - - - 60,260 - - - - - - PERSISTENT_DURABILITY_QOS - - - - - - 60,360 - - - - - - - DurabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - PresentationQosPolicyAccessScopeKind - - - - - - - - - - - - - - INSTANCE_PRESENTATION_QOS - - - - - - 60,60 - - - - - - TOPIC_PRESENTATION_QOS - - - - - - 60,160 - - - - - - GROUP_PRESENTATION_QOS - - - - - - 60,260 - - - - - - - PresentationQosPolicy - - - - - - - - - - - - - - access_scope - - - - - - 60,60 - - - - - - coherent_access - - - - - - 60,160 - - - - - - ordered_access - - - - - - 60,260 - - - - - - - DeadlineQosPolicy - - - - - - - - - - - - - - period - - - - - - 60,60 - - - - - - - LatencyBudgetQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - OwnershipQosPolicyKind - - - - - - - - - - - - - - SHARED_OWNERSHIP_QOS - - - - - - 60,60 - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - 60,160 - - - - - - - OwnershipQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - OwnershipStrengthQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - LivelinessQosPolicyKind - - - - - - - - - - - - - - AUTOMATIC_LIVELINESS_QOS - - - - - - 60,60 - - - - - - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - - - - 60,160 - - - - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - - - - 60,260 - - - - - - - LivelinessQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - lease_duration - - - - - - 60,160 - - - - - - - TimeBasedFilterQosPolicy - - - - - - - - - - - - - - minimum_separation - - - - - - 60,60 - - - - - - - PartitionQosPolicy - - - - - - - - - - - - - - name - - - - - - 60,60 - - - - - - - ReliabilityQosPolicyKind - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - 60,60 - - - - - - RELIABLE_RELIABILITY_QOS - - - - - - 60,160 - - - - - - - ReliabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - max_blocking_time - - - - - - 60,160 - - - - - - - DestinationOrderQosPolicyKind - - - - - - - - - - - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,60 - - - - - - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,160 - - - - - - - DestinationOrderQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - HistoryQosPolicyKind - - - - - - - - - - - - - - KEEP_LAST_HISTORY_QOS - - - - - - 60,60 - - - - - - KEEP_ALL_HISTORY_QOS - - - - - - 60,160 - - - - - - - HistoryQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - depth - - - - - - 60,160 - - - - - - - ResourceLimitsQosPolicy - - - - - - - - - - - - - - max_samples - - - - - - 60,60 - - - - - - max_instances - - - - - - 60,160 - - - - - - max_samples_per_instance - - - - - - 60,260 - - - - - - - EntityFactoryQosPolicy - - - - - - - - - - - - - - autoenable_created_entities - - - - - - 60,60 - - - - - - - WriterDataLifecycleQosPolicy - - - - - - - - - - - - - - autodispose_unregistered_instances - - - - - - 60,60 - - - - - - - ReaderDataLifecycleQosPolicy - - - - - - - - - - - - - - autopurge_nowriter_samples_delay - - - - - - 60,60 - - - - - - autopurge_disposed_samples_delay - - - - - - 60,160 - - - - - - - DurabilityServiceQosPolicy - - - - - - - - - - - - - - service_cleanup_delay - - - - - - 60,60 - - - - - - history_kind - - - - - - 60,160 - - - - - - history_depth - - - - - - 60,260 - - - - - - max_samples - - - - - - 60,360 - - - - - - max_instances - - - - - - 60,460 - - - - - - max_samples_per_instance - - - - - - 60,560 - - - - - - - DomainParticipantFactoryQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,60 - - - - - - - DomainParticipantQos - - - - - - - - - - - - - - user_data - - - - - - 60,60 - - - - - - entity_factory - - - - - - 60,160 - - - - - - - TopicQos - - - - - - - - - - - - - - topic_data - - - - - - 60,60 - - - - - - durability - - - - - - 60,160 - - - - - - durability_service - - - - - - 60,260 - - - - - - deadline - - - - - - 60,360 - - - - - - latency_budget - - - - - - 60,460 - - - - - - liveliness - - - - - - 60,560 - - - - - - reliability - - - - - - 60,660 - - - - - - destination_order - - - - - - 60,760 - - - - - - history - - - - - - 60,860 - - - - - - resource_limits - - - - - - 60,960 - - - - - - transport_priority - - - - - - 60,1060 - - - - - - lifespan - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - - DataWriterQos - - - - - - - - - - - - - - durability - - - - - - 60,60 - - - - - - durability_service - - - - - - 60,160 - - - - - - deadline - - - - - - 60,260 - - - - - - latency_budget - - - - - - 60,360 - - - - - - liveliness - - - - - - 60,460 - - - - - - reliability - - - - - - 60,560 - - - - - - destination_order - - - - - - 60,660 - - - - - - history - - - - - - 60,760 - - - - - - resource_limits - - - - - - 60,860 - - - - - - transport_priority - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - writer_data_lifecycle - - - - - - 60,1460 - - - - - - - PublisherQos - - - - - - - - - - - - - - presentation - - - - - - 60,60 - - - - - - partition - - - - - - 60,160 - - - - - - group_data - - - - - - 60,260 - - - - - - entity_factory - - - - - - 60,360 - - - - - - - DataReaderQos - - - - - - - - - - - - - - durability - - - - - - 60,60 - - - - - - deadline - - - - - - 60,160 - - - - - - latency_budget - - - - - - 60,260 - - - - - - liveliness - - - - - - 60,360 - - - - - - reliability - - - - - - 60,460 - - - - - - destination_order - - - - - - 60,560 - - - - - - history - - - - - - 60,660 - - - - - - resource_limits - - - - - - 60,760 - - - - - - user_data - - - - - - 60,860 - - - - - - ownership - - - - - - 60,960 - - - - - - time_based_filter - - - - - - 60,1060 - - - - - - reader_data_lifecycle - - - - - - 60,1160 - - - - - - - SubscriberQos - - - - - - - - - - - - - - presentation - - - - - - 60,60 - - - - - - partition - - - - - - 60,160 - - - - - - group_data - - - - - - 60,260 - - - - - - entity_factory - - - - - - 60,360 - - - - - - - ParticipantBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - user_data - - - - - - 60,160 - - - - - - - TopicBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - durability - - - - - - 60,360 - - - - - - durability_service - - - - - - 60,460 - - - - - - deadline - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,760 - - - - - - reliability - - - - - - 60,860 - - - - - - transport_priority - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - destination_order - - - - - - 60,1160 - - - - - - history - - - - - - 60,1260 - - - - - - resource_limits - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1460 - - - - - - topic_data - - - - - - 60,1560 - - - - - - name - - - - - - 60,160 - - - - - - type_name - - - - - - 60,260 - - - - - - - PublicationBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - participant_key - - - - - - 60,160 - - - - - - durability - - - - - - 60,460 - - - - - - durability_service - - - - - - 60,560 - - - - - - deadline - - - - - - 60,660 - - - - - - latency_budget - - - - - - 60,760 - - - - - - liveliness - - - - - - 60,860 - - - - - - reliability - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - destination_order - - - - - - 60,1460 - - - - - - presentation - - - - - - 60,1560 - - - - - - partition - - - - - - 60,1660 - - - - - - topic_data - - - - - - 60,1760 - - - - - - group_data - - - - - - 60,1860 - - - - - - topic_name - - - - - - 60,260 - - - - - - type_name - - - - - - 60,360 - - - - - - - SubscriptionBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - participant_key - - - - - - 60,160 - - - - - - durability - - - - - - 60,460 - - - - - - deadline - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,760 - - - - - - reliability - - - - - - 60,860 - - - - - - ownership - - - - - - 60,960 - - - - - - destination_order - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - time_based_filter - - - - - - 60,1260 - - - - - - presentation - - - - - - 60,1360 - - - - - - partition - - - - - - 60,1460 - - - - - - topic_data - - - - - - 60,1560 - - - - - - group_data - - - - - - 60,1660 - - - - - - topic_name - - - - - - 60,260 - - - - - - type_name - - - - - - 60,360 - - - - - - - DomainParticipant - - local - - - - - - - - - - - - - - - - - - create_publisher - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - mask - - - - - - 360,60 - - - - - - - create_publisher_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - - delete_publisher - - - - - - 60,260 - - - - - - - - - - - p - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_subscriber - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - mask - - - - - - 360,60 - - - - - - - create_subscriber_with_profile - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - - delete_subscriber - - - - - - 60,560 - - - - - - - - - - - s - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_builtin_subscriber - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_topic - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - - create_topic_with_profile - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 560,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - library_name - - - - - - 360,60 - - - - - - profile_name - - - - - - 460,60 - - - - - - mask - - - - - - 660,60 - - - - - - - delete_topic - - - - - - 60,960 - - - - - - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - find_topic - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - timeout - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - lookup_topicdescription - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - name - - - - - - 160,60 - - - - - - - create_contentfilteredtopic - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - related_topic - - - - - - 260,60 - - - - - - name - - - - - - 160,60 - - - - - - filter_expression - - - - - - 360,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - delete_contentfilteredtopic - - - - - - 60,1360 - - - - - - - - - - - a_contentfilteredtopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_multitopic - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - subscription_expression - - - - - - 360,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - delete_multitopic - - - - - - 60,1560 - - - - - - - - - - - a_multitopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,1760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,1860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,1960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,2060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_participant - - - - - - 60,2160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_topic - - - - - - 60,2260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_publication - - - - - - 60,2360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_subscription - - - - - - 60,2460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - get_domain_id - - - - - - 60,2560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,2660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_publisher_qos - - - - - - 60,2760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_publisher_qos - - - - - - 60,2860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_subscriber_qos - - - - - - 60,2960 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_subscriber_qos - - - - - - 60,3060 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_topic_qos - - - - - - 60,3160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_topic_qos - - - - - - 60,3260 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participants - - - - - - 60,3360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_handles - - - - - - 160,60 - - - - - - - get_discovered_participant_data - - - - - - 60,3460 - - - - - - - - - - - participant_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_handle - - - - - - 260,60 - - - - - - - get_discovered_topics - - - - - - 60,3560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_handles - - - - - - 160,60 - - - - - - - get_discovered_topic_data - - - - - - 60,3660 - - - - - - - - - - - topic_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_handle - - - - - - 260,60 - - - - - - - contains_entity - - - - - - 60,3760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_handle - - - - - - 160,60 - - - - - - - get_current_time - - - - - - 60,3860 - - - - - - - - - - - current_time - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - DomainParticipantFactory - - local - - - - - - - - - - - - - - - - - - create_participant - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_participant_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_participant - - - - - - 60,260 - - - - - - - - - - - a_participant - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_participant - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - - set_default_participant_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos_with_profile - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - - get_default_participant_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - TypeSupport - - local - - - - - - - - - - - - - - - - - - - SampleInfo - - - - - - - - - - - - - - source_timestamp - - - - - - 60,360 - - - - - - sample_state - - - - - - 60,60 - - - - - - view_state - - - - - - 60,160 - - - - - - instance_state - - - - - - 60,260 - - - - - - instance_handle - - - - - - 60,460 - - - - - - publication_handle - - - - - - 60,560 - - - - - - disposed_generation_count - - - - - - 60,660 - - - - - - no_writers_generation_count - - - - - - 60,760 - - - - - - sample_rank - - - - - - 60,860 - - - - - - generation_rank - - - - - - 60,960 - - - - - - absolute_generation_rank - - - - - - 60,1060 - - - - - - valid_data - - - - - - 60,1160 - - - - - - - QosPolicyCountSeq - - - - - - - - - - - - - - - - - - DataReaderSeq - - - - - - - - - - - - - - - - - - ConditionSeq - - - - - - - - - - - - - - - - - - SampleInfoSeq - - - - - - - - - - - - - - - - - - DomainId_t - - - - - - - - - - - - - - - ReturnCode_t - - - - - - - - - - - - - - - QosPolicyId_t - - - - - - - - - - - - - - - StringSeq - - - - - - - - - - - - - - - - - - LENGTH_UNLIMITED - - - - - - - - -1 - - - - DURATION_INFINITE_SEC - - - - - - - - 2147483647 - - - - DURATION_INFINITE_NSEC - - - - - - - - 2147483647 - - - - DURATION_ZERO_SEC - - - - - - - - 0 - - - - DURATION_ZERO_NSEC - - - - - - - - 0 - - - - TIME_INVALID_SEC - - - - - - - - -1 - - - - TIME_INVALID_NSEC - - - - - - - - 4294967295 - - - - RETCODE_OK - - - - - - - - 0 - - - - RETCODE_ERROR - - - - - - - - 1 - - - - RETCODE_UNSUPPORTED - - - - - - - - 2 - - - - RETCODE_BAD_PARAMETER - - - - - - - - 3 - - - - RETCODE_PRECONDITION_NOT_MET - - - - - - - - 4 - - - - RETCODE_OUT_OF_RESOURCES - - - - - - - - 5 - - - - RETCODE_NOT_ENABLED - - - - - - - - 6 - - - - RETCODE_IMMUTABLE_POLICY - - - - - - - - 7 - - - - RETCODE_INCONSISTENT_POLICY - - - - - - - - 8 - - - - RETCODE_ALREADY_DELETED - - - - - - - - 9 - - - - RETCODE_TIMEOUT - - - - - - - - 10 - - - - RETCODE_NO_DATA - - - - - - - - 11 - - - - RETCODE_ILLEGAL_OPERATION - - - - - - - - 12 - - - - StatusKind - - - - - - - - - - - - - - - StatusMask - - - - - - - - - - - - - - - INCONSISTENT_TOPIC_STATUS - - - - - - - - 1 - - - - OFFERED_DEADLINE_MISSED_STATUS - - - - - - - - 2 - - - - REQUESTED_DEADLINE_MISSED_STATUS - - - - - - - - 4 - - - - OFFERED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 32 - - - - REQUESTED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 64 - - - - SAMPLE_LOST_STATUS - - - - - - - - 128 - - - - SAMPLE_REJECTED_STATUS - - - - - - - - 256 - - - - DATA_ON_READERS_STATUS - - - - - - - - 512 - - - - DATA_AVAILABLE_STATUS - - - - - - - - 1024 - - - - LIVELINESS_LOST_STATUS - - - - - - - - 2048 - - - - LIVELINESS_CHANGED_STATUS - - - - - - - - 4096 - - - - PUBLICATION_MATCHED_STATUS - - - - - - - - 8192 - - - - SUBSCRIPTION_MATCHED_STATUS - - - - - - - - 16384 - - - - RELIABLE_WRITER_CACHE_CHANGED_STATUS - - - - - - - - 16777216 - - - - RELIABLE_READER_ACTIVITY_CHANGED_STATUS - - - - - - - - 33554432 - - - - SampleStateKind - - - - - - - - - - - - - - - READ_SAMPLE_STATE - - - - - - - - 1 - - - - NOT_READ_SAMPLE_STATE - - - - - - - - 2 - - - - SampleStateMask - - - - - - - - - - - - - - - ANY_SAMPLE_STATE - - - - - - - - 65535 - - - - ViewStateKind - - - - - - - - - - - - - - - NEW_VIEW_STATE - - - - - - - - 1 - - - - NOT_NEW_VIEW_STATE - - - - - - - - 2 - - - - ViewStateMask - - - - - - - - - - - - - - - ANY_VIEW_STATE - - - - - - - - 65535 - - - - InstanceStateKind - - - - - - - - - - - - - - - ALIVE_INSTANCE_STATE - - - - - - - - 1 - - - - NOT_ALIVE_DISPOSED_INSTANCE_STATE - - - - - - - - 2 - - - - NOT_ALIVE_NO_WRITERS_INSTANCE_STATE - - - - - - - - 4 - - - - InstanceStateMask - - - - - - - - - - - - - - - ANY_INSTANCE_STATE - - - - - - - - 65535 - - - - NOT_ALIVE_INSTANCE_STATE - - - - - - - - 6 - - - - USERDATA_QOS_POLICY_NAME - - - - - - - - UserData - - - - DURABILITY_QOS_POLICY_NAME - - - - - - - - Durability - - - - PRESENTATION_QOS_POLICY_NAME - - - - - - - - Presentation - - - - DEADLINE_QOS_POLICY_NAME - - - - - - - - Deadline - - - - LATENCYBUDGET_QOS_POLICY_NAME - - - - - - - - LatencyBudget - - - - OWNERSHIP_QOS_POLICY_NAME - - - - - - - - Ownership - - - - OWNERSHIPSTRENGTH_QOS_POLICY_NAME - - - - - - - - OwnershipStrength - - - - LIVELINESS_QOS_POLICY_NAME - - - - - - - - Liveliness - - - - TIMEBASEDFILTER_QOS_POLICY_NAME - - - - - - - - TimeBasedFilter - - - - PARTITION_QOS_POLICY_NAME - - - - - - - - Partition - - - - RELIABILITY_QOS_POLICY_NAME - - - - - - - - Reliability - - - - DESTINATIONORDER_QOS_POLICY_NAME - - - - - - - - DestinationOrder - - - - HISTORY_QOS_POLICY_NAME - - - - - - - - History - - - - RESOURCELIMITS_QOS_POLICY_NAME - - - - - - - - ResourceLimits - - - - ENTITYFACTORY_QOS_POLICY_NAME - - - - - - - - EntityFactory - - - - WRITERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - WriterDataLifecycle - - - - READERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - ReaderDataLifecycle - - - - TOPICDATA_QOS_POLICY_NAME - - - - - - - - TopicData - - - - GROUPDATA_QOS_POLICY_NAME - - - - - - - - TransportPriority - - - - LIFESPAN_QOS_POLICY_NAME - - - - - - - - Lifespan - - - - DURABILITYSERVICE_POLICY_NAME - - - - - - - - DurabilityService - - - - INVALID_QOS_POLICY_ID - - - - - - - - 0 - - - - USERDATA_QOS_POLICY_ID - - - - - - - - 1 - - - - DURABILITY_QOS_POLICY_ID - - - - - - - - 2 - - - - PRESENTATION_QOS_POLICY_ID - - - - - - - - 3 - - - - DEADLINE_QOS_POLICY_ID - - - - - - - - 4 - - - - LATENCYBUDGET_QOS_POLICY_ID - - - - - - - - 5 - - - - OWNERSHIP_QOS_POLICY_ID - - - - - - - - 6 - - - - OWNERSHIPSTRENGTH_QOS_POLICY_ID - - - - - - - - 7 - - - - LIVELINESS_QOS_POLICY_ID - - - - - - - - 8 - - - - TIMEBASEDFILTER_QOS_POLICY_ID - - - - - - - - 9 - - - - PARTITION_QOS_POLICY_ID - - - - - - - - 10 - - - - RELIABILITY_QOS_POLICY_ID - - - - - - - - 11 - - - - DESTINATIONORDER_QOS_POLICY_ID - - - - - - - - 12 - - - - HISTORY_QOS_POLICY_ID - - - - - - - - 13 - - - - RESOURCELIMITS_QOS_POLICY_ID - - - - - - - - 14 - - - - ENTITYFACTORY_QOS_POLICY_ID - - - - - - - - 15 - - - - WRITERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 16 - - - - READERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 17 - - - - TOPICDATA_QOS_POLICY_ID - - - - - - - - 18 - - - - GROUPDATA_QOS_POLICY_ID - - - - - - - - 19 - - - - TRANSPORTPRIORITY_QOS_POLICY_ID - - - - - - - - 20 - - - - LIFESPAN_QOS_POLICY_ID - - - - - - - - 21 - - - - DURABILITYSERVICE_QOS_POLICY_ID - - - - - - - - 22 - - - - OctetSeq - - - - - - - - - - - - - - - - - - - - dds_rtf2_dcps_instance_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - HANDLE_NIL - - - - - dds_rtf2_dcps_i_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - NativeInstanceHandle_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 16 - - - - length - - - - - - 60,160 - - - - - - isValid - - - - - - 60,260 - - - - - - - InstanceHandle_t - - - - - - - - - - - - - - - InstanceHandleSeq - - - - - - - - - - - - - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl deleted file mode 100644 index c7e8bc65bc8..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.idl +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @file Shapes_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHAPES_BASE_IDL -#define SHAPES_BASE_IDL - -#pragma ndds typesupport "Base/Shapes_BaseSupport.h" -#pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "org::omg::dds::demo::ShapeType" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::ShapeType color" - -module org { - module omg { - module dds { - module demo { - struct ShapeType { - string color; //@key - long x; - long y; - long shapesize; - }; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED - typedef sequence ShapeTypeSeq; -#endif - }; - }; - }; -}; - - -#pragma keylist ShapeType color - -#pragma DCPS_DATA_TYPE "org::omg::dds::demo::Attributes" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes shape" -#pragma DCPS_DATA_KEY "org::omg::dds::demo::Attributes color" - -module org { - module omg { - module dds { - module demo { - struct Attributes { - string shape; //@key - string color; //@key - float speed; - }; - }; - }; - }; -}; - -// #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq" -// typedef sequence AttributesSeq; - - - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc deleted file mode 100644 index 8fb79f0b5c5..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Base.mpc +++ /dev/null @@ -1,101 +0,0 @@ -project (ShapesContr_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = ShapesContr_Base_stub - dynamicflags += SHAPES_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \ - -Wb,stub_export_include=Shapes_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Shapes_Base.idl - } - - opendds_ts_flags += --export=SHAPES_BASE_STUB_Export - - DDSGenerator_Files { - Shapes_Base.idl - } - - Source_Files { - } -} - -project(Shapes_Contr_Base_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPE_CONTR_BASE_STUB_Export \ - -Wb,stub_export_include=Shapes_Contr_Base_stub_export.h \ - -Wb,skel_export_macro=SHAPE_CONTR_BASE_SVNT_Export \ - -Wb,skel_export_include=Shapes_Contr_Base_svnt_export.h \ - -Wb,svnt_export_macro=SHAPE_CONTR_BASE_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Contr_Base_svnt_export.h - - - IDL_Files { - Shapes_Contr_Base.idl - } -} - -project(Shapes_Contr_Base_lem_gen) : ciaoidldefaults { - custom_only = 1 - after += Shapes_Contr_Base_idl_gen - idlflags += -Wb,export_macro=SHAPE_CONTR_BASE_STUB_Export \ - -Wb,export_include=Shapes_Contr_Base_stub_export.h - - IDL_Files { - Shapes_Contr_BaseE.idl - } -} - -project(Shapes_Contr_Base_stub) : ccm_stub { - after += Shapes_Contr_Base_lem_gen - libout = ../lib - sharedname = Shapes_Contr_Base_stub - dynamicflags += SHAPE_CONTR_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Contr_BaseC.cpp - Shapes_Contr_BaseEC.cpp - } - - Header_Files { - Shapes_Contr_BaseC.h - Shapes_Contr_Base_stub_export.h - } - - Inline_Files { - Shapes_Contr_BaseC.inl - } -} - - -project(Shapes_Contr_Base_svnt) : ciao_servant { - after += Shapes_Contr_Base_stub - sharedname = Shapes_Contr_Base_svnt - libs += Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAPE_CONTR_BASE_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Contr_BaseS.cpp - Shapes_Contr_Base_svnt.cpp - } - - Header_Files { - Shapes_Contr_BaseS.h - Shapes_Contr_Base_svnt.h - Shapes_Contr_Base_svnt_export.h - } - - Inline_Files { - } - } \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl deleted file mode 100644 index dc8acc64199..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Base/Shapes_Contr_Base.idl +++ /dev/null @@ -1,72 +0,0 @@ -/** - * @file Shapes_Contr_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SHAPES_CONTR_BASE_IDL -#define SHAPES_CONTR_BASE_IDL - - -#pragma ciao lem "../Base/Shapes_Contr_BaseE.idl" - -interface shape_attributes_get -{ - unsigned short max_size (); - unsigned short max_x (); - unsigned short max_y (); - boolean resize (); - unsigned long publish_rate (); -}; - -interface shape_attributes_set -{ - void max_size(in unsigned short ms); - void max_x(in unsigned short mx); - void max_y(in unsigned short my); - void resize(in boolean rs); - void publish_rate (in unsigned long pr); - - void get_attr_values (out unsigned short max_size, out unsigned short max_x, out unsigned short max_y, out unsigned long publish_rate, out boolean resize); - void update_changes (); -}; - -interface shape_changes -{ - void pass_change_event(); -}; - -struct shape_info -{ - string shape; - string color; - unsigned short size; - unsigned short posX; - unsigned short posY; -}; - -typedef sequence ShapeInfoSeq; - -interface shape_received -{ - unsigned short number_of_shapes(); - ShapeInfoSeq get_info_shapes(); -}; - -struct shape_aggr -{ - string shape; - string color; - unsigned long number_of_shapes; - unsigned short last_size; - unsigned short last_posX; - unsigned short last_posY; -}; - -typedef sequence ShapeAggrSeq; - -interface shapes_aggregates -{ - ShapeAggrSeq get_aggr_shapes(); -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl deleted file mode 100644 index 9669a787727..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Shapes_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHAPES_CONNECTOR_IDL_ -#define SHAPES_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Shapes_Base.idl" - -#pragma ciao lem "Connector/Shapes_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Shapes_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::org::omg::dds::demo::ShapeType, ::org::omg::dds::demo::ShapeTypeSeq> Shapes; - -#endif /* SHAPES_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc deleted file mode 100644 index f340f65ffcb..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Connector/Shapes_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l .. -o ../lib -u DDS Shapes_Connector" - -project(ShapesContr_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen ShapesContr_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Shapes_Connector_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Shapes_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Connector_svnt_export.h \ - -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Shapes_Connector_conn_export.h \ - -I .. - - IDL_Files { - Shapes_Connector.idl - } -} - -project(ShapesContr_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += ShapesContr_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Shapes_ConnectorE.idl - } -} - -project(ShapesContr_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += ShapesContr_Connector_lem_gen ShapesContr_Connector_stub ShapesContr_Base_stub - libs += ShapesContr_Base_stub ShapesContr_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = ShapesContr_Connector_lem_stub - dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorEC.cpp - } - - Header_Files { - Shapes_ConnectorEC.h - Shapes_Connector_lem_stub_export.h - } - - Inline_Files { - Shapes_ConnectorEC.inl - } -} - -project(ShapesContr_Connector_stub) : ccm_stub, dds4ccm_base { - after += ShapesContr_Connector_idl_gen ShapesContr_Base_stub - libs += ShapesContr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = ShapesContr_Connector_stub - dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorC.cpp - } - - Header_Files { - Shapes_ConnectorC.h - Shapes_Connector_stub_export.h - } - - Inline_Files { - Shapes_ConnectorC.inl - } -} - -project(ShapesContr_Connector_exec) : ciao_executor, dds4ccm_impl { - after += ShapesContr_Connector_lem_stub ShapesContr_Connector_stub - sharedname = ShapesContr_Connector_exec - libs += ShapesContr_Connector_stub ShapesContr_Connector_lem_stub ShapesContr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Connector_conn.cpp - } - - Header_Files { - Shapes_Connector_conn.h - Shapes_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(ShapesContr_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += ShapesContr_Connector_lem_stub ShapesContr_Connector_exec ShapesContr_Connector_stub - sharedname = ShapesContr_Connector_svnt - libs += ShapesContr_Connector_stub \ - ShapesContr_Connector_lem_stub \ - ShapesContr_Base_stub \ - ShapesContr_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ConnectorS.cpp - Shapes_Connector_svnt.cpp - } - - Header_Files { - Shapes_ConnectorS.h - Shapes_Connector_svnt.h - Shapes_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl deleted file mode 100644 index 46d54bab0f3..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SHAPES_CONTROLLER_IDL -#define SHAPES_CONTROLLER_IDL - -#include - -#include "../Base/Shapes_Contr_Base.idl" - - -module Shapes -{ - component ShapesController - { - provides shape_attributes_set shapeAttribsSet; - provides shape_attributes_get shapeAttribsPub; - uses shape_changes shapeChangesSub; - //attribute unsigned long rate; - attribute unsigned long publish_rate; - attribute unsigned short max_size; - attribute unsigned short max_x; - attribute unsigned short max_y; - attribute boolean resize_shape; - attribute boolean use_web_interface; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc deleted file mode 100644 index f4cd67ea274..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(ShapesContr_Controller_idl_gen) : componentidldefaults{ - custom_only = 1 - after += Shapes_Contr_Base_stub - idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \ - -Wb,stub_export_include=Controller_stub_export.h \ - -Wb,skel_export_macro=CONTROLLER_SVNT_Export \ - -Wb,skel_export_include=Controller_svnt_export.h \ - -Wb,svnt_export_macro=CONTROLLER_SVNT_Export \ - -Wb,svnt_export_include=Controller_svnt_export.h \ - -Wb,exec_export_macro=CONTROLLER_EXEC_Export \ - -Wb,exec_export_include=Controller_exec_export.h \ - -I.. - - IDL_Files { - Shapes_Controller.idl - } -} - -project(ShapesContr_Controller_lem_gen) : ciaoidldefaults { - after += ShapesContr_Controller_idl_gen Shapes_Contr_Base_lem_gen - custom_only = 1 - idlflags += -Wb,export_macro=CONTROLLER_EXEC_Export \ - -Wb,export_include=Controller_exec_export.h \ - -SS - - IDL_Files { - Shapes_ControllerE.idl - } -} - -project(ShapesContr_Controller_stub) : ccm_stub { - after += ShapesContr_Controller_idl_gen Shapes_Contr_Base_stub - libs += Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - sharedname = ShapesContr_Controller_stub - dynamicflags += CONTROLLER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerC.cpp - } - - Header_Files { - Shapes_ControllerC.h - Shapes_Controller_stub_export.h - } - - Inline_Files { - Shapes_ControllerC.inl - } -} - -project(ShapesContr_Controller_exec) : ciao_executor { - after += ShapesContr_Controller_lem_gen ShapesContr_Controller_stub - sharedname = ShapesContr_Controller_exec - libs += ShapesContr_Controller_stub Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - dynamicflags += CONTROLLER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerEC.cpp - Shapes_Controller_exec.cpp - } - - Header_Files { - Shapes_ControllerEC.h - Shapes_Controller_exec.h - Shapes_Controller_exec_export.h - } - - Inline_Files { - Shapes_ControllerEC.inl - } -} - - -project(ShapesContr_Controller_svnt) : ciao_servant { - after += Shapes_Contr_Base_skel ShapesContr_Controller_exec Shapes_Contr_Base_svnt Shapes_Contr_Base_stub - sharedname = ShapesContr_Controller_svnt - libs += ShapesContr_Controller_exec \ - ShapesContr_Controller_stub \ - Shapes_Contr_Base_svnt \ - Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - dynamicflags += CONTROLLER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerS.cpp - Shapes_Controller_svnt.cpp - } - - Header_Files { - Shapes_ControllerS.h - Shapes_Controller_svnt.h - Shapes_Controller_svnt_export.h - } - - Inline_Files { - } -} - -//project (Thread_starter) : ccm_stub, valuetype { -// exename = starter -// after += ShapesContr_Controller_stub -// libs += ShapesContr_Controller_stub Shapes_Contr_Base_stub -// libout = ../lib -// libpaths += ../lib - -// IDL_Files { -// } - -// Source_Files { -// starter.cpp -// } - -// Header_Files { -// } - -// Inline_Files { -// } -//} - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp deleted file mode 100644 index b083f93f6ea..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.cpp +++ /dev/null @@ -1,276 +0,0 @@ -// -*- C++ -*- -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - - -#include "Shapes_Controller_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_ShapesController_Impl -{ - CORBA::UShort - shape_attributes_get_i::max_size () - { - return component_.max_size (); - } - - CORBA::UShort - shape_attributes_get_i::max_x () - { - return component_.max_x (); - } - - CORBA::UShort - shape_attributes_get_i::max_y () - { - return component_.max_y (); - } - - CORBA::Boolean - shape_attributes_get_i::resize () - { - return component_.resize_shape(); - } - CORBA::ULong - shape_attributes_get_i::publish_rate () - { - return (component_.publish_rate()); - } - - void - shape_attributes_set_i::max_size ( CORBA::UShort max_size) - { - component_.max_size (max_size); - } - - void - shape_attributes_set_i::max_x ( CORBA::UShort max_x) - { - component_.max_x (max_x); - } - - void - shape_attributes_set_i::max_y ( CORBA::UShort max_y) - { - component_.max_y (max_y); - } - - void - shape_attributes_set_i::resize (CORBA::Boolean resize) - { - component_.resize_shape(resize); - } - - void - shape_attributes_set_i::publish_rate (CORBA::ULong pub_rate) - { - component_.publish_rate(pub_rate); - } - - void - shape_attributes_set_i::get_attr_values (CORBA::UShort_out max_size, - CORBA::UShort_out max_x, - CORBA::UShort_out max_y, - CORBA::ULong_out publish_rate, - CORBA::Boolean_out resize) - { - max_size = component_.max_size (); - max_x = component_.max_x (); - max_y = component_.max_y (); - publish_rate = component_.publish_rate (); - resize = component_.resize_shape(); - } - - void - shape_attributes_set_i::update_changes () - { - component_.invoke_shape_changes (); - } - - /** - * Component Executor Implementation Class: Controller_exec_i - */ - - Controller_exec_i::Controller_exec_i (void) - : publish_rate_ (0) - , max_size_ (50) - , max_x_ (200) - , max_y_ (200) - , resize_shape_ (false) - , use_web_interface_ (true) - { - } - - Controller_exec_i::~Controller_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CORBA::ULong - Controller_exec_i::publish_rate (void) - { - return this->publish_rate_; - } - - void - Controller_exec_i::publish_rate ( - const ::CORBA::ULong publish_rate) - { - this->publish_rate_ = publish_rate; - } - - ::CORBA::UShort - Controller_exec_i::max_size (void) - { - return this->max_size_; - } - - void - Controller_exec_i::max_size ( - const ::CORBA::UShort max_size) - { - this->max_size_ = max_size; - } - - ::CORBA::UShort - Controller_exec_i::max_x (void) - { - return this->max_x_; - } - - void - Controller_exec_i::max_x ( - const ::CORBA::UShort max_x) - { - this->max_x_ = max_x; - } - - ::CORBA::UShort - Controller_exec_i::max_y (void) - { - return this->max_y_; - } - - void - Controller_exec_i::max_y ( - const ::CORBA::UShort max_y) - { - this->max_y_ = max_y; - } - - ::CORBA::Boolean - Controller_exec_i::resize_shape (void) - { - return this->resize_shape_; - } - - void - Controller_exec_i::resize_shape ( - const ::CORBA::Boolean resize_shape) - { - this->resize_shape_ = resize_shape; - } - - ::CORBA::Boolean - Controller_exec_i::use_web_interface (void) - { - return this->use_web_interface_; - } - - void - Controller_exec_i::use_web_interface ( - const ::CORBA::Boolean use_web_interface) - { - this->use_web_interface_ = use_web_interface; - } - - void - Controller_exec_i::invoke_shape_changes (void) - { - shape_changes_var invoker = - this->ciao_context_->get_connection_shapeChangesSub (); - - invoker->pass_change_event (); - } - - CCM_shape_attributes_get* - Controller_exec_i::get_shapeAttribsPub () - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::get_shapeAttribsPub\n"))); - return ( new shape_attributes_get_i (*this) ); - - } - - CCM_shape_attributes_set* - Controller_exec_i::get_shapeAttribsSet () - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::get_shapeAttribsSet\n"))); - return ( new shape_attributes_set_i (*this) ); - - } - - // Operations from Components::SessionComponent. - - void - Controller_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::set_session_context\n"))); - - this->ciao_context_ = - ::Shapes::CCM_ShapesController_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Controller_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::configuration_complete\n"))); - } - - void - Controller_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Controller_exec_i::ccm_activate\n"))); - // If no extern web interface is used to start and stop publishing, - // start publishing now. - if (!use_web_interface_) - { - this->publish_rate_ = 1; - this->invoke_shape_changes(); - } - } - - void - Controller_exec_i::ccm_passivate (void) - { - } - - void - Controller_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" CONTROLLER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Controller_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Controller_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h deleted file mode 100644 index 28c77145b44..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Controller/Shapes_Controller_exec.h +++ /dev/null @@ -1,163 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_ -#define CIAO_SHAPES_CONTROLLER_EXEC_ETSDUL_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_ControllerEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Controller_exec_export.h" -#include "tao/LocalObject.h" - - -namespace CIAO_Shapes_ShapesController_Impl -{ - - class Controller_exec_i; - - class shape_attributes_get_i - : public virtual CCM_shape_attributes_get, - public virtual ::CORBA::LocalObject - { - public: - shape_attributes_get_i (Controller_exec_i& component) - : component_ (component) - { - } - - CORBA::UShort max_size (void); - CORBA::UShort max_x (void); - CORBA::UShort max_y (void); - CORBA::Boolean resize (void); - CORBA::ULong publish_rate (void); - - private: - Controller_exec_i& component_; - }; - - class shape_attributes_set_i - : public virtual CCM_shape_attributes_set, - public virtual ::CORBA::LocalObject - { - public: - shape_attributes_set_i (Controller_exec_i& component) - : component_ (component) - { - } - - void max_size (CORBA::UShort); - void max_x (CORBA::UShort); - void max_y (CORBA::UShort); - void resize (CORBA::Boolean); - void publish_rate (CORBA::ULong); - - void get_attr_values (CORBA::UShort_out max_size, - CORBA::UShort_out max_x, - CORBA::UShort_out max_y, - CORBA::ULong_out publish_rate, - CORBA::Boolean_out resize); - - void update_changes (); - - private: - Controller_exec_i& component_; - }; - - /** - * Component Executor Implementation Class: Controller_exec_i - */ - - class Controller_exec_i - : public virtual ShapesController_Exec, - public virtual ::CORBA::LocalObject - { - public: - Controller_exec_i (void); - virtual ~Controller_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::ULong publish_rate (void); - - virtual void publish_rate (::CORBA::ULong publish_rate); - - virtual ::CORBA::UShort max_size (void); - - virtual void max_size (::CORBA::UShort max_size); - - virtual ::CORBA::UShort max_x (void); - - virtual void max_x (::CORBA::UShort max_x); - - virtual ::CORBA::UShort max_y (void); - - virtual void max_y (::CORBA::UShort max_y); - - virtual ::CORBA::Boolean resize_shape (void); - - virtual void resize_shape (::CORBA::Boolean resize_shape); - - virtual ::CORBA::Boolean use_web_interface (void); - - virtual void use_web_interface (::CORBA::Boolean use_web_interface); - - virtual CCM_shape_attributes_get* get_shapeAttribsPub (void); - - virtual CCM_shape_attributes_set* get_shapeAttribsSet (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - virtual void invoke_shape_changes (void); - - //@} - - private: - ::Shapes::CCM_ShapesController_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CORBA::ULong publish_rate_; - ::CORBA::UShort max_size_; - ::CORBA::UShort max_x_; - ::CORBA::UShort max_y_; - ::CORBA::Boolean resize_shape_; - ::CORBA::Boolean use_web_interface_; - //@} - - //@{ - /** User defined members. */ - //@} - - //@{ - /** User defined private operations. */ - //@} - }; -} - -extern "C" CONTROLLER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Controller_Impl (void); - - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl deleted file mode 100644 index e6fdf878053..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SHAPES_CONTROLLERR_IDL -#define SHAPES_CONTROLLERR_IDL - -#include - -#include "../Base/Shapes_Contr_Base.idl" - - -module Shapes -{ - component ShapesControllerR - { - uses shape_received shapeReceivedSub; - provides shapes_aggregates shapeAggrPub; - attribute unsigned short rate; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc deleted file mode 100644 index bd947e04fc2..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR.mpc +++ /dev/null @@ -1,116 +0,0 @@ -project(ShapesContr_ContrR_idl_gen) : componentidldefaults{ - custom_only = 1 - after += Shapes_Contr_Base_stub - idlflags += -Wb,stub_export_macro=CONTROLLERR_STUB_Export \ - -Wb,stub_export_include=ControllerR_stub_export.h \ - -Wb,skel_export_macro=CONTROLLERR_SVNT_Export \ - -Wb,skel_export_include=ControllerR_svnt_export.h \ - -Wb,svnt_export_macro=CONTROLLERR_SVNT_Export \ - -Wb,svnt_export_include=ControllerR_svnt_export.h \ - -Wb,exec_export_macro=CONTROLLERR_EXEC_Export \ - -Wb,exec_export_include=ControllerR_exec_export.h \ - -I.. - - IDL_Files { - Shapes_ControllerR.idl - } -} - -project(ShapesContr_ContrR_lem_gen) : ciaoidldefaults { - after += ShapesContr_ContrR_idl_gen Shapes_Contr_Base_lem_gen - custom_only = 1 - idlflags += -Wb,export_macro=CONTROLLERR_EXEC_Export \ - -Wb,export_include=ControllerR_exec_export.h \ - -SS - - IDL_Files { - Shapes_ControllerRE.idl - } -} - -project(ShapesContr_ContrR_stub) : ccm_stub { - after += ShapesContr_ContrR_idl_gen Shapes_Contr_Base_stub - libs += Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - sharedname = ShapesContr_ContrR_stub - dynamicflags += CONTROLLERR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerRC.cpp - } - - Header_Files { - Shapes_ControllerRC.h - Shapes_ControllerR_stub_export.h - } - - Inline_Files { - Shapes_ControllerRC.inl - } -} - -project(ShapesContr_ContrR_exec) : ciao_executor { - after += ShapesContr_ContrR_lem_gen ShapesContr_ContrR_stub - sharedname = ShapesContr_ContrR_exec - libs += ShapesContr_ContrR_stub Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - dynamicflags += CONTROLLERR_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerREC.cpp - Shapes_ControllerR_exec.cpp - } - - Header_Files { - Shapes_ControllerREC.h - Shapes_ControllerR_exec.h - Shapes_ControllerR_exec_export.h - } - - Inline_Files { - Shapes_ControllerREC.inl - } -} - - -project(ShapesContr_ContrRr_svnt) : ciao_servant { - after += Shapes_Contr_Base_skel ShapesContr_ContrR_exec Shapes_Contr_Base_svnt Shapes_Contr_Base_stub - sharedname = ShapesContr_ContrR_svnt - libs += ShapesContr_ContrR_exec \ - ShapesContr_ContrR_stub \ - Shapes_Contr_Base_svnt \ - Shapes_Contr_Base_stub - libout = ../lib - libpaths += ../lib - - dynamicflags += CONTROLLERR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ControllerRS.cpp - Shapes_ControllerR_svnt.cpp - } - - Header_Files { - Shapes_ControllerRS.h - Shapes_ControllerR_svnt.h - Shapes_ControllerR_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp deleted file mode 100644 index 1ab2ccb3972..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.cpp +++ /dev/null @@ -1,249 +0,0 @@ -// -*- C++ -*- -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - - -#include "Shapes_ControllerR_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_ShapesControllerR_Impl -{ - ShapeAggrSeq * - shapes_aggregates_i::get_aggr_shapes() - { - ShapeAggrSeq_var info_seq = component_.get_shapes_list(); - return info_seq._retn (); - } - - /** - * Write action generator - */ - pulse_Generator::pulse_Generator (ControllerR_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.get_received_shapes (); - return 0; - } - - /** - * Component Executor Implementation Class: ControllerR_exec_i - */ - - ControllerR_exec_i::ControllerR_exec_i (void) - : rate_ (10) - { - shape_aggr_seq_.length(0); - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - - } - - ControllerR_exec_i::~ControllerR_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - ControllerR_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - - // Component attributes and port operations. - ::CORBA::UShort - ControllerR_exec_i::rate (void) - { - return this->rate_; - } - - void - ControllerR_exec_i::rate ( - const ::CORBA::UShort rate) - { - this->rate_ = rate; - } - - void - ControllerR_exec_i::get_received_shapes (void) - { - shape_received_var invoker = - this->ciao_context_->get_connection_shapeReceivedSub (); - - if (!::CORBA::is_nil(invoker)) - { - ShapeInfoSeq_var info_seq = invoker->get_info_shapes(); - if (!::CORBA::is_nil(info_seq)) - { - for (unsigned int i = 0; i < info_seq->length(); i ++) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::get_received_shapes: ") - ACE_TEXT ("received shapes_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - info_seq[i].shape.in(), - info_seq[i].color.in(), - info_seq[i].posY, - info_seq[i].posX, - info_seq[i].size)); - - } - //aggregate received samples, sort on color - aggregate_samples(info_seq.in()); - } - } - } - - void - ControllerR_exec_i::aggregate_samples(const ShapeInfoSeq &info_seq) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - //handle all records - for (unsigned int i = 0; i < info_seq.length(); i++) - { - CORBA::Boolean color_found = false; - //color exists? - for (unsigned int y = 0; y < shape_aggr_seq_.length(); y++) - { - if (ACE_OS::strcmp (info_seq[i].color,this->shape_aggr_seq_[y].color )== 0) - { - color_found = true; - this->shape_aggr_seq_[y].number_of_shapes++; - this->shape_aggr_seq_[y].last_size = info_seq[i].size; - this->shape_aggr_seq_[y].last_posX = info_seq[i].posX; - this->shape_aggr_seq_[y].last_posY = info_seq[i].posY; - } - } - if (!color_found) - { - CORBA::ULong seq_length = this->shape_aggr_seq_.length(); - this->shape_aggr_seq_.length(seq_length + 1); - this->shape_aggr_seq_[seq_length].shape = info_seq[i].shape; - this->shape_aggr_seq_[seq_length].color = info_seq[i].color; - this->shape_aggr_seq_[seq_length].number_of_shapes++; - this->shape_aggr_seq_[seq_length].last_size = info_seq[i].size; - this->shape_aggr_seq_[seq_length].last_posX = info_seq[i].posX; - this->shape_aggr_seq_[seq_length].last_posY = info_seq[i].posY; - } - - } - } - - ShapeAggrSeq* - ControllerR_exec_i::get_shapes_list(void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - ShapeAggrSeq_var info_seq = new ShapeAggrSeq(this->shape_aggr_seq_); - this->shape_aggr_seq_.length(0); - return info_seq._retn (); - } - - void - ControllerR_exec_i::clear_shape_list () - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - this->shape_aggr_seq_.length(0); - } - - CCM_shapes_aggregates* - ControllerR_exec_i::get_shapeAggrPub () - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::get_shapeAggrPub\n"))); - return ( new shapes_aggregates_i (*this) ); - } - - // Operations from Components::SessionComponent. - - void - ControllerR_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::set_session_context\n"))); - - this->ciao_context_ = - ::Shapes::CCM_ShapesControllerR_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - ControllerR_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::configuration_complete\n"))); - } - - void - ControllerR_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ControllerR_exec_i::ccm_activate\n"))); - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - ControllerR_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - ControllerR_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" CONTROLLERR_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_ControllerR_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - ControllerR_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h deleted file mode 100644 index e7d3b9c425b..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/ControllerR/Shapes_ControllerR_exec.h +++ /dev/null @@ -1,125 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_ -#define CIAO_SHAPES_CONTROLLERR_EXEC_ETSDUL_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_ControllerREC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ControllerR_exec_export.h" -#include "tao/LocalObject.h" - - -namespace CIAO_Shapes_ShapesControllerR_Impl -{ - - class ControllerR_exec_i; - - class shapes_aggregates_i - : public virtual CCM_shapes_aggregates, - public virtual ::CORBA::LocalObject - { - public: - shapes_aggregates_i (ControllerR_exec_i& component) - : component_ (component) - { - } - - virtual ShapeAggrSeq* get_aggr_shapes(); - - private: - ControllerR_exec_i& component_; - }; - - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (ControllerR_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - ControllerR_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Controller_exec_i - */ - - class ControllerR_exec_i - : public virtual ShapesControllerR_Exec, - public virtual ::CORBA::LocalObject - { - public: - ControllerR_exec_i (void); - virtual ~ControllerR_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort rate (void); - - virtual void rate (::CORBA::UShort rate); - - virtual CCM_shapes_aggregates* get_shapeAggrPub (void); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - virtual void get_received_shapes (void); - virtual ShapeAggrSeq* get_shapes_list(void); - virtual void clear_shape_list(); - //@} - - private: - ::Shapes::CCM_ShapesControllerR_Context_var ciao_context_; - ShapeAggrSeq shape_aggr_seq_; - TAO_SYNCH_MUTEX mutex_; - - //@{ - /** Component attributes. */ - ::CORBA::UShort rate_; - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - //@} - - //@{ - /** User defined private operations. */ - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - void aggregate_samples(const ShapeInfoSeq &info_seq); - //@} - }; -} - -extern "C" CONTROLLERR_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_ControllerR_Impl (void); - - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/README b/CIAO/connectors/dds4ccm/examples/ShapesContr/README deleted file mode 100644 index d17a085216d..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/README +++ /dev/null @@ -1,23 +0,0 @@ - - -This test uses a Controller component to start and stop publishing of shapes by the Sender component. -The Receiver component receives these samples and collects them. -The ControllerR component get the collected samples from the receiver and aggregates the samples, sort on color. -The ControllerR component also provides a CORBA port (interface) to get the aggregate samples. - - -If the Controller attribute use_web_interface == false (as used in plan.cdp) , then the Controller component triggers the Sender -to start publishing. - -If the Controller attribute use_web_interface == true (default, if not set in deployment plan, as used in plan_no_pub.cdp), -then with the use of the Controller component provided CORBA port (interface) , an extern CORBA client, -by example a R2CORBA client, can be used to change the attributes shape resizing, -shape max_size, shape max_x , shape max_y and publish_rate. -Starting and stopping of publishing can be controlled by the extern client, by setting publish_rate resp. greater then 0 or equal to 0. -The CORBA port (interface) provided by the ControllerR component can, for example, be used by a R2CORBA client to get the aggregate samples, -which in turn can be used to show the received samples with a GUI. - - -In plan.cdp there are used 3 Controller-, 3 Sender-, 3 Receiver- and 3 ControllerR- components for resp. a SQUARE,TRIANGLE and CIRCLE. -In plan_nopub.cdp there are used 3 Controller-, 3 Sender-, 3 Receiver- and 3 ControllerR- components for resp. a SQUARE, -TRIANGLE and CIRCLE, for the TRIANGLE there is an incompatible , defined in the QoS file, between Publisher and Subscriber. diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl deleted file mode 100644 index aafbd686bd3..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Shapes_Connector.idl" -#include "../Base/Shapes_Contr_Base.idl" - -module Shapes -{ - component Receiver - { - port Shapes::DDS_Listen info_out; - port Shapes::DDS_Get info_get; - provides shape_received shapeReceivedPub; - 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. - attribute boolean raw_listen; //if true, raw listen port is enabled. - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc deleted file mode 100644 index cce6c036767..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver.mpc +++ /dev/null @@ -1,140 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver" - -project(ShapesContr_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += ShapesContr_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Shapes_Receiver.idl - } -} - -project(ShapesContr_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += ShapesContr_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Shapes_ReceiverE.idl - } -} - -project(ShapesContr_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += ShapesContr_Receiver_lem_gen ShapesContr_Receiver_stub ShapesContr_Connector_stub ShapesContr_Base_stub - libs += Receiver_stub ShapesContr_Connector_stub ShapesContr_Base_stub Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverEC.cpp - } - - Header_Files { - Shapes_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Shapes_ReceiverEC.inl - } -} - -project(ShapesContr_Receiver_stub) : ccm_stub, dds4ccm_base { - after += ShapesContr_Receiver_idl_gen ShapesContr_Connector_stub ShapesContr_Base_stub ShapesContr_Connector_lem_gen - libs += ShapesContr_Connector_stub ShapesContr_Base_stub Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverC.cpp - } - - Header_Files { - Shapes_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Shapes_ReceiverC.inl - } -} - -project(ShapesContr_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += ShapesContr_Receiver_lem_stub ShapesContr_Receiver_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_lem_stub Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Receiver_exec.cpp - } - - Header_Files { - Shapes_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(ShapesContr_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += ShapesContr_Receiver_lem_stub Shapes_Contr_Base_svnt ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt ShapesContr_Receiver_exec ShapesContr_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt Receiver_exec ShapesContr_Connector_lem_stub \ - Shapes_Contr_Base_svnt \ - Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_ReceiverS.cpp - Shapes_Receiver_svnt.cpp - } - - Header_Files { - Shapes_ReceiverS.h - Shapes_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp deleted file mode 100644 index 4bbe7874404..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.cpp +++ /dev/null @@ -1,660 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Shapes_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/TimeUtilities.h" - -namespace CIAO_Shapes_Receiver_Impl -{ - - shape_received_i::shape_received_i (Receiver_exec_i& callback) - : callback_ (callback) - { - } - CORBA::UShort - shape_received_i::number_of_shapes () - { - return callback_.length_shape_list(); - } - - //return all collected shapes - ShapeInfoSeq * - shape_received_i::get_info_shapes() - { - ShapeInfoSeq_var info_seq = callback_.get_shapes_list(); - return info_seq._retn (); - } - - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - if (pulse_callback_.read_data ()) - { - this->pulse_callback_.read_one(); - this->pulse_callback_.read_all(); - } - if (pulse_callback_.get_data ()) - { - this->pulse_callback_.get_one (); - } - return 0; - } - - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Shapes::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: info_out_data_listener_exec_i::on_one_data - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - datum.color.in (), - datum.x, - datum.y, - datum.shapesize)); - - //Save all received shape's - callback_.add_shape_to_list(topic.in (), datum.color.in (), - datum.shapesize, datum.x,datum.y ); - - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (0) - , get_data_ (true) - , read_data_ (true) - , raw_listen_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - shape_info_seq_.length(0); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_one (void) - { - ShapeType shape_info; - shape_info.color = "GREEN"; - ::CCM_DDS::ReadInfo readinfo; - - try - { - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (! ::CORBA::is_nil (reader.in ())) - { - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_one - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); - ACE_Time_Value time; - time <<= readinfo.source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") - ACE_TEXT (" -> date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_info.color.in (), - shape_info.x, - shape_info.y, - shape_info.shapesize)); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - " - "ERROR: reader seems to be nil.\n")); - } - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: ") - ACE_TEXT ("no shape_info received\n"))); - } - - } - - void - Receiver_exec_i::read_all (void) - { - ShapeTypeSeq shape_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - ::Shapes::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (! ::CORBA::is_nil (reader.in ())) - { - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - reader->read_all(shape_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) - { - ACE_Time_Value time; - time <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date = %#T\n"), &time)); - } - for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_infos[i].color.in (), - shape_infos[i].x, - shape_infos[i].y, - shape_infos[i].shapesize)); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "ERROR: reader seems to be nil.\n")); - } - - } - - void - Receiver_exec_i::get_one (void) - { - ShapeType_var shape_info; - ::CCM_DDS::ReadInfo_var readinfo; - - try - { - ::Shapes::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (! ::CORBA::is_nil (getter.in ())) - { - ::CORBA::Object_var cmp = getter->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::get_one - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - if (getter->get_one (shape_info.out (), readinfo.out ())) - { - ACE_Time_Value time; - time <<= readinfo->source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") - ACE_TEXT ("date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") - ACE_TEXT ("received shape_info <%C> for <%C> at X <%u> Y <%u> size <%u>\n"), - topic.in (), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), - shape_info->color.in ())); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " - "ERROR: Getter seems nil\n")); - } - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n"))); - } - - } - - // Component attributes and port operations. - - ::Shapes::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - (*this)), - ::Shapes::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Shapes::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - CCM_shape_received* - Receiver_exec_i::get_shapeReceivedPub () - { - return ( new shape_received_i (*this) ); - } - - ::CORBA::ULong - Receiver_exec_i::rate (void) - { - return this->rate_; - } - - void - Receiver_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::Boolean - Receiver_exec_i::get_data (void) - { - return this->get_data_; - } - - void - Receiver_exec_i::get_data ( - const ::CORBA::Boolean get_data) - { - this->get_data_ = get_data; - } - - ::CORBA::Boolean - Receiver_exec_i::read_data (void) - { - return this->read_data_; - } - - void - Receiver_exec_i::read_data ( - const ::CORBA::Boolean read_data) - { - this->read_data_ = read_data; - } - - ::CORBA::Boolean - Receiver_exec_i::raw_listen (void) - { - return this->raw_listen_; - } - - void - Receiver_exec_i::raw_listen ( - const ::CORBA::Boolean raw_listen) - { - this->raw_listen_ = raw_listen; - } - - void - Receiver_exec_i::add_shape_to_list (const char* topic, const char* color, CORBA::UShort size, - CORBA::UShort pos_x, CORBA::UShort pos_y) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - CORBA::ULong seq_length = this->shape_info_seq_.length(); - this->shape_info_seq_.length(seq_length + 1); - this->shape_info_seq_[seq_length].shape = CORBA::string_dup (topic); - this->shape_info_seq_[seq_length].color = CORBA::string_dup (color); - this->shape_info_seq_[seq_length].size = size; - this->shape_info_seq_[seq_length].posX = pos_x; - this->shape_info_seq_[seq_length].posY = pos_y; - } - - void - Receiver_exec_i::clear_shape_list () - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - this->shape_info_seq_.length(0); - } - - //get all collected shapes from list and then empty - // list . - ShapeInfoSeq* - Receiver_exec_i::get_shapes_list(void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - ShapeInfoSeq_var info_seq = new ShapeInfoSeq(this->shape_info_seq_); - this->shape_info_seq_.length(0); - return info_seq._retn (); - } - - CORBA::UShort - Receiver_exec_i::length_shape_list () - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - return this->shape_info_seq_.length(); - } - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - - lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED); - - //if using only raw_listen, the timer isn't needed. - if (this->get_data_ || this->read_data_) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(0, usec), - ACE_Time_Value(0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h deleted file mode 100644 index 3f5887454ab..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Receiver/Shapes_Receiver_exec.h +++ /dev/null @@ -1,291 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ -#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -// 2013 version of the DDS shapes example moves -// the ShapeType to a nested module -using org::omg::dds::demo::ShapeType; -using org::omg::dds::demo::ShapeTypeSeq; -using org::omg::dds::demo::ShapeType_var; - -namespace CIAO_Shapes_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ShapeInfoSeq; - - class Receiver_exec_i; - - - class shape_received_i - : public virtual CCM_shape_received, - public virtual ::CORBA::LocalObject - { - public: - shape_received_i (Receiver_exec_i& callback); - virtual CORBA::UShort number_of_shapes (); - virtual ShapeInfoSeq * get_info_shapes(); - - private: - Receiver_exec_i& callback_; - }; - - /** - * @class reader activity generator - * - * @brief an active object used by Receiver to perform a periodical read action - * - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Shapes::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Shapes::Listener. */ - - virtual - void on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ShapeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Shapes::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::Boolean get_data (void); - - virtual void get_data (::CORBA::Boolean get_data); - - virtual ::CORBA::Boolean read_data (void); - - virtual void read_data (::CORBA::Boolean read_data); - - virtual ::CORBA::Boolean raw_listen (void); - - virtual void raw_listen (::CORBA::Boolean raw_listen); - - virtual CCM_shape_received* get_shapeReceivedPub (); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_one (void); - void read_all (void); - void get_one (void); - void add_shape_to_list (const char* topic, - const char* color, - ::CORBA::UShort size, - ::CORBA::UShort pos_x, - ::CORBA::UShort pos_y); - - void clear_shape_list (void); - ShapeInfoSeq* get_shapes_list(void); - CORBA::UShort length_shape_list (void); - - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Shapes::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - - ::CORBA::ULong rate_; - - ::CORBA::Boolean get_data_; - - ::CORBA::Boolean read_data_; - - ::CORBA::Boolean raw_listen_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - ShapeInfoSeq shape_info_seq_; - TAO_SYNCH_MUTEX mutex_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl deleted file mode 100644 index e504a7c9166..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_SHAPES_SENDER_IDL -#define DDS_SHAPES_SENDER_IDL - -#include "Connector/Shapes_Connector.idl" -#include "../Base/Shapes_Contr_Base.idl" - -module Shapes -{ - component Sender - { - port Shapes::DDS_Write info_write; - uses shape_attributes_get shapeAttribsSub; - provides shape_changes shapeChangesPub; - attribute string color; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc deleted file mode 100644 index 942763b7b94..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender.mpc +++ /dev/null @@ -1,140 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ShapesContr_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(ShapesContr_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += ShapesContr_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Shapes_Sender.idl - } -} - -project(ShapesContr_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += ShapesContr_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Shapes_SenderE.idl - } -} - -project(ShapesContr_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += ShapesContr_Sender_lem_gen ShapesContr_Sender_stub ShapesContr_Base_stub - libs += ShapesContr_Base_stub Shapes_Contr_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderEC.cpp - } - - Header_Files { - Shapes_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Shapes_SenderEC.inl - } -} - -project(ShapesContr_Sender_stub) : ccm_stub, dds4ccm_base { - after += ShapesContr_Sender_idl_gen ShapesContr_Base_stub ShapesContr_Connector_stub - libs += ShapesContr_Base_stub Shapes_Contr_Base_stub ShapesContr_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderC.cpp - } - - Header_Files { - Shapes_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Shapes_SenderC.inl - } -} - -project(ShapesContr_Sender_exec) : ciao_executor, dds4ccm_base { - after += ShapesContr_Sender_lem_stub ShapesContr_Sender_stub ShapesContr_Connector_lem_stub ShapesContr_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub ShapesContr_Base_stub Shapes_Contr_Base_stub ShapesContr_Connector_lem_stub ShapesContr_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Sender_exec.cpp - } - - Header_Files { - Shapes_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(ShapesContr_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += ShapesContr_Base_stub Shapes_Contr_Base_svnt ShapesContr_Sender_lem_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt ShapesContr_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - ShapesContr_Base_stub ShapesContr_Connector_stub ShapesContr_Connector_svnt ShapesContr_Connector_lem_stub \ - Shapes_Contr_Base_svnt \ - Shapes_Contr_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_SenderS.cpp - Shapes_Sender_svnt.cpp - } - - Header_Files { - Shapes_SenderS.h - Shapes_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp deleted file mode 100644 index 6c3ae2be1df..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.cpp +++ /dev/null @@ -1,411 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Shapes_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Sender_Impl -{ - shape_changes_i::shape_changes_i (Sender_exec_i& callback) - : callback_ (callback) - { - } - - void - shape_changes_i::pass_change_event() - { - //there is a change in shape attributes, so get the new atrributes - this->callback_.get_shape_attributes_get(); - } - - /** - * Write action generator - */ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - Sender_exec_i::Sender_exec_i (void) - : rate_ (0) - , max_x_ (100) - , max_y_ (100) - , max_size_ (25) - , resize_shape_ (false) - , color_ ("CYAN") - , x_increasing_ (false) - , y_increasing_ (false) - , size_increasing_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->shape_, - ShapeType, - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - delete this->shape_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - if (this->x_increasing_) - { - ++this->shape_->x; - this->x_increasing_ = this->shape_->x + 1 <= this->max_x_; - } - else - { - --this->shape_->x; - this->x_increasing_ = this->shape_->x - 1 < 0; - } - if (this->y_increasing_) - { - ++this->shape_->y; - this->y_increasing_ = this->shape_->y + 1 <= this->max_y_; - } - else - { - --this->shape_->y; - this->y_increasing_ = this->shape_->y - 1 < 0; - } - - if (this->resize_shape_) - { - if (this->size_increasing_) - { - ++this->shape_->shapesize; - this->size_increasing_ = this->shape_->shapesize + 1 <= this->max_size_; - } - else - { - --this->shape_->shapesize; - this->size_increasing_ = this->shape_->shapesize - 1 < 0; - } - } - - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::Shapes::CCM_DDS_Event_var conn = - ::Shapes::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::tick - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - CORBA::String_var topic = conn->topic_name (); - - writer->write_one (*this->shape_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info <%C> for <%C> %u:%u:%u\n"), - topic.in (), - this->shape_->color.in (), - this->shape_->x, - this->shape_->y, - this->shape_->shapesize)); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not updated: didn't exist.\n"), - this->shape_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - this->shape_->color.in ())); - } - } - - void - Sender_exec_i::start (void) - { - - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::start : Timer started.\n"))); - - } - void - Sender_exec_i::register_topic() - { - // Register shape with dds. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - this->shape_->color.in (), - this->shape_->x, - this->shape_->y, - this->shape_->shapesize)); - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - this->instance_handle_ = - writer->register_instance (*this->shape_); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::AlreadyCreated& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - this->shape_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - this->shape_->color.in ())); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - - } - - void - Sender_exec_i::unregister_topic() - { - try - { - Shapes::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - writer->unregister_instance (*this->shape_, - this->instance_handle_); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - " - "ERROR: Writer seems nil.\n")); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - this->shape_->color.in (), this->shape_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - this->shape_->color.in ())); - } - - } - - void - Sender_exec_i::get_shape_attributes_get() - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shape_attributes\n"))); - shape_attributes_get_var shape_attrib_ = this->ciao_context_->get_connection_shapeAttribsSub (); - if (CORBA::is_nil (shape_attrib_.in ())) - throw CORBA::BAD_INV_ORDER (); - - //CORBA::String_var color_ = shape_attrib_->color (); - CORBA::UShort rate = shape_attrib_->publish_rate(); - this->max_size_ = shape_attrib_->max_size(); - this->max_x_ = shape_attrib_->max_x(); - this->max_y_ = shape_attrib_->max_y(); - this->resize_shape_ = shape_attrib_->resize(); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shape_attributes ") - ACE_TEXT (" color = %C, rate= %d, resize = %d, max_size = %d, max_x = %d, max_y = %d, resize = %d \n"), - color_.in(), rate, this->resize_shape_, this->max_size_, - this->max_x_, this->max_y_, this->resize_shape_)); - - - this->shape_->color = CORBA::string_dup(color_); - - if (rate != this->rate_) - { - //rate of publishing is changed so stop and start timer. - this->stop(); - this->rate_ = rate; - if (this->rate_ != 0) - { - this->start(); - } - } - - } - - // Component attributes and port operations. - char* - Sender_exec_i::color (void) - { - return ::CORBA::string_dup (this->color_); - } - - void - Sender_exec_i::color (const char* color) - { - this->color_ = ::CORBA::string_dup (color); - } - - CCM_shape_changes* - Sender_exec_i::get_shapeChangesPub () - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::get_shapeChangesPub\n"))); - return ( new shape_changes_i (*this) ); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::set_session_context\n"))); - this->ciao_context_ = - ::Shapes::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::configuration_complete\n"))); - // Set the initial square properties right now - this->shape_->x = ACE_OS::rand () % this->max_x_; - this->shape_->y = ACE_OS::rand () % this->max_y_; - this->shape_->shapesize = this->max_size_; - this->shape_->color = CORBA::string_dup(this->color_); - } - - void - Sender_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::ccm_activate\n"))); - this->register_topic(); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - this->unregister_topic(); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h deleted file mode 100644 index 35c4f961e16..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/Sender/Shapes_Sender_exec.h +++ /dev/null @@ -1,173 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ -#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -using org::omg::dds::demo::ShapeType; -using org::omg::dds::demo::ShapeTypeSeq; -using org::omg::dds::demo::ShapeType_var; - -namespace CIAO_Shapes_Sender_Impl -{ - class Sender_exec_i; - - - class shape_changes_i - : public virtual CCM_shape_changes, - public virtual ::CORBA::LocalObject - { - public: - shape_changes_i (Sender_exec_i& callback); - - virtual void pass_change_event(void); - - private: - Sender_exec_i& callback_; - }; - - /** - * Write action generator - */ - - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void get_shape_attributes_get(); - //@} - - //@{ - /** Component attributes and port operations. */ - virtual char *color (void); - - virtual void color (const char* color); - - virtual CCM_shape_changes* get_shapeChangesPub (); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - - //@} - - private: - ::Shapes::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::ULong rate_; - - ::CORBA::UShort max_x_; - - ::CORBA::UShort max_y_; - - ::CORBA::UShort max_size_; - - ::CORBA::Boolean resize_shape_; - - ::CORBA::String_var color_; - //@} - - //@{ - /** User defined members. */ - void start (void); - void stop (void); - void unregister_topic (void); - void register_topic (void); - - pulse_Generator * ticker_; - - bool x_increasing_; - bool y_increasing_; - bool size_increasing_; - - ShapeType* shape_; - - ::DDS::InstanceHandle_t instance_handle_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index ba339827d6a..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp deleted file mode 100644 index b463e33d7e4..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan.cdp +++ /dev/null @@ -1,1576 +0,0 @@ - - - - Shapes_Depl_1 - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ControllerComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Controller_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_ShapesController_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Controller_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Controller_exec - - - - - - - ControllerRComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_ControllerR_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_ShapesControllerR_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ControllerR_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ControllerR_exec - - - - - - - ComponentServerReceiverInstance - ReceiverNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBDottedDecimalAddresses 1 - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - TriangleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - - ComponentServerSenderInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBDottedDecimalAddresses 1 - - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - use_web_interface - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Square - - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - - CircleControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - use_web_interface - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Circle - - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - TriangleControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - use_web_interface - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Triangle - - - - - - - TriangleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - SquareControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 5 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverSquare - - - - - - CircleControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 5 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverCircle - - - - - - TriangleControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 5 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverTriangle - - - - - - - square_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - square_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - - shape_received_square - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - shape_received_circle - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - shape_received_triangle - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - - - triangle_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - triangle_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - - circle_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - circle_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - triangle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - triangle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - triangle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - triangle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - ShapesContr_Connector_exec - - - - Controller_exec - - - ShapesContr_Controller_exec - - - Controller_svnt - - - ShapesContr_Controller_svnt - - - - ControllerR_exec - - - ShapesContr_ContrR_exec - - - ControllerR_svnt - - - ShapesContr_ContrR_svnt - - - - Shapes_Connector_svnt - - - ShapesContr_Connector_svnt - - - Shapes_Connector_stub - - - ShapesContr_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp deleted file mode 100644 index e646f3e1117..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.cdp +++ /dev/null @@ -1,1609 +0,0 @@ - - - - Shapes_Depl_1 - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ControllerComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Controller_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_ShapesController_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Controller_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Controller_exec - - - - - - - ControllerRComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_ControllerR_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_ShapesControllerR_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - ControllerR_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - ControllerR_exec - - - - - - - ComponentServerReceiverInstance - ReceiverNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBDottedDecimalAddresses 1 - - - - - - - SquareReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - CircleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - TriangleReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - get_data - - - tk_boolean - - - false - - - - - read_data - - - tk_boolean - - - false - - - - - raw_listen - - - tk_boolean - - - true - - - - - - - ComponentServerSenderInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBDottedDecimalAddresses 1 - - - - - - - SquareShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - plan_nopub#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - plan_nopub#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - plan_nopub#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - plan_nopub#square - - - - - topic_name - - - tk_string - - - Square - - - - - type_name - - - tk_string - - - ShapeType - - - - - - CircleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - plan_nopub#circle - - - - - topic_name - - - tk_string - - - Circle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - TriangleShapes_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - plan_nopub#triangle - - - - - topic_name - - - tk_string - - - Triangle - - - - - type_name - - - tk_string - - - ShapeType - - - - - - SquareControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Square - - - - - - - SquareSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - - CircleControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Circle - - - - - - - CircleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - TriangleControllerComponent - SenderNode - - - - - publish_rate - - - tk_ulong - - - 0 - - - - - max_size - - - tk_ushort - - - 50 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - resize_shape - - - tk_boolean - - - false - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - Triangle - - - - - - - TriangleSenderComponent - SenderNode - - - - - color - - - tk_string - - - ORANGE - - - - - - SquareControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverSquare - - - - - - CircleControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverCircle - - - - - - TriangleControllerRComponent - ReceiverNode - - - - - rate - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - ReceiverTriangle - - - - - - - square_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - square_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - - shape_received_square - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - shape_received_circle - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - shape_received_triangle - - shapeReceivedPub - true - Facet - - - - shapeReceivedSub - false - SimplexReceptacle - - - - - - - triangle_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - triangle_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - - circle_control_shape_attribs - - shapeAttribsSub - false - SimplexReceptacle - - - - shapeAttribsPub - true - Facet - - - - - - circle_control_change_changed - - shapeChangesPub - true - Facet - - - - shapeChangesSub - false - SimplexReceptacle - - - - - square_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - square_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - square_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - square_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - circle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - circle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - circle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - circle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - triangle_info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - triangle_listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - triangle_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - triangle_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - square_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - circle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - triangle_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - ShapesContr_Connector_exec - - - - Controller_exec - - - ShapesContr_Controller_exec - - - Controller_svnt - - - ShapesContr_Controller_svnt - - - - ControllerR_exec - - - ShapesContr_ContrR_exec - - - ControllerR_svnt - - - ShapesContr_ContrR_svnt - - - - Shapes_Connector_svnt - - - ShapesContr_Connector_svnt - - - Shapes_Connector_stub - - - ShapesContr_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml deleted file mode 100644 index d4fb8fcce40..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/plan_nopub.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - RELIABLE_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl deleted file mode 100755 index b7bc5581df6..00000000000 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/run_test.pl +++ /dev/null @@ -1,293 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS_ROOT = "$ENV{'DDS_ROOT'}"; - -#$ENV{'DANCE_LOG_LEVEL'}=10; -#$ENV{'CIAO_LOG_LEVEL'}=10; -#$ENV{'DANCE_TRACE_ENABLE'}=1; -#$ENV{'CIAO_TRACE_ENABLE'}=1; - - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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_pub = "plan.cdp"; -$cdp_file_nopub = "plan_nopub.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 --instance-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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 for plan_nopub.cdp- NO PUBLISHING expected\n"; - -print "Start dance_plan_launcher.exe with -x $cdp_file_nopub -k file://$ior_emfile\n"; -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file_nopub -k file://$ior_emfile"); -$pl_status = $E->SpawnWaitKill (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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_nopub\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file_nopub -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; -} - -# Invoke executor - start the application -. -print "Invoking executor - launch the application for plan.cdp- publishing expected\n"; - -print "Start dance_plan_launcher.exe with -x $cdp_file_pub -k file://$ior_emfile\n"; -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file_pub -k file://$ior_emfile"); -$pl_status = $E->SpawnWaitKill (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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_pub\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file_pub -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/CIAO/connectors/dds4ccm/idl/.gitignore b/CIAO/connectors/dds4ccm/idl/.gitignore deleted file mode 100644 index c68776794a5..00000000000 --- a/CIAO/connectors/dds4ccm/idl/.gitignore +++ /dev/null @@ -1,75 +0,0 @@ -/ccm_ddsC.cpp -/ccm_ddsC.h -/ccm_ddsE.idl -/ccm_ddsS.h -/dds4ccm_Base_svnt.h -/dds4ccm_BaseC.cpp -/dds4ccm_BaseC.h -/dds4ccm_BaseE.idl -/dds4ccm_BaseEC.cpp -/dds4ccm_BaseEC.h -/dds4ccm_BaseES.h -/dds4ccm_BaseS.h -/dds4ccm_Connector_svnt.cpp -/dds4ccm_Connector_svnt.h -/dds4ccm_Connector_svnt_T.cpp -/dds4ccm_Connector_svnt_T.h -/dds4ccm_ConnectorC.cpp -/dds4ccm_ConnectorC.h -/dds4ccm_ConnectorC.inl -/dds4ccm_ConnectorE.idl -/dds4ccm_ConnectorEC.cpp -/dds4ccm_ConnectorEC.h -/dds4ccm_ConnectorES.h -/dds4ccm_ConnectorS.cpp -/dds4ccm_ConnectorS.h -/dds4ccm_ConnectorStatusListener_svnt.h -/dds4ccm_ConnectorStatusListenerC.cpp -/dds4ccm_ConnectorStatusListenerC.h -/dds4ccm_ConnectorStatusListenerE.idl -/dds4ccm_ConnectorStatusListenerEC.cpp -/dds4ccm_ConnectorStatusListenerEC.h -/dds4ccm_ConnectorStatusListenerES.h -/dds4ccm_ConnectorStatusListenerS.h -/dds4ccm_DataListenerControl_svnt.h -/dds4ccm_DataListenerControlC.cpp -/dds4ccm_DataListenerControlC.h -/dds4ccm_DataListenerControlE.idl -/dds4ccm_DataListenerControlEC.cpp -/dds4ccm_DataListenerControlEC.h -/dds4ccm_DataListenerControlES.h -/dds4ccm_DataListenerControlS.h -/dds4ccm_EntityC.cpp -/dds4ccm_EntityC.h -/dds4ccm_EntityS.h -/dds4ccm_lem_stub_export.h -/dds4ccm_PortStatusListener_svnt.h -/dds4ccm_PortStatusListenerC.cpp -/dds4ccm_PortStatusListenerC.h -/dds4ccm_PortStatusListenerE.idl -/dds4ccm_PortStatusListenerEC.cpp -/dds4ccm_PortStatusListenerEC.h -/dds4ccm_PortStatusListenerES.h -/dds4ccm_PortStatusListenerS.h -/dds4ccm_QueryFilterC.cpp -/dds4ccm_QueryFilterC.h -/dds4ccm_QueryFilterS.h -/dds4ccm_skel_export.h -/dds4ccm_StateListenerControl_svnt.h -/dds4ccm_StateListenerControlC.cpp -/dds4ccm_StateListenerControlC.h -/dds4ccm_StateListenerControlE.idl -/dds4ccm_StateListenerControlEC.cpp -/dds4ccm_StateListenerControlEC.h -/dds4ccm_StateListenerControlES.h -/dds4ccm_StateListenerControlS.h -/dds4ccm_stub_export.h -/dds_rtf2_dcps_i_handleE.idl -/dds_rtf2_dcps_svnt.h -/dds_rtf2_dcpsC.cpp -/dds_rtf2_dcpsC.h -/dds_rtf2_dcpsE.idl -/dds_rtf2_dcpsEC.cpp -/dds_rtf2_dcpsEC.h -/dds_rtf2_dcpsES.h -/dds_rtf2_dcpsS.h diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl deleted file mode 100644 index 829697f1dd5..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl +++ /dev/null @@ -1,281 +0,0 @@ -#ifndef CCM_DDS_BASE_IDL -#define CCM_DDS_BASE_IDL - -#include -#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl" -#include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl" -#include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl" -#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl" -#include "connectors/dds4ccm/idl/dds4ccm_Connector.idl" -#include "connectors/dds4ccm/idl/dds4ccm_Entity.idl" - -#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" -#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h" - -module CCM_DDS -{ - module Typed TSeq> { - alias DDS_Entity DDS_Typed_Entity; - typedef DDS_Typed_Entity::DataReader DataReader; - typedef DDS_Typed_Entity::DataWriter DataWriter; - - // Gathers all the constructs that are dependent on the data type (T), - // either directly -- interfaces making use of T or TSeq, - // or indirectly -- porttypes using or providing those intefaces. - // TSeq is passed as a second parameter to avoid creating a new sequence type. - - // ------------------------------------- - // Interfaces to be 'used' or 'provided' - // ------------------------------------- - - // Data access - publishing side - // ----------------------------- - - // -- InstanceHandle Manager - local interface InstanceHandleManager { - DDS::InstanceHandle_t register_instance (in T datum) - raises (InternalError); - void unregister_instance (in T datum, in DDS::InstanceHandle_t instance_handle) - raises (InternalError); - }; - - // -- Writer: when the instance lifecycle is not a concern - local interface Writer : InstanceHandleManager { - void write_one (in T datum, in DDS::InstanceHandle_t instance_handle) - raises (InternalError); - void write_many (in TSeq data) - raises (InternalError); - attribute boolean is_coherent_write; // FALSE by default - // behavior - // --------- - // - the handle is exactly managed as by DDS (cf. DDS spec for more details) - // - attempt to write_many is stopped at the first error - // - if is_coherent_write, DDS write orders issued by a write_many - // are placed between begin/end coherent updates (even if an error occurs) - }; - - // -- Updater: when the instance lifecycle is a concern - local interface Updater : InstanceHandleManager { - void create_one (in T datum) - raises (AlreadyCreated, - InternalError); - void update_one (in T datum, in DDS::InstanceHandle_t instance_handle) - raises (NonExistent, - InternalError); - void delete_one (in T datum,in DDS::InstanceHandle_t instance_handle) - raises (NonExistent, - InternalError); - - void create_many (in TSeq data) - raises (AlreadyCreated, - InternalError); - void update_many (in TSeq data) - raises (NonExistent, - InternalError); - void delete_many (in TSeq data) - raises (NonExistent, - InternalError); - - readonly attribute boolean is_global_scope; // FALSE by default - attribute boolean is_coherent_write; // FALSE by default - - // behavior - // -------- - // - the handle is exactly managed as by DDS (cf. DDS spec for more details) - // - exceptions AlreadyCreated or NonExistent are raised at least if a local - // conflict exists; in addition if is_global_scope is true, the test on - // existence attempts to take into account the instances created outside - // - note: this check requires to previously attempt to read (not free) - // - note: this check is not 100% guaranteed as a creation or a deletion - // may occur in the short time between the check and the DDS order - // - For *-many operations: - // - global check is performed before actual write or dispose - // (in case of error, all the erroneous instances are reported - // in the exception) - // - attempt to DDS write or dispose is stopped at the first error - // - if is_coherent_write, DDS orders resulting from a *_many operation - // are placed between begin/end coherent updates (even if an error - // occurs) - }; - - // Data access - subscribing side - // ------------------------------ - - // -- Reader: to simply access to the available data (no wait) - local interface Reader { - void read_last (inout TSeq data, inout ReadInfoSeq infos) - raises (InternalError); - void read_all (inout TSeq data, inout ReadInfoSeq infos) - raises (InternalError); - void read_one_last (inout T datum, out ReadInfo info, - in DDS::InstanceHandle_t instance_handle) - raises (NonExistent, - InternalError); - void read_one_all (in T datum, inout TSeq data, inout ReadInfoSeq infos, - in DDS::InstanceHandle_t instance_handle) - raises (NonExistent, - InternalError); - attribute QueryFilter query - setraises (InternalError); - // behavior - // -------- - // - read operations are performed with the following parameters - // - READ or NO_READ - // - NEW or NOT_NEW - // - ALIVE - // - through the query as specified in the expression ("" means no query) - // - data returned: - // - read_last returns for each living instance, its last sample - // - read_all returns all the samples of all instances - // ordered by instance first and then by sample - // - read_one_last returns the last sample of the given instance - // - read_one_all returns all the samples for the given instance - // - read_one operations use the instance_handle the same way - // the Writer or Updater *_one operations do - }; - - // -- Getter: to get new data (and wait for) - local interface Getter { - boolean get_one (out T datum, out ReadInfo info) - raises (InternalError); - boolean get_many (inout TSeq data, inout ReadInfoSeq infos) - raises (InternalError); - attribute DDS::Duration_t time_out; - attribute DataNumber_t max_delivered_data; // default 0 (no limit) - // behavior - // -------- - // - get operations are performed with the following parameters - // - NO_READ - // - NEW or NOT_NEW - // - ALIVE or NOT_ALIVE - // - through the query as specified in the associated Reader - // - within the time limit specified in time_out - // - all operations returns TRUE if data are provided - // or FALSE if time-out occurred - // - data returned: - // - get_one returns each read sample one by one - // - get_many returns all available samples within the - // max_delivered_data limit - }; - - // -- Listener: similar to a Getter but in push mode - local interface Listener { - void on_one_data (in T datum, in ReadInfo info); - void on_many_data (in TSeq data, in ReadInfoSeq infos); - // behavior - // -------- - // - on_one_data() trigered is the mode of the associated listener control - // is ONE_BY_ONE (then similar to a get_one(), except that in push mode - // instead of pull mode) - // - on_many_data() triggered if the listener mode is MANY_BY_MANY (then - // similar to get_many() but in push mode) - // - query filter (if any) in the associated Reader - }; - - // -- StateListener: listener to be notified based on the instance lifecycle - local interface StateListener { - void on_creation (in T datum, in ReadInfo info); - void on_one_update (in T datum, in ReadInfo info); - void on_many_updates (in TSeq data, in ReadInfoSeq infos); - void on_deletion (in T datum, in ReadInfo info); - // behavior - // -------- - // - no operations are trigerred if the mode of the associated listener - // control is NOT_ENABLED - // - on_creation() is triggered if the instance is considered as new in the - // component scope; note that in case there is a filter and the attribute - // is_filter_interpreted of the listener control is TRUE, this gathers also - // the case when the instance is filtered-in. - // - on_delation() is triggered if the instance is no more existing; note - // that in case there is a filter and the attribute - // is_filter_interpreted of the listener control is TRUE, this gathers - // also the case when the instance is filtered-out - // - on_one_update() is trigrered if neither on_creation() nor on_deletion() - // are triggered and the mode of the associated listener control is - // ONE_BY_ONE - // - on_many_updates()is triggered if neither on_creation() nor on_deletion() - // are triggered and the mode of the associated listener control is - // MANY_BY_MANY; the number of returned samples is within the limits of - // max_delivered_data attribute of the associated listener control. - // - query filter (if any) in the associated Reader - }; - - - // --------- - // DDS Ports - // --------- - - porttype DDS_Write { - uses Writer data; - uses DDS::DataWriter dds_entity; - }; - - porttype DDS_Update { - uses Updater data; - uses DDS::DataWriter dds_entity; - }; - - porttype DDS_Read { - uses Reader data; - uses DDS::DataReader dds_entity; - provides PortStatusListener status; - attribute QueryFilter filter - setraises (NonChangeable); - uses ContentFilterSetting filter_config; - }; - - porttype DDS_Get { - uses Reader data; - uses Getter fresh_data; - uses DDS::DataReader dds_entity; - provides PortStatusListener status; - attribute QueryFilter filter - setraises (NonChangeable); - uses ContentFilterSetting filter_config; - }; - - porttype DDS_Listen { - uses Reader data; - uses DataListenerControl data_control; - provides Listener data_listener; - uses DDS::DataReader dds_entity; - provides PortStatusListener status; - attribute QueryFilter filter - setraises (NonChangeable); - uses ContentFilterSetting filter_config; - }; - - porttype DDS_StateListen { - uses Reader data; - uses StateListenerControl data_control; - provides StateListener data_listener; - uses DDS::DataReader dds_entity; - provides PortStatusListener status; - attribute QueryFilter filter - setraises (NonChangeable); - uses ContentFilterSetting filter_config; - }; - - // ---------------------------- - // Connectors - // (Correspond to DDS patterns) - // ---------------------------- - - connector DDS_State : DDS_TopicBase { - mirrorport DDS_Update observable; - mirrorport DDS_Read passive_observer; - mirrorport DDS_Get pull_observer; - mirrorport DDS_Listen push_observer; - mirrorport DDS_StateListen push_state_observer; - }; - - connector DDS_Event : DDS_TopicBase { - mirrorport DDS_Write supplier; - mirrorport DDS_Get pull_consumer; - mirrorport DDS_Listen push_consumer; - }; - }; -}; - -#endif - diff --git a/CIAO/connectors/dds4ccm/idl/dds/.gitignore b/CIAO/connectors/dds4ccm/idl/dds/.gitignore deleted file mode 100644 index 95fd51432c1..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -/DdsDcps_lem_stub_export.h -/DdsDcpsDomain_svnt.h -/DdsDcpsDomainE.idl -/DdsDcpsDomainEC.cpp -/DdsDcpsDomainEC.h -/DdsDcpsDomainES.h -/DdsDcpsInfrastructure_svnt.h -/DdsDcpsInfrastructureE.idl -/DdsDcpsInfrastructureEC.cpp -/DdsDcpsInfrastructureEC.h -/DdsDcpsInfrastructureES.h -/DdsDcpsPublication_svnt.h -/DdsDcpsPublicationE.idl -/DdsDcpsPublicationEC.cpp -/DdsDcpsPublicationEC.h -/DdsDcpsPublicationES.h -/DdsDcpsSubscription_svnt.h -/DdsDcpsSubscriptionE.idl -/DdsDcpsSubscriptionEC.cpp -/DdsDcpsSubscriptionEC.h -/DdsDcpsSubscriptionES.h -/DdsDcpsTopic_svnt.h -/DdsDcpsTopicE.idl -/DdsDcpsTopicEC.cpp -/DdsDcpsTopicEC.h -/DdsDcpsTopicES.h diff --git a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc deleted file mode 100644 index 362f1e12134..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds/opendds_lem_stub.mpc +++ /dev/null @@ -1,118 +0,0 @@ -project(CIAO_OpenDDS_Dcps_idl_gen): gen_ostream, ccm_lem_stub, ciaoidldefaults, \ - taobaseidldefaults, ccm_lw, ccm_noevent, ccm_direct_collocation { - requires += dds4ccm_opendds - custom_only = 1 - idlflags += -SS -Sci -Scc -Sch -Ssh -Ssc \ - -I$(DDS_ROOT) -I.. \ - -Glem -Gsv -Ssvntt -Ssvntc - - IDL_Files { - gendir = . - idlflags += -Wb,stripped_filename=dds/DdsDcpsInfrastructure.idl - $(DDS_ROOT)/dds/DdsDcpsInfrastructure.idl >> DdsDcpsInfrastructureE.idl DdsDcpsInfrastructure_svnt.h - } - - IDL_Files { - gendir = . - idlflags += -Wb,stripped_filename=dds/DdsDcpsDomain.idl - $(DDS_ROOT)/dds/DdsDcpsDomain.idl >> DdsDcpsDomainE.idl DdsDcpsDomain_svnt.h - } - IDL_Files { - gendir = . - idlflags += -Wb,stripped_filename=dds/DdsDcpsPublication.idl - $(DDS_ROOT)/dds/DdsDcpsPublication.idl >> DdsDcpsPublicationE.idl DdsDcpsPublication_svnt.h - } - IDL_Files { - gendir = . - idlflags += -Wb,stripped_filename=dds/DdsDcpsSubscription.idl - $(DDS_ROOT)/dds/DdsDcpsSubscription.idl >> DdsDcpsSubscriptionE.idl DdsDcpsSubscription_svnt.h - } - IDL_Files { - gendir = . - idlflags += -Wb,stripped_filename=dds/DdsDcpsTopic.idl - $(DDS_ROOT)/dds/DdsDcpsTopic.idl >> DdsDcpsTopicE.idl DdsDcpsTopic_svnt.h - } - - specific { - install_dir = connectors/dds4ccm/idl/dds - } -} - -project (CIAO_OpenDDS_Dcps_lem_gen) : taoidldefaults, install, \ - ciaoidldefaults, taobaseidldefaults, ccm_lw, ccm_noevent, ccm_direct_collocation{ - custom_only = 1 - requires += dds4ccm_opendds - after += CIAO_OpenDDS_Dcps_idl_gen - idlflags += -I$(CIAO_ROOT)/connectors\ - -Wb,stub_export_macro=DDSDCPS_LEM_STUB_Export \ - -Wb,stub_export_include=DdsDcps_lem_stub_export.h \ - -SS -I$(DDS_ROOT) -Ssvntt -Ssvntc -Sci -I.. - - IDL_Files { - idlflags += -Gxhst - DdsDcpsDomainE.idl - } - - IDL_Files { - // DDS specification defined - DdsDcpsInfrastructureE.idl - DdsDcpsPublicationE.idl - DdsDcpsSubscriptionE.idl - DdsDcpsTopicE.idl - } - - Source_Files { - } - - Header_Files { - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl/dds - } -} - -project (CIAO_OpenDDS_Dcps_lem_stub) : taolib, valuetype, dds4ccm, \ - gen_ostream, install, ciao_output, \ - ccm_lem_stub, ciaoidldefaults, taobaseidldefaults, \ - ccm_lw, ccm_noevent, ccm_direct_collocation { - requires += dds4ccm_opendds - after += CCM_stub_idl CCM_session_idl - sharedname = CIAO_OpenDDS_Dcps_lem_stub - dynamicflags += DDSDCPS_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DdsDcpsDomainEC.cpp - DdsDcpsInfrastructureEC.cpp - DdsDcpsPublicationEC.cpp - DdsDcpsSubscriptionEC.cpp - DdsDcpsTopicEC.cpp - } - - Header_Files { - DdsDcpsDomainEC.h - DdsDcpsInfrastructureEC.h - DdsDcpsPublicationEC.h - DdsDcpsSubscriptionEC.h - DdsDcpsTopicEC.h - DdsDcps_lem_stub_export.h - DdsDcpsDomain_svnt.h - DdsDcpsPublication_svnt.h - DdsDcpsSubscription_svnt.h - DdsDcpsTopic_svnt.h - DdsDcpsInfrastructure_svnt.h - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl/dds - } -} diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl deleted file mode 100644 index c060ebfab3f..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @file dds4ccm_Base.idl - */ - -#ifndef DDS4CCM_BASE_IDL3 -#define DDS4CCM_BASE_IDL3 - -#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl" -#include "connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_BaseE.idl" - -module CCM_DDS -{ - typedef unsigned long DataNumber_t; // count or index of data - typedef sequence DataNumberSeq; - const DataNumber_t UNLIMITED = 0; - - enum AccessStatus { - FRESH_INFO, - ALREADY_SEEN - }; - - enum InstanceStatus { - INSTANCE_CREATED, - INSTANCE_FILTERED_IN, - INSTANCE_UPDATED, - INSTANCE_FILTERED_OUT, - INSTANCE_DELETED - }; - - struct ReadInfo { - DDS::InstanceHandle_t instance_handle; - DDS::Time_t source_timestamp; - AccessStatus access_status; - InstanceStatus instance_status; - }; - typedef sequence ReadInfoSeq; - - enum ListenerMode { - NOT_ENABLED, - ONE_BY_ONE, - MANY_BY_MANY - }; - - exception AlreadyCreated { - DataNumberSeq indexes; // of the erroneous - }; - - exception NonExistent{ - DataNumberSeq indexes; // of the erroneous - }; - - exception InternalError{ - DDS::ReturnCode_t error_code; - DataNumber_t index; // of the erroneaous - }; - - exception NonChangeable { - }; - - local interface ContentFilterSetting { - void set_filter_parameters (in DDS::StringSeq parameters) - raises (InternalError); - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl deleted file mode 100644 index ad91514b2c9..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef DDS4CCM_CONNECTOR_IDL -#define DDS4CCM_CONNECTOR_IDL - -#include -#include "connectors/dds4ccm/idl/dds4ccm_Base.idl" -#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_ConnectorE.idl" - -module CCM_DDS -{ - connector DDS_Base { - uses ConnectorStatusListener error_listener; - attribute DDS::DomainId_t domain_id - setraises (NonChangeable); - attribute string qos_profile - setraises (NonChangeable); - }; - connector DDS_TopicBase : DDS_Base { - attribute string topic_name - setraises (NonChangeable); - attribute DDS::StringSeq key_fields - setraises (NonChangeable); - /// The type_name that will be used by DDS4CCM when - /// registering the topic to DDS. If empty the default - /// typename from the DDS typesupport will be used, this - /// default typename is vendor specific - attribute string type_name; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl deleted file mode 100644 index 487f3e5d2ea..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file dds4ccm_ConnectorStatusListener.idl - */ - -#ifndef DDS4CCM_CONNECTORSTATUSLISTNER_IDL3 -#define DDS4CCM_CONNECTORSTATUSLISTNER_IDL3 - -#include "connectors/dds4ccm/idl/dds4ccm_Base.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListenerE.idl" - -module CCM_DDS -{ - local interface ConnectorStatusListener { - // status that are relevant system-wide - void on_inconsistent_topic(in DDS::Topic the_topic, - in DDS::InconsistentTopicStatus status); - void on_requested_incompatible_qos(in DDS::DataReader the_reader, - in DDS::RequestedIncompatibleQosStatus status); - void on_sample_rejected(in DDS::DataReader the_reader, - in DDS::SampleRejectedStatus status); - void on_offered_deadline_missed(in DDS::DataWriter the_writer, - in DDS::OfferedDeadlineMissedStatus status); - void on_offered_incompatible_qos(in DDS::DataWriter the_writer, - in DDS::OfferedIncompatibleQosStatus status); - void on_unexpected_status (in DDS::Entity the_entity, - in DDS::StatusKind status_kind); - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl deleted file mode 100644 index 9fe611810bf..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file dds4ccm_DataListenerControl.idl - */ - -#ifndef DDS4CCM_LISTENERCONTROL_IDL3 -#define DDS4CCM_LISTENERCONTROL_IDL3 - -#include "connectors/dds4ccm/idl/dds4ccm_Base.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_DataListenerControlE.idl" - -module CCM_DDS -{ - local interface DataListenerControl { - attribute ListenerMode mode; - attribute DataNumber_t max_delivered_data; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl deleted file mode 100644 index 0535eecae1c..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Entity.idl +++ /dev/null @@ -1,145 +0,0 @@ -#ifndef DDS4CCM_ENTITY -#define DDS4CCM_ENTITY - -#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl" - -/** - * Typed DDS apis defined in IDL, CIAO specific extension - */ -module DDS_Entity TSeq> { - local interface DataWriter : ::DDS::DataWriter { - DDS::InstanceHandle_t register_instance( - in T instance_data); - DDS::InstanceHandle_t register_instance_w_timestamp( - in T instance_data, - in DDS::Time_t source_timestamp); - DDS::ReturnCode_t unregister_instance( - in T instance_data, - in DDS::InstanceHandle_t handle); - DDS::ReturnCode_t unregister_instance_w_timestamp( - in T instance_data, - in DDS::InstanceHandle_t handle, - in DDS::Time_t source_timestamp); - DDS::ReturnCode_t write( - in T instance_data, - in DDS::InstanceHandle_t handle); - DDS::ReturnCode_t write_w_timestamp( - in T instance_data, - in DDS::InstanceHandle_t handle, - in DDS::Time_t source_timestamp); - DDS::ReturnCode_t dispose( - in T instance_data, - in DDS::InstanceHandle_t instance_handle); - DDS::ReturnCode_t dispose_w_timestamp( - in T instance_data, - in DDS::InstanceHandle_t instance_handle, - in DDS::Time_t source_timestamp); - DDS::ReturnCode_t get_key_value( - inout T key_holder, - in DDS::InstanceHandle_t handle); - DDS::InstanceHandle_t lookup_instance( - in T instance_data); - }; - - local interface DataReader : ::DDS::DataReader { - DDS::ReturnCode_t read( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t take( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t read_w_condition( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::ReadCondition a_condition); - - DDS::ReturnCode_t take_w_condition( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::ReadCondition a_condition); - - DDS::ReturnCode_t read_next_sample( - inout T data_values, - inout DDS::SampleInfo sample_info); - - DDS::ReturnCode_t take_next_sample( - inout T data_values, - inout DDS::SampleInfo sample_info); - - DDS::ReturnCode_t read_instance( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t a_handle, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t take_instance( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t a_handle, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t read_next_instance( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t previous_handle, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t take_next_instance( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t previous_handle, - in DDS::SampleStateMask sample_states, - in DDS::ViewStateMask view_states, - in DDS::InstanceStateMask instance_states); - - DDS::ReturnCode_t read_next_instance_w_condition( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t previous_handle, - in DDS::ReadCondition a_condition); - - DDS::ReturnCode_t take_next_instance_w_condition( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos, - in long max_samples, - in DDS::InstanceHandle_t previous_handle, - in DDS::ReadCondition a_condition); - - DDS::ReturnCode_t return_loan ( - inout TSeq data_values, - inout DDS::SampleInfoSeq sample_infos); - - DDS::ReturnCode_t get_key_value( - inout T key_holder, - in DDS::InstanceHandle_t handle); - - DDS::InstanceHandle_t lookup_instance( - in T instance_data); - }; -}; - -#endif - diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl deleted file mode 100644 index eadc949c6f9..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file dds4ccm_PortStatusListener.idl - */ - -#ifndef DDS4CCM_PORTSTATUSLISTNER_IDL3 -#define DDS4CCM_PORTSTATUSLISTNER_IDL3 - -#include "connectors/dds4ccm/idl/dds4ccm_Base.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_PortStatusListenerE.idl" - -module CCM_DDS -{ - local interface PortStatusListener { - void on_requested_deadline_missed(in DDS::DataReader the_reader, - in DDS::RequestedDeadlineMissedStatus status); - void on_sample_lost(in DDS::DataReader the_reader, - in DDS::SampleLostStatus status); - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl deleted file mode 100644 index 885eab03aec..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file dds4ccm_QueryFilter.idl - */ - -#ifndef DDS4CCM_QUERYFILTER_IDL3 -#define DDS4CCM_QUERYFILTER_IDL3 - -#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl" - -module CCM_DDS -{ - struct QueryFilter { - string expression; - ::DDS::StringSeq parameters; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl deleted file mode 100644 index 521fbf8c70a..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file dds4ccm_StateListenerControl.idl - */ - -#ifndef DDS4CCM_STATELISTENERCONTROL_IDL -#define DDS4CCM_STATELISTENERCONTROL_IDL - -#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl" - -#pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_StateListenerControlE.idl" - -module CCM_DDS -{ - local interface StateListenerControl : DataListenerControl { - attribute boolean is_filter_interpreted; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc deleted file mode 100644 index 25451e58bf9..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc +++ /dev/null @@ -1,68 +0,0 @@ -// -*- MPC -*- -project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { - custom_only = 1 - after += DDS4CCM_idl_gen - idlflags += -I$(CIAO_ROOT)/connectors \ - -Wb,stub_export_macro=DDS4CCM_LEM_STUB_Export \ - -Wb,stub_export_include=dds4ccm_lem_stub_export.h -SS -Sci - - IDL_Files { - idlflags += -Gxhst -Sci - dds_rtf2_dcpsE.idl - } - - IDL_Files { - dds4ccm_BaseE.idl - dds4ccm_PortStatusListenerE.idl - dds4ccm_DataListenerControlE.idl - dds4ccm_ConnectorStatusListenerE.idl - dds4ccm_StateListenerControlE.idl - dds4ccm_ConnectorE.idl - } - - specific { - install_dir = connectors/dds4ccm/idl - } -} - -project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, \ - ciaolib_with_idl, ciao_output, taolib, valuetype, \ - ifr_client { - after += DDS4CCM_stub DDS4CCM_lem_gen CIAO_NDDS_lem_stub CIAO_OpenDDS_Dcps_lem_stub - libs += DDS4CCM_stub - includes += $(CIAO_ROOT)/connectors - sharedname = DDS4CCM_lem_stub - dynamicflags += DDS4CCM_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - dds4ccm_BaseEC.cpp - dds_rtf2_dcpsEC.cpp - dds4ccm_PortStatusListenerEC.cpp - dds4ccm_DataListenerControlEC.cpp - dds4ccm_ConnectorStatusListenerEC.cpp - dds4ccm_StateListenerControlEC.cpp - dds4ccm_ConnectorEC.cpp - } - - Header_Files { - dds4ccm_BaseEC.h - dds_rtf2_dcpsEC.h - dds4ccm_PortStatusListenerEC.h - dds4ccm_DataListenerControlEC.h - dds4ccm_ConnectorStatusListenerEC.h - dds4ccm_StateListenerControlEC.h - dds4ccm_ConnectorEC.h - dds4ccm_lem_stub_export.h - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl - } -} - diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc deleted file mode 100644 index 929fb16e33c..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ /dev/null @@ -1,48 +0,0 @@ -project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \ - ciao_output, taolib, portableserver, ciao_servant { - includes += $(CIAO_ROOT)/connectors - - dynamicflags += DDS4CCM_SKEL_BUILD_DLL - IDL_Files { - } - - Header_Files { - dds4ccm_skel_export.h - dds4ccm_EntityS.h - ccm_ddsS.h - dds4ccm_BaseS.h - dds4ccm_QueryFilterS.h - dds4ccm_PortStatusListenerS.h - dds4ccm_DataListenerControlS.h - dds4ccm_StateListenerControlS.h - dds4ccm_ConnectorStatusListenerS.h - dds4ccm_ConnectorS.h - dds_rtf2_dcpsS.h - dds4ccm_Base_svnt.h - dds4ccm_Connector_svnt.h - dds4ccm_Connector_svnt_T.h - dds4ccm_PortStatusListener_svnt.h - dds4ccm_DataListenerControl_svnt.h - dds4ccm_ConnectorStatusListener_svnt.h - dds4ccm_StateListenerControl_svnt.h - } - - Source_Files { - dds4ccm_ConnectorS.cpp - dds4ccm_Connector_svnt.cpp - } - - Inline_Files { - } - - Template_Files { - dds4ccm_Connector_svnt_T.cpp - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl - } -} diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc deleted file mode 100644 index 051d64d5762..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ /dev/null @@ -1,89 +0,0 @@ -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 \ - -Wb,skel_export_macro=DDS4CCM_SKEL_Export \ - -Wb,skel_export_include=dds4ccm_skel_export.h \ - -I$(CIAO_ROOT)/connectors - - IDL_Files { - idlflags += -Gxhst -Gxhsk -SS -Ssvntc -Ssvntt -Sci - dds4ccm_Base.idl - } - - IDL_Files { - idlflags -= -Gxhst -Gxhsk -Gsv -Glem - idlflags -= -St -Sa - idlflags += -SS -Sci - dds4ccm_QueryFilter.idl - } - - IDL_Files { - idlflags -= -Gxhst -Gxhsk -Gsv -Glem - idlflags += -Sci -SS - dds4ccm_Entity.idl - ccm_dds.idl - } - - IDL_Files { - idlflags -= -Gxhst -Gxhsk - dds4ccm_Connector.idl - } - - IDL_Files { - idlflags -= -Gxhst -Gxhsk - idlflags += -Ssvntc -Ssvntt -SS -Sci - dds4ccm_ConnectorStatusListener.idl - dds4ccm_DataListenerControl.idl - dds4ccm_PortStatusListener.idl - dds4ccm_StateListenerControl.idl - dds_rtf2_dcps.idl - } - - specific { - install_dir = connectors/dds4ccm/idl - } -} - -project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib { - after += DDS4CCM_idl_gen - includes += $(CIAO_ROOT)/connectors - - dynamicflags += DDS4CCM_STUB_BUILD_DLL - IDL_Files { - } - - Header_Files { - dds4ccm_stub_export.h - dds4ccm_EntityC.h - ccm_ddsC.h - dds4ccm_BaseC.h - dds4ccm_QueryFilterC.h - dds4ccm_PortStatusListenerC.h - dds4ccm_DataListenerControlC.h - dds4ccm_ConnectorStatusListenerC.h - dds4ccm_StateListenerControlC.h - dds4ccm_ConnectorC.h - dds_rtf2_dcpsC.h - } - - Source_Files { - dds4ccm_BaseC.cpp - dds4ccm_QueryFilterC.cpp - dds4ccm_PortStatusListenerC.cpp - dds4ccm_DataListenerControlC.cpp - dds4ccm_ConnectorStatusListenerC.cpp - dds4ccm_StateListenerControlC.cpp - dds4ccm_ConnectorC.cpp - dds_rtf2_dcpsC.cpp - } - - Inline_Files { - dds4ccm_ConnectorC.inl - } - - specific { - install_dir = connectors/dds4ccm/idl - } -} - diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl deleted file mode 100644 index fe8ab421af0..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef DDS_RFT2_DCPS_IDL -#define DDS_RFT2_DCPS_IDL - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "dds/DdsDcps.idl" -#endif - -#if (CIAO_DDS4CCM_NDDS==1) -# include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl" -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl deleted file mode 100644 index 64e62203ec8..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl +++ /dev/null @@ -1,1254 +0,0 @@ -#ifndef NDDS_DCPS_IDL -#define NDDS_DCPS_IDL - -#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcpsE.idl" - -# define DOMAINID_TYPE_NATIVE long -# define HANDLE_TYPE_NATIVE long -# define HANDLE_NIL_NATIVE 0 -# define BUILTIN_TOPIC_KEY_TYPE_NATIVE long - -#define TheParticipantFactory -#define PARTICIPANT_QOS_DEFAULT -#define TOPIC_QOS_DEFAULT -#define PUBLISHER_QOS_DEFAULT -#define SUBSCRIBER_QOS_DEFAULT -#define DATAWRITER_QOS_DEFAULT -#define DATAREADER_QOS_DEFAULT -#define DATAWRITER_QOS_USE_TOPIC_QOS -#define DATAREADER_QOS_USE_TOPIC_QOS - -#include "tao/StringSeq.pidl" -#include "connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl" - -module DDS { - typedef long DomainId_t; - typedef long long_3[3]; - - struct BuiltinTopicKey_t { - long_3 value; - }; - - typedef long ReturnCode_t; - typedef long QosPolicyId_t; - typedef sequence StringSeq; - - struct Duration_t { - long sec; - unsigned long nanosec; - }; - - struct Time_t { - long sec; - unsigned long nanosec; - }; - - // ---------------------------------------------------------------------- - // Pre-defined values - // ---------------------------------------------------------------------- - //const InstanceHandle_t HANDLE_NIL = 0; - - const long LENGTH_UNLIMITED = -1; - - const long DURATION_INFINITE_SEC = 0x7fffffff; - const unsigned long DURATION_INFINITE_NSEC = 0x7fffffff; - - const long DURATION_ZERO_SEC = 0; - const unsigned long DURATION_ZERO_NSEC = 0; - - const long TIME_INVALID_SEC = -1; - const unsigned long TIME_INVALID_NSEC = 0xffffffff; - - // ---------------------------------------------------------------------- - // Return codes - // ---------------------------------------------------------------------- - const ReturnCode_t RETCODE_OK = 0; - const ReturnCode_t RETCODE_ERROR = 1; - const ReturnCode_t RETCODE_UNSUPPORTED = 2; - const ReturnCode_t RETCODE_BAD_PARAMETER = 3; - const ReturnCode_t RETCODE_PRECONDITION_NOT_MET = 4; - const ReturnCode_t RETCODE_OUT_OF_RESOURCES = 5; - const ReturnCode_t RETCODE_NOT_ENABLED = 6; - const ReturnCode_t RETCODE_IMMUTABLE_POLICY = 7; - const ReturnCode_t RETCODE_INCONSISTENT_POLICY = 8; - const ReturnCode_t RETCODE_ALREADY_DELETED = 9; - const ReturnCode_t RETCODE_TIMEOUT = 10; - const ReturnCode_t RETCODE_NO_DATA = 11; - const ReturnCode_t RETCODE_ILLEGAL_OPERATION = 12; - - // ---------------------------------------------------------------------- - // Status to support listeners and conditions - // ---------------------------------------------------------------------- - - typedef unsigned long StatusKind; - typedef unsigned long StatusMask; // bit-mask StatusKind - - const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0; - const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1; - const StatusKind REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 << 2; - const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 5; - const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 6; - const StatusKind SAMPLE_LOST_STATUS = 0x0001 << 7; - const StatusKind SAMPLE_REJECTED_STATUS = 0x0001 << 8; - const StatusKind DATA_ON_READERS_STATUS = 0x0001 << 9; - const StatusKind DATA_AVAILABLE_STATUS = 0x0001 << 10; - const StatusKind LIVELINESS_LOST_STATUS = 0x0001 << 11; - const StatusKind LIVELINESS_CHANGED_STATUS = 0x0001 << 12; - const StatusKind PUBLICATION_MATCHED_STATUS = 0x0001 << 13; - const StatusKind SUBSCRIPTION_MATCHED_STATUS = 0x0001 << 14; - const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS = 0x00000001 << 24; - const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS = 0x00000001 << 25; - - struct InconsistentTopicStatus { - long total_count; - long total_count_change; - }; - - struct SampleLostStatus { - long total_count; - long total_count_change; - }; - - enum SampleRejectedStatusKind { - NOT_REJECTED, - REJECTED_BY_INSTANCES_LIMIT, - REJECTED_BY_SAMPLES_LIMIT, - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT, - REJECTED_BY_REMOTE_WRITERS_LIMIT, /* RTI Extension */ - REJECTED_BY_REMOTE_WRITERS_PER_INSTANCE_LIMIT, /* RTI Extension */ - REJECTED_BY_SAMPLES_PER_REMOTE_WRITER_LIMIT, /* RTI Extension */ - REJECTED_BY_VIRTUAL_WRITERS_LIMIT, /* RTI DDS 5.0.0 Extension */ - REJECTED_BY_REMOTE_WRITERS_PER_SAMPLE_LIMIT, /* RTI DDS 5.0.0 Extension */ - REJECTED_BY_REMOTE_WRITER_SAMPLES_PER_VIRTUAL_QUEUE_LIMIT /* RTI DDS 5.0.0 Extension */ - }; - - struct SampleRejectedStatus { - long total_count; - long total_count_change; - SampleRejectedStatusKind last_reason; - InstanceHandle_t last_instance_handle; - }; - - struct LivelinessLostStatus { - long total_count; - long total_count_change; - }; - - struct LivelinessChangedStatus { - long alive_count; - long not_alive_count; - long alive_count_change; - long not_alive_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct OfferedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct RequestedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct QosPolicyCount { - QosPolicyId_t policy_id; - long count; - }; - - typedef sequence QosPolicyCountSeq; - - struct OfferedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct RequestedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct PublicationMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_subscription_handle; - }; - - struct SubscriptionMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct ReliableReaderActivityChangedStatus { - long active_count; - long inactive_count; - long active_count_change; - long inactive_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct ReliableWriterCacheEventCount { - long total_count; - long total_count_change; - }; - - struct ReliableWriterCacheChangedStatus { - ReliableWriterCacheEventCount empty_reliable_writer_cache; - ReliableWriterCacheEventCount full_reliable_writer_cache; - ReliableWriterCacheEventCount low_watermark_reliable_writer_cache; - ReliableWriterCacheEventCount high_watermark_reliable_writer_cache; - long unacknowledged_sample_count; - long unacknowledged_sample_count_peak; - }; - - enum TypeConsistencyKind { - DISALLOW_TYPE_COERCION, - ALLOW_TYPE_COERCION - }; - - struct TypeConsistencyEnforcementQosPolicy { - TypeConsistencyKind kind; - }; - - // ---------------------------------------------------------------------- - // Listeners - // ---------------------------------------------------------------------- - - local interface Listener; - local interface Entity; - local interface TopicDescription; - local interface Topic; - local interface ContentFilteredTopic; - local interface MultiTopic; - local interface DataWriter; - local interface DataReader; - local interface Subscriber; - local interface Publisher; - - typedef sequence DataReaderSeq; - - local interface Listener {}; - - local interface TopicListener : Listener { - void on_inconsistent_topic(in Topic the_topic, - in InconsistentTopicStatus status); - }; - - local interface DataWriterListener : Listener { - void on_offered_deadline_missed( - in DataWriter writer, - in OfferedDeadlineMissedStatus status); - void on_offered_incompatible_qos( - in DataWriter writer, - in OfferedIncompatibleQosStatus status); - void on_liveliness_lost( - in DataWriter writer, - in LivelinessLostStatus status); - void on_publication_matched( - in DataWriter writer, - in PublicationMatchedStatus status); - void on_reliable_writer_cache_changed ( - in DataWriter writer, - in ReliableWriterCacheChangedStatus status); - void on_reliable_reader_activity_changed ( - in DataWriter writer, - in ReliableReaderActivityChangedStatus status); - }; - - local interface PublisherListener : DataWriterListener { - }; - - local interface DataReaderListener : Listener { - void on_requested_deadline_missed( - in DataReader the_reader, - in RequestedDeadlineMissedStatus status); - void on_requested_incompatible_qos( - in DataReader the_reader, - in RequestedIncompatibleQosStatus status); - void on_sample_rejected( - in DataReader the_reader, - in SampleRejectedStatus status); - void on_liveliness_changed( - in DataReader the_reader, - in LivelinessChangedStatus status); - void on_data_available( - in DataReader the_reader); - void on_subscription_matched( - in DataReader the_reader, - in SubscriptionMatchedStatus status); - void on_sample_lost( - in DataReader the_reader, - in SampleLostStatus status); - }; - - local interface SubscriberListener : DataReaderListener { - void on_data_on_readers( - in Subscriber the_subscriber); - }; - - - local interface DomainParticipantListener : TopicListener, - PublisherListener, - SubscriberListener { - }; - - - // ---------------------------------------------------------------------- - // Conditions - // ---------------------------------------------------------------------- - - local interface Condition { - boolean get_trigger_value(); - }; - - typedef sequence ConditionSeq; - - local interface WaitSet { - ReturnCode_t wait( - inout ConditionSeq active_conditions, - in Duration_t timeout); - ReturnCode_t attach_condition( - in Condition cond); - ReturnCode_t detach_condition( - in Condition cond); - ReturnCode_t get_conditions( - inout ConditionSeq attached_conditions); - }; - - local interface GuardCondition : Condition { - ReturnCode_t set_trigger_value( - in boolean value); - }; - - local interface StatusCondition : Condition { - StatusMask get_enabled_statuses(); - ReturnCode_t set_enabled_statuses( - in StatusMask mask); - Entity get_entity(); - }; - - /// Sample states to support reads - typedef unsigned long SampleStateKind; - const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0; - const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1; - - /// This is a bit-mask SampleStateKind - typedef unsigned long SampleStateMask; - const SampleStateMask ANY_SAMPLE_STATE = 0xffff; - - /// View states to support reads - typedef unsigned long ViewStateKind; - const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0; - const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1; - - /// This is a bit-mask ViewStateKind - typedef unsigned long ViewStateMask; - const ViewStateMask ANY_VIEW_STATE = 0xffff; - - /// Instance states to support reads - typedef unsigned long InstanceStateKind; - const InstanceStateKind ALIVE_INSTANCE_STATE = 0x0001 << 0; - const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 << 1; - const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2; - - /// This is a bit-mask InstanceStateKind - typedef unsigned long InstanceStateMask; - const InstanceStateMask ANY_INSTANCE_STATE = 0xffff; - const InstanceStateMask NOT_ALIVE_INSTANCE_STATE = 0x006; - - local interface ReadCondition : Condition { - SampleStateMask get_sample_state_mask(); - ViewStateMask get_view_state_mask(); - InstanceStateMask get_instance_state_mask(); - DataReader get_datareader(); - }; - - local interface QueryCondition : ReadCondition { - string get_query_expression(); - ReturnCode_t get_query_parameters( - inout StringSeq query_parameters); - ReturnCode_t set_query_parameters( - in StringSeq query_parameters); - }; - - // ---------------------------------------------------------------------- - // Qos - // ---------------------------------------------------------------------- - const string USERDATA_QOS_POLICY_NAME = "UserData"; - const string DURABILITY_QOS_POLICY_NAME = "Durability"; - const string PRESENTATION_QOS_POLICY_NAME = "Presentation"; - const string DEADLINE_QOS_POLICY_NAME = "Deadline"; - const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget"; - const string OWNERSHIP_QOS_POLICY_NAME = "Ownership"; - const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength"; - const string LIVELINESS_QOS_POLICY_NAME = "Liveliness"; - const string TIMEBASEDFILTER_QOS_POLICY_NAME = "TimeBasedFilter"; - const string PARTITION_QOS_POLICY_NAME = "Partition"; - const string RELIABILITY_QOS_POLICY_NAME = "Reliability"; - const string DESTINATIONORDER_QOS_POLICY_NAME = "DestinationOrder"; - const string HISTORY_QOS_POLICY_NAME = "History"; - const string RESOURCELIMITS_QOS_POLICY_NAME = "ResourceLimits"; - const string ENTITYFACTORY_QOS_POLICY_NAME = "EntityFactory"; - const string WRITERDATALIFECYCLE_QOS_POLICY_NAME = "WriterDataLifecycle"; - const string READERDATALIFECYCLE_QOS_POLICY_NAME = "ReaderDataLifecycle"; - const string TOPICDATA_QOS_POLICY_NAME = "TopicData"; - const string GROUPDATA_QOS_POLICY_NAME = "TransportPriority"; - const string LIFESPAN_QOS_POLICY_NAME = "Lifespan"; - const string DURABILITYSERVICE_POLICY_NAME = "DurabilityService"; - - const QosPolicyId_t INVALID_QOS_POLICY_ID = 0; - const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1; - const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2; - const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3; - const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4; - const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5; - const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6; - const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7; - const QosPolicyId_t LIVELINESS_QOS_POLICY_ID = 8; - const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID = 9; - const QosPolicyId_t PARTITION_QOS_POLICY_ID = 10; - const QosPolicyId_t RELIABILITY_QOS_POLICY_ID = 11; - const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID = 12; - const QosPolicyId_t HISTORY_QOS_POLICY_ID = 13; - const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID = 14; - const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID = 15; - const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID = 16; - const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID = 17; - const QosPolicyId_t TOPICDATA_QOS_POLICY_ID = 18; - const QosPolicyId_t GROUPDATA_QOS_POLICY_ID = 19; - const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID = 20; - const QosPolicyId_t LIFESPAN_QOS_POLICY_ID = 21; - const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID = 22; - const QosPolicyId_t TYPE_CONSISTENCY_ENFORCEMENT_QOS_POLICY_ID = 24; - - /* --- Extension QoS policies: --- */ - const QosPolicyId_t WIREPROTOCOL_QOS_POLICY_ID = 1000; - const QosPolicyId_t DISCOVERY_QOS_POLICY_ID = 1001; - const QosPolicyId_t DATAREADERRESOURCELIMITS_QOS_POLICY_ID = 1003; - const QosPolicyId_t DATAWRITERRESOURCELIMITS_QOS_POLICY_ID = 1004; - const QosPolicyId_t DATAREADERPROTOCOL_QOS_POLICY_ID = 1005; - const QosPolicyId_t DATAWRITERPROTOCOL_QOS_POLICY_ID = 1006; - const QosPolicyId_t DOMAINPARTICIPANTRESOURCELIMITS_QOS_POLICY_ID = 1007; - const QosPolicyId_t EVENT_QOS_POLICY_ID = 1008; - const QosPolicyId_t DATABASE_QOS_POLICY_ID = 1009; - const QosPolicyId_t RECEIVERPOOL_QOS_POLICY_ID = 1010; - const QosPolicyId_t DISCOVERYCONFIG_QOS_POLICY_ID = 1011; - const QosPolicyId_t EXCLUSIVEAREA_QOS_POLICY_ID = 1012; - const QosPolicyId_t USEROBJECT_QOS_POLICY_ID = 1013; - const QosPolicyId_t SYSTEMRESOURCELIMITS_QOS_POLICY_ID = 1014; - const QosPolicyId_t TRANSPORTSELECTION_QOS_POLICY_ID = 1015; - const QosPolicyId_t TRANSPORTUNICAST_QOS_POLICY_ID = 1016; - const QosPolicyId_t TRANSPORTMULTICAST_QOS_POLICY_ID = 1017; - const QosPolicyId_t TRANSPORTBUILTIN_QOS_POLICY_ID = 1018; - const QosPolicyId_t TYPESUPPORT_QOS_POLICY_ID = 1019; - const QosPolicyId_t PROPERTY_QOS_POLICY_ID = 1020; - const QosPolicyId_t PUBLISHMODE_QOS_POLICY_ID = 1021; - const QosPolicyId_t ASYNCHRONOUSPUBLISHER_QOS_POLICY_ID = 1022; - const QosPolicyId_t ENTITYNAME_QOS_POLICY_ID = 1023; - const QosPolicyId_t SERVICE_QOS_POLICY_ID = 1025; - const QosPolicyId_t BATCH_QOS_POLICY_ID = 1026; - const QosPolicyId_t PROFILE_QOS_POLICY_ID = 1027; - const QosPolicyId_t LOCATORFILTER_QOS_POLICY_ID = 1028; - const QosPolicyId_t MULTICHANNEL_QOS_POLICY_ID = 1029; - const QosPolicyId_t TRANSPORTENCAPSULATION_QOS_POLICY_ID = 1030; - const QosPolicyId_t PUBLISHERPROTOCOL_QOS_POLICY_ID = 1031; - const QosPolicyId_t SUBSCRIBERPROTOCOL_QOS_POLICY_ID = 1032; - const QosPolicyId_t TOPICPROTOCOL_QOS_POLICY_ID = 1033; - const QosPolicyId_t DOMAINPARTICIPANTPROTOCOL_QOS_POLICY_ID = 1034; - const QosPolicyId_t AVAILABILITY_QOS_POLICY_ID = 1035; - const QosPolicyId_t TRANSPORTMULTICASTMAPPING_QOS_POLICY_ID = 1036; - const QosPolicyId_t LOGGING_QOS_POLICY_ID = 1037; - - typedef sequence OctetSeq; - struct UserDataQosPolicy { - OctetSeq value; - }; - - struct TopicDataQosPolicy { - OctetSeq value; - }; - - struct GroupDataQosPolicy { - OctetSeq value; - }; - - struct TransportPriorityQosPolicy { - long value; - }; - - struct LifespanQosPolicy { - Duration_t duration; - }; - - enum DurabilityQosPolicyKind { - VOLATILE_DURABILITY_QOS, - TRANSIENT_LOCAL_DURABILITY_QOS, - TRANSIENT_DURABILITY_QOS, - PERSISTENT_DURABILITY_QOS - }; - struct DurabilityQosPolicy { - DurabilityQosPolicyKind kind; - }; - - enum PresentationQosPolicyAccessScopeKind { - INSTANCE_PRESENTATION_QOS, - TOPIC_PRESENTATION_QOS, - GROUP_PRESENTATION_QOS, - HIGHEST_OFFERED_PRESENTATION_QOS /* RTI DDS 5.0.0 Extension */ - }; - struct PresentationQosPolicy { - PresentationQosPolicyAccessScopeKind access_scope; - boolean coherent_access; - boolean ordered_access; - }; - - struct DeadlineQosPolicy { - Duration_t period; - }; - - struct LatencyBudgetQosPolicy { - Duration_t duration; - }; - - enum OwnershipQosPolicyKind { - SHARED_OWNERSHIP_QOS, - EXCLUSIVE_OWNERSHIP_QOS - }; - struct OwnershipQosPolicy { - OwnershipQosPolicyKind kind; - }; - - struct OwnershipStrengthQosPolicy { - long value; - }; - - enum LivelinessQosPolicyKind { - AUTOMATIC_LIVELINESS_QOS, - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, - MANUAL_BY_TOPIC_LIVELINESS_QOS - }; - - struct LivelinessQosPolicy { - LivelinessQosPolicyKind kind; - Duration_t lease_duration; - }; - - struct TimeBasedFilterQosPolicy { - Duration_t minimum_separation; - }; - - struct PartitionQosPolicy { - StringSeq name; - }; - - enum ReliabilityQosPolicyKind { - BEST_EFFORT_RELIABILITY_QOS, - RELIABLE_RELIABILITY_QOS - }; - - struct ReliabilityQosPolicy { - ReliabilityQosPolicyKind kind; - Duration_t max_blocking_time; - }; - - enum DestinationOrderQosPolicyKind { - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - }; - - enum DestinationOrderQosPolicyScopeKind { - INSTANCE_SCOPE_DESTINATIONORDER_QOS, - TOPIC_SCOPE_DESTINATIONORDER_QOS - }; - - enum DataWriterResourceLimitsInstanceReplacementKind { - UNREGISTERED_INSTANCE_REPLACEMENT, - ALIVE_INSTANCE_REPLACEMENT, - DISPOSED_INSTANCE_REPLACEMENT, - ALIVE_THEN_DISPOSED_INSTANCE_REPLACEMENT, - DISPOSED_THEN_ALIVE_INSTANCE_REPLACEMENT, - ALIVE_OR_DISPOSED_INSTANCE_REPLACEMENT - }; - - struct DestinationOrderQosPolicy { - DestinationOrderQosPolicyKind kind; - DestinationOrderQosPolicyScopeKind scope; - Duration_t source_timestamp_tolerance; - }; - - enum HistoryQosPolicyKind { - KEEP_LAST_HISTORY_QOS, - KEEP_ALL_HISTORY_QOS - }; - - enum RefilterQosPolicyKind { - NONE_REFILTER_QOS, - ALL_REFILTER_QOS, - ON_DEMAND_REFILTER_QOS - }; - - struct HistoryQosPolicy { - HistoryQosPolicyKind kind; - long depth; - RefilterQosPolicyKind refilter; - }; - - struct ResourceLimitsQosPolicy { - long max_samples; - long max_instances; - long max_samples_per_instance; - long initial_samples; - long initial_instances; - long instance_hash_buckets; - }; - - struct EntityFactoryQosPolicy { - boolean autoenable_created_entities; - }; - - struct WriterDataLifecycleQosPolicy { - boolean autodispose_unregistered_instances; - }; - - struct DataReaderResourceLimitsQosPolicy { - long max_remote_writers; - long max_remote_writers_per_instance; - long max_samples_per_remote_writer; - long max_infos; - long initial_remote_writers; - long initial_remote_writers_per_instance; - long initial_infos; - long initial_outstanding_reads; - long max_outstanding_reads; - long max_samples_per_read; - boolean disable_fragmentation_support; - long max_fragmented_samples; - long initial_fragmented_samples; - long max_fragmented_samples_per_remote_writer; - long max_fragments_per_sample; - boolean dynamically_allocate_fragmented_samples; - long max_total_instances; - long max_remote_virtual_writers_per_instance; - long initial_remote_virtual_writers_per_instance; - long max_query_condition_filters; - }; - - struct DataWriterResourceLimitsQosPolicy { - long initial_concurrent_blocking_threads; - long max_concurrent_blocking_threads; - long max_remote_reader_filters; - long initial_batches; - long max_batches; - long cookie_max_length; - DataWriterResourceLimitsInstanceReplacementKind instance_replacement; - boolean replace_empty_instances; - boolean autoregister_instances; - }; - - struct ReaderDataLifecycleQosPolicy { - Duration_t autopurge_nowriter_samples_delay; - Duration_t autopurge_disposed_samples_delay; - }; - - struct DurabilityServiceQosPolicy { - Duration_t service_cleanup_delay; - HistoryQosPolicyKind history_kind; - long history_depth; - long max_samples; - long max_instances; - long max_samples_per_instance; - }; - - struct DomainParticipantFactoryQos { - EntityFactoryQosPolicy entity_factory; - }; - - struct DomainParticipantQos { - UserDataQosPolicy user_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct TopicQos { - TopicDataQosPolicy topic_data; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - OwnershipQosPolicy ownership; - }; - - struct DataWriterQos { - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - WriterDataLifecycleQosPolicy writer_data_lifecycle; - - DataWriterResourceLimitsQosPolicy writer_resource_limits; - }; - - struct PublisherQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct DataReaderQos { - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - TimeBasedFilterQosPolicy time_based_filter; - ReaderDataLifecycleQosPolicy reader_data_lifecycle; - - DataReaderResourceLimitsQosPolicy reader_resource_limits; - - TypeConsistencyEnforcementQosPolicy type_consistency; - }; - - struct SubscriberQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - // ---------------------------------------------------------------------- - - struct ParticipantBuiltinTopicData { - BuiltinTopicKey_t key; - UserDataQosPolicy user_data; - }; - - struct TopicBuiltinTopicData { - BuiltinTopicKey_t key; - string name; - string type_name; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - OwnershipQosPolicy ownership; - TopicDataQosPolicy topic_data; - }; - - struct PublicationBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - LifespanQosPolicy lifespan; - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - DestinationOrderQosPolicy destination_order; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - struct SubscriptionBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - OwnershipQosPolicy ownership; - DestinationOrderQosPolicy destination_order; - UserDataQosPolicy user_data; - TimeBasedFilterQosPolicy time_based_filter; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - // ---------------------------------------------------------------------- - local interface Entity { - // ReturnCode_t set_qos( - // in EntityQos qos); - // ReturnCode_t get_qos( - // inout EntityQos qos); - // ReturnCode_t set_listener( - // in Listener l, - // in StatusMask mask); - // Listener get_listener(); - - ReturnCode_t enable(); - - StatusCondition get_statuscondition(); - - StatusMask get_status_changes(); - - InstanceHandle_t get_instance_handle(); - }; - - // ---------------------------------------------------------------------- - local interface DomainParticipant : Entity { - // Factory interfaces - Publisher create_publisher( - in PublisherQos qos, - in PublisherListener a_listener, - in StatusMask mask); - Publisher create_publisher_with_profile( - in string qos_profile, - in PublisherListener a_listener, - in StatusMask mask); - ReturnCode_t delete_publisher( - in Publisher p); - - Subscriber create_subscriber( - in SubscriberQos qos, - in SubscriberListener a_listener, - in StatusMask mask); - Subscriber create_subscriber_with_profile( - in string qos_profile, - in SubscriberListener a_listener, - in StatusMask mask); - ReturnCode_t delete_subscriber( - in Subscriber s); - Subscriber get_builtin_subscriber(); - - Topic create_topic( - in string topic_name, - in string type_name, - in TopicQos qos, - in TopicListener a_listener, - in StatusMask mask); - Topic create_topic_with_profile( - in string topic_name, - in string type_name, - in string qos_profile, - in TopicListener a_listener, - in StatusMask mask); - - ReturnCode_t delete_topic( - in Topic a_topic); - - Topic find_topic( - in string topic_name, - in Duration_t timeout); - TopicDescription lookup_topicdescription( - in string name); - - ContentFilteredTopic create_contentfilteredtopic( - in string name, - in Topic related_topic, - in string filter_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_contentfilteredtopic( - in ContentFilteredTopic a_contentfilteredtopic); - - MultiTopic create_multitopic( - in string name, - in string type_name, - in string subscription_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_multitopic( - in MultiTopic a_multitopic); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DomainParticipantQos qos); - ReturnCode_t get_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_listener( - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipantListener get_listener(); - - ReturnCode_t ignore_participant( - in InstanceHandle_t handle); - ReturnCode_t ignore_topic( - in InstanceHandle_t handle); - ReturnCode_t ignore_publication( - in InstanceHandle_t handle); - ReturnCode_t ignore_subscription( - in InstanceHandle_t handle); - - DomainId_t get_domain_id(); - ReturnCode_t assert_liveliness(); - - ReturnCode_t set_default_publisher_qos( - in PublisherQos qos); - ReturnCode_t get_default_publisher_qos( - inout PublisherQos qos); - - ReturnCode_t set_default_subscriber_qos( - in SubscriberQos qos); - ReturnCode_t get_default_subscriber_qos( - inout SubscriberQos qos); - - ReturnCode_t set_default_topic_qos( - in TopicQos qos); - ReturnCode_t get_default_topic_qos( - inout TopicQos qos); - - ReturnCode_t get_discovered_participants( - inout InstanceHandleSeq participant_handles); - ReturnCode_t get_discovered_participant_data( - inout ParticipantBuiltinTopicData participant_data, - in InstanceHandle_t participant_handle); - - ReturnCode_t get_discovered_topics( - inout InstanceHandleSeq topic_handles); - ReturnCode_t get_discovered_topic_data( - inout TopicBuiltinTopicData topic_data, - in InstanceHandle_t topic_handle); - - boolean contains_entity( - in InstanceHandle_t a_handle); - - ReturnCode_t get_current_time( - inout Time_t current_time); - }; - - local interface DomainParticipantFactory { - DomainParticipant create_participant( - in DomainId_t domain_id, - in DomainParticipantQos qos, - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipant create_participant_with_profile( - in DomainId_t domain_id, - in string qos_profile, - in DomainParticipantListener a_listener, - in StatusMask mask); - ReturnCode_t delete_participant( - in DomainParticipant a_participant); - - DomainParticipant lookup_participant( - in DomainId_t domain_id); - - ReturnCode_t set_default_participant_qos( - in DomainParticipantQos qos); - ReturnCode_t set_default_participant_qos_with_profile( - in string qos_profile); - ReturnCode_t get_default_participant_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_qos( - in DomainParticipantFactoryQos qos); - ReturnCode_t get_qos( - inout DomainParticipantFactoryQos qos); - }; - - local interface TypeSupport { - ReturnCode_t register_type( - in DomainParticipant domain, - in string type_name); - string get_type_name(); - }; - - // ---------------------------------------------------------------------- - local interface TopicDescription { - string get_type_name(); - string get_name(); - - DomainParticipant get_participant(); - }; - - local interface Topic : Entity, TopicDescription { - ReturnCode_t set_qos( - in TopicQos qos); - ReturnCode_t get_qos( - inout TopicQos qos); - ReturnCode_t set_listener( - in TopicListener a_listener, - in StatusMask mask); - TopicListener get_listener(); - // Access the status - ReturnCode_t get_inconsistent_topic_status( - inout InconsistentTopicStatus a_status); - }; - - local interface ContentFilteredTopic : TopicDescription { - string get_filter_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - Topic get_related_topic(); - }; - - local interface MultiTopic : TopicDescription { - string get_subscription_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - }; - - // ---------------------------------------------------------------------- - local interface Publisher : Entity { - DataWriter create_datawriter( - in Topic a_topic, - in DataWriterQos qos, - in DataWriterListener a_listener, - in StatusMask mask); - DataWriter create_datawriter_with_profile( - in Topic a_topic, - in string qos_profile, - in DataWriterListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datawriter( - in DataWriter a_datawriter); - DataWriter lookup_datawriter( - in string topic_name); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in PublisherQos qos); - ReturnCode_t get_qos( - inout PublisherQos qos); - - ReturnCode_t set_listener( - in PublisherListener a_listener, - in StatusMask mask); - PublisherListener get_listener(); - - ReturnCode_t suspend_publications(); - ReturnCode_t resume_publications(); - - ReturnCode_t begin_coherent_changes(); - ReturnCode_t end_coherent_changes(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datawriter_qos( - in DataWriterQos qos); - ReturnCode_t get_default_datawriter_qos( - inout DataWriterQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataWriterQos a_datawriter_qos, - in TopicQos a_topic_qos); - }; - - local interface DataWriter : Entity { - ReturnCode_t set_qos( - in DataWriterQos qos); - ReturnCode_t get_qos( - inout DataWriterQos qos); - - ReturnCode_t set_listener( - in DataWriterListener a_listener, - in StatusMask mask); - DataWriterListener get_listener(); - - Topic get_topic(); - Publisher get_publisher(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - // Access the status - ReturnCode_t get_liveliness_lost_status( - inout LivelinessLostStatus status); - ReturnCode_t get_offered_deadline_missed_status( - inout OfferedDeadlineMissedStatus status); - ReturnCode_t get_offered_incompatible_qos_status( - inout OfferedIncompatibleQosStatus status); - ReturnCode_t get_publication_matched_status( - inout PublicationMatchedStatus status); - - ReturnCode_t assert_liveliness(); - - ReturnCode_t get_matched_subscriptions( - inout InstanceHandleSeq subscription_handles); - ReturnCode_t get_matched_subscription_data( - inout SubscriptionBuiltinTopicData subscription_data, - in InstanceHandle_t subscription_handle); - }; - - // ---------------------------------------------------------------------- - local interface Subscriber : Entity { - DataReader create_datareader( - in TopicDescription a_topic, - in DataReaderQos qos, - in DataReaderListener a_listener, - in StatusMask mask); - DataReader create_datareader_with_profile( - in TopicDescription a_topic, - in string qos_profile, - in DataReaderListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datareader( - in DataReader a_datareader); - ReturnCode_t delete_contained_entities(); - DataReader lookup_datareader( - in string topic_name); - ReturnCode_t get_datareaders( - inout DataReaderSeq readers, - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - ReturnCode_t notify_datareaders(); - - ReturnCode_t set_qos( - in SubscriberQos qos); - ReturnCode_t get_qos( - inout SubscriberQos qos); - - ReturnCode_t set_listener( - in SubscriberListener a_listener, - in StatusMask mask); - SubscriberListener get_listener(); - - ReturnCode_t begin_access(); - ReturnCode_t end_access(); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datareader_qos( - in DataReaderQos qos); - ReturnCode_t get_default_datareader_qos( - inout DataReaderQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataReaderQos a_datareader_qos, - in TopicQos a_topic_qos); - }; - - local interface DataReader : Entity { - ReadCondition create_readcondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - - QueryCondition create_querycondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states, - in string query_expression, - in StringSeq query_parameters); - - ReturnCode_t delete_readcondition( - in ReadCondition a_condition); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DataReaderQos qos); - ReturnCode_t get_qos( - inout DataReaderQos qos); - - ReturnCode_t set_listener( - in DataReaderListener a_listener, - in StatusMask mask); - DataReaderListener get_listener(); - - TopicDescription get_topicdescription(); - Subscriber get_subscriber(); - - ReturnCode_t get_sample_rejected_status( - inout SampleRejectedStatus status); - ReturnCode_t get_liveliness_changed_status( - inout LivelinessChangedStatus status); - ReturnCode_t get_requested_deadline_missed_status( - inout RequestedDeadlineMissedStatus status); - ReturnCode_t get_requested_incompatible_qos_status( - inout RequestedIncompatibleQosStatus status); - ReturnCode_t get_subscription_matched_status( - inout SubscriptionMatchedStatus status); - ReturnCode_t get_sample_lost_status( - inout SampleLostStatus status); - - ReturnCode_t wait_for_historical_data( - in Duration_t max_wait); - - ReturnCode_t get_matched_publications( - inout InstanceHandleSeq publication_handles); - ReturnCode_t get_matched_publication_data( - inout PublicationBuiltinTopicData publication_data, - in InstanceHandle_t publication_handle); - }; - - struct SampleInfo { - SampleStateKind sample_state; - ViewStateKind view_state; - InstanceStateKind instance_state; - Time_t source_timestamp; - InstanceHandle_t instance_handle; - InstanceHandle_t publication_handle; - long disposed_generation_count; - long no_writers_generation_count; - long sample_rank; - long generation_rank; - long absolute_generation_rank; - boolean valid_data; - }; - - typedef sequence SampleInfoSeq; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl deleted file mode 100644 index e165e42216e..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef NDDS_DCPS_IDL_I -#define NDDS_DCPS_IDL_I - -#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handleE.idl" - -module DDS { - typedef octet octet_value[16]; - struct NativeInstanceHandle_t { - octet_value value; - unsigned long length; - unsigned long isValid; - }; - typedef NativeInstanceHandle_t InstanceHandle_t; - - typedef sequence InstanceHandleSeq; -}; - -#endif - diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl deleted file mode 100644 index 2ca3586e6fe..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef NDDS_DCPS_INSTANCE_HANDLE_IDL -#define NDDS_DCPS_INSTANCE_HANDLE_IDL - -#include "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl" - -module DDS { - native HANDLE_NIL; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp deleted file mode 100644 index 51322d79dbf..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- -#include "ndds_dcps_instance_handleC.h" - -static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0}; - -namespace DDS -{ - ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE; -} - - -bool -operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2) -{ - DDS_InstanceHandle_t i1 = DDS_HANDLE_NIL; - DDS_InstanceHandle_t i2 = DDS_HANDLE_NIL; - i1 <<= instancehandle1; - i2 <<= instancehandle2; - if (DDS_InstanceHandle_is_nil(&instancehandle1)) - { - return DDS_InstanceHandle_is_nil (&instancehandle2); - } - else if (DDS_InstanceHandle_is_nil(&instancehandle2)) - { - return DDS_InstanceHandle_is_nil (&instancehandle1); - } - else - { - return DDS_InstanceHandle_equals (&i1, &i2); - } -} - -bool -operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2) -{ - return !operator== (instancehandle1, instancehandle2); -} - -void -operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle) -{ - if (DDS_InstanceHandle_is_nil (&instancehandle)) - { - ddsinstancehandle = DDS::HANDLE_NIL; - } - else - { - ACE_OS::memcpy (ddsinstancehandle.value, instancehandle.keyHash.value, sizeof (instancehandle.keyHash.value)); - ddsinstancehandle.length = instancehandle.keyHash.length; - ddsinstancehandle.isValid = instancehandle.isValid; - } -} - -void -operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle) -{ - ACE_OS::memcpy (ddsinstancehandle.keyHash.value, instancehandle.value, sizeof (instancehandle.value)); - ddsinstancehandle.keyHash.length = instancehandle.length; - ddsinstancehandle.isValid = instancehandle.isValid; -} diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h deleted file mode 100644 index 17440296b19..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- -#ifndef _TAO_IDL_DDS_RTF2_DCPSC_H_XX -#define _TAO_IDL_DDS_RTF2_DCPSC_H_XX - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#include /**/ "ndds_stub_export.h" -#include /**/ "tao/Versioned_Namespace.h" - -#include "ndds_dcps_i_handleC.h" -#include "ndds/ndds_cpp.h" - -namespace DDS -{ - extern NDDS_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL; -} - -NDDS_STUB_Export bool -operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2); - -NDDS_STUB_Export bool -operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2); - -NDDS_STUB_Export void -operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle); - -NDDS_STUB_Export void -operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle); - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h deleted file mode 100644 index b491e8235c4..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * http://doc.ece.uci.edu/ - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// C:\ACE\latest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:134 - -#ifndef _TAO_IDL_DDS_RTF2_DCPSEC_H_XX -#define _TAO_IDL_DDS_RTF2_DCPSEC_H_XX - -#include /**/ "ace/pre.h" - - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#include /**/ "ndds_lem_stub_export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Basic_Types.h" -#include "tao/ORB_Constants.h" -#include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/String_Manager_T.h" -#include "tao/Objref_VarOut_T.h" -#include /**/ "tao/Versioned_Namespace.h" - -#include "ccm/CCM_ContainerC.h" -#include "ndds_dcps_instance_handleC.h" - - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h deleted file mode 100644 index c5945babcba..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h +++ /dev/null @@ -1,46 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * http://doc.ece.uci.edu/ - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -// TAO_IDL - Generated from -// C:\ACE\latest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:471 - -#ifndef _TAO_IDL_DDS_RTF2_DCPS_I_HANDLES_H_S -#define _TAO_IDL_DDS_RTF2_DCPS_I_HANDLES_H_S - -#include /**/ "ace/pre.h" - -#include "ndds_dcps_i_handleC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#include /**/ "ndds_skel_export.h" - -#include /**/ "ace/post.h" -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc deleted file mode 100644 index 3be068a5a94..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc +++ /dev/null @@ -1,49 +0,0 @@ -project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults { - custom_only = 1 - after += CIAO_NDDS_idl_gen - idlflags += -I$(CIAO_ROOT)/connectors \ - -Wb,stub_export_macro=NDDS_LEM_STUB_Export \ - -Wb,stub_export_include=ndds_lem_stub_export.h -SS -Sci - - IDL_Files { - idlflags += -Gxhst - ndds_dcpsE.idl - } - - IDL_Files { - idlflags += -Sci - ndds_dcps_i_handleE.idl - } - - specific { - install_dir = connectors/dds4ccm/idl/ndds - } -} - -project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { - after += CIAO_NDDS_lem_gen - sharedname = CIAO_NDDS_lem_stub - dynamicflags += NDDS_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ndds_dcpsEC.cpp - ndds_dcps_i_handleEC.cpp - } - - Header_Files { - ndds_dcpsEC.h - ndds_lem_stub_export.h - ndds_dcps_i_handleEC.h - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl/ndds - } -} - diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc deleted file mode 100644 index 0bc50fa1d15..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc +++ /dev/null @@ -1,29 +0,0 @@ -// -*- MPC -*- -project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { - includes += $(CIAO_ROOT)/connectors - - dynamicflags += NDDS_SKEL_BUILD_DLL - - IDL_Files { - } - - Header_Files { - ndds_skel_export.h - ndds_dcpsS.h - ndds_dcps_i_handleS.h - ndds_dcps_instance_handleS.h - ndds_dcps_svnt.h - ndds_dcps_i_handle_svnt.h - } - - Source_Files { - ndds_dcpsS.cpp - } - - Inline_Files { - } - - specific { - install_dir = connectors/dds4ccm/idl/ndds - } -} diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc deleted file mode 100644 index a136a721cce..00000000000 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc +++ /dev/null @@ -1,73 +0,0 @@ -project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \ - -Wb,stub_export_include=ndds_stub_export.h \ - -Wb,skel_export_macro=NDDS_SKEL_Export \ - -Wb,skel_export_include=ndds_skel_export.h \ - -I$(CIAO_ROOT)/connectors -Glem -Ssvntc -Ssvntt - - IDL_Files { - ndds_dcps.idl - } - - IDL_Files { - idlflags -= -Gxhst -Gxhsk -SS - ndds_dcps_i_handle.idl - } - - specific { - install_dir = connectors/dds4ccm/idl/ndds - } - - verbatim(gnuace, postinstall) { -" cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/" - } -} - -project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, ciao_output, taolib { - - after += CIAO_NDDS_idl_gen - includes += $(CIAO_ROOT)/connectors - - dynamicflags += NDDS_STUB_BUILD_DLL - - IDL_Files { - } - - Header_Files { - ndds_stub_export.h - ndds_dcpsC.h - ndds_dcps_i_handleC.h - ndds_dcps_instance_handleC.h - ndds_dcps_instance_handleEC.h - } - - Source_Files { - ndds_dcpsC.cpp - ndds_dcps_i_handleC.cpp - ndds_dcps_instance_handleC.cpp - } - - Inline_Files { - ndds_dcpsC.inl - ndds_dcps_i_handleC.inl - } - - specific { - install_dir = connectors/dds4ccm/idl/ndds - } -} - -project (CIAO_NDDS_idl_install_only) { - - avoids += dds4ccm_opendds dds4ccm_ndds - - custom_only = 1 - - verbatim(gnuace, bottom) { -"install:" -" $(MKDIR) $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds" -" cp *.idl $(INSTALL_PREFIX)/share/ciao/connectors/dds4ccm/idl/ndds" - } - -} diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp deleted file mode 100644 index 5199451e5be..00000000000 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp +++ /dev/null @@ -1,215 +0,0 @@ -#include "CCM_DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -CIAO::DDS4CCM::CCM_DataReader::CCM_DataReader (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::CCM_DataReader"); -} - -CIAO::DDS4CCM::CCM_DataReader::~CCM_DataReader (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::~CCM_DataReader"); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::enable (void) -{ - return this->dds_entity ()->enable (); -} - -::DDS::StatusCondition_ptr -CIAO::DDS4CCM::CCM_DataReader::get_statuscondition (void) -{ - return this->dds_entity ()->get_statuscondition (); -} - -::DDS::StatusMask -CIAO::DDS4CCM::CCM_DataReader::get_status_changes (void) -{ - return this->dds_entity ()->get_status_changes (); -} - -::DDS::InstanceHandle_t -CIAO::DDS4CCM::CCM_DataReader::get_instance_handle (void) -{ - return this->dds_entity ()->get_instance_handle (); -} - -::DDS::ReadCondition_ptr -CIAO::DDS4CCM::CCM_DataReader::create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) -{ - return this->dds_entity ()->create_readcondition (sample_states, - view_states, - instance_states); -} - -::DDS::QueryCondition_ptr -CIAO::DDS4CCM::CCM_DataReader::create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters) -{ - return this->dds_entity ()->create_querycondition (sample_states, - view_states, - instance_states, - query_expression, - query_parameters); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition) -{ - return this->dds_entity ()->delete_readcondition (a_condition); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::delete_contained_entities (void) -{ - return this->dds_entity ()->delete_contained_entities (); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::set_qos ( - const ::DDS::DataReaderQos & qos) -{ - return this->dds_entity ()->set_qos (qos); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_qos ( - ::DDS::DataReaderQos & qos) -{ - return this->dds_entity ()->get_qos (qos); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) -{ - return this->dds_entity ()->set_listener (a_listener, mask); -} - -::DDS::DataReaderListener_ptr -CIAO::DDS4CCM::CCM_DataReader::get_listener (void) -{ - return this->dds_entity ()->get_listener (); -} - -::DDS::TopicDescription_ptr -CIAO::DDS4CCM::CCM_DataReader::get_topicdescription (void) -{ - return this->dds_entity ()->get_topicdescription(); -} - -::DDS::Subscriber_ptr -CIAO::DDS4CCM::CCM_DataReader::get_subscriber (void) -{ - return this->dds_entity ()->get_subscriber (); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_sample_rejected_status ( - ::DDS::SampleRejectedStatus & status) -{ - return this->get_dds_entity ()->get_sample_rejected_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status) -{ - return this->dds_entity ()->get_liveliness_changed_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status) -{ - return this->dds_entity ()->get_requested_deadline_missed_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status) -{ - return this->dds_entity ()->get_requested_incompatible_qos_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status) -{ - return this->dds_entity ()->get_subscription_matched_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_sample_lost_status ( - ::DDS::SampleLostStatus & status) -{ - return this->dds_entity ()->get_sample_lost_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::wait_for_historical_data ( - const ::DDS::Duration_t & max_wait) -{ - return this->dds_entity ()->wait_for_historical_data (max_wait); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles) -{ - return this->dds_entity ()->get_matched_publications (publication_handles); -} - -#if !defined (DDS_HAS_MINIMUM_BIT) -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataReader::get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle) -{ - return this->dds_entity ()->get_matched_publication_data (publication_data, - publication_handle); -} -#endif - -void -CIAO::DDS4CCM::CCM_DataReader::set_dds_entity (::DDS::DataReader_ptr dr) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::set_dds_entity"); - this->dds_entity_ = ::DDS::DataReader::_duplicate (dr); -} - -::DDS::DataReader_ptr -CIAO::DDS4CCM::CCM_DataReader::get_dds_entity (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::get_dds_entity"); - - return ::DDS::DataReader::_duplicate (this->dds_entity_); -} - -::DDS::DataReader_ptr -CIAO::DDS4CCM::CCM_DataReader::dds_entity (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataReader::dds_entity"); - - if (::CORBA::is_nil (this->dds_entity_.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "CIAO::DDS4CCM::CCM_DataReader::dds_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - else - { - return this->dds_entity_.in (); - } -} diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h deleted file mode 100644 index 60f89160062..00000000000 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h +++ /dev/null @@ -1,116 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for DDS. - */ - -#ifndef CCM_DATAREADER_T_H_ -#define CCM_DATAREADER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export CCM_DataReader - : public virtual ::DDS::CCM_DataReader, - public virtual LocalObject - { - public: - /// Constructor - CCM_DataReader (void); - - /// Destructor - virtual ~CCM_DataReader (void); - - virtual ::DDS::ReturnCode_t - enable (void); - - virtual ::DDS::StatusCondition_ptr - get_statuscondition (void); - - virtual ::DDS::StatusMask - get_status_changes (void); - - virtual ::DDS::InstanceHandle_t - get_instance_handle (void); - - virtual ::DDS::ReadCondition_ptr - create_readcondition (::DDS::SampleStateMask , - ::DDS::ViewStateMask , - ::DDS::InstanceStateMask); - virtual ::DDS::QueryCondition_ptr - create_querycondition (::DDS::SampleStateMask , - ::DDS::ViewStateMask , - ::DDS::InstanceStateMask , - const char * , - const ::DDS::StringSeq & ); - - virtual ::DDS::ReturnCode_t - delete_readcondition (::DDS::ReadCondition_ptr ); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataReaderQos & ); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::DataReaderQos & ); - - virtual ::DDS::ReturnCode_t - set_listener (::DDS::DataReaderListener_ptr, - ::DDS::StatusMask ); - - virtual ::DDS::DataReaderListener_ptr - get_listener (void); - - virtual ::DDS::TopicDescription_ptr - get_topicdescription (void); - - virtual ::DDS::Subscriber_ptr - get_subscriber (void); - - virtual ::DDS::ReturnCode_t - get_sample_rejected_status (::DDS::SampleRejectedStatus & ); - - virtual ::DDS::ReturnCode_t - get_liveliness_changed_status (::DDS::LivelinessChangedStatus & ); - - virtual ::DDS::ReturnCode_t - get_requested_deadline_missed_status (::DDS::RequestedDeadlineMissedStatus & ); - - virtual ::DDS::ReturnCode_t - get_requested_incompatible_qos_status (::DDS::RequestedIncompatibleQosStatus & ); - - virtual ::DDS::ReturnCode_t - get_subscription_matched_status (::DDS::SubscriptionMatchedStatus & ); - - virtual ::DDS::ReturnCode_t - get_sample_lost_status (::DDS::SampleLostStatus & ); - - virtual ::DDS::ReturnCode_t - wait_for_historical_data (const ::DDS::Duration_t & ); - - virtual ::DDS::ReturnCode_t - get_matched_publications (::DDS::InstanceHandleSeq & ); - -#if !defined (DDS_HAS_MINIMUM_BIT) - virtual ::DDS::ReturnCode_t - get_matched_publication_data (::DDS::PublicationBuiltinTopicData & , - DDS_INSTANCE_HANDLE_T_IN ); -#endif - - void set_dds_entity (::DDS::DataReader_ptr dr); - - ::DDS::DataReader_ptr get_dds_entity (void); - - private: - ::DDS::DataReader_var dds_entity_; - ::DDS::DataReader_ptr dds_entity (void); - }; - } -} - -#endif /* CCM_DATAREADER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp deleted file mode 100644 index 62d71e9f988..00000000000 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp +++ /dev/null @@ -1,160 +0,0 @@ -#include "CCM_DataWriter.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -CIAO::DDS4CCM::CCM_DataWriter::CCM_DataWriter (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::CCM_DataWriter"); -} - -CIAO::DDS4CCM::CCM_DataWriter::~CCM_DataWriter (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::~CCM_DataWriter"); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::enable (void) -{ - return this->impl ()->enable (); -} - -::DDS::StatusCondition_ptr -CIAO::DDS4CCM::CCM_DataWriter::get_statuscondition (void) -{ - return this->impl ()->get_statuscondition (); -} - -::DDS::StatusMask -CIAO::DDS4CCM::CCM_DataWriter::get_status_changes (void) -{ - return this->impl ()->get_status_changes (); -} - -::DDS::InstanceHandle_t -CIAO::DDS4CCM::CCM_DataWriter::get_instance_handle (void) -{ - return this->impl ()->get_instance_handle (); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::set_qos ( - const ::DDS::DataWriterQos &qos) -{ - return this->impl ()->set_qos (qos); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_qos (::DDS::DataWriterQos &qos) -{ - return this->impl ()->get_qos (qos); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::set_listener (::DDS::DataWriterListener_ptr listener, - ::DDS::StatusMask mask) -{ - return this->impl ()->set_listener (listener, mask); -} - -::DDS::DataWriterListener_ptr -CIAO::DDS4CCM::CCM_DataWriter::get_listener (void) -{ - return this->impl ()->get_listener (); -} - -::DDS::Topic_ptr -CIAO::DDS4CCM::CCM_DataWriter::get_topic (void) -{ - return this->impl ()->get_topic (); -} - -::DDS::Publisher_ptr -CIAO::DDS4CCM::CCM_DataWriter::get_publisher (void) -{ - return this->impl ()->get_publisher (); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::wait_for_acknowledgments (const ::DDS::Duration_t &duration) -{ - return this->impl ()->wait_for_acknowledgments (duration); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_liveliness_lost_status (::DDS::LivelinessLostStatus &status) -{ - return this->impl ()->get_liveliness_lost_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus &status) -{ - return this->impl ()->get_offered_deadline_missed_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus &status) -{ - return this->impl ()->get_offered_incompatible_qos_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_publication_matched_status (::DDS::PublicationMatchedStatus &status) -{ - return this->impl ()->get_publication_matched_status (status); -} - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::assert_liveliness (void) -{ - return this->impl ()->assert_liveliness (); -} - -#if !defined (DDS_HAS_MINIMUM_BIT) -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscriptions (::DDS::InstanceHandleSeq &seq) -{ - return this->impl ()->get_matched_subscriptions (seq); -} -#endif - -::DDS::ReturnCode_t -CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscription_data ( - ::DDS::SubscriptionBuiltinTopicData & data, - DDS_INSTANCE_HANDLE_T_IN handle) -{ - return this->impl ()->get_matched_subscription_data (data, handle); -} - -void -CIAO::DDS4CCM::CCM_DataWriter::set_dds_entity (::DDS::DataWriter_ptr dw) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::set_dds_entity"); - - this->impl_ = ::DDS::DataWriter::_duplicate (dw); -} - -::DDS::DataWriter_ptr -CIAO::DDS4CCM::CCM_DataWriter::get_dds_entity (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::get_dds_entity"); - - return ::DDS::DataWriter::_duplicate (this->impl ()); -} - -::DDS::DataWriter_ptr -CIAO::DDS4CCM::CCM_DataWriter::impl (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::CCM_DataWriter::impl"); - - if (::CORBA::is_nil (this->impl_.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "CIAO::DDS4CCM::CCM_DataWriter::impl - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - else - { - return this->impl_.in (); - } -} diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h deleted file mode 100644 index 858606d78d5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h +++ /dev/null @@ -1,100 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for DDS. - */ - -#ifndef CCM_DATAWRITER_T_H_ -#define CCM_DATAWRITER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export CCM_DataWriter - : public virtual ::DDS::CCM_DataWriter, - public virtual LocalObject - { - public: - /// Constructor - CCM_DataWriter (void); - - /// Destructor - virtual ~CCM_DataWriter (void); - - virtual ::DDS::ReturnCode_t - enable (void); - - virtual ::DDS::StatusCondition_ptr - get_statuscondition (void); - - virtual ::DDS::StatusMask - get_status_changes (void); - - virtual ::DDS::InstanceHandle_t - get_instance_handle (void); - - virtual ::DDS::ReturnCode_t - set_qos (const ::DDS::DataWriterQos & ); - - virtual ::DDS::ReturnCode_t - get_qos (::DDS::DataWriterQos & ); - - virtual ::DDS::ReturnCode_t - set_listener (::DDS::DataWriterListener_ptr , - ::DDS::StatusMask ); - - virtual ::DDS::DataWriterListener_ptr - get_listener (void); - - virtual ::DDS::Topic_ptr - get_topic (void); - - virtual ::DDS::Publisher_ptr - get_publisher (void); - - virtual ::DDS::ReturnCode_t - wait_for_acknowledgments (const ::DDS::Duration_t & ); - - virtual ::DDS::ReturnCode_t - get_liveliness_lost_status (::DDS::LivelinessLostStatus & ); - - virtual ::DDS::ReturnCode_t - get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & ); - - virtual ::DDS::ReturnCode_t - get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & ); - - virtual ::DDS::ReturnCode_t - get_publication_matched_status (::DDS::PublicationMatchedStatus & ); - - virtual ::DDS::ReturnCode_t - assert_liveliness (void); - - virtual ::DDS::ReturnCode_t - get_matched_subscriptions (::DDS::InstanceHandleSeq & ); - -#if !defined (DDS_HAS_MINIMUM_BIT) - virtual ::DDS::ReturnCode_t - get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & , - DDS_INSTANCE_HANDLE_T_IN); -#endif - - void set_dds_entity (::DDS::DataWriter_ptr dw); - - ::DDS::DataWriter_ptr - get_dds_entity (void); - - private: - ::DDS::DataWriter_var impl_; - ::DDS::DataWriter_ptr impl (void); - }; - } -} - -#endif /* CCM_DATAREADER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp deleted file mode 100644 index ad574ed8726..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "dds4ccm/impl/Coherent_Changes_Guard.h" - -CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard ( - ::DDS::Publisher_ptr p, - bool coherent_write) : - p_ (::DDS::Publisher::_duplicate (p)), - coherent_write_ (coherent_write) -{ - if (this->coherent_write_) - { - p_->begin_coherent_changes (); - } -} - -CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard () -{ - if (this->coherent_write_) - { - this->p_->end_coherent_changes (); - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h deleted file mode 100644 index 0ab277eba33..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef _CIAO_COHERENT_CHANGES_GUARD -#define _CIAO_COHERENT_CHANGES_GUARD - -#include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * Guard class which calls begin_coherent_changes() on - * construction and end_coherent_changes() at destruction - */ - class DDS4CCM_DDS_IMPL_Export Coherent_Changes_Guard : - private ACE_Copy_Disabled - { - public: - Coherent_Changes_Guard (::DDS::Publisher_ptr p, bool coherent_write); - ~Coherent_Changes_Guard (); - private: - ::DDS::Publisher_var p_; - bool const coherent_write_; - }; - } -} - -#endif /* _CIAO_COHERENT_CHANGES_GUARD */ - diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp deleted file mode 100644 index 4fa50f0eb49..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp +++ /dev/null @@ -1,523 +0,0 @@ -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/ConditionManager.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/TimeUtilities.h" -#include "ace/OS_NS_sys_time.h" - -namespace CIAO -{ - namespace DDS4CCM - { - ConditionManager::ConditionManager (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::ConditionManager"); - } - - ConditionManager::~ConditionManager (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::~ConditionManager"); - } - - ::DDS::ReadCondition_ptr - ConditionManager::get_readcondition (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_readcondition"); - - return ::DDS::ReadCondition::_duplicate (this->rd_condition_.in ()); - } - - ::DDS::QueryCondition_ptr - ConditionManager::get_querycondition_getter (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_getter"); - - return ::DDS::QueryCondition::_duplicate (this->qc_getter_.in ()); - } - - ::DDS::QueryCondition_ptr - ConditionManager::get_querycondition_listener (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_listener"); - - return ::DDS::QueryCondition::_duplicate (this->qc_listener_.in ()); - } - - ::DDS::QueryCondition_ptr - ConditionManager::get_querycondition_reader (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::get_querycondition_reader"); - - return ::DDS::QueryCondition::_duplicate (this->qc_reader_.in ()); - } - - ::DDS::InstanceHandle_t - ConditionManager::check_handle (DDS_INSTANCE_HANDLE_T_IN instance_handle, - DDS_INSTANCE_HANDLE_T_IN lookup_handle) - { - bool error = false; - bool non_existent = false; -#if (CIAO_DDS4CCM_NDDS==1) - ::DDS::InstanceHandle_t ret = this->ws_.check_handle (instance_handle, - lookup_handle, - error, - non_existent); -#else - ::DDS::InstanceHandle_t ret = lookup_handle; - error = instance_handle != ::DDS::HANDLE_NIL && instance_handle != lookup_handle; - non_existent = lookup_handle == ::DDS::HANDLE_NIL; -#endif - if (error) - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - if (non_existent) - throw ::CCM_DDS::NonExistent (); - return ret; - } - - void - ConditionManager::init_readcondition (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::init_readcondition"); - -#if (CIAO_DDS4CCM_NDDS==1) - if (!this->ws_.get_rti_entity ()) - { - // Waitset is created when a query condition is attached. - // when this is the case, no need to create a read condition - // (including its proxy). - this->ws_.init (); - } -#endif - if ( ::CORBA::is_nil (this->rd_condition_.in ())) - { - this->rd_condition_ = this->dds_entity ()->create_readcondition ( - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE | ::DDS::NOT_ALIVE_INSTANCE_STATE); - - if ( ::CORBA::is_nil (this->rd_condition_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::init_readcondition - ") - ACE_TEXT ("Error creating read condition.\n"))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - } - - ::DDS::ReturnCode_t const retcode = - this->ws_.attach_condition (this->rd_condition_.in ()); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::init_readcondition - ") - ACE_TEXT ("Unable to attach read condition to waitset. Error <%C>\n"), - translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::init_readcondition - ") - ACE_TEXT ("Read condition created and attached to Waitset.\n"))); - } - - ::CCM_DDS::QueryFilter * - ConditionManager::query (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::query"); - - if (! ::CORBA::is_nil (this->rd_condition_.in ())) - { - // When a query condition is set, the rd_condition is not set - // and therefor nil. - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::query - ") - ACE_TEXT ("Error: No QueryCondition set yet, ") - ACE_TEXT ("first set a filter.\n"))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - if (::CORBA::is_nil (this->qc_reader_.in ())) - { - // qc reader is nil - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::query - ") - ACE_TEXT ("Error: qc reader is nil.\n"))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - ::CCM_DDS::QueryFilter_var filter; - ACE_NEW_THROW_EX (filter, - ::CCM_DDS::QueryFilter(), - ::CORBA::NO_MEMORY ()); - filter->expression = this->qc_reader_->get_query_expression (); - this->qc_reader_->get_query_parameters (filter->parameters); - return filter._retn (); - } - - void - ConditionManager::query ( - const ::CCM_DDS::QueryFilter & filter) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::query"); - - // Since the readcondition for the getter is always created (at start up), - // this should be removed first. Instead of a readcondition, there should - // be a QueryCondition attached to the waitset - if (! ::CORBA::is_nil (this->rd_condition_.in ())) - { - // Getter functionality - // First remove the existing conditions from the waitset - // Than create a new (query) condition and attach it to the waitset - // instead of the readcondition - this->remove_conditions (); - } - - if (::CORBA::is_nil (this->qc_reader_.in ())) - { - // We're sure the query is not set yet. - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("Creating query condition for the reader: ") - ACE_TEXT ("expression <%C>\n"), - filter.expression.in ())); - this->qc_reader_ = this->dds_entity ()->create_querycondition ( - ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE, - filter.expression, - filter.parameters); - if ( ::CORBA::is_nil (this->qc_getter_.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("Creating query condition for the getter: ") - ACE_TEXT ("expression <%C>\n"), - filter.expression.in ())); - this->qc_getter_ = this->dds_entity ()->create_querycondition ( - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE | ::DDS::NOT_ALIVE_INSTANCE_STATE, - filter.expression, - filter.parameters); - // attach the query condition for the getter to the waitset. - // creates a waitset if not already created. - this->attach_querycondition (); - } - if ( ::CORBA::is_nil (this->qc_listener_.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("Creating query condition for the listener: ") - ACE_TEXT ("expression <%C>\n"), - filter.expression.in ())); - this->qc_listener_ = this->dds_entity ()->create_querycondition ( - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE, - filter.expression, - filter.parameters); - } - if (::CORBA::is_nil (this->qc_reader_.in ()) || - ::CORBA::is_nil (this->qc_getter_.in ()) || - ::CORBA::is_nil (this->qc_listener_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::query - ") - ACE_TEXT ("Error creating query conditions ") - ACE_TEXT ("reader <%@> - getter <%@> - listener <%@>.\n"), - this->qc_reader_.in (), - this->qc_getter_.in (), - this->qc_listener_.in ())); - - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::query - ") - ACE_TEXT ("All query conditions created successfully: ") - ACE_TEXT ("expression <%C>\n"), - filter.expression.in ())); - } - } - else if (ACE_OS::strlen (filter.expression.in ()) > 0) - { - // Filter has been set. Change the parameters of this filter. - this->set_parameters (filter, this->qc_reader_.in ()); - this->set_parameters (filter, this->qc_getter_.in ()); - this->set_parameters (filter, this->qc_listener_.in ()); - } - else - { - // No expression set so remove the query conditions and - // create the read condition again. ConditionManager has - // the same state as at start up. - this->remove_conditions (); - this->init_readcondition (); - } - } - - void - ConditionManager::set_parameters ( - const ::CCM_DDS::QueryFilter & filter, - ::DDS::QueryCondition_ptr qc) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::set_parameters"); - - ::DDS::ReturnCode_t const retval = qc->set_query_parameters (filter.parameters); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::set_parameters - ") - ACE_TEXT ("Error setting expression_parameters. ") - ACE_TEXT ("Retval is %C\n"), - translate_retcode(retval))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); - } - } - - void - ConditionManager::attach_querycondition (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::attach_querycondition"); - -#if (CIAO_DDS4CCM_NDDS==1) - if (!this->ws_.get_rti_entity ()) - { - this->ws_.init (); - } -#endif - - ::DDS::ReturnCode_t const retcode = - this->ws_.attach_condition (this->qc_getter_.in ()); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "ConditionManager::attach_querycondition - " - "Unable to attach query condition to waitset. " - "Error <%C>\n", - translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 1); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "ConditionManager::attach_querycondition - " - "Query condition created and attached to Waitset.\n")); - } - } - - bool - ConditionManager::wait (const ::DDS::Duration_t & time_out) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::wait"); - - #if !defined (DDS4CCM_NLOGGING) - ACE_Time_Value const start = ACE_OS::gettimeofday (); - #endif - - DDS::ConditionSeq active_conditions; - ::DDS::ReturnCode_t const retcode = - this->ws_.wait (active_conditions, time_out); - - #if !defined (DDS4CCM_NLOGGING) - ACE_Time_Value const waited = ACE_OS::gettimeofday () - start; - ACE_Time_Value wait_time; - wait_time <<= time_out; - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::wait - ") - ACE_TEXT ("to wait <%#T> waited <%#T> return code <%C>\n"), - &wait_time, &waited, ::CIAO::DDS4CCM::translate_retcode (retcode))); - #endif - - if (retcode == ::DDS::RETCODE_TIMEOUT) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::wait - ") - ACE_TEXT ("No data available after timeout.\n"))); - return false; - } - - ::DDS::ReadCondition_var rc = this->get_readcondition (); - if (!CORBA::is_nil (rc.in ())) - { - if (rc->get_trigger_value() == true) - { - return true; - } - } - - ::DDS::QueryCondition_var qc = this->get_querycondition_getter (); - if (!CORBA::is_nil (qc.in ())) - { - if (qc->get_trigger_value() == true) - { - return true; - } - } - - return false; - } - - void - ConditionManager::remove_condition ( - ::DDS::QueryCondition_ptr dds_qc, - const char * type) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::remove_condition"); - if (! ::CORBA::is_nil (dds_qc)) - { - ::DDS::ReturnCode_t const retcode = this->dds_entity ()->delete_readcondition (dds_qc); - if (retcode == ::DDS::RETCODE_OK) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_condition - ") - ACE_TEXT ("Succesfully removed query condition for <%C>.\n"), - type)); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_condition - ") - ACE_TEXT ("Unable to remove query condition for <%C>.") - ACE_TEXT ("Error <%C>\n"), - type, translate_retcode (retcode))); - } - } - } - - void - ConditionManager::remove_conditions () - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::remove_conditions"); - - // Save to remove the query conditions of the reader and listener since - // these are not attached to a waitset. - ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_OK; - if (! ::CORBA::is_nil (this->qc_reader_.in ())) - { - ::DDS::QueryCondition_var qc = this->qc_reader_._retn (); - this->remove_condition (qc.in (), "reader"); - } - if (! ::CORBA::is_nil (this->qc_listener_.in ())) - { - ::DDS::QueryCondition_var qc = this->qc_listener_._retn (); - this->remove_condition (qc.in (), "listener"); - } - -#if (CIAO_DDS4CCM_NDDS==1) - if (this->ws_.get_rti_entity ()) -#endif - { - // Waitset is created. Therefor detach any condition - // from the waitset first (in this case, the query condition). - if (! ::CORBA::is_nil (this->qc_getter_.in ())) - { - retcode = this->ws_.detach_condition (this->qc_getter_.in ()); - if (retcode == ::DDS::RETCODE_OK) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Query condition successfully detached from waitset.\n"))); - // Query condition is detached. Now we can savely remove it. - ::DDS::QueryCondition_var qc = this->qc_getter_._retn (); - this->remove_condition (qc.in (), "getter"); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Unable to detach query condition from waitset: ") - ACE_TEXT ("Error: <%C>\n"), - translate_retcode (retcode) )); - } - } - else - { - // No query condition on of the getter. - // TODO: Check whether we can savely remove the following check: - ::DDS::QueryCondition_var q_condition = this->get_querycondition_getter (); - if (::CORBA::is_nil (q_condition.in ())) - { - if (!::CORBA::is_nil (this->rd_condition_.in ())) - { - // Read condition should be attached to the waitset. - retcode = this->ws_.detach_condition (this->rd_condition_.in ()); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Unable to detach read condition ") - ACE_TEXT ("from waitset. Error <%C>\n"), - translate_retcode (retcode))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Read condition successfully detached from waitset.\n"))); - } - } - } - } - } - // Now we can safely remove the read condition (in a thread safe manner) - if (! ::CORBA::is_nil (this->rd_condition_.in ())) - { - retcode = ::DDS::RETCODE_OK; - ::DDS::ReadCondition_var rd = this->rd_condition_._retn (); - if (!::CORBA::is_nil (rd.in ())) - { - retcode = this->dds_entity ()->delete_readcondition (rd.in ()); - } - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Unable to delete read condition from DDSDataReader.") - ACE_TEXT ("Error <%C>\n"), - translate_retcode (retcode))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("ConditionManager::remove_conditions - ") - ACE_TEXT ("Read condition successfully deleted from DDSDataReader.\n"))); - } - } - } - - void - ConditionManager::passivate () - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::passivate"); - - this->remove_conditions (); - } - - void - ConditionManager::set_dds_entity ( - ::DDS::DataReader_ptr dr) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::set_dds_entity"); - - this->dr_ = ::DDS::DataReader::_duplicate (dr); - } - - ::DDS::DataReader_ptr - ConditionManager::get_dds_entity (void) - { - return ::DDS::DataReader::_duplicate (this->dr_.in ()); - } - - ::DDS::DataReader_ptr - ConditionManager::dds_entity (void) - { - if (! ::CORBA::is_nil (this->dr_.in ())) - { - return this->dr_.in (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "ConditionManager::dds_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h deleted file mode 100644 index d773e939af1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h +++ /dev/null @@ -1,200 +0,0 @@ -#ifndef CONDITIONMANAGER_H_ -#define CONDITIONMANAGER_H_ - -#include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -#if (CIAO_DDS4CCM_NDDS==1) -#include "dds4ccm/impl/ndds/WaitSet.h" -#elif (CIAO_DDS4CCM_OPENDDS==1) -#include "dds/DCPS/WaitSet.h" -#endif - -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -namespace CCM_DDS -{ - struct QueryFilter; -} - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * @class ConditionManager - * - * @brief Helper class - * - * Manages the read and query conditions for the Getter, - * Reader and listeners. - */ - class DDS4CCM_DDS_IMPL_Export ConditionManager - { - public: - /// Constructor - ConditionManager (void); - - /// Destructor - ~ConditionManager (void); - - /// Returns the read condition in general - ::DDS::ReadCondition_ptr get_readcondition (void); - - /// Returns the query condition for the getter - ::DDS::QueryCondition_ptr get_querycondition_getter (void); - /// Returns the query condition for the reader - ::DDS::QueryCondition_ptr get_querycondition_reader (void); - /// Returns the query condition for the listener - ::DDS::QueryCondition_ptr get_querycondition_listener (void); - - /** - * Proxy method. - * See WaitSet::check_handle in ndds/WaitSet.h - * for more information on this. - * - * If WaitSet::check_handle set 'error' to true, a - * ::CCM_DDS::InternalError exception is called. - * Error will be ::DDS::RETCODE_ERROR - * - * If WaitSet::check_handle set 'non_existent' to true, - * a ::CCM_DDS::NonExistent exception is thrown. - */ - ::DDS::InstanceHandle_t check_handle ( - DDS_INSTANCE_HANDLE_T_IN instance_handle, - DDS_INSTANCE_HANDLE_T_IN lookup_handle); - - /** - * Getter functionality. - * Creates a read_condition for the getter. - * It will also initialize the waitset and attaches the - * read_condition to the waitset. - */ - void init_readcondition (void); - - /** - * Getter functionality, waits for the attached conditions. - * Only returns true when one of the getter conditions has triggered - * and we have data - */ - bool wait (const ::DDS::Duration_t & time_out); - - /** - * Returns the internal filter. This is the DDS4CCM QueryFilter - * (a representation of the DDS query). - * - * If the QueryFilter hasn't been initialized, a ::CCM_DDS::InternalError - * exception with error code ::DDS::RETCODE_ERROR is thrown. - */ - ::CCM_DDS::QueryFilter * query (void); - - /** - * Sets the DDS4CCM query filter. - * The following rules apply when a filter is set: - * - * If there's a read condition set, this will be removed. - * The read condition is replaced by a query condition. - * - * If there're no query conditions yet (i.e. the filter hasn't - * been set before), three query conditions are created: - * 1. One for the Getter - * 2. One for the Reader - * 3. One for the Listener - * Each query condition has it's own sample_state, - * instance_state and view_state set but the filters are - * the same. - * - * Off course the query condition for the getter will be - * attached to the waitset. - * - * If the internal filter has already been set, this method sets - * the new parameters for this filter on all three query conditions. - * - * If the filter expression (the actual query) is empty, all three query - * conditions will be removed (the query condition for the getter will be - * detached from the waitset first) and the initial read condition will - * created (see init_readcondition()). - */ - void query (const ::CCM_DDS::QueryFilter & filter); - - /** - * Sets the internal datareader. - * Applies to Getter, Reader and Listener - */ - void set_dds_entity (::DDS::DataReader_ptr dr); - - /** - * Retrieves the internal datareader. - */ - ::DDS::DataReader_ptr get_dds_entity (void); - - /** - * Detaches conditions from the waitset and - * removes all conditions by calling - * delete_readcondition on the DataReader. - */ - void passivate (void); - - private: - ::DDS::DataReader_var dr_; - - //TODO: Not allowed -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_WaitSet_i ws_; -#elif (CIAO_DDS4CCM_OPENDDS==1) - ::DDS::WaitSet ws_; -#endif - - /** - * Different QueryConditions since the sample mask - * differs for all entities. - */ - ::DDS::QueryCondition_var qc_reader_; - ::DDS::QueryCondition_var qc_getter_; - ::DDS::QueryCondition_var qc_listener_; - - ::DDS::ReadCondition_var rd_condition_; - - /** - * Internal getter for the DataReader. - * If the internal dds_entity is not set before this method - * is called, a CORBA::BAD_INV_ORDER exception is thrown. - */ - ::DDS::DataReader_ptr dds_entity (void); - - /** - * Removes the internal (read/query) condition by invoking - * delete_condition on the DataReader. - */ - void remove_condition (::DDS::QueryCondition_ptr qc, - const char * type); - - /** - * Calling 'remove_condition' for each query and read - * condition. - * - * The query condition for the getter will be detached from - * the waitset first. - */ - void remove_conditions (void); - - /** - * Getter functionality. - * - * Attaches the query condition for the getter to the - * waitset. It the waitset doesn't exist, it will be - * created. - */ - void attach_querycondition (void); - - /** - * Generic method which sets the parameters of the given - * filter on the given query condition. - */ - void set_parameters (const ::CCM_DDS::QueryFilter & filter, - ::DDS::QueryCondition_ptr qc); - }; - } -} - -#endif /* CONDITIONMANAGER_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp deleted file mode 100644 index 3ff0b3c939a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp +++ /dev/null @@ -1,171 +0,0 @@ -#include "dds4ccm/impl/ContentFilterSetting.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_ContentFilterSetting_i::CCM_DDS_ContentFilterSetting_i () - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::CCM_DDS_ContentFilterSetting_i"); - } - - CCM_DDS_ContentFilterSetting_i::~CCM_DDS_ContentFilterSetting_i () - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::~CCM_DDS_ContentFilterSetting_i"); - } - - ::CCM_DDS::QueryFilter * - CCM_DDS_ContentFilterSetting_i::filter (void) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::filter"); - ::CCM_DDS::QueryFilter* retval = new ::CCM_DDS::QueryFilter; - retval->expression = ::CORBA::string_dup (this->filter_.expression); - retval->parameters.length (this->filter_.parameters.length ()); - for (::CORBA::ULong i = 0; i < this->filter_.parameters.length (); ++i) - { - retval->parameters[i] = ::CORBA::string_dup (this->filter_.parameters[i]); - } - return retval; - } - - void - CCM_DDS_ContentFilterSetting_i::filter ( - const ::CCM_DDS::QueryFilter & filter) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::filter"); - - this->filter_ = filter; - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::filter - ")); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "Expression : <%C>\t\n", - filter.expression.in ())); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Parameters :\n")); - for (::CORBA::ULong i = 0; i < filter.parameters.length (); ++i) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "\t<%C>\n", - filter.parameters[i].in ())); - } - } - - ::DDS::ContentFilteredTopic_ptr - CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic"); - - ::DDS::DomainParticipant_var dp = subscriber->get_participant (); - if (::CORBA::is_nil (dp.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " - "Unable to get DomainParticipant.\n")); - throw ::CORBA::INTERNAL (); - } - - ACE_Auto_Array_Ptr name; - { - char *name_bootstrap = 0; - ACE_NEW_THROW_EX (name_bootstrap, - char[32], - ::CORBA::NO_MEMORY ()); - name.reset(name_bootstrap); - } - ACE_OS::sprintf (name.get (), - "DDS4CCM_CFT_%ld", - reinterpret_cast (this)); - - this->cft_ = dp->create_contentfilteredtopic (name.get (), - topic, - this->filter_.expression, - this->filter_.parameters); - if (::CORBA::is_nil (this->cft_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " - "Error creating ContentFilteredTopic <%C>.\n", - name.get ())); - throw ::CORBA::INTERNAL (); - } - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " - "successfully created ContentFilteredTopic <%C>\n", - name.get ())); - return ::DDS::ContentFilteredTopic::_duplicate (this->cft_); - } - - void - CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic ( - ::DDS::Subscriber_ptr subscriber) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic"); - - if (! ::CORBA::is_nil (subscriber)) - { - ::DDS::DomainParticipant_var dp = subscriber->get_participant (); - ::DDS::ContentFilteredTopic_var cft = this->cft_._retn (); - if (! ::CORBA::is_nil (dp.in ()) && (! ::CORBA::is_nil (cft.in ()))) - { - ::CORBA::String_var name = cft->get_name (); - ::DDS::ReturnCode_t const retcode = - dp->delete_contentfilteredtopic (cft.in ()); - - if (retcode == ::DDS::RETCODE_OK) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic: " - "successfully deleted ContentFilteredTopic <%C>\n", - name.in ())); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::delete_contentfilteredtopic: " - "Error deleting ContentFilteredTopic <%C>: <%C>\n", - name.in (), - translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - } - } - } - - void - CCM_DDS_ContentFilterSetting_i::set_filter_parameters ( - const ::DDS::StringSeq & parameters) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::set_filter_parameters"); - if (::CORBA::is_nil (this->cft_.in ()) || - ACE_OS::strlen (this->filter_.expression.in ()) == 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: " - "Calling set_filter_parameters without having set a filter\n")); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - ::DDS::ReturnCode_t const retcode = - this->cft_->set_expression_parameters (parameters); - if (retcode == ::DDS::RETCODE_OK) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: " - "successfully set parameters on ContentFilteredTopic\n")); - this->filter_.parameters = parameters; - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: " - "Error setting filter parameters: <%C>\n", - translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h deleted file mode 100644 index 0411f28d476..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef CCM_DDS_CONTENTFILTERSETTING_H -#define CCM_DDS_CONTENTFILTERSETTING_H - -#include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/idl/dds4ccm_BaseEC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export CCM_DDS_ContentFilterSetting_i - : public virtual ::CCM_DDS::CCM_ContentFilterSetting, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_ContentFilterSetting_i (void); - - /// Destructor - virtual ~CCM_DDS_ContentFilterSetting_i (void); - - virtual void set_filter_parameters (const ::DDS::StringSeq & parameters); - - ::CCM_DDS::QueryFilter *filter (void); - - void filter (const ::CCM_DDS::QueryFilter & filter); - - ::DDS::ContentFilteredTopic_ptr - create_contentfilteredtopic (::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber); - - void delete_contentfilteredtopic (::DDS::Subscriber_ptr subscriber); - private: - ::CCM_DDS::QueryFilter filter_; - ::DDS::ContentFilteredTopic_var cft_; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp deleted file mode 100644 index 06e7db19130..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp +++ /dev/null @@ -1,398 +0,0 @@ -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -//============================================================ -// On_Unexpected_Status_Handler -//============================================================ -namespace CIAO -{ - namespace DDS4CCM - { - DDSCallbackStatusHandlerBase::DDSCallbackStatusHandlerBase (void) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - DDSCallbackStatusHandlerBase::~DDSCallbackStatusHandlerBase (void) - { - - } - - OnUnexpectedStatusHandler::OnUnexpectedStatusHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) : - error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - entity_ (::DDS::Entity::_duplicate (entity)), - status_kind_ (status_kind) - { - } - - OnUnexpectedStatusHandler::~OnUnexpectedStatusHandler (void) - { - } - - int - OnUnexpectedStatusHandler::handle_exception (ACE_HANDLE) - { - try - { - this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnUnexpectedStatusHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnUnexpectedStatusHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnUnexpectedStatusHandler::handle_exception - " - "Unexpected exception caught for <%C>\n", - translate_statuskind (this->status_kind_))); - - } - return 0; - } - - //============================================================ - // OnRequestedOncompatibleQosHandler - //============================================================ - OnRequestedOncompatibleQosHandler::OnRequestedOncompatibleQosHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedIncompatibleQosStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnRequestedOncompatibleQosHandler::~OnRequestedOncompatibleQosHandler (void) - { - } - - int - OnRequestedOncompatibleQosHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_requested_incompatible_qos (this->dr_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnRequestedOncompatibleQosHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnRequestedOncompatibleQosHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnRequestedOncompatibleQosHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnSampleRejectedHandler - //============================================================ - OnSampleRejectedHandler::OnSampleRejectedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleRejectedStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnSampleRejectedHandler::~OnSampleRejectedHandler (void) - { - } - - int - OnSampleRejectedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_sample_rejected (this->dr_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnSampleRejectedHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnSampleRejectedHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnSampleRejectedHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnInconsistentTopicHandler - //============================================================ - OnInconsistentTopicHandler::OnInconsistentTopicHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::Topic_ptr tp, - const ::DDS::InconsistentTopicStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - tp_ (::DDS::Topic::_duplicate (tp)), - status_ (status) - { - } - - OnInconsistentTopicHandler::~OnInconsistentTopicHandler (void) - { - } - - int - OnInconsistentTopicHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_inconsistent_topic (this->tp_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnInconsistentTopicHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnInconsistentTopicHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnInconsistentTopicHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnOfferedDeadlineMissedHandler - //============================================================ - OnOfferedDeadlineMissedHandler::OnOfferedDeadlineMissedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedDeadlineMissedStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dw_ (::DDS::DataWriter::_duplicate (dw)), - status_ (status) - { - } - - OnOfferedDeadlineMissedHandler::~OnOfferedDeadlineMissedHandler (void) - { - } - - int - OnOfferedDeadlineMissedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_offered_deadline_missed (this->dw_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnOfferedDeadlineMissedHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnOfferedDeadlineMissedHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnOfferedDeadlineMissedHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnOfferedIncompatibleQoSHandler - //============================================================ - OnOfferedIncompatibleQoSHandler::OnOfferedIncompatibleQoSHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedIncompatibleQosStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dw_ (::DDS::DataWriter::_duplicate (dw)), - status_ (status) - { - } - - OnOfferedIncompatibleQoSHandler::~OnOfferedIncompatibleQoSHandler (void) - { - } - - int - OnOfferedIncompatibleQoSHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_offered_incompatible_qos (this->dw_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnOfferedIncompatibleQoSHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnOfferedIncompatibleQoSHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnOfferedIncompatibleQoSHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnRequestedDeadlineMissedHandler - //============================================================ - OnRequestedDeadlineMissedHandler::OnRequestedDeadlineMissedHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedDeadlineMissedStatus & status) : - psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnRequestedDeadlineMissedHandler::~OnRequestedDeadlineMissedHandler () - { - } - - int - OnRequestedDeadlineMissedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->psl_->on_requested_deadline_missed (this->dr_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnRequestedDeadlineMissedHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnRequestedDeadlineMissedHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnRequestedDeadlineMissedHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - - //============================================================ - // OnSampleLostHandler - //============================================================ - OnSampleLostHandler::OnSampleLostHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleLostStatus & status) : - psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnSampleLostHandler::~OnSampleLostHandler () - { - } - - int - OnSampleLostHandler::handle_exception (ACE_HANDLE) - { - try - { - this->psl_->on_sample_lost (this->dr_, this->status_); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "OnSampleLostHandler::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "OnSampleLostHandler::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "OnSampleLostHandler::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h deleted file mode 100644 index ef50ac24205..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h +++ /dev/null @@ -1,160 +0,0 @@ -/** - * @author Johnny Willemsen - * - * Eventhandler on orb thread, handling the - * received data from DDS. - */ - -#ifndef CIAO_DDS_CALLBACK_STATUS_HANDLER -#define CIAO_DDS_CALLBACK_STATUS_HANDLER - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" -#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h" -#include "ace/Event_Handler.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDSCallbackStatusHandlerBase - : public ACE_Event_Handler - { - public: - DDSCallbackStatusHandlerBase (void); - ~DDSCallbackStatusHandlerBase (void); - }; - - class DDS4CCM_DDS_IMPL_Export OnUnexpectedStatusHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnUnexpectedStatusHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - virtual ~OnUnexpectedStatusHandler (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - ::DDS::Entity_var entity_; - ::DDS::StatusKind status_kind_; - }; - - class DDS4CCM_DDS_IMPL_Export OnRequestedOncompatibleQosHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnRequestedOncompatibleQosHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedIncompatibleQosStatus &status); - virtual ~OnRequestedOncompatibleQosHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataReader_var dr_; - ::DDS::RequestedIncompatibleQosStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnSampleRejectedHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnSampleRejectedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleRejectedStatus &status); - virtual ~OnSampleRejectedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataReader_var dr_; - ::DDS::SampleRejectedStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnInconsistentTopicHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnInconsistentTopicHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::Topic_ptr tp, - const ::DDS::InconsistentTopicStatus &status); - virtual ~OnInconsistentTopicHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::Topic_var tp_; - ::DDS::InconsistentTopicStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnOfferedDeadlineMissedHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnOfferedDeadlineMissedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedDeadlineMissedStatus &status); - virtual ~OnOfferedDeadlineMissedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataWriter_var dw_; - ::DDS::OfferedDeadlineMissedStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnOfferedIncompatibleQoSHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnOfferedIncompatibleQoSHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedIncompatibleQosStatus &status); - virtual ~OnOfferedIncompatibleQoSHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataWriter_var dw_; - ::DDS::OfferedIncompatibleQosStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnRequestedDeadlineMissedHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnRequestedDeadlineMissedHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedDeadlineMissedStatus &status); - virtual ~OnRequestedDeadlineMissedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::PortStatusListener_var psl_; - ::DDS::DataReader_var dr_; - ::DDS::RequestedDeadlineMissedStatus const status_; - }; - - class DDS4CCM_DDS_IMPL_Export OnSampleLostHandler - : public DDSCallbackStatusHandlerBase - { - public: - OnSampleLostHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleLostStatus &status); - virtual ~OnSampleLostHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::PortStatusListener_var psl_; - ::DDS::DataReader_var dr_; - ::DDS::SampleLostStatus const status_; - }; - } -} - -#endif /* CIAO_DDS_CALLBACK_STATUS_HANDLER */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp deleted file mode 100644 index 7e325e5e60d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ /dev/null @@ -1,1162 +0,0 @@ -// -*- C++ -*- -#include "ace/Env_Value_T.h" -#include "tao/ORB_Core.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -#include "dds4ccm/impl/TopicListener.h" -#include "dds4ccm/impl/PublisherListener.h" -#include "dds4ccm/impl/SubscriberListener.h" - -#include "dds4ccm/impl/DomainParticipantManager.h" - -#if (CIAO_DDS4CCM_NDDS==1) -# include "dds4ccm/impl/ndds/TypeSupport.h" -# include "dds4ccm/impl/ndds/DomainParticipant.h" -#endif - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "dds/DCPS/Marked_Default_Qos.h" -# include "dds/DCPS/RcHandle_T.h" -# include "dds/DCPS/RTPS/RtpsDiscovery.h" -# include "dds/DCPS/Discovery.h" -# include "dds/DCPS/transport/framework/TransportType_rch.h" -# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst_rch.h" -# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst.h" -# include "dds/DCPS/transport/framework/TransportRegistry.h" -# include "dds/DCPS/transport/framework/TransportConfig_rch.h" -#endif - -#if defined (GEN_OSTREAM_OPS) -#include -#endif - -template -DDS_Base_Connector_T::DDS_Base_Connector_T (void) - : domain_id_ (0) - , configuration_complete_ (false) - , dlf_ (0) - , qos_xml_ (0) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::DDS_Base_Connector_T"); - - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_); - this->domain_id_ = id; -#if (CIAO_DDS4CCM_OPENDDS==1) - ACE_Env_Value oid (ACE_TEXT("OPENDDS_RTPS_DEFAULT_D0"), this->domain_id_); - this->domain_id_ = oid; -#endif - this->dlf_ = - ACE_Dynamic_Service::instance ("DDS4CCM_Logger"); - if (this->dlf_) - { - this->dlf_->init (); - } - qos_xml_ = new DDS_XML_QOS_PARSER_TYPE; - this->create_dds_participant_factory (); -} - -template -DDS_Base_Connector_T::~DDS_Base_Connector_T (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::~DDS_Base_Connector_T"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::~DDS_Base_Connector_T - " - "Connector has been destructed\n")); - delete this->qos_xml_; - this->qos_xml_ = 0; - - if (DPMANAGER->close()) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::~DDS_Base_Connector_T - " - "Closed the domain participant manager, DDS interaction " - "has been shutdown completely.\n")); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::~DDS_Base_Connector_T - " - "Didn't shutdown the domain participant manager, DDS interaction " - "still active.\n")); - } -} - -template -void -DDS_Base_Connector_T::create_dds_participant_factory (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::create_dds_participant_factory"); - try - { - if (::CORBA::is_nil (this->participant_factory_.in ())) - { -#if (CIAO_DDS4CCM_OPENDDS==1) - this->participant_factory_ = TheParticipantFactory; - TheServiceParticipant->set_default_discovery (OpenDDS::DCPS::Discovery::DEFAULT_RTPS); - - OpenDDS::RTPS::RtpsDiscovery_rch disc = - new OpenDDS::RTPS::RtpsDiscovery(OpenDDS::DCPS::Discovery::DEFAULT_RTPS); - - TheServiceParticipant->add_discovery(OpenDDS::DCPS::static_rchandle_cast(disc)); - TheServiceParticipant->set_repo_domain(this->domain_id (), disc->key()); -#else - this->participant_factory_ = - new ::CIAO::NDDS::DDS_DomainParticipantFactory_i; -#endif - } - } - catch (const CORBA::Exception& e) - { - DDS4CCM_PRINT_CORBA_EXCEPTION (DDS4CCM_LOG_LEVEL_ERROR, e, - "DDS_Base_Connector_T::create_dds_participant_factory - " - "Exception caught whilst setting up dds participant factory"); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } -} - -template -::DDS::DomainId_t -DDS_Base_Connector_T::domain_id (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); - - return this->domain_id_; -} - -template -void -DDS_Base_Connector_T::domain_id ( - ::DDS::DomainId_t domain_id) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); - - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->domain_id_ = domain_id; - } -} - -template -char * -DDS_Base_Connector_T::qos_profile (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); - - return CORBA::string_dup (this->qos_profile_.in ()); -} - -template -void -DDS_Base_Connector_T::qos_profile ( - const char * qos_profile) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); - - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->qos_profile_ = ::CORBA::string_dup (qos_profile); - - if (this->qos_xml_) - { - DDS::ReturnCode_t const retcode = this->qos_xml_->init (qos_profile); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::qos_profile - " - "Error while initializing QOS Handler <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - } - } -} - -template -void -DDS_Base_Connector_T::init_domain ( - ::DDS::DomainParticipant_ptr & participant) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::init_domain"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Start configuring default domain <%d>\n", - this->domain_id_)); - -#if (CIAO_DDS4CCM_NDDS==1) - if (this->qos_profile_.in () != 0) - { - this->participant_factory_->set_default_participant_qos_with_profile ( - this->qos_profile_.in ()); - - DDS::DomainParticipant_var dds_dp = - DPMANAGER->get_participant (this->domain_id_, this->qos_profile_.in ()); - - if (::CORBA::is_nil (dds_dp.in ())) - { - // Create a new participant for this qos profile and domain ID. - participant = this->participant_factory_->create_participant_with_profile ( - this->domain_id_, - this->qos_profile_.in (), - ::DDS::DomainParticipantListener::_nil (), - 0); - if (!DPMANAGER->register_participant ( - this->domain_id_, this->qos_profile_.in (), participant)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Error: Unable to register DomainParticipant for domain <%d>\n", - this->domain_id_)); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - } - else - { - // Re-use the domain_participant for this QOS profile and domain ID - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Re-using domainparticipant " - DDS_ENTITY_FORMAT_SPECIFIER - " domain <%d> - " - "qos_profile <%C>\n", - DDS_ENTITY_LOG (dds_dp.in ()), - this->domain_id_, this->qos_profile_.in ())); - - participant = ::DDS::DomainParticipant::_duplicate (dds_dp.in ()); - } - } - else -#endif - { - ::DDS::DomainParticipantQos qos; - DDS::ReturnCode_t const retcode = - this->participant_factory_->get_default_participant_qos (qos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Error: Unable to retrieve default_participant_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (this->qos_profile_.in () != 0 && this->qos_xml_) - { - DDS::ReturnCode_t const retcode_dp_qos = - this->qos_xml_->get_participant_qos ( - qos, - this->qos_profile_.in ()); - - if (retcode_dp_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Error: Unable to retrieve participant QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_dp_qos))); - throw ::CCM_DDS::InternalError (retcode_dp_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << qos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Base_Connector_T::init_domain - ") - ACE_TEXT ("Using participant QOS <%C>\n"), message.c_str())); - } -#endif - - DDS::DomainParticipant_var dds_dp = - DPMANAGER->get_participant (this->domain_id_, this->qos_profile_.in ()); - - if (::CORBA::is_nil (dds_dp.in ())) - { - // Create a new participant for this qos profile and domain ID. - participant = this->participant_factory_->create_participant ( - this->domain_id_, - qos, - ::DDS::DomainParticipantListener::_nil (), - 0); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Created domainparticipant " - DDS_ENTITY_FORMAT_SPECIFIER - " domain <%d> - " - "qos_profile <%C>\n", - DDS_ENTITY_LOG (participant), - this->domain_id_, this->qos_profile_.in ())); - -#if (CIAO_DDS4CCM_OPENDDS==1) - // Ok, we need to create a new domain participant, let us setup some - // special transport settings right now. - // Convert the domain id to a string and by concatenating the qos_profile - // string we get an unique string - char str_domain_id[10]; - ACE_OS::itoa (this->domain_id (), str_domain_id, 10); - std::string config_name = str_domain_id; - std::string rtps_transport_name = str_domain_id; - config_name.append ("#"); - rtps_transport_name.append ("#"); - if (this->qos_profile_.in () != 0) - { - config_name.append (this->qos_profile_.in ()); - rtps_transport_name.append (this->qos_profile_.in ()); - } - rtps_transport_name.append ("#"); - rtps_transport_name.append ("transport"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Creating OpenDDS config <%C> for transport <%C>\n", - config_name.c_str(), rtps_transport_name.c_str ())); - - OpenDDS::DCPS::TransportInst_rch inst = - OpenDDS::DCPS::TransportRegistry::instance()->get_inst(rtps_transport_name); - - if (inst.is_nil()) - { - inst = - OpenDDS::DCPS::TransportRegistry::instance()->create_inst(rtps_transport_name, - "rtps_udp"); - } - - OpenDDS::DCPS::TransportConfig_rch config = - OpenDDS::DCPS::TransportRegistry::instance()->get_config(config_name); - - if (config.is_nil ()) - { - config = - OpenDDS::DCPS::TransportRegistry::instance()->create_config(config_name); - } - - config->instances_.push_back (inst); - TheTransportRegistry->bind_config(config, participant); -#endif - - if (!DPMANAGER->register_participant ( - this->domain_id_, this->qos_profile_.in (), participant)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Error: Unable to register DomainParticipant for domain <%d>\n", - this->domain_id_)); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - } - else - { - // Re-use the domain_participant for this QOS profile and domain ID - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Re-using domainparticipant " - DDS_ENTITY_FORMAT_SPECIFIER - ". domain <%d> - " - "qos_profile <%C>\n", - DDS_ENTITY_LOG (dds_dp.in ()), - this->domain_id_, this->qos_profile_.in ())); - participant = ::DDS::DomainParticipant::_duplicate (dds_dp.in ()); - } - } - - if (::CORBA::is_nil (participant)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_domain - " - "Error: Unable to create DomainParticipant for domain <%d>\n", - this->domain_id_)); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } -} - -template -void -DDS_Base_Connector_T::set_session_context ( - ::Components::SessionContext_ptr ctx) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::set_session_context"); - - typename CCM_TYPE::context_type::_var_type lctx = - CCM_TYPE::context_type::_narrow (ctx); - - if (::CORBA::is_nil (lctx.in ())) - { - throw ::CORBA::INTERNAL (); - } - - this->context_ = lctx; -} - -template -void -DDS_Base_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::configuration_complete"); - this->init_domain (this->domain_participant_.inout ()); - this->configuration_complete_ = true; -} - -template -void -DDS_Base_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_activate"); -} - -template -void -DDS_Base_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_passivate"); -} - -template -void -DDS_Base_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_remove"); - - ::DDS::DomainParticipant_var dp = this->domain_participant_._retn (); - if (!::CORBA::is_nil (dp.in ())) - { - this->remove_domain (dp.in ()); - } -} - -template -ACE_Reactor* -DDS_Base_Connector_T::reactor (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::reactor"); - - ACE_Reactor* reactor = 0; - -#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - ::CORBA::Object_var ccm_object = this->context_->get_CCM_object(); - if (!::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (!::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - if (!reactor) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::ccm_activate - " - "No reactor to perform required context switch.\n")); - throw ::CORBA::INTERNAL (); - } - } - } -#endif - return reactor; -} - -/** - * Initialization - **/ -template -void -DDS_Base_Connector_T::init_topic ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Topic_ptr & topic, - const char * topic_name, - const char * type_name) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::init_topic"); - - ::DDS::Duration_t timeout; - timeout.sec = 0; - timeout.nanosec = 0; - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Finding existing topic " - "name <%C> for profile <%C> in participant " - DDS_ENTITY_FORMAT_SPECIFIER "\n", - topic_name, this->qos_profile_.in (), - DDS_ENTITY_LOG (participant))); - - ::DDS::Topic_var dds_tp = - participant->find_topic (topic_name, timeout); - - if (!CORBA::is_nil (dds_tp.in ())) - { - // Re-use topic. - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Re using topic <%C> for profile <%C>\n", - topic_name, this->qos_profile_.in ())); - - topic = ::DDS::Topic::_duplicate (dds_tp); - return; - } -#if (CIAO_DDS4CCM_NDDS==1) - if (this->qos_profile_.in () != 0) - { - // Create a new topic - topic = participant->create_topic_with_profile (topic_name, - type_name, - this->qos_profile_.in (), - ::DDS::TopicListener::_nil (), - 0); - } - else -#endif - { - ::DDS::TopicQos tqos; - DDS::ReturnCode_t const retcode = - participant->get_default_topic_qos (tqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Error: Unable to retrieve default_topic_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (this->qos_profile_.in () != 0 && this->qos_xml_) - { - DDS::ReturnCode_t const retcode_tp_qos = - this->qos_xml_->get_topic_qos ( - tqos, - this->qos_profile_.in (), - topic_name); - - if (retcode_tp_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Error: Unable to retrieve topic QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_tp_qos))); - throw ::CCM_DDS::InternalError (retcode_tp_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << tqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Base_Connector_T::init_topic - ") - ACE_TEXT ("Using topic QOS <%C>\n"), message.c_str())); - } -#endif - - // Create a new topic - topic = participant->create_topic (topic_name, - type_name, - tqos, - ::DDS::TopicListener::_nil (), - 0); - } - - if (!::CORBA::is_nil (topic)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Created new topic " - DDS_ENTITY_FORMAT_SPECIFIER - " name <%C> type <%C> for profile <%C>\n", - DDS_ENTITY_LOG (topic), - topic_name, type_name, this->qos_profile_.in ())); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_topic - " - "Error: unable to create new topic <%C> for profile <%C>\n", - topic_name, this->qos_profile_.in ())); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } -} - -template -void -DDS_Base_Connector_T::init_publisher ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Publisher_ptr & publisher) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::init_publisher"); - - if (::CORBA::is_nil (publisher)) - { -#if (CIAO_DDS4CCM_NDDS==1) - if (this->qos_profile_.in () != 0) - { - publisher = participant->create_publisher_with_profile ( - this->qos_profile_.in (), - ::DDS::PublisherListener::_nil (), - 0); - } - else -#endif - { - ::DDS::PublisherQos pqos; - DDS::ReturnCode_t const retcode = - participant->get_default_publisher_qos (pqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_publisher - " - "Error: Unable to retrieve get_default_publisher_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (this->qos_profile_.in () != 0 && this->qos_xml_) - { - DDS::ReturnCode_t const retcode_pub_qos = - this->qos_xml_->get_publisher_qos ( - pqos, - this->qos_profile_.in ()); - - if (retcode_pub_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_publisher - " - "Error: Unable to retrieve publisher QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_pub_qos))); - throw ::CCM_DDS::InternalError (retcode_pub_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << pqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Base_Connector_T::init_publisher - ") - ACE_TEXT ("Using publisher QOS <%C>\n"), message.c_str())); - } -#endif - - publisher = participant->create_publisher (pqos, - ::DDS::PublisherListener::_nil (), - 0); - } - if (!::CORBA::is_nil (publisher)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_publisher - " - "Created publisher " - DDS_ENTITY_FORMAT_SPECIFIER - " using participant " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (publisher), - DDS_ENTITY_LOG (participant))); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_publisher - " - "Error: DDS returned a nil publisher.\n")); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - } -} - -template -void -DDS_Base_Connector_T::init_subscriber ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Subscriber_ptr & subscriber) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::init_subscriber"); - - if (::CORBA::is_nil (subscriber)) - { -#if (CIAO_DDS4CCM_NDDS==1) - if (this->qos_profile_.in () != 0) - { - subscriber = participant->create_subscriber_with_profile ( - this->qos_profile_.in (), - ::DDS::SubscriberListener::_nil (), - 0); - } - else -#endif - { - ::DDS::SubscriberQos sqos; - DDS::ReturnCode_t const retcode = - participant->get_default_subscriber_qos (sqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_subscriber - " - "Error: Unable to retrieve get_default_subscriber_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (this->qos_profile_.in () != 0 && this->qos_xml_) - { - DDS::ReturnCode_t const retcode_sub_qos = - this->qos_xml_->get_subscriber_qos ( - sqos, - this->qos_profile_.in ()); - - if (retcode_sub_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_subscriber - " - "Error: Unable to retrieve subscriber QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_sub_qos))); - throw ::CCM_DDS::InternalError (retcode_sub_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << sqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Base_Connector_T::init_subscriber - ") - ACE_TEXT ("Using subscriber QOS <%C>\n"), message.c_str())); - } -#endif - - subscriber = participant->create_subscriber (sqos, - ::DDS::SubscriberListener::_nil (), - 0); - } - if (!::CORBA::is_nil (subscriber)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::init_subscriber - " - "Created subscriber " - DDS_ENTITY_FORMAT_SPECIFIER - " using participant " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (subscriber), - DDS_ENTITY_LOG (participant))); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::init_subscriber - " - "Error: DDS returned a nil subscriber.\n")); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - } -} - -/** - * Activation - **/ -template -void -DDS_Base_Connector_T::activate_topic ( - ACE_Reactor* reactor, - ::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr & listener) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_topic"); - - ::CCM_DDS::ConnectorStatusListener_var error_listener = - this->context_->get_connection_error_listener (); - - ::DDS::StatusMask const mask = - ::CIAO::DDS4CCM::TopicListener::get_mask (error_listener.in ()); - - if (mask != 0) - { - // If no listener has been passed in we create the default - // topic listener - if (::CORBA::is_nil (listener)) - { - ACE_NEW_THROW_EX (listener, - ::CIAO::DDS4CCM::TopicListener ( - error_listener.in (), - reactor), - ::CORBA::NO_MEMORY ()); - } - - DDS::ReturnCode_t const retcode = topic->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::activate_topic - " - "Error while setting the listener on the topic - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Base_Connector_T::activate_publisher ( - ACE_Reactor* reactor, - ::DDS::Publisher_ptr publisher, - ::DDS::PublisherListener_ptr & publisher_listener) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_publisher"); - - ::CCM_DDS::ConnectorStatusListener_var error_listener = - this->context_->get_connection_error_listener (); - - ::DDS::StatusMask const mask = - ::CIAO::DDS4CCM::PublisherListener::get_mask (error_listener.in ()); - - if (mask != 0) - { - if (::CORBA::is_nil (publisher_listener)) - { - ACE_NEW_THROW_EX (publisher_listener, - ::CIAO::DDS4CCM::PublisherListener ( - error_listener.in (), - reactor), - ::CORBA::NO_MEMORY ()); - } - - DDS::ReturnCode_t const retcode = publisher->set_listener (publisher_listener, - mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::activate_publisher - " - "Error while setting the listener on the publisher - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Base_Connector_T::activate_subscriber ( - ACE_Reactor* reactor, - ::DDS::Subscriber_ptr subscriber, - ::DDS::SubscriberListener_ptr & subscriber_listener) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::activate_subscriber"); - - ::CCM_DDS::ConnectorStatusListener_var error_listener = - this->context_->get_connection_error_listener (); - - ::DDS::StatusMask const mask = - ::CIAO::DDS4CCM::SubscriberListener::get_mask (error_listener.in ()); - - if (mask != 0) - { - if (::CORBA::is_nil (subscriber_listener)) - { - ACE_NEW_THROW_EX (subscriber_listener, - ::CIAO::DDS4CCM::SubscriberListener ( - error_listener.in (), - reactor), - ::CORBA::NO_MEMORY ()); - } - - DDS::ReturnCode_t const retcode = subscriber->set_listener (subscriber_listener, - mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::activate_subscriber - " - "Error while setting the listener on the subscriber - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -/** - * Passivation - **/ -template -void -DDS_Base_Connector_T::passivate_topic ( - ::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr topic_listener) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_topic"); - - if (!::CORBA::is_nil (topic_listener)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_topic - " - "Setting the listener on the topic to nil\n")); - - DDS::ReturnCode_t const retcode = - topic->set_listener (::DDS::TopicListener::_nil (), 0); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_topic - " - "Error while setting the listener on the topic - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Base_Connector_T::passivate_publisher ( - ::DDS::Publisher_ptr publisher, - ::DDS::PublisherListener_ptr publisher_listener) - -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_publisher"); - - if (!::CORBA::is_nil (publisher_listener)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_publisher - " - "Setting the listener on the publisher to nil\n")); - - DDS::ReturnCode_t const retcode = - publisher->set_listener (::DDS::PublisherListener::_nil (), 0); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_publisher - " - "Error while setting the listener on the publisher - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Base_Connector_T::passivate_subscriber ( - ::DDS::Subscriber_ptr subscriber, - ::DDS::SubscriberListener_ptr subscriber_listener) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::passivate_subscriber"); - - if (!::CORBA::is_nil (subscriber_listener)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_subscriber - " - "Setting the listener on the subscriber to nil\n")); - - DDS::ReturnCode_t const retcode = - subscriber->set_listener (::DDS::SubscriberListener::_nil (), 0); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::passivate_subscriber - " - "Error while setting the listener on the subscriber - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -/** - * Removal - **/ -template -void DDS_Base_Connector_T::remove_topic ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Topic_ptr topic) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_topic"); - - CORBA::String_var name = topic->get_name (); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_topic - " - "Going to delete topic <%C> " - DDS_ENTITY_FORMAT_SPECIFIER - "from participant" - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - name.in (), - DDS_ENTITY_LOG (topic), - DDS_ENTITY_LOG (participant))); - - DDS::ReturnCode_t const retcode = participant->delete_topic (topic); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_topic - " - "Deleted topic <%C> " - DDS_ENTITY_FORMAT_SPECIFIER - "from " - DDS_ENTITY_FORMAT_SPECIFIER - " return code <%C>\n", - name.in (), - DDS_ENTITY_LOG (topic), - DDS_ENTITY_LOG (participant), - ::CIAO::DDS4CCM::translate_retcode (retcode))); - - if (retcode != ::DDS::RETCODE_OK && retcode != ::DDS::RETCODE_PRECONDITION_NOT_MET) - { - throw ::CCM_DDS::InternalError (retcode, 0); - } -} - -template -void -DDS_Base_Connector_T::remove_publisher ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Publisher_ptr publisher) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_publisher"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_publisher - " - "Going to delete publisher " - DDS_ENTITY_FORMAT_SPECIFIER - " from participant" - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (publisher), - DDS_ENTITY_LOG (participant))); - - DDS::ReturnCode_t const retval = - participant->delete_publisher (publisher); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_publisher - " - "Unable to delete publisher: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - throw ::CORBA::INTERNAL (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_publisher - " - "Deleted publisher\n")); - } -} - -template -void -DDS_Base_Connector_T::remove_subscriber ( - ::DDS::DomainParticipant_ptr participant, - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_subscriber"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_subscriber - " - "Going to delete subscriber " - DDS_ENTITY_FORMAT_SPECIFIER - " from participant" - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (subscriber), - DDS_ENTITY_LOG (participant))); - - DDS::ReturnCode_t const retval = - participant->delete_subscriber (subscriber); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_subscriber - " - "Unable to delete subscriber: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - throw ::CORBA::INTERNAL (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - "DDS_Base_Connector_T::remove_subscriber - " - "Deleted subscriber\n")); - } -} - -template -void -DDS_Base_Connector_T::remove_domain ( - ::DDS::DomainParticipant_ptr participant) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::remove_domain"); - - DDS::ReturnCode_t retcode = DDS::RETCODE_OK; - - if (DPMANAGER->unregister_participant ( - this->domain_id_, this->qos_profile_.in (), participant)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::remove_domain - " - "Going to delete contained entities of participant " - DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> with qos <%C>.\n", - DDS_ENTITY_LOG (participant), - this->domain_id_, this->qos_profile_.in ())); - - retcode = participant->delete_contained_entities (); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::remove_domain - " - "Deleted contained entities for participant " - DDS_ENTITY_FORMAT_SPECIFIER - " remove_topic - Deleted topic for domain <%d> with qos <%C> " - "return code <%C>\n", - DDS_ENTITY_LOG (participant), - this->domain_id_, this->qos_profile_.in (), - ::CIAO::DDS4CCM::translate_retcode (retcode))); - - if (retcode != ::DDS::RETCODE_OK) - { - throw ::CCM_DDS::InternalError (retcode, 0); - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::remove_domain - " - "Going to delete participant " - DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> with qos <%C>.\n", - DDS_ENTITY_LOG (participant), - this->domain_id_, this->qos_profile_.in ())); - - retcode = this->participant_factory_->delete_participant (participant); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Base_Connector_T" - "::remove_domain - " - "Deleted participant for domain <%d> with qos <%C> " - "return code <%C>\n", - this->domain_id_, this->qos_profile_.in (), - ::CIAO::DDS4CCM::translate_retcode (retcode))); - } - - if (retcode != ::DDS::RETCODE_OK) - { - throw ::CCM_DDS::InternalError (retcode, 0); - } -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h deleted file mode 100644 index c9a6f84a13b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h +++ /dev/null @@ -1,218 +0,0 @@ -/** - * @author Johnny Willemsen - */ -#ifndef DDS_BASE_CONNECTOR_T_H_ -#define DDS_BASE_CONNECTOR_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/logger/Logger_Service.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "ace/Copy_Disabled.h" - -#if (CIAO_DDS4CCM_NDDS==1) -# include "dds4ccm/impl/ndds/DomainParticipantFactory.h" -#elif (CIAO_DDS4CCM_OPENDDS==1) -# include "dds/DCPS/Service_Participant.h" -# include "dds/DCPS/QOS_XML_Handler/QOS_XML_Loader.h" -#endif - -template -class DDS_Base_Connector_T - : public virtual CCM_TYPE::base_type, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled -{ -public: - DDS_Base_Connector_T (void); - virtual ~DDS_Base_Connector_T (void); - - /** - * @name domain_id - * Accessors for domain_id - */ - //@{ - virtual ::DDS::DomainId_t domain_id (void); - - virtual void domain_id (::DDS::DomainId_t domain_id); - //@} - - /** - * @name qos_profile - * Accessors for qos_profile - */ - //@{ - virtual char *qos_profile (void); - - virtual void qos_profile (const char * qos_profile); - //@} - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - /** - * - * Interface methods for the Deployment and Configuration Framework - */ - //@{ - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - //@} - -private: - /** - * Initialization of the domain participant factory. - */ - void create_dds_participant_factory (void); - -protected: - - /** - * Initialization of a connector. - * - * When one wants to use his own DDS::DomainParticipant, DDS::Topic, - * DDS::Subscriber and/or DDS::Publisher, these helper methods allows - * to create these, independent of the DDS vendor. - * - * See - * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp - * on how to use these methods. - * - * These methods will create the DDS4CCM Entities (and therefor the DDS - * entities in DDS itself), like DomainParticipant, Topic, Subscriber and Publisher - * - */ - //@{ - void init_domain (::DDS::DomainParticipant_ptr & participant); - - virtual void register_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) = 0; - - void init_topic (::DDS::DomainParticipant_ptr participant, - ::DDS::Topic_ptr & topic, - const char * topic_name, - const char * type_name); - void init_publisher (::DDS::DomainParticipant_ptr participant, - ::DDS::Publisher_ptr & publisher); - void init_subscriber (::DDS::DomainParticipant_ptr participant, - ::DDS::Subscriber_ptr & subscriber); - //@} - - /** - * Activation of a connector. - * - * Helper methods to create the DDS listeners and attach them to the DDS Entities. - * This will activate the DDS Entities. - * - */ - //@{ - void activate_topic (ACE_Reactor* reactor, - ::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr & listener); - void activate_publisher (ACE_Reactor* reactor, - ::DDS::Publisher_ptr publisher, - ::DDS::PublisherListener_ptr & publisher_listener); - void activate_subscriber (ACE_Reactor* reactor, - ::DDS::Subscriber_ptr subscriber, - ::DDS::SubscriberListener_ptr & subscriber_listener); - //@} - - /** - * Passivation of a connector. - * - * Helper methods to detach the DDS listeners from the DDS Entities. - * This'll passivate the DDS Entities. - * - * In order to allow a thread safe and memory leak free passivation, one should - * use a temporary _var variable and assign this by using _retn () in the calling - * methods. - * - * For example: - * - * DDS::TopicListener_var tmp = this->topic_listener_._retn (); - * if (!::CORBA::is_nil (tmp.in ())) this->passivate_topi (this->topic_.in (), - * tmp.in ()); - * - * Where topic_listener_ and topic_ are _var class members of a derived, user - * defined class. - * - * Again, see - * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp - * on how to passivate a connector. - * - */ - //@{ - void passivate_topic (::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr topic_listener); - void passivate_publisher (::DDS::Publisher_ptr publisher, - ::DDS::PublisherListener_ptr publisher_listener); - void passivate_subscriber (::DDS::Subscriber_ptr subscriber, - ::DDS::SubscriberListener_ptr subscriber_listener); - //@} - - /** - * Removal of a connector. - * - * Helper methods to remove the DDS Entities from memory. - * - * Again, one should use a temporary _var variable and _retn () in order to - * remove the DDS Entities in a thread safe and memory leak free manner. - * See 'Passivation of a connector' in this file. - */ - //@{ - void remove_topic (::DDS::DomainParticipant_ptr participant, - ::DDS::Topic_ptr topic); - void remove_publisher (::DDS::DomainParticipant_ptr participant, - ::DDS::Publisher_ptr publisher); - void remove_subscriber (::DDS::DomainParticipant_ptr participant, - ::DDS::Subscriber_ptr subscriber); - void remove_domain (::DDS::DomainParticipant_ptr participant); - - virtual - void unregister_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) = 0; - //@} - - /// Get the reactor associated with this component - ACE_Reactor * reactor (void); - - /** - * Attribute of DDS4CCM Base - */ - //@{ - ::DDS::DomainId_t domain_id_; - ::CORBA::String_var qos_profile_; - //@} - - /** - * @name configuration_complete_ - * Indicates whether configuration_complete has been invoked. Once invoked, - * changing a connectors attribute is not allowed anymore. If the user still - * wants to set an attribute, a NonChangeable exception is thrown. - */ - bool configuration_complete_; - - ::CIAO::DDS4CCM::Logger_Service * dlf_; - - ::DDS::DomainParticipant_var domain_participant_; - - /** - * Context of the connector. Used to make connection to the user component - * like the interface to the data listeners. - */ - typename CCM_TYPE::context_type::_var_type context_; - - /** - * DomainParticipantFactory. Administration of Domain Participants - */ - ::DDS::DomainParticipantFactory_var participant_factory_; - -#if (CIAO_DDS4CCM_OPENDDS==1) - OpenDDS::DCPS::TransportImpl_rch transport_impl_; -#endif - DDS_XML_QOS_PARSER_TYPE* qos_xml_; -}; - -#include "dds4ccm/impl/DDS_Base_Connector_T.cpp" - -#endif /* DDS_BASE_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp deleted file mode 100644 index 34a86e07f1d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp +++ /dev/null @@ -1,572 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataReaderListener_T.h" -#include "dds4ccm/impl/Writer_T.h" -#include "dds4ccm/impl/Getter_T.h" -#include "dds4ccm/impl/Reader_T.h" -#include "dds4ccm/impl/DataListenerControl_T.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -template -DDS_Event_Connector_T::DDS_Event_Connector_T (void) : - TopicBaseConnector (), - supplier_obtained_ (false), - push_consumer_obtained_ (false), - pull_consumer_obtained_ (false), - supplier_ (), - push_consumer_ (), - pull_consumer_ () -{ -} - -template -DDS_Event_Connector_T::~DDS_Event_Connector_T (void) -{ -} - -template -typename CCM_TYPE::supplier_traits::data_type::_ptr_type -DDS_Event_Connector_T::get_supplier_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_data"); - - this->supplier_obtained_ = true; - this->supplier_.set_component (this); - this->init_publisher_ |= this->supplier_obtained_; - return this->supplier_.get_data (); -} - -template -typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type -DDS_Event_Connector_T::get_supplier_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_dds_entity"); - - this->supplier_obtained_ = true; - this->supplier_.set_component (this); - this->init_publisher_ |= this->supplier_obtained_; - return this->supplier_.get_dds_entity (); -} - -template -typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type -DDS_Event_Connector_T::get_pull_consumer_fresh_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_fresh_data"); - - this->pull_consumer_obtained_ = true; - this->pull_consumer_.set_component (this); - this->init_subscriber_ |= this->pull_consumer_obtained_; - return this->pull_consumer_.get_fresh_data (); -} - -template -typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T::get_push_consumer_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data"); - - this->push_consumer_obtained_ = true; - this->push_consumer_.set_component (this); - this->init_subscriber_ |= this->push_consumer_obtained_; - return this->push_consumer_.get_data (); -} - -template -typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T::get_pull_consumer_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_data"); - - this->pull_consumer_obtained_ = true; - this->pull_consumer_.set_component (this); - this->init_subscriber_ |= this->pull_consumer_obtained_; - return this->pull_consumer_.get_data (); -} - -template -::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T::get_pull_consumer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_filter_config"); - - this->pull_consumer_obtained_ = true; - this->pull_consumer_.set_component (this); - this->init_subscriber_ |= this->pull_consumer_obtained_; - return this->pull_consumer_.get_filter_config (); -} - -template -::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Event_Connector_T::get_push_consumer_data_control (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data_control"); - - this->push_consumer_obtained_ = true; - this->push_consumer_.set_component (this); - this->init_subscriber_ |= this->push_consumer_obtained_; - return this->push_consumer_.get_data_control (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T::get_pull_consumer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_dds_entity"); - - this->pull_consumer_obtained_ = true; - this->pull_consumer_.set_component (this); - this->init_subscriber_ |= this->pull_consumer_obtained_; - return this->pull_consumer_.get_dds_entity (); -} - -template -::CCM_DDS::QueryFilter* -DDS_Event_Connector_T::pull_consumer_filter (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::pull_consumer_filter"); - - return this->pull_consumer_.filter (); -} - -template -void -DDS_Event_Connector_T::pull_consumer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::pull_consumer_filter"); - - this->pull_consumer_.filter (filter); -} - -template -::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T::get_push_consumer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_dds_entity"); - - this->push_consumer_obtained_ = true; - this->push_consumer_.set_component (this); - this->init_subscriber_ |= this->push_consumer_obtained_; - return this->push_consumer_.get_dds_entity (); -} - -template -::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T::get_push_consumer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_filter_config"); - - this->push_consumer_obtained_ = true; - this->push_consumer_.set_component (this); - this->init_subscriber_ |= this->push_consumer_obtained_; - return this->push_consumer_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter* -DDS_Event_Connector_T::push_consumer_filter (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::push_consumer_filter"); - - return this->push_consumer_.filter (); -} - -template -void -DDS_Event_Connector_T::push_consumer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::push_consumer_filter"); - - this->push_consumer_.filter (filter); -} - -template -void -DDS_Event_Connector_T::topic_name ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::topic_name"); - - if (this->stop_dds (topic_name)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "Stopping DDS=>switching to new topic <%C>.\n", - topic_name)); - this->ccm_passivate (); - this->do_ccm_remove (); - - if (ACE_OS::strlen (topic_name) > 0) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "DDS is down. Setting new to <%C>.\n", - topic_name)); - - TopicBaseConnector::topic_name (topic_name); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "Initialize DDS again for topic <%C>.\n", - topic_name)); - - this->do_configuration_complete (); - this->do_ccm_activate (); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "DDS up and running for topic <%C>.\n", - topic_name)); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "DDS is down.\n")); - TopicBaseConnector::topic_name (topic_name); - } - } - else if (this->late_binded (topic_name)) - { - this->do_configuration_complete (); - this->do_ccm_activate (); - } -} - -template -char * -DDS_Event_Connector_T::topic_name (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::topic_name"); - - return TopicBaseConnector::topic_name (); -} - -template -void -DDS_Event_Connector_T::do_configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::do_configuration_complete"); - - typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type - push_consumer_data_listener = - this->context_->get_connection_push_consumer_data_listener (); - - this->push_consumer_obtained_ |= - ! ::CORBA::is_nil (push_consumer_data_listener.in ()); - ::CCM_DDS::PortStatusListener_var push_consumer_psl = - this->context_->get_connection_push_consumer_status (); - this->push_consumer_obtained_ |= ! ::CORBA::is_nil (push_consumer_psl.in ()); - this->init_subscriber_ |= this->push_consumer_obtained_; - - ::CCM_DDS::PortStatusListener_var pull_consumer_psl = - this->context_->get_connection_pull_consumer_status (); - this->pull_consumer_obtained_ |= - ! ::CORBA::is_nil (pull_consumer_psl.in ()); - this->init_subscriber_ |= this->pull_consumer_obtained_; - - TopicBaseConnector::configuration_complete (); - - if (this->push_consumer_obtained_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "Creating push consumer port.\n")); - this->push_consumer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "No need to create push consumer port.\n")); - } - - if (this->supplier_obtained_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "Creating supplier port.\n")); - this->supplier_.configuration_complete( - this->topic_.in (), - this->publisher_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "No need to create supplier port.\n")); - } - - if (this->pull_consumer_obtained_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "Creating pull consumer port.\n")); - this->pull_consumer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T" - "::configuration_complete - " - "No need to create pull consumer port.\n")); - } -} - -template -void -DDS_Event_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::configuration_complete"); - - try - { - if (!this->late_binding ()) - { - this->do_configuration_complete (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_Event_Connector_T::configuration_complete"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_Event_Connector_T::configuration_complete"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::configuration_complete - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_Event_Connector_T::do_ccm_activate (void) -{ - ACE_Reactor *reactor = this->reactor (); - - TopicBaseConnector::ccm_activate (); - - if (this->push_consumer_obtained_) - { - typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type push_consumer_data_listener = - this->context_->get_connection_push_consumer_data_listener (); - ::CCM_DDS::PortStatusListener_var push_consumer_psl = - this->context_->get_connection_push_consumer_status (); - - this->push_consumer_.activate ( - push_consumer_data_listener.in (), - push_consumer_psl.in (), - reactor); - } - - if (this->supplier_obtained_) - { - this->supplier_.activate (); - } - - if (this->pull_consumer_obtained_) - { - ::CCM_DDS::PortStatusListener_var pull_consumer_psl = - this->context_->get_connection_pull_consumer_status (); - - this->pull_consumer_.activate ( - pull_consumer_psl.in (), - reactor); - } -} - -template -void -DDS_Event_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_activate"); - - try - { - if (!this->late_binding ()) - { - this->do_ccm_activate (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_Event_Connector_T::ccm_activate"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_Event_Connector_T::ccm_activate"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::ccm_activate - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_Event_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_passivate"); - - try - { - if (ACE_OS::strlen (this->topic_name_) != 0) - { - if (this->push_consumer_obtained_) - { - this->push_consumer_.passivate (); - } - - if (this->supplier_obtained_) - { - this->supplier_.passivate (); - } - - if (this->pull_consumer_obtained_) - { - this->pull_consumer_.passivate (); - } - TopicBaseConnector::ccm_passivate (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_Event_Connector_T::ccm_passivate"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_Event_Connector_T::ccm_passivate"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::ccm_passivate - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - - -template -void -DDS_Event_Connector_T::do_ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::do_ccm_remove"); - try - { - if (ACE_OS::strlen (this->topic_name_) != 0) - { - if (this->push_consumer_obtained_) - { - this->push_consumer_.remove (this->subscriber_.in ()); - } - - if (this->supplier_obtained_) - { - this->supplier_.remove (this->publisher_.in ()); - } - - if (this->pull_consumer_obtained_) - { - this->pull_consumer_.remove (this->subscriber_.in ()); - } - TopicBaseConnector::ccm_remove (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_Event_Connector_T::do_ccm_remove"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_Event_Connector_T::do_ccm_remove"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::do_ccm_remove - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_Event_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_remove"); - if (this->push_consumer_obtained_) - { - this->push_consumer_.set_component (::CORBA::Object::_nil ()); - } - - if (this->supplier_obtained_) - { - this->supplier_.set_component (::CORBA::Object::_nil ()); - } - - if (this->pull_consumer_obtained_) - { - this->pull_consumer_.set_component (::CORBA::Object::_nil ()); - } - - this->do_ccm_remove (); -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h deleted file mode 100644 index c83bbd5a426..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h +++ /dev/null @@ -1,132 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * DDS Event Connector implementation - */ -#ifndef DDS_EVENT_CONNECTOR_T_H_ -#define DDS_EVENT_CONNECTOR_T_H_ - -#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/DDS_Get_T.h" -#include "dds4ccm/impl/DDS_Write_T.h" -#include "dds4ccm/impl/DDS_Listen_T.h" - -template -class DDS_Event_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ -public: - DDS_Event_Connector_T (void); - virtual ~DDS_Event_Connector_T (void); - - /** - * @name DDS_Write - * DDS_Write operations - */ - //@{ - virtual typename CCM_TYPE::supplier_traits::data_type::_ptr_type get_supplier_data (void); - - virtual typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type get_supplier_dds_entity (void); - //@} - - /** - * @name DDS_Get - * DDS_Get operations - */ - //@{ - virtual typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type - get_pull_consumer_data (void); - - virtual typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type - get_pull_consumer_fresh_data (void); - - virtual ::DDS::CCM_DataReader_ptr get_pull_consumer_dds_entity (void); - - virtual ::CCM_DDS::CCM_ContentFilterSetting_ptr - get_pull_consumer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *pull_consumer_filter (void); - - virtual void pull_consumer_filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - virtual typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type get_push_consumer_data (void); - - virtual ::CCM_DDS::CCM_DataListenerControl_ptr get_push_consumer_data_control (void); - - virtual ::DDS::CCM_DataReader_ptr get_push_consumer_dds_entity (void); - - virtual ::CCM_DDS::CCM_ContentFilterSetting_ptr - get_push_consumer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *push_consumer_filter (void); - - virtual void push_consumer_filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - virtual void topic_name (const char * topic_name); - virtual char *topic_name (void); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - -private: - bool supplier_obtained_; - bool push_consumer_obtained_; - bool pull_consumer_obtained_; - - /** - * DDS_Write supplier - */ - //@{ - DDS_Write_T < - typename CCM_TYPE::supplier_traits, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - supplier_; - //@} - - /** - * DDS_Listen push_consumer - */ - //@{ - DDS_Listen_T < - typename CCM_TYPE::push_consumer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - CIAO::DDS4CCM::DDS4CCM_TAKE> - push_consumer_; - //@} - - /** - * DDS_Get pull_consumer - */ - //@{ - DDS_Get_T < - typename CCM_TYPE::pull_consumer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - FIXED> - pull_consumer_; - //@} - - void do_configuration_complete (void); - void do_ccm_activate (void); - void do_ccm_remove (void); - - typedef DDS_TopicBase_Connector_T TopicBaseConnector; -}; - -#include "dds4ccm/impl/DDS_Event_Connector_T.cpp" - -#endif /* DDS_EVENT_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp deleted file mode 100644 index 05d68c4e6ec..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -DDS_Get_T::DDS_Get_T (void) -{ -} - -template -DDS_Get_T::~DDS_Get_T (void) -{ -} - -template -void -DDS_Get_T::set_component (::CORBA::Object_ptr component) -{ - SubscriberBase_type::set_component (component); - this->dds_get_->_set_component (component); -} - -template -void -DDS_Get_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml) -{ - DDS4CCM_TRACE ("DDS_Get_T::configuration_complete"); - - SubscriberBase_type::configuration_complete (topic, - subscriber, - qos_profile, - qos_xml); - - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - this->dds_get_->set_dds_reader (dr.in (), &this->condition_manager_); -} - -template -void -DDS_Get_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Get_T::remove"); - SubscriberBase_type::remove (subscriber); -} - -template -typename CCM_TYPE::fresh_data_type::_ptr_type -DDS_Get_T::get_fresh_data (void) -{ - DDS4CCM_TRACE ("DDS_Get_T::get_fresh_data"); - - return CCM_TYPE::fresh_data_type::_duplicate (this->dds_get_); -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h deleted file mode 100644 index 2c7e9407e92..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_GET_T_H_ -#define DDS_GET_T_H_ - -#include "dds4ccm/impl/DDS_Subscriber_Base_T.h" -#include "dds4ccm/impl/Getter_T.h" - -template -class DDS_Get_T - : public DDS_Subscriber_Base_T -{ -public: - DDS_Get_T (void); - ~DDS_Get_T (void); - - /** - * @name DDS_Get - * DDS_Get operations - */ - //@{ - typename CCM_TYPE::fresh_data_type::_ptr_type get_fresh_data (void); - //@} - - void set_component (::CORBA::Object_ptr component); - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml); - - void remove (::DDS::Subscriber_ptr subscriber); - -private: - typedef DDS_Subscriber_Base_T - SubscriberBase_type; - - typedef ::CIAO::DDS4CCM::Getter_T< - typename CCM_TYPE::fresh_data_type, - TYPED_DDS_READER , - VALUE_TYPE, - SEQ_VALUE_TYPE, - FIXED> - Getter_type; - - /** - * DDS_Get - */ - //@{ - ::DDS::DataReaderListener_var listener_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T dds_get_; - //@} -}; - -#include "dds4ccm/impl/DDS_Get_T.cpp" - -#endif /* DDS_GET_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp deleted file mode 100644 index 42623aec1db..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataListenerControl_T.h" -#include "dds4ccm/impl/DataReaderListener_T.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -DDS_Listen_T::DDS_Listen_T (void) -{ -} - -template -DDS_Listen_T::~DDS_Listen_T (void) -{ -} - -template -void -DDS_Listen_T::set_component ( - ::CORBA::Object_ptr component) -{ - DDS_Subscriber_Base_T::set_component (component); - this->data_control_->_set_component (component); -} - -template -void -DDS_Listen_T::activate ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_Listen_T::activate"); - - ::DDS::StatusMask const mask = - DataReaderListener_type::get_mask (listener, status); - - if (mask != 0) - { - if (::CORBA::is_nil (this->listener_.in ())) - { - ACE_NEW_THROW_EX (this->listener_, - DataReaderListener_type ( - listener, - status, - this->data_control_, - reactor, - this->condition_manager_), - ::CORBA::NO_MEMORY ()); - } - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - if (!::CORBA::is_nil (dr.in ())) - { - ::DDS::ReturnCode_t const retcode = dr->set_listener ( - this->listener_.in (), mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Listen_T::activate - " - "Error while setting the listener on the listen - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Listen_T::activate - " - "Error while retrieving the DataReader\n")); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Listen_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Listen_T::remove"); - - SubscriberBase_type::remove (subscriber); -} - -template -::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Listen_T::get_data_control (void) -{ - DDS4CCM_TRACE ("DDS_Listen_T::get_data_control"); - - return ::CCM_DDS::CCM_DataListenerControl::_duplicate (this->data_control_); -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h deleted file mode 100644 index 613328c610f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_LISTEN_T_H_ -#define DDS_LISTEN_T_H_ - -#include "dds4ccm/impl/DDS_Subscriber_Base_T.h" -#include "dds4ccm/impl/DataReaderListener_T.h" -#include "dds4ccm/impl/DataListenerControl_T.h" -#include "dds4ccm/impl/Utils.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -/** - * Template implementing the DDS4CCM Listen basic port - * @tparam CCM_TYPE Set of type traits for this basic port - * @tparam TYPED_DDS_READER The typed DDS DataReader type - * @tparam SEQ_TYPE The type of sequence - * @tparam LRT An enum indicating the read or take semantics of this port - */ -template -class DDS_Listen_T - : public DDS_Subscriber_Base_T -{ -public: - DDS_Listen_T (void); - ~DDS_Listen_T (void); - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - ::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void); - //@} - - void set_component (::CORBA::Object_ptr component); - - void activate ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor); - - void remove (::DDS::Subscriber_ptr subscriber); - -private: - typedef ::CIAO::DDS4CCM::DataReaderListener_T - DataReaderListener_type; - typedef CCM_DDS_DataListenerControl_T< ::CCM_DDS::CCM_DataListenerControl> - DataListenerControl_type; - typedef DDS_Subscriber_Base_T - SubscriberBase_type; - - /** - * DDS_Listen - */ - //@{ - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T data_control_; - //@} -}; - -#include "dds4ccm/impl/DDS_Listen_T.cpp" - -#endif /* DDS_LISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp deleted file mode 100644 index 81688f74ce3..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -DDS_Read_T::DDS_Read_T (void) -{ -} - -template -DDS_Read_T::~DDS_Read_T (void) -{ -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h deleted file mode 100644 index bba7d944bbf..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_READ_T_H_ -#define DDS_READ_T_H_ - -#include "dds4ccm/impl/DDS_Subscriber_Base_T.h" - -template -class DDS_Read_T - : public DDS_Subscriber_Base_T -{ -public: - DDS_Read_T (void); - ~DDS_Read_T (void); -}; - -#include "dds4ccm/impl/DDS_Read_T.cpp" - -#endif /* DDS_READ_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp deleted file mode 100644 index e1f25b90760..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataReaderStateListener_T.h" -#include "dds4ccm/impl/StateListenerControl_T.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -DDS_StateListen_T::DDS_StateListen_T (void) -{ -} - -template -DDS_StateListen_T::~DDS_StateListen_T (void) -{ -} - -template -void -DDS_StateListen_T::set_component ( - ::CORBA::Object_ptr component) -{ - DDS_Subscriber_Base_T::set_component (component); - this->data_control_->_set_component (component); -} - -template -void -DDS_StateListen_T::activate ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::activate"); - - ::DDS::StatusMask const mask = - DataReaderStateListener_type::get_mask (listener); - - if (mask != 0) - { - if (::CORBA::is_nil (this->listener_.in ())) - { - ACE_NEW_THROW_EX (this->listener_, - DataReaderStateListener_type ( - listener, - status, - this->data_control_, - reactor, - this->condition_manager_), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - if (!::CORBA::is_nil (dr.in ())) - { - ::DDS::ReturnCode_t const retcode = - dr->set_listener (this->listener_.in (), mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_StateListen_T::activate - " - "Error setting the listener on the DataReader - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_StateListen_T::activate - " - "Error while retrieving the DataReader\n")); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_StateListen_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::remove"); - - SubscriberBase_type::remove (subscriber); -} - -template -::CCM_DDS::CCM_StateListenerControl_ptr -DDS_StateListen_T::get_data_control (void) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::get_data_control"); - - return ::CCM_DDS::CCM_StateListenerControl::_duplicate (this->data_control_); -} - - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h deleted file mode 100644 index d8971a3f1fc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * DDS4CCM StateListen port - */ -#ifndef DDS_STATELISTEN_T_H_ -#define DDS_STATELISTEN_T_H_ - -#include "dds4ccm/impl/DDS_Subscriber_Base_T.h" -#include "dds4ccm/impl/StateListenerControl_T.h" -#include "dds4ccm/impl/DataReaderStateListener_T.h" -#include "dds4ccm/impl/Utils.h" - -template -class DDS_StateListen_T - : public DDS_Subscriber_Base_T -{ -public: - DDS_StateListen_T (void); - ~DDS_StateListen_T (void); - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - ::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void); - //@} - - void set_component (::CORBA::Object_ptr component); - - void activate ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor); - - void remove (::DDS::Subscriber_ptr subscriber); - -private: - typedef ::CIAO::DDS4CCM::DataReaderStateListener_T - DataReaderStateListener_type; - typedef CCM_DDS_StateListenerControl_T< ::CCM_DDS::CCM_StateListenerControl> - StateListenerControl_type; - typedef DDS_Subscriber_Base_T - SubscriberBase_type; - - /** - * DDS_StateListen - */ - //@{ - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T data_control_; - //@} -}; - -#include "dds4ccm/impl/DDS_StateListen_T.cpp" - -#endif /* DDS_STATELISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp deleted file mode 100644 index 0b099761033..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp +++ /dev/null @@ -1,744 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataReaderStateListener_T.h" -#include "dds4ccm/impl/Updater_T.h" -#include "dds4ccm/impl/Reader_T.h" -#include "dds4ccm/impl/DataListenerControl_T.h" -#include "dds4ccm/impl/StateListenerControl_T.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -template -DDS_State_Connector_T::DDS_State_Connector_T (void) : - TopicBaseConnector (), - observable_obtained_ (false), - passive_observer_obtained_ (false), - pull_observer_obtained_ (false), - push_observer_obtained_ (false), - push_state_observer_obtained_ (false) -{ -} - -template -DDS_State_Connector_T::~DDS_State_Connector_T (void) -{ -} - -template -typename CCM_TYPE::observable_traits::data_type::_ptr_type -DDS_State_Connector_T::get_observable_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_observable_data"); - - this->observable_obtained_ = true; - this->observable_.set_component (this); - this->init_publisher_ |= this->observable_obtained_; - return this->observable_.get_data (); -} - -template -typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T::get_observable_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_observable_dds_entity"); - - this->observable_obtained_ = true; - this->observable_.set_component (this); - this->init_publisher_ |= this->observable_obtained_; - return this->observable_.get_dds_entity (); -} - -template -typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type -DDS_State_Connector_T::get_passive_observer_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_passive_observer_data"); - - this->passive_observer_obtained_ = true; - this->passive_observer_.set_component (this); - this->init_subscriber_ |= this->passive_observer_obtained_; - return this->passive_observer_.get_data (); -} - -template -typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T::get_passive_observer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_passive_observer_dds_entity"); - - this->passive_observer_obtained_ = true; - this->passive_observer_.set_component (this); - this->init_subscriber_ |= this->passive_observer_obtained_; - return this->passive_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T::get_passive_observer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_passive_observer_filter_config"); - - this->passive_observer_obtained_ = true; - this->passive_observer_.set_component (this); - this->init_subscriber_ |= this->passive_observer_obtained_; - return this->passive_observer_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter* -DDS_State_Connector_T::passive_observer_filter (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::passive_observer_filter"); - - return this->passive_observer_.filter (); -} - -template -void -DDS_State_Connector_T::passive_observer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::passive_observer_filter"); - - this->passive_observer_.filter (filter); -} - -template -typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_pull_observer_data"); - - this->pull_observer_obtained_ = true; - this->pull_observer_.set_component (this); - this->init_subscriber_ |= this->pull_observer_obtained_; - return this->pull_observer_.get_data (); -} - -template -typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_fresh_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_pull_observer_fresh_data"); - - this->pull_observer_obtained_ = true; - this->pull_observer_.set_component (this); - this->init_subscriber_ |= this->pull_observer_obtained_; - return this->pull_observer_.get_fresh_data (); -} - -template -typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_pull_observer_dds_entity"); - - this->pull_observer_obtained_ = true; - this->pull_observer_.set_component (this); - this->init_subscriber_ |= this->pull_observer_obtained_; - return this->pull_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_pull_observer_filter_config"); - - this->pull_observer_obtained_ = true; - this->pull_observer_.set_component (this); - this->init_subscriber_ |= this->pull_observer_obtained_; - return this->pull_observer_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter* -DDS_State_Connector_T::pull_observer_filter (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::pull_observer_filter"); - - return this->pull_observer_.filter (); -} - -template -void -DDS_State_Connector_T::pull_observer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::pull_observer_filter"); - - this->pull_observer_.filter (filter); -} - -template -typename CCM_TYPE::push_observer_traits::data_type::_ptr_type -DDS_State_Connector_T::get_push_observer_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_observer_data"); - - this->push_observer_obtained_ = true; - this->push_observer_.set_component (this); - this->init_subscriber_ |= this->push_observer_obtained_; - return this->push_observer_.get_data (); -} - -template -typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T::get_push_observer_data_control (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_observer_data_control"); - - this->push_observer_obtained_ = true; - this->push_observer_.set_component (this); - this->init_subscriber_ |= this->push_observer_obtained_; - return this->push_observer_.get_data_control (); -} - -template -typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T::get_push_observer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_observer_dds_entity"); - - this->push_observer_obtained_ = true; - this->push_observer_.set_component (this); - this->init_subscriber_ |= this->push_observer_obtained_; - return this->push_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T::get_push_observer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_observer_filter_config"); - - this->push_observer_obtained_ = true; - this->push_observer_.set_component (this); - this->init_subscriber_ |= this->push_observer_obtained_; - return this->push_observer_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter* -DDS_State_Connector_T::push_observer_filter (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::push_observer_filter"); - - return this->push_observer_.filter (); -} - -template -void -DDS_State_Connector_T::push_observer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::push_observer_filter"); - - this->push_observer_.filter (filter); -} - -template -typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type -DDS_State_Connector_T::get_push_state_observer_data (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_state_observer_data"); - - this->push_state_observer_obtained_ = true; - this->push_state_observer_.set_component (this); - this->init_subscriber_ |= this->push_state_observer_obtained_; - return this->push_state_observer_.get_data (); -} - -template -typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T::get_push_state_observer_data_control (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_state_observer_data_control"); - - this->push_state_observer_obtained_ = true; - this->push_state_observer_.set_component (this); - this->init_subscriber_ |= this->push_state_observer_obtained_; - return this->push_state_observer_.get_data_control (); -} - -template -typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T::get_push_state_observer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_state_observer_dds_entity"); - - this->push_state_observer_obtained_ = true; - this->push_state_observer_.set_component (this); - this->init_subscriber_ |= this->push_state_observer_obtained_; - return this->push_state_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T::get_push_state_observer_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::get_push_state_observer_filter_config"); - - this->push_state_observer_obtained_ = true; - this->push_state_observer_.set_component (this); - this->init_subscriber_ |= this->push_state_observer_obtained_; - return this->push_state_observer_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter* -DDS_State_Connector_T::push_state_observer_filter (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::push_state_observer_filter"); - - return this->push_state_observer_.filter (); -} - -template -void -DDS_State_Connector_T::push_state_observer_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::push_state_observer_filter"); - - this->push_state_observer_.filter (filter); -} - -template -void -DDS_State_Connector_T::topic_name ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::topic_name"); - - if (this->stop_dds (topic_name)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_State_Connector_T::topic_name - " - "Stopping DDS=>switching to new topic <%C>.\n", - topic_name)); - this->ccm_passivate (); - this->do_ccm_remove (); - - if (ACE_OS::strlen (topic_name) > 0) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_State_Connector_T::topic_name - " - "DDS is down. Setting new to <%C>.\n", - topic_name)); - - TopicBaseConnector::topic_name (topic_name); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_State_Connector_T::topic_name - " - "Initialize DDS again for topic <%C>.\n", - topic_name)); - - this->do_configuration_complete (); - this->do_ccm_activate (); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_State_Connector_T::topic_name - " - "DDS up and running for topic <%C>.\n", - topic_name)); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T::topic_name - " - "DDS is down.\n")); - TopicBaseConnector::topic_name (topic_name); - } - } - else if (this->late_binded (topic_name)) - { - this->do_configuration_complete (); - this->do_ccm_activate (); - } -} - -template -char * -DDS_State_Connector_T::topic_name (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::topic_name"); - - return TopicBaseConnector::topic_name (); -} - -template -void -DDS_State_Connector_T::do_configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::do_configuration_complete"); - - ::CCM_DDS::PortStatusListener_var push_observer_psl = - this->context_->get_connection_push_observer_status (); - typename CCM_TYPE::push_observer_traits::data_listener_type::_var_type push_observer_dl = - this->context_->get_connection_push_observer_data_listener (); - this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_psl.in ()); - this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_dl.in ()); - this->init_subscriber_ |= this->push_observer_obtained_; - - ::CCM_DDS::PortStatusListener_var push_state_observer_psl = - this->context_->get_connection_push_state_observer_status (); - typename CCM_TYPE::push_state_observer_traits::data_listener_type::_var_type push_state_observer_dl = - this->context_->get_connection_push_state_observer_data_listener (); - this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_psl.in ()); - this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_dl.in ()); - this->init_subscriber_ |= this->push_state_observer_obtained_; - - ::CCM_DDS::PortStatusListener_var pull_observer_psl = - this->context_->get_connection_pull_observer_status (); - this->pull_observer_obtained_ |= ! ::CORBA::is_nil (pull_observer_psl.in ()); - this->init_subscriber_ |= this->pull_observer_obtained_; - - ::CCM_DDS::PortStatusListener_var passive_observer_psl = - this->context_->get_connection_passive_observer_status (); - this->passive_observer_obtained_ |= ! ::CORBA::is_nil (passive_observer_psl.in ()); - this->init_subscriber_ |= this->passive_observer_obtained_; - - TopicBaseConnector::configuration_complete (); - - if (this->observable_obtained_) - { - this->observable_.configuration_complete ( - this->topic_.in (), - this->publisher_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - - if (this->push_observer_obtained_) - { - this->push_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - - if (this->push_state_observer_obtained_) - { - this->push_state_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - - if (this->pull_observer_obtained_) - { - this->pull_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } - - if (this->passive_observer_obtained_) - { - this->passive_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->qos_profile_.in (), - this->qos_xml_); - } -} - -template -void -DDS_State_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::configuration_complete"); - - try - { - if (!this->late_binding ()) - { - this->do_configuration_complete (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_State_Connector_T::configuration_complete"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_State_Connector_T::configuration_complete"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_State_Connector_T::configuration_complete - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_State_Connector_T::do_ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::do_ccm_activate"); - - ACE_Reactor *reactor = this->reactor (); - - TopicBaseConnector::ccm_activate (); - - if (this->observable_obtained_) - { - this->observable_.activate (); - } - - if (this->push_observer_obtained_) - { - typename CCM_TYPE::push_observer_traits::data_listener_type::_var_type push_observer_dl = - this->context_->get_connection_push_observer_data_listener (); - ::CCM_DDS::PortStatusListener_var push_observer_psl = - this->context_->get_connection_push_observer_status (); - - this->push_observer_.activate ( - push_observer_dl.in (), - push_observer_psl.in (), - reactor); - } - - if (this->push_state_observer_obtained_) - { - typename CCM_TYPE::push_state_observer_traits::data_listener_type::_var_type push_state_observer_dl = - this->context_->get_connection_push_state_observer_data_listener (); - - ::CCM_DDS::PortStatusListener_var push_state_observer_psl = - this->context_->get_connection_push_state_observer_status (); - - this->push_state_observer_.activate ( - push_state_observer_dl.in (), - push_state_observer_psl.in (), - reactor); - } - - if (this->pull_observer_obtained_) - { - ::CCM_DDS::PortStatusListener_var pull_observer_psl = - this->context_->get_connection_pull_observer_status (); - - this->pull_observer_.activate ( - pull_observer_psl.in (), - reactor); - } - - if (this->passive_observer_obtained_) - { - ::CCM_DDS::PortStatusListener_var passive_observer_psl = - this->context_->get_connection_passive_observer_status (); - - this->passive_observer_.activate ( - passive_observer_psl.in (), - reactor); - } -} - -template -void -DDS_State_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::ccm_activate"); - - try - { - if (!this->late_binding ()) - { - this->do_ccm_activate (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_State_Connector_T::ccm_activate"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_State_Connector_T::ccm_activate"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_State_Connector_T::ccm_activate - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_State_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::ccm_passivate"); - - try - { - if (ACE_OS::strlen (this->topic_name_) != 0) - { - if (this->observable_obtained_) - { - this->observable_.passivate (); - } - - if (this->push_observer_obtained_) - { - this->push_observer_.passivate (); - } - - if (this->push_state_observer_obtained_) - { - this->push_state_observer_.passivate (); - } - - if (this->pull_observer_obtained_) - { - this->pull_observer_.passivate (); - } - - if (this->passive_observer_obtained_) - { - this->passive_observer_.passivate (); - } - - TopicBaseConnector::ccm_passivate (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_State_Connector_T::ccm_passivate"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_State_Connector_T::ccm_passivate"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_State_Connector_T::ccm_passivate - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_State_Connector_T::do_ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::do_ccm_remove"); - try - { - if (ACE_OS::strlen (this->topic_name_) != 0) - { - if (this->observable_obtained_) - { - this->observable_.remove (this->publisher_.in ()); - } - - if (this->push_observer_obtained_) - { - this->push_observer_.remove (this->subscriber_.in ()); - } - - if (this->push_state_observer_obtained_) - { - this->push_state_observer_.remove (this->subscriber_.in ()); - } - - if (this->pull_observer_obtained_) - { - this->pull_observer_.remove (this->subscriber_.in ()); - } - - if (this->passive_observer_obtained_) - { - this->passive_observer_.remove (this->subscriber_.in ()); - } - TopicBaseConnector::ccm_remove (); - } - } - catch (const ::CCM_DDS::InternalError &ex) - { - DDS4CCM_PRINT_INTERNAL_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_State_Connector_T::do_ccm_remove"); - throw ::CORBA::INTERNAL (); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DDS_State_Connector_T::do_ccm_remove"); - throw; - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_State_Connector_T::do_ccm_remove - " - "Caught unexpected exception.\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_State_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_State_Connector_T::ccm_remove"); - - if (this->observable_obtained_) - { - this->observable_.set_component (::CORBA::Object::_nil ()); - } - - if (this->push_observer_obtained_) - { - this->push_observer_.set_component (::CORBA::Object::_nil ()); - } - - if (this->push_state_observer_obtained_) - { - this->push_state_observer_.set_component (::CORBA::Object::_nil ()); - } - - if (this->pull_observer_obtained_) - { - this->pull_observer_.set_component (::CORBA::Object::_nil ()); - } - - if (this->passive_observer_obtained_) - { - this->passive_observer_.set_component (::CORBA::Object::_nil ()); - } - - this->do_ccm_remove (); -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h deleted file mode 100644 index 40c54f3b1f7..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h +++ /dev/null @@ -1,209 +0,0 @@ -/** - * @author Johnny Willemsen - * - * DDS State Connector implementation - */ -#ifndef DDS_STATE_CONNECTOR_T_H_ -#define DDS_STATE_CONNECTOR_T_H_ - -#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/DDS_Get_T.h" -#include "dds4ccm/impl/DDS_Listen_T.h" -#include "dds4ccm/impl/DDS_StateListen_T.h" -#include "dds4ccm/impl/DDS_Update_T.h" -#include "dds4ccm/impl/DDS_Read_T.h" - -template -class DDS_State_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ -public: - DDS_State_Connector_T (void); - virtual ~DDS_State_Connector_T (void); - - /** - * @name DDS_Update - * DDS_Update operations - */ - //@{ - virtual typename CCM_TYPE::observable_traits::data_type::_ptr_type - get_observable_data (void); - - virtual typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type - get_observable_dds_entity (void); - //@} - - /** - * @name DDS_Read - * DDS_Read operations - */ - //@{ - virtual typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type - get_passive_observer_data (void); - - virtual typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type - get_passive_observer_dds_entity (void); - - virtual typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type - get_passive_observer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *passive_observer_filter (void); - - virtual void passive_observer_filter (const ::CCM_DDS::QueryFilter & filter); -//@} - - /** - * @name DDS_Get - * DDS_Get operations - */ - //@{ - virtual typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type - get_pull_observer_data (void); - - virtual typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type - get_pull_observer_fresh_data (void); - - virtual typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type - get_pull_observer_dds_entity (void); - - virtual typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type - get_pull_observer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *pull_observer_filter (void); - - virtual void pull_observer_filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - virtual typename CCM_TYPE::push_observer_traits::data_type::_ptr_type - get_push_observer_data (void); - - virtual typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type - get_push_observer_data_control (void); - - virtual typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type - get_push_observer_dds_entity (void); - - virtual typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type - get_push_observer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *push_observer_filter (void); - - virtual void push_observer_filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - /** - * @name DDS_StateListen - * DDS_StateListen operations - */ - //@{ - virtual typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type - get_push_state_observer_data (void); - - virtual typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type - get_push_state_observer_data_control (void); - - virtual typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type - get_push_state_observer_dds_entity (void); - - virtual typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type - get_push_state_observer_filter_config (void); - - virtual ::CCM_DDS::QueryFilter *push_state_observer_filter (void); - - virtual void - push_state_observer_filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - void topic_name (const char * topic_name); - virtual char *topic_name (void); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - -private: - bool observable_obtained_; - bool passive_observer_obtained_; - bool pull_observer_obtained_; - bool push_observer_obtained_; - bool push_state_observer_obtained_; - - /** - * DDS_Update observable - */ - //@{ - DDS_Update_T < - typename CCM_TYPE::observable_traits, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - observable_; - //@} - - /** - * DDS_Read passive_observer - */ - //@{ - DDS_Read_T < - typename CCM_TYPE::passive_observer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - passive_observer_; - //@} - - /** - * DDS_Get pull_observer - */ - //@{ - DDS_Get_T < - typename CCM_TYPE::pull_observer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - FIXED> - pull_observer_; - //@} - - /** - * DDS_Listen push_observer - */ - //@{ - DDS_Listen_T < - typename CCM_TYPE::push_observer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - CIAO::DDS4CCM::DDS4CCM_READ> - push_observer_; - //@} - - /** - * DDS_StateListen push_state_observer - */ - //@{ - DDS_StateListen_T < - typename CCM_TYPE::push_state_observer_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - CIAO::DDS4CCM::DDS4CCM_READ> - push_state_observer_; - //@} - - void do_configuration_complete (void); - void do_ccm_activate (void); - void do_ccm_remove (void); - - typedef DDS_TopicBase_Connector_T TopicBaseConnector; -}; - -#include "dds4ccm/impl/DDS_State_Connector_T.cpp" - -#endif /* DDS_STATE_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp deleted file mode 100644 index ae258d83fa4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ /dev/null @@ -1,333 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/logger/Log_Macros.h" - -#if (CIAO_DDS4CCM_OPENDDS==1) -#include "dds/DCPS/Marked_Default_Qos.h" -#endif - -template -DDS_Subscriber_Base_T::DDS_Subscriber_Base_T (void) - : configuration_complete_ (false) -{ -} - -template -DDS_Subscriber_Base_T::~DDS_Subscriber_Base_T (void) -{ -} - -template -void -DDS_Subscriber_Base_T::set_component ( - ::CORBA::Object_ptr component) -{ - this->dds_read_->_set_component (component); - this->ccm_data_reader_->_set_component (component); -} - -template -void -DDS_Subscriber_Base_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::configuration_complete"); - - this->configuration_complete_ = true; - - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - if (::CORBA::is_nil (dr.in ())) - { - ::DDS::TopicDescription_var td; - - ::CCM_DDS::QueryFilter_var filter = this->cft_setting_->filter (); - if (ACE_OS::strlen (filter->expression.in ()) > 0) - { - ::DDS::ContentFilteredTopic_var cft = - this->cft_setting_->create_contentfilteredtopic (topic, subscriber); - if (CORBA::is_nil (cft.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, - "DDS_Subscriber_Base_T::configuration_complete: " - "Error creating ContentFilteredTopic.\n")); - throw ::CORBA::INTERNAL (); - } - td = ::DDS::TopicDescription::_narrow (cft.in ()); - } - else - { - td = ::DDS::TopicDescription::_narrow (topic); - } -#if (CIAO_DDS4CCM_NDDS==1) - if (qos_profile) - { - dr = subscriber->create_datareader_with_profile ( - td.in (), - qos_profile, - ::DDS::DataReaderListener::_nil (), - 0); - } - else -#endif - { - ::DDS::DataReaderQos drqos; - DDS::ReturnCode_t const retcode = - subscriber->get_default_datareader_qos (drqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::configuration_complete - " - "Error: Unable to retrieve get_default_datareader_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (qos_profile && qos_xml) - { - CORBA::String_var name = topic->get_name (); - DDS::ReturnCode_t const retcode_dr_qos = qos_xml->get_datareader_qos ( - drqos, - qos_profile, - name.in ()); - - if (retcode_dr_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::configuration_complete - " - "Error: Unable to retrieve datawriter QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_dr_qos))); - throw ::CCM_DDS::InternalError (retcode_dr_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << drqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Subscriber_Base_T::configuration_complete - ") - ACE_TEXT ("Using datareader QOS <%C>\n"), message.c_str())); - } -#endif - - dr = subscriber->create_datareader ( - td.in (), - drqos, - ::DDS::DataReaderListener::_nil (), - 0); - } - if (!::CORBA::is_nil (dr.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Subscriber_Base_T::configuration_complete - " - "Created DataReader " - DDS_ENTITY_FORMAT_SPECIFIER - " using subscriber " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (dr.in ()), - DDS_ENTITY_LOG (subscriber))); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::configuration_complete - " - "Error: DDS returned a nil datareader.\n")); - throw ::CORBA::INTERNAL (); - } - - this->dds_read_->set_dds_reader (dr.in (), &this->condition_manager_); - this->ccm_data_reader_->set_dds_entity (dr.in ()); - this->condition_manager_.set_dds_entity (dr.in ()); - this->condition_manager_.init_readcondition (); - - DDS::ReturnCode_t const retcode = dr->enable (); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::configuration_complete - " - "Error: Unable to enable the datareader: <%C>.\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Subscriber_Base_T::activate ( - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::activate"); - - ::DDS::StatusMask const mask = - ::CIAO::DDS4CCM::PortStatusListener::get_mask (status); - - if (mask != 0) - { - if (::CORBA::is_nil (this->listener_.in ())) - { - ACE_NEW_THROW_EX (this->listener_, - ::CIAO::DDS4CCM::PortStatusListener (status, reactor), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - if (!::CORBA::is_nil (dr.in ())) - { - DDS::ReturnCode_t const retcode = dr->set_listener ( - this->listener_.in (), mask); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::activate - " - "Error while setting the listener on the subscriber - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::activate - " - "Error while retrieving the DataReader\n")); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Subscriber_Base_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::passivate"); - - this->condition_manager_.passivate (); - ::DDS::DataReader_var reader = this->dds_read_->get_dds_reader (); - ::DDS::DataReaderListener_var reader_listener = this->listener_._retn (); - if (!::CORBA::is_nil (reader_listener.in ()) && - !::CORBA::is_nil (reader.in ()) ) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Subscriber_Base_T::passivate - " - "Setting the listener on the reader to nil\n")); - - DDS::ReturnCode_t const retcode = - reader->set_listener (::DDS::DataReaderListener::_nil (), 0); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_Base_T::passivate - " - "Error while setting the listener on the reader - <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Subscriber_Base_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::remove"); - - ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); - - this->condition_manager_.set_dds_entity (::DDS::DataReader::_nil ()); - this->dds_read_->set_dds_reader (::DDS::DataReader::_nil (), 0); - this->ccm_data_reader_->set_dds_entity (::DDS::DataReader::_nil ()); - - if (!::CORBA::is_nil (dr.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Subscriber_Base_T::remove - " - "Going to delete DataReader " - DDS_ENTITY_FORMAT_SPECIFIER - " from subscriber " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (dr.in ()), - DDS_ENTITY_LOG (subscriber))); - - DDS::ReturnCode_t const retval = - subscriber->delete_datareader (dr.in ()); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DDS_Subscriber_Base_T::remove - ") - ACE_TEXT ("Unable to delete DataReader: <%C>\n"), - ::CIAO::DDS4CCM::translate_retcode (retval))); - throw ::CORBA::INTERNAL (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - "DDS_Subscriber_Base_T::remove - " - "Deleted DataReader\n")); - } - } - - dr = ::DDS::DataReader::_nil (); - this->cft_setting_->delete_contentfilteredtopic (subscriber); -} - -template -typename CCM_TYPE::data_type::_ptr_type -DDS_Subscriber_Base_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::get_data"); - - return CCM_TYPE::data_type::_duplicate (this->dds_read_); -} - -template -typename CCM_TYPE::dds_entity_type::_ptr_type -DDS_Subscriber_Base_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::get_dds_entity"); - - return CCM_TYPE::dds_entity_type::_duplicate (this->ccm_data_reader_); -} - -template -typename CCM_TYPE::filter_config_type::_ptr_type -DDS_Subscriber_Base_T::get_filter_config (void) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::get_filter_config"); - - return ::CCM_DDS::CCM_ContentFilterSetting::_duplicate (this->cft_setting_); -} - -template -::CCM_DDS::QueryFilter * -DDS_Subscriber_Base_T::filter (void) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::filter"); - - return this->cft_setting_->filter (); -} - -template -void -DDS_Subscriber_Base_T::filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("DDS_Subscriber_Base_T::filter"); - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->cft_setting_->filter (filter); - } -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h deleted file mode 100644 index 537ae837873..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Base class for all ports, containing a reader - */ -#ifndef DDS_SUBSCRIBER_BASE_T_H_ -#define DDS_SUBSCRIBER_BASE_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/impl/Reader_T.h" -#include "dds4ccm/impl/PortStatusListener.h" -#include "dds4ccm/impl/ContentFilterSetting.h" -#include "dds4ccm/impl/ConditionManager.h" -#include "dds4ccm/impl/CCM_DataReader.h" -#include "dds4ccm/impl/LocalObject_T.h" - -template -class DDS_Subscriber_Base_T -{ -public: - DDS_Subscriber_Base_T (void); - ~DDS_Subscriber_Base_T (void); - - /** - * @name DDS_Read - * DDS_Subscriber_Base_T operations - */ - //@{ - typename CCM_TYPE::data_type::_ptr_type get_data (void); - - typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void); - - typename CCM_TYPE::filter_config_type::_ptr_type get_filter_config (void); - - ::CCM_DDS::QueryFilter *filter (void); - - void filter (const ::CCM_DDS::QueryFilter & filter); - //@} - - void set_component (::CORBA::Object_ptr component); - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml); - - void activate ( - ::CCM_DDS::PortStatusListener_ptr listener, - ACE_Reactor* reactor); - - void passivate (void); - - void remove (::DDS::Subscriber_ptr subscriber); - -protected: - typedef ::CIAO::DDS4CCM::Reader_T< - typename CCM_TYPE::data_type, - TYPED_DDS_READER, - VALUE_TYPE, - SEQ_VALUE_TYPE> - Reader_type; - typedef ::CIAO::DDS4CCM::CCM_DDS_ContentFilterSetting_i - ContentFilterSetting_type; - - /** - * DDS_Subscriber_Base_T - */ - //@{ - ::DDS::DataReaderListener_var listener_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T cft_setting_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T dds_read_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< ::CIAO::DDS4CCM::CCM_DataReader > ccm_data_reader_; - - bool configuration_complete_; - //@} - ::CIAO::DDS4CCM::ConditionManager condition_manager_; -}; - -#include "dds4ccm/impl/DDS_Subscriber_Base_T.cpp" - -#endif /* DDS_SUBSCRIBER_BASE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp deleted file mode 100644 index a45d646fa34..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp +++ /dev/null @@ -1,414 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ace/Reactor.h" - -template -DDS_TopicBase_Connector_T::DDS_TopicBase_Connector_T (void) : - BaseConnector () - , init_subscriber_ (false) - , init_publisher_(false) - , late_binding_ (false) -{ -} - -template -DDS_TopicBase_Connector_T::~DDS_TopicBase_Connector_T (void) -{ -} - -template -bool -DDS_TopicBase_Connector_T::late_binding (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::late_binding"); - return this->late_binding_; -} - -template -void -DDS_TopicBase_Connector_T::late_binding (bool late_binding) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::late_binding"); - this->late_binding_ |= late_binding; -} - -template -bool -DDS_TopicBase_Connector_T::stop_dds ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::stop_dds"); - - if (this->topic_name_.in () != 0) - { - // Topic name already set - // Do not stop DDS when topic names are equal - if (ACE_OS::strlen (this->topic_name_.in ()) == 0) - return false; - return ACE_OS::strcmp (this->topic_name_.in (), topic_name) != 0; - } - else - { - // Topic is not set - return false; - } -} - -template -bool -DDS_TopicBase_Connector_T::late_binded ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::late_binded"); - - this->late_binding (ACE_OS::strlen (topic_name) == 0); - - if ((ACE_OS::strlen (topic_name) > 0) && - (this->topic_name_.in () != 0) && - (ACE_OS::strlen (this->topic_name_.in ()) == 0)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ") - ACE_TEXT ("Topic <%C> is late binded.\n"), topic_name)); - DDS_TopicBase_Connector_T::topic_name (topic_name); - return true; - } - else if (!this->configuration_complete_) - { - DDS_TopicBase_Connector_T::topic_name (topic_name); - } - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ") - ACE_TEXT ("Topic <%C> is not late binded.\n"), topic_name)); - return false; -} - -template -void -DDS_TopicBase_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::configuration_complete"); - - BaseConnector::configuration_complete (); - - // When the user has not set a type_name we default to the DDS - // vendor defined default type_name - if (this->type_name_.in () == 0 || - ACE_OS::strlen (this->type_name_.in ()) == 0) - { -#if (CIAO_DDS4CCM_NDDS==1) - this->type_name_ = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ()); -#elif (CIAO_DDS4CCM_OPENDDS==1) - typename DDS_TYPE::type_support type; - this->type_name_ = type.get_type_name (); -#endif - } - - ::CCM_DDS::ConnectorStatusListener_var error_listener = - this->context_->get_connection_error_listener (); - this->init_subscriber_ |= ! ::CORBA::is_nil (error_listener.in ()); - this->init_publisher_ |= ! ::CORBA::is_nil (error_listener.in ()); - - if (::CORBA::is_nil (this->topic_.in ())) - { - this->register_type (this->domain_participant_.in (), - this->type_name_.in ()); - - this->init_topic (this->domain_participant_.in (), - this->topic_.inout () , - this->topic_name_.in (), - this->type_name_.in ()); - } - - if (this->init_subscriber_) - { - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_.inout ()); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TopicBase_Connector_T::configuration_complete - " - "No need to create a subscriber.\n")); - } - - if (this->init_publisher_) - { - this->init_publisher (this->domain_participant_.in (), - this->publisher_.inout ()); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TopicBase_Connector_T::configuration_complete - " - "No need to create a publisher.\n")); - } -} - -template -void -DDS_TopicBase_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_activate"); - BaseConnector::ccm_activate (); - - ACE_Reactor *reactor = this->reactor (); - this->activate_topic (reactor, - this->topic_.in (), - this->topiclistener_.inout ()); - if (this->init_subscriber_) - { - this->activate_subscriber (reactor, - this->subscriber_.in (), - this->subscriber_listener_.inout ()); - } - if (this->init_publisher_) - { - this->activate_publisher (reactor, - this->publisher_.in (), - this->publisher_listener_.inout ()); - } -} - -template -void -DDS_TopicBase_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_passivate"); - - ::DDS::TopicListener_var topiclistener = - this->topiclistener_._retn (); - if (! CORBA::is_nil (topiclistener.in ())) - { - this->passivate_topic (this->topic_.in (), - topiclistener.in ()); - } - ::DDS::SubscriberListener_var subscriber_listener = - this->subscriber_listener_._retn (); - if (! CORBA::is_nil (subscriber_listener.in ())) - { - this->passivate_subscriber (this->subscriber_.in (), - subscriber_listener.in ()); - } - ::DDS::PublisherListener_var publisher_listener = - this->publisher_listener_._retn (); - if (!::CORBA::is_nil (publisher_listener.in ())) - { - this->passivate_publisher (this->publisher_.in (), - publisher_listener.in ()); - } - - BaseConnector::ccm_passivate (); -} - -template -void -DDS_TopicBase_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_remove"); - ::DDS::Topic_var topic = this->topic_._retn (); - if (! CORBA::is_nil (topic.in ())) - { - this->remove_topic (this->domain_participant_.in (), - topic.in ()); - topic = ::DDS::Topic::_nil (); - } - - this->unregister_type (this->domain_participant_.in (), - this->type_name_.in ()); - - ::DDS::Subscriber_var subscriber = this->subscriber_._retn (); - if (!::CORBA::is_nil (subscriber.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber.in ()); - subscriber = ::DDS::Subscriber::_nil (); - } - ::DDS::Publisher_var publisher = this->publisher_._retn (); - if (!::CORBA::is_nil (publisher.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher.in ()); - publisher = ::DDS::Publisher::_nil (); - } - BaseConnector::ccm_remove (); -} - - -/** - * Type registration - **/ -template -void -DDS_TopicBase_Connector_T::register_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::register_type"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DDS_TopicBase_Connector_T::register_type - ") - ACE_TEXT ("Going to register type <%C>.\n"), - typesupport_name)); - - ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_ERROR; -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_DomainParticipant_i *part = - dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant); - if (!part) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TopicBase_Connector_T::register_type - " - "Unable to cast the DomainParticipant proxy to its internal " - "representation.\n")); - throw ::CORBA::INTERNAL (); - } - - dds_type_factory *factory = 0; - ACE_NEW_THROW_EX (factory, - dds_type_factory (), - ::CORBA::NO_MEMORY ()); - - if (! ::CIAO::NDDS::DDS_TypeSupport_i::register_type (participant, typesupport_name, factory)) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DDS_TopicBase_Connector_T::register_type - ") - ACE_TEXT ("Type <%C> is already registered or failed.\n"), - typesupport_name)); - delete factory; - } - - retcode = DDS_TYPE::type_support::register_type( - part->get_rti_entity (), typesupport_name); -#else - typename DDS_TYPE::type_support::_var_type ts = new typename DDS_TYPE::type_support; - retcode = ts->register_type (participant, typesupport_name); -#endif - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TopicBase_Connector_T::register_type - " - "Error registering type <%C> in DDS\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } -} - -/** - * Unregister type - **/ -template -void -DDS_TopicBase_Connector_T::unregister_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::unregister_type"); - -#if (CIAO_DDS4CCM_NDDS==1) - // Unregister the type from NDDS, it will delete the type factory when - // it is not used anymore - if (!::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (participant, typesupport_name)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TopicBase_Connector_T::unregister_type - " - "Error unregistering type <%C> from type support factory\n", - typesupport_name)); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } -#else - ACE_UNUSED_ARG (participant); - ACE_UNUSED_ARG (typesupport_name); -#endif -} - -template -char * -DDS_TopicBase_Connector_T::topic_name (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); - - return CORBA::string_dup (this->topic_name_.in ()); -} - -template -void -DDS_TopicBase_Connector_T::topic_name ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); - - this->topic_name_ = topic_name; -} - -template -char * -DDS_TopicBase_Connector_T::type_name (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::type_name"); - - return CORBA::string_dup (this->type_name_.in ()); -} - -template -void -DDS_TopicBase_Connector_T::type_name ( - const char * type_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::type_name"); - - this->type_name_ = type_name; -} - -template -void -DDS_TopicBase_Connector_T::key_fields ( - const ::DDS::StringSeq & key_fields) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->key_fields_.length (key_fields.length ()); - for (CORBA::ULong i = 0; i < key_fields.length (); ++i) - { - this->key_fields_.operator [](i) = CORBA::string_dup (key_fields[i]); - } - } -} - -template -::DDS::StringSeq * -DDS_TopicBase_Connector_T::key_fields (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); -/* - For future use, DDS_TYPE doesn't have get_typecode yet - ::DDS_TypeCode* ptr = ::DDS_TYPE::type_support::get_typecode (); - DDS_ExceptionCode_t ex; - DDS_UnsignedLong const number = ptr->member_count (ex); - for (DDS_UnsignedLong i = 0; i < number; i++) - { - if (ptr->is_member_key (i, ex)) - { - const char* name = ptr->member_name (i, ex); - ACE_OS::printf ("Name: %s\n", name); - } - } - */ - ::DDS::StringSeq_var retval = 0; - ACE_NEW_THROW_EX (retval, - ::DDS::StringSeq (this->key_fields_.length ()), - ::CORBA::NO_MEMORY ()); - retval->length (this->key_fields_.length ()); - - for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i) - { - (*retval)[i] = CORBA::string_dup (this->key_fields_[i]); - } - return retval._retn (); -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h deleted file mode 100644 index 91fce50b075..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_TOPICBASE_CONNECTOR_H -#define DDS_TOPICBASE_CONNECTOR_H - -#include "ace/Copy_Disabled.h" - -#include "dds4ccm/impl/DDS_Base_Connector_T.h" - -template -class DDS_TopicBase_Connector_T - : public virtual DDS_Base_Connector_T -{ -public: - DDS_TopicBase_Connector_T (void); - virtual ~DDS_TopicBase_Connector_T (void); - - virtual ::DDS::StringSeq *key_fields (void); - - virtual void topic_name (const char * topic_name); - virtual char *topic_name (void); - - virtual void type_name (const char * type_name); - virtual char *type_name (void); - - virtual void key_fields (const ::DDS::StringSeq & key_fields); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - virtual void register_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - virtual - void unregister_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - - -protected: - bool late_binding (void); - void late_binding (bool late_binding); - bool late_binded (const char * topic_name); - bool stop_dds (const char * topic_name); - - CORBA::String_var topic_name_; - CORBA::String_var type_name_; - DDS::StringSeq key_fields_; - - ::DDS::Topic_var topic_; - ::DDS::TopicListener_var topiclistener_; - - ::DDS::Publisher_var publisher_; - ::DDS::PublisherListener_var publisher_listener_; - ::DDS::Subscriber_var subscriber_; - ::DDS::SubscriberListener_var subscriber_listener_; - - bool init_subscriber_; - bool init_publisher_; - - typedef DDS_Base_Connector_T BaseConnector; - -#if (CIAO_DDS4CCM_NDDS==1) - typedef ::CIAO::NDDS::DDS_TypeFactory_T dds_type_factory; -#endif - -private: - bool late_binding_; -}; - -#include "dds4ccm/impl/DDS_TopicBase_Connector_T.cpp" - -#endif /* DDS_TOPICBASE_CONNECTOR_H */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp deleted file mode 100644 index 392835b0384..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ /dev/null @@ -1,212 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataReaderStateListener_T.h" -#include "dds4ccm/impl/Updater_T.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -#if (CIAO_DDS4CCM_OPENDDS==1) -#include "dds/DCPS/Marked_Default_Qos.h" -#endif - -template -DDS_Update_T::DDS_Update_T (void) -{ -} - -template -DDS_Update_T::~DDS_Update_T (void) -{ -} - -template -void -DDS_Update_T::set_component (::CORBA::Object_ptr component) -{ - this->dds_update_->_set_component (component); - this->ccm_data_writer_->_set_component (component); -} - -template -void -DDS_Update_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml) -{ - DDS4CCM_TRACE ("DDS_Update_T::configuration_complete"); - ::DDS::DataWriter_var dw = this->dds_update_->get_dds_writer (); - if (::CORBA::is_nil (dw.in ())) - { - ::DDS::DataWriter_var dwv_tmp; -#if (CIAO_DDS4CCM_NDDS==1) - if (qos_profile) - { - dwv_tmp = publisher->create_datawriter_with_profile ( - topic, - qos_profile, - ::DDS::DataWriterListener::_nil (), - 0); - } - else -#endif - { - ::DDS::DataWriterQos dwqos; - DDS::ReturnCode_t const retcode = - publisher->get_default_datawriter_qos (dwqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Update_T::configuration_complete - " - "Error: Unable to retrieve get_default_datawriter_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (qos_profile && qos_xml) - { - CORBA::String_var name = topic->get_name (); - DDS::ReturnCode_t const retcode_dw_qos = qos_xml->get_datawriter_qos ( - dwqos, - qos_profile, - name.in ()); - if (retcode_dw_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Update_T::configuration_complete - " - "Error: Unable to retrieve datawriter QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_dw_qos))); - throw ::CCM_DDS::InternalError (retcode_dw_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << dwqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Update_T::configuration_complete - ") - ACE_TEXT ("Using datawriter QOS <%C>\n"), message.c_str())); - } -#endif - - dwv_tmp = publisher->create_datawriter ( - topic, - dwqos, - ::DDS::DataWriterListener::_nil (), - 0); - } - if (!::CORBA::is_nil (dwv_tmp.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Update_T::configuration_complete - " - "Created datawriter " - DDS_ENTITY_FORMAT_SPECIFIER - " using publisher " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (dwv_tmp.in ()), - DDS_ENTITY_LOG (publisher))); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Update_T::configuration_complete - " - "Error: DDS returned a nil datawriter.\n")); - throw ::CORBA::INTERNAL (); - } - - this->dds_update_->set_dds_writer (dwv_tmp.in ()); - this->ccm_data_writer_->set_dds_entity (dwv_tmp.in ()); - - DDS::ReturnCode_t const retcode = dwv_tmp->enable (); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Update_T::configuration_complete - " - "Error: Unable to enable the datawriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Update_T::activate () -{ - DDS4CCM_TRACE ("DDS_Update_T::activate"); -} - -template -void -DDS_Update_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Update_T::passivate"); -} - -template -void -DDS_Update_T::remove ( - ::DDS::Publisher_ptr publisher) -{ - DDS4CCM_TRACE ("DDS_Update_T::remove"); - - ::DDS::DataWriter_var writer = this->dds_update_->get_dds_writer (); - - this->dds_update_->set_dds_writer (::DDS::DataWriter::_nil ()); - this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ()); - - if (!::CORBA::is_nil (writer.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Update_T::remove - " - "Going to delete DataWriter " - DDS_ENTITY_FORMAT_SPECIFIER - " from publisher " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (writer.in ()), - DDS_ENTITY_LOG (publisher))); - - DDS::ReturnCode_t const retval = - publisher->delete_datawriter (writer.in ()); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Update_T::remove - " - "Unable to delete DataWriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - throw ::CORBA::INTERNAL (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - "DDS_Update_T::remove - " - "Deleted DataWriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - } -} - -template -typename CCM_TYPE::data_type::_ptr_type -DDS_Update_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Update_T::get_data"); - - return CCM_TYPE::data_type::_duplicate (this->dds_update_); -} - -template -typename CCM_TYPE::dds_entity_type::_ptr_type -DDS_Update_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Update_T::get_dds_entity"); - - return ::DDS::CCM_DataWriter::_duplicate (this->ccm_data_writer_); -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h deleted file mode 100644 index 888edbd5764..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * @author Johnny Willemsen - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_UPDATE_T_H_ -#define DDS_UPDATE_T_H_ - -#include "dds4ccm/impl/Updater_T.h" -#include "dds4ccm/impl/CCM_DataWriter.h" - -template -class DDS_Update_T -{ -public: - DDS_Update_T (void); - ~DDS_Update_T (void); - - typename CCM_TYPE::data_type::_ptr_type get_data (void); - - typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void); - - void set_component (::CORBA::Object_ptr component); - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml); - - void activate (void); - - void passivate (void); - - void remove (::DDS::Publisher_ptr publisher); - -private: - typedef ::CIAO::DDS4CCM::Updater_T< - typename CCM_TYPE::data_type, - TYPED_WRITER, - VALUE_TYPE, - SEQ_VALUE_TYPE> - Updater_type; - - /** - * DDS_Update - */ - //@{ - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< Updater_type > dds_update_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T< ::CIAO::DDS4CCM::CCM_DataWriter > ccm_data_writer_; - //@} -}; - -#include "dds4ccm/impl/DDS_Update_T.cpp" - -#endif /* DDS_UPDATE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp deleted file mode 100644 index 05c65a15183..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- -#include "dds4ccm/impl/DataReaderListener_T.h" -#include "dds4ccm/impl/DataListenerControl_T.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - - -template -DDS_Write_T::DDS_Write_T (void) -{ -} - -template -DDS_Write_T::~DDS_Write_T (void) -{ -} - -template -void -DDS_Write_T::set_component ( - ::CORBA::Object_ptr component) -{ - this->dds_write_->_set_component (component); - this->ccm_data_writer_->_set_component (component); -} - -template -void -DDS_Write_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml) -{ - DDS4CCM_TRACE ("DDS_Write_T::configuration_complete"); - ::DDS::DataWriter_var dw = this->dds_write_->get_dds_writer (); - if (::CORBA::is_nil (dw.in ())) - { - ::DDS::DataWriter_var dwv_tmp; -#if (CIAO_DDS4CCM_NDDS==1) - if (qos_profile) - { - dwv_tmp = publisher->create_datawriter_with_profile ( - topic, - qos_profile, - ::DDS::DataWriterListener::_nil (), - 0); - } - else -#endif - { - ::DDS::DataWriterQos dwqos; - DDS::ReturnCode_t const retcode = - publisher->get_default_datawriter_qos (dwqos); - - if (retcode != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Write_T::configuration_complete - " - "Error: Unable to retrieve get_default_datawriter_qos: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CCM_DDS::InternalError (retcode, 0); - } - - if (qos_profile && qos_xml) - { - CORBA::String_var name = topic->get_name (); - DDS::ReturnCode_t const retcode_dw_qos = qos_xml->get_datawriter_qos ( - dwqos, - qos_profile, - name.in ()); - - if (retcode_dw_qos != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Write_T::configuration_complete - " - "Error: Unable to retrieve datawriter QOS from XML: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_dw_qos))); - throw ::CCM_DDS::InternalError (retcode_dw_qos, 0); - } - } - -#if defined GEN_OSTREAM_OPS - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - std::stringstream output; - output << dwqos; - std::string message = output.str(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DDS_Update_T::configuration_complete - ") - ACE_TEXT ("Using datawriter QOS <%C>\n"), message.c_str())); - } -#endif - dwv_tmp = publisher->create_datawriter ( - topic, - dwqos, - ::DDS::DataWriterListener::_nil (), - 0); - } - if (!::CORBA::is_nil (dwv_tmp.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO - "DDS_Write_T::configuration_complete - " - "Created datawriter " - DDS_ENTITY_FORMAT_SPECIFIER - " using publisher " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (dwv_tmp.in ()), - DDS_ENTITY_LOG (publisher))); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Write_T::configuration_complete - " - "Error: DDS returned a nil datawriter.\n")); - throw ::CORBA::INTERNAL (); - } - - this->dds_write_->set_dds_writer (dwv_tmp.in ()); - this->ccm_data_writer_->set_dds_entity (dwv_tmp.in ()); - - DDS::ReturnCode_t const retcode = dwv_tmp->enable (); - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Write_T::configuration_complete - " - "Error: Unable to enable the datawriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - throw ::CORBA::INTERNAL (); - } - - } -} - -template -void -DDS_Write_T::activate () -{ - DDS4CCM_TRACE ("DDS_Write_T::activate"); -} - -template -void -DDS_Write_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Write_T::passivate"); -} - -template -void -DDS_Write_T::remove ( - ::DDS::Publisher_ptr publisher) -{ - DDS4CCM_TRACE ("DDS_Write_T::remove"); - - ::DDS::DataWriter_var writer = this->dds_write_->get_dds_writer (); - - this->dds_write_->set_dds_writer (::DDS::DataWriter::_nil ()); - this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ()); - - if (!::CORBA::is_nil (writer.in ())) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_Write_T::remove - " - "Going to delete DataWriter " - DDS_ENTITY_FORMAT_SPECIFIER - " from publisher " - DDS_ENTITY_FORMAT_SPECIFIER - "\n", - DDS_ENTITY_LOG (writer.in ()), - DDS_ENTITY_LOG (publisher))); - - DDS::ReturnCode_t const retval = - publisher->delete_datawriter (writer.in ()); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Write_T::remove - " - "Unable to delete DataWriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - throw ::CORBA::INTERNAL (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - "DDS_Write_T::remove - " - "Deleted DataWriter: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - } -} - -template -typename CCM_TYPE::data_type::_ptr_type -DDS_Write_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Write_T::get_data"); - - return CCM_TYPE::data_type::_duplicate (this->dds_write_); -} - -template -typename CCM_TYPE::dds_entity_type::_ptr_type -DDS_Write_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Write_T::get_dds_entity"); - return ::DDS::CCM_DataWriter::_duplicate (this->ccm_data_writer_); -} - diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h deleted file mode 100644 index 1aef87dec6f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_WRITE_T_H_ -#define DDS_WRITE_T_H_ - -#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/Writer_T.h" -#include "dds4ccm/impl/CCM_DataWriter.h" - -template -class DDS_Write_T -{ -public: - DDS_Write_T (void); - ~DDS_Write_T (void); - - /** - * @name DDS_Write - * DDS_Write operations - */ - //@{ - typename CCM_TYPE::data_type::_ptr_type get_data (void); - - typename CCM_TYPE::dds_entity_type::_ptr_type get_dds_entity (void); - //@} - - void set_component (::CORBA::Object_ptr component); - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char * qos_profile, - DDS_XML_QOS_PARSER_TYPE* qos_xml); - - void activate (void); - - void passivate (void); - - void remove (::DDS::Publisher_ptr publisher); - -private: - typedef ::CIAO::DDS4CCM::Writer_T< - typename CCM_TYPE::data_type, - TYPED_WRITER, - VALUE_TYPE, - SEQ_VALUE_TYPE> - Writer_type; - - /** - * DDS_Write - */ - //@{ - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T < Writer_type > dds_write_; - ::CIAO::DDS4CCM::LocalObject_Auto_Ptr_T < ::CIAO::DDS4CCM::CCM_DataWriter > ccm_data_writer_; - //@} - -}; - -#include "dds4ccm/impl/DDS_Write_T.cpp" - -#endif /* DDS_WRITE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp deleted file mode 100644 index 50d99b5489a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- -template -CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T (void) : - mode_ (::CCM_DDS::NOT_ENABLED), - max_delivered_data_ (0) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T"); -} - -template -CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T"); -} - -template -::CCM_DDS::ListenerMode -CCM_DDS_DataListenerControl_T::mode (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); - return this->mode_.value (); -} - -template -void -CCM_DDS_DataListenerControl_T::mode (::CCM_DDS::ListenerMode mode) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); - this->mode_ = mode; -} - -template -::CCM_DDS::DataNumber_t -CCM_DDS_DataListenerControl_T::max_delivered_data (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); - return this->max_delivered_data_.value (); -} - -template -void -CCM_DDS_DataListenerControl_T::max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); - this->max_delivered_data_ = max_delivered_data; -} - diff --git a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h deleted file mode 100644 index ba936757ef4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- -#ifndef DATALISTENERCONTROL_T_H_ -#define DATALISTENERCONTROL_T_H_ - -#include "dds4ccm/idl/dds4ccm_DataListenerControlEC.h" -#include "dds4ccm/impl/LocalObject.h" - -#include "ace/Copy_Disabled.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class CCM_DDS_DataListenerControl_T - : public virtual BASE_TYPE, - public virtual ::CIAO::DDS4CCM::LocalObject, - private ACE_Copy_Disabled -{ -public: - /// Constructor - CCM_DDS_DataListenerControl_T (void); - - /// Destructor - virtual ~CCM_DDS_DataListenerControl_T (void); - - /// Set the mode - virtual ::CCM_DDS::ListenerMode mode (void); - - /// Get the mode - virtual void mode (::CCM_DDS::ListenerMode mode); - - /// Set the max_delivered_data - virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); - - /// Get the max_delivered_data - virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data); - -protected: - ACE_Atomic_Op mode_; - ACE_Atomic_Op max_delivered_data_; -}; - -#include "dds4ccm/impl/DataListenerControl_T.cpp" - -#endif /* DATALISTENERCONTROL_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp deleted file mode 100644 index 68ca4cf1a76..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::DataReaderHandler_T::DataReaderHandler_T ( - LISTENER* drl, - ::DDS::DataReader_ptr dr) - : drl_ (drl) - , dr_ (::DDS::DataReader::_duplicate (dr)) -{ - // Add a reference, this we're using the DataReaderListener_type - // again. This should prevent preliminary destruction of the listener - // while the reactor queue still got messages to handle. - this->drl_->_add_ref (); - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); -} - -template -CIAO::DDS4CCM::DataReaderHandler_T::~DataReaderHandler_T (void) -{ - this->drl_->_remove_ref (); -} - -template -int -CIAO::DDS4CCM::DataReaderHandler_T::handle_exception (ACE_HANDLE) -{ - try - { - this->drl_->on_data_available_i (this->dr_.in ()); - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "DataReaderHandler_T::handle_exception"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DataReaderHandler_T::handle_exception"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DataReaderHandler_T::handle_exception - " - "Unexpected exception caught\n")); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h deleted file mode 100644 index dd15e414f5f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Eventhandler on orb thread, handling the - * received data from DDS. - */ - -#ifndef DATAREADERHANDLER_T_H_ -#define DATAREADERHANDLER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Event_Handler.h" - -namespace CIAO -{ - namespace DDS4CCM - { - - template - class DataReaderHandler_T : - public ACE_Event_Handler - { - public: - DataReaderHandler_T (LISTENER *drl, - ::DDS::DataReader_ptr dr); - virtual ~DataReaderHandler_T (void); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - - private: - LISTENER *drl_; - ::DDS::DataReader_var dr_; - }; - } -} - -#include "dds4ccm/impl/DataReaderHandler_T.cpp" - -#endif /* DATAREADERHANDLER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp deleted file mode 100644 index 458491a6bf1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp +++ /dev/null @@ -1,292 +0,0 @@ -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ace/Reactor.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - DataReaderListenerBase_T::DataReaderListenerBase_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor * reactor, - ConditionManager& condition_manager) - : PortStatusListener (port_status_listener, reactor) , - listener_ (CCM_TYPE::data_listener_type::_duplicate (listener)), - control_ (::CCM_DDS::DataListenerControl::_duplicate (control)), - condition_manager_ (condition_manager) - { - DDS4CCM_TRACE ("DataReaderListenerBase_T::DataReaderListenerBase_T"); - } - - template - DataReaderListenerBase_T::~DataReaderListenerBase_T (void) - { - DDS4CCM_TRACE ("DataReaderListenerBase_T::~DataReaderListenerBase_T"); - } - - template - void - DataReaderListenerBase_T::on_data_available ( - ::DDS::DataReader_ptr rdr) - { - DDS4CCM_TRACE ("DataReaderListenerBase_T::on_data_available"); - - if (!::CORBA::is_nil (rdr) && - this->control_->mode () != ::CCM_DDS::NOT_ENABLED) - { - if (this->reactor_) - { - DataReaderHandler_type * rh = 0; - ACE_NEW (rh, DataReaderHandler_type (this, rdr)); - - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderListener_T::on_data_available - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->on_data_available_i (rdr); - } - } - } - - template - ::DDS::ReturnCode_t - DataReaderListener_T::get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) - { - DDS4CCM_TRACE ("DataReaderListener_T::get_data_i"); - - ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK; - if (! ::CORBA::is_nil (qc)) - { - ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc); - result = reader->take_w_condition (data, - sample_info, - max_samples, - rd.in ()); - } - else - { - result = reader->take (data, - sample_info, - max_samples, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE); - } - return result; - } - - template - ::DDS::ReturnCode_t - DataReaderListener_T::get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) - { - DDS4CCM_TRACE ("DataReaderListener_T::get_data_i"); - - ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK; - if (! ::CORBA::is_nil (qc)) - { - ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc); - result = reader->read_w_condition (data, - sample_info, - max_samples, - rd.in ()); - } - else - { - result = reader->read (data, - sample_info, - max_samples, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE); - } - return result; - } - - template - void - DataReaderListenerBase_T::on_data_available_i ( - ::DDS::DataReader_ptr rdr) - { - DDS4CCM_TRACE ("DataReaderListenerBase_T::on_data_available_i"); - - if (::CORBA::is_nil (rdr)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ") - ACE_TEXT ("No datareader received.\n"))); - return; - } - - ::CCM_DDS::ListenerMode const mode = this->control_->mode (); - if (mode == ::CCM_DDS::NOT_ENABLED) - { - return; - } - - typename TYPED_DDS_READER::_var_type reader; - reader = TYPED_DDS_READER::_narrow (rdr); - - if (::CORBA::is_nil (reader.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Failed to narrow DataReader to a type ") - ACE_TEXT ("specific DataReader.\n"))); - return; - } - - try - { - SEQ_TYPE data; - ::DDS::SampleInfoSeq sample_info; - ::CORBA::Long max_samples = 0; - - mode == ::CCM_DDS::ONE_BY_ONE - ? max_samples = ::DDS::LENGTH_UNLIMITED - : this->control_->max_delivered_data() == 0 - ? max_samples = ::DDS::LENGTH_UNLIMITED - : max_samples = this->control_->max_delivered_data (); - - ::DDS::QueryCondition_var qc = - this->condition_manager_.get_querycondition_listener (); - - ::DDS::ReturnCode_t const result = - this->get_data_i (reader, qc.in (), data, sample_info, max_samples); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Get data returned %C.\n"), - translate_retcode (result))); - - if (result == ::DDS::RETCODE_OK) - { - if (mode == ::CCM_DDS::ONE_BY_ONE) - { - for (::CORBA::ULong i = 0; i < data.length (); ++i) - { - if (sample_info[i].valid_data) - { - ::CCM_DDS::ReadInfo info; - info <<= sample_info[i]; - this->listener_->on_one_data (data[i], info); - } - } - } - else - { - CORBA::ULong nr_of_samples = 0; - for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++) - { - if (sample_info[i].valid_data) - { - ++nr_of_samples; - } - } - - if (nr_of_samples > 0) - { - SEQ_TYPE inst_seq (nr_of_samples); - ::CCM_DDS::ReadInfoSeq infoseq (nr_of_samples); - - infoseq.length (nr_of_samples); - inst_seq.length (nr_of_samples); - - // Copy the valid samples - CORBA::ULong ix = 0; - for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++) - { - if(sample_info[i].valid_data) - { - infoseq[ix] <<= sample_info[i]; - inst_seq[ix] = data[i]; - ++ix; - } - } - this->listener_->on_many_data (inst_seq, infoseq); - } - } - } - - // Return the loan - DDS::ReturnCode_t const retval = reader->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Error returning loan to DDS - <%C>\n"), - translate_retcode (retval))); - // No exception here since this the DDS vendor doesn't expect this. - // It will likely causes a crash in their implementation - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "DataReaderListenerBase_T::on_data_available_i"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DataReaderListenerBase_T::on_data_available_i"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderListener_T::on_data_available_i - ") - ACE_TEXT ("Unexpected exception caught\n"))); - } - } - - template - ::DDS::StatusMask - DataReaderListenerBase_T::get_mask ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status) - { - DDS4CCM_TRACE ("DataReaderListenerBase_T::get_mask"); - - ::DDS::StatusMask mask = 0; - - if (! ::CORBA::is_nil (listener) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::DATA_AVAILABLE_STATUS; - mask |= ::CIAO::DDS4CCM::PortStatusListener::get_mask (status); - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "DataReaderListenerBase_T::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h deleted file mode 100644 index ab98a59b4a2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DATAREADERLISTENER_T_H_ -#define DATAREADERLISTENER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/PortStatusListener.h" -#include "dds4ccm/impl/DataReaderHandler_T.h" -#include "dds4ccm/impl/ConditionManager.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataReaderListener_T; - - template - class DataReaderListenerBase_T : - public PortStatusListener - { - typedef DataReaderListenerBase_T - DataReaderListener_type; - typedef ::CIAO::DDS4CCM::DataReaderHandler_T - DataReaderHandler_type; - - public: - /// Constructor - DataReaderListenerBase_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor * reactor, - ConditionManager& condition_manager); - - /// Destructor - virtual ~DataReaderListenerBase_T (void); - - virtual void on_data_available (::DDS::DataReader_ptr rdr); - - static ::DDS::StatusMask get_mask ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status); - - void on_data_available_i (::DDS::DataReader_ptr rdr); - - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) = 0; - - typename CCM_TYPE::data_listener_type::_var_type listener_; - ::CCM_DDS::DataListenerControl_var control_; - ConditionManager& condition_manager_; - }; - - template - class DataReaderListener_T : - public DataReaderListenerBase_T - { - public: - /// Constructor - DataReaderListener_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor * reactor, - ConditionManager& condition_manager) : - DataReaderListenerBase_T ( - listener, port_status_listener, control, reactor, condition_manager) - { - } - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples); - }; - - template - class DataReaderListener_T : - public DataReaderListenerBase_T - { - public: - /// Constructor - DataReaderListener_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor * reactor, - ConditionManager& condition_manager) : - DataReaderListenerBase_T ( - listener, port_status_listener, control, reactor, condition_manager) - { - } - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples); - }; - } -} - -#include "dds4ccm/impl/DataReaderListener_T.cpp" - -#endif /* DATAREADERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp deleted file mode 100644 index 80afa61f5e7..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp +++ /dev/null @@ -1,344 +0,0 @@ -#include "dds4ccm/impl/Utils.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/DataReaderHandler_T.h" -#include "tao/ORB_Core.h" - -#include - -namespace CIAO -{ - namespace DDS4CCM - { - template - DataReaderStateListenerBase_T::DataReaderStateListenerBase_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor, - ConditionManager& condition_manager) - : PortStatusListener (port_status_listener, reactor) , - listener_ (CCM_TYPE::data_listener_type::_duplicate (listener)), - control_ (::CCM_DDS::StateListenerControl::_duplicate (control)), - condition_manager_ (condition_manager) - { - DDS4CCM_TRACE ("DataReaderStateListenerBase_T::DataReaderStateListenerBase_T"); - } - - // Implementation skeleton destructor - template - DataReaderStateListenerBase_T::~DataReaderStateListenerBase_T (void) - { - DDS4CCM_TRACE ("DataReaderStateListenerBase_T::~DataReaderStateListenerBase_T"); - } - - template - void - DataReaderStateListenerBase_T::on_data_available( - ::DDS::DataReader_ptr rdr) - { - DDS4CCM_TRACE ("DataReaderStateListenerBase_T::on_data_available"); - - if (!::CORBA::is_nil (rdr) && - this->control_->mode () != ::CCM_DDS::NOT_ENABLED) - { - if (this->reactor_) - { - DataReaderStateHandler_type* rh = 0; - ACE_NEW (rh, DataReaderStateHandler_type (this, rdr)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->on_data_available_i (rdr); - } - } - } - - template - void - DataReaderStateListenerBase_T::on_data_available_i ( - ::DDS::DataReader_ptr rdr) - { - DDS4CCM_TRACE ("DataReaderStateListenerBase_T::on_data_available_i"); - - ::CCM_DDS::ListenerMode const mode = this->control_->mode (); - if (::CORBA::is_nil (rdr) || - mode == ::CCM_DDS::NOT_ENABLED) - { - return; - } - - typename TYPED_DDS_READER::_var_type reader; - reader = TYPED_DDS_READER::_narrow (rdr); - - if (::CORBA::is_nil (reader.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Failed to narrow DataReader to a type ") - ACE_TEXT ("specific DataReader.\n"))); - return; - } - - try - { - SEQ_TYPE data; - ::DDS::SampleInfoSeq sample_info; - ::CORBA::Long max_samples = 0; - - mode == ::CCM_DDS::ONE_BY_ONE - ? max_samples = ::DDS::LENGTH_UNLIMITED - : this->control_->max_delivered_data() == 0 - ? max_samples = ::DDS::LENGTH_UNLIMITED - : max_samples = this->control_->max_delivered_data (); - - ::DDS::QueryCondition_var qc = - this->condition_manager_.get_querycondition_listener (); - - ::DDS::ReturnCode_t const result = - this->get_data_i (reader, qc.in (), data, sample_info, max_samples); - - if (result == ::DDS::RETCODE_NO_DATA) - { - return; - } - else if (result != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Unable to get data from data reader, ") - ACE_TEXT ("error %C.\n"), translate_retcode (result))); - } - if (mode == ::CCM_DDS::ONE_BY_ONE) - { - for (::CORBA::ULong i = 0; i < data.length (); ++i) - { - // Sample data may not be valid anymore when - // deleted so don't check the valid_data flag - // here. - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - if (sample_info[i].instance_state == - ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - this->listener_->on_deletion (data[i], readinfo); - } - else if (sample_info[i].valid_data) - { - if (sample_info[i].view_state == ::DDS::NEW_VIEW_STATE) - { - this->listener_->on_creation (data[i], readinfo); - } - else - { - this->listener_->on_one_update (data[i], readinfo); - } - } - } - } - else if (mode == ::CCM_DDS::MANY_BY_MANY) - { - typedef std::vector< ::CORBA::Long > Updates; - Updates updates; - - for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++) - { - if ((sample_info[i].valid_data && - sample_info[i].view_state == ::DDS::NEW_VIEW_STATE) || - sample_info[i].instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - if (updates.size () > 0) - { - // Sample_new or sample_delete found -> first send out the - // updated samples in one go - SEQ_TYPE inst_seq (updates.size ()); - ::CCM_DDS::ReadInfoSeq infoseq (updates.size ()); - - infoseq.length (updates.size ()); - inst_seq.length (updates.size ()); - CORBA::ULong ix = 0; - for(Updates::iterator iter = updates.begin(); - iter != updates.end(); - ++iter) - { - infoseq[ix] <<= sample_info[*iter]; - inst_seq[ix] = data[*iter]; - ++ix; - } - this->listener_->on_many_updates (inst_seq, infoseq); - // Clean up - updates.clear (); - } - // Now invoke on_creation or on_deletion - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - if (sample_info[i].valid_data && - sample_info[i].view_state == ::DDS::NEW_VIEW_STATE) - { - this->listener_->on_creation (data[i], readinfo); - } - else if (sample_info[i].instance_state == - ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - this->listener_->on_deletion (data[i], readinfo); - } - } - else if (sample_info[i].valid_data) - { - updates.push_back (i); - } - } - // Send the latest updates. - if (updates.size () > 0) - { - SEQ_TYPE inst_seq (updates.size ()); - ::CCM_DDS::ReadInfoSeq infoseq (updates.size ()); - - infoseq.length (updates.size ()); - inst_seq.length (updates.size ()); - CORBA::ULong ix = 0; - for(Updates::iterator iter = updates.begin(); - iter != updates.end(); - ++iter) - { - infoseq[ix] <<= sample_info[*iter]; - inst_seq[ix] = data[*iter]; - ++ix; - } - this->listener_->on_many_updates (inst_seq, infoseq); - } - } - // Return the loan - ::DDS::ReturnCode_t const retval = reader->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Error returning loan to DDS - <%C>\n"), - translate_retcode (retval))); - // No exception here since this the DDS vendor doesn't expect this. - // It will likely causes a crash in their implementation - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "DataReaderStateListenerBase_T::on_data_available_i"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "DataReaderStateListenerBase_T::on_data_available_i"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReaderStateListenerBase_T::on_data_available_i - ") - ACE_TEXT ("Unexpected exception caught\n"))); - } - } - - template - ::DDS::StatusMask - DataReaderStateListenerBase_T::get_mask ( - typename CCM_TYPE::data_listener_type::_ptr_type listener) - { - ::DDS::StatusMask mask = 0; - - if (! ::CORBA::is_nil (listener) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::DATA_AVAILABLE_STATUS | - ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | - ::DDS::SAMPLE_LOST_STATUS; - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "DataReaderStateListenerBase_T::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - - template - ::DDS::ReturnCode_t - DataReaderStateListener_T::get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) - { - DDS4CCM_TRACE ("DataReaderStateListener_T::get_data_i"); - - ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK; - if (! ::CORBA::is_nil (qc)) - { - ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc); - result = reader->take_w_condition (data, - sample_info, - max_samples, - rd.in ()); - } - else - { - result = reader->take (data, - sample_info, - max_samples, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE); - } - return result; - } - - template - ::DDS::ReturnCode_t - DataReaderStateListener_T::get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) - { - DDS4CCM_TRACE ("DataReaderStateListener_T::get_data_i"); - - ::DDS::ReturnCode_t result = ::DDS::RETCODE_OK; - if (! ::CORBA::is_nil (qc)) - { - ::DDS::ReadCondition_var rd = ::DDS::ReadCondition::_narrow (qc); - result = reader->read_w_condition (data, - sample_info, - max_samples, - rd.in ()); - } - else - { - result = reader->read (data, - sample_info, - max_samples, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ANY_INSTANCE_STATE); - } - return result; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h deleted file mode 100644 index a5c21a060a1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DATAREADERSTATELISTENER_T_H_ -#define DATAREADERSTATELISTENER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/PortStatusListener.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataReaderStateListener_T; - - /** - * Template implementing the DDS4CCM DataReaderStateListener basic port - * @tparam CCM_TYPE Set of type traits for this basic port - * @tparam TYPED_DDS_READER The typed DDS DataReader type - * @tparam SEQ_TYPE The type of sequence - * @tparam LRT An enum indicating the semantics of this port - */ - template - class DataReaderStateListenerBase_T : - public PortStatusListener - { - typedef DataReaderStateListenerBase_T - DataReaderStateListener_type; - typedef ::CIAO::DDS4CCM::DataReaderHandler_T - DataReaderStateHandler_type; - - public: - /// Constructor - DataReaderStateListenerBase_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor, - ConditionManager& condition_manager); - - /// Destructor - virtual ~DataReaderStateListenerBase_T (void); - - virtual void on_data_available (::DDS::DataReader_ptr rdr); - - static ::DDS::StatusMask get_mask ( - typename CCM_TYPE::data_listener_type::_ptr_type listener); - - void on_data_available_i (::DDS::DataReader_ptr rdr); - - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples) = 0; - - typename CCM_TYPE::data_listener_type::_var_type listener_; - ::CCM_DDS::StateListenerControl_var control_; - ConditionManager& condition_manager_; - }; - - template - class DataReaderStateListener_T : - public DataReaderStateListenerBase_T - { - public: - /// Constructor - DataReaderStateListener_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor, - ConditionManager& condition_manager) : - DataReaderStateListenerBase_T ( - listener, port_status_listener, control, reactor, condition_manager) - { - } - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples); - }; - - template - class DataReaderStateListener_T : - public DataReaderStateListenerBase_T - { - public: - /// Constructor - DataReaderStateListener_T ( - typename CCM_TYPE::data_listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor, - ConditionManager& condition_manager) : - DataReaderStateListenerBase_T ( - listener, port_status_listener, control, reactor, condition_manager) - { - } - private: - /// Helper method to get data from DDS - virtual ::DDS::ReturnCode_t get_data_i ( - typename TYPED_DDS_READER::_ptr_type reader, - ::DDS::QueryCondition_ptr qc, - SEQ_TYPE &data, - ::DDS::SampleInfoSeq &sample_info, - ::CORBA::Long max_samples); - }; - } -} - -#include "dds4ccm/impl/DataReaderStateListener_T.cpp" - -#endif /* DATAREADERSTATELISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp deleted file mode 100644 index c8ab1a84571..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp +++ /dev/null @@ -1,291 +0,0 @@ -#include "dds4ccm/impl/DomainParticipantManager.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/Utils.h" -#include "ace/Env_Value_T.h" - -#if (CIAO_DDS4CCM_NDDS==1) -# include "ndds/convertors/InstanceHandle_t.h" -#endif - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "dds/DCPS/transport/framework/TransportDebug.h" -# include "dds/DCPS/Service_Participant.h" -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - //============================================================ - // DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic - //============================================================ - DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic ( - DDS::DomainParticipant_ptr dp) - : ref_count_ (1), - dp_ (DDS::DomainParticipant::_duplicate(dp)) - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::DDSParticipantTopic"); - } - - DomainParticipantManager::DDSParticipantTopic::~DDSParticipantTopic (void) - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::~DDSParticipantTopic"); - } - - DDS::DomainParticipant_ptr - DomainParticipantManager::DDSParticipantTopic::get_participant () - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::get_participant"); - - return DDS::DomainParticipant::_duplicate(this->dp_); - } - - int - DomainParticipantManager::DDSParticipantTopic::_ref_count () - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_ref_count"); - - return this->ref_count_; - } - - void - DomainParticipantManager::DDSParticipantTopic::_inc_ref () - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_inc_ref"); - - ++this->ref_count_; - } - - void - DomainParticipantManager::DDSParticipantTopic::_dec_ref () - { - DDS4CCM_TRACE ("DomainParticipantManager::DDSParticipantTopic::_dec_ref"); - - --this->ref_count_; - } - - //============================================================ - // DomainParticipantManager::DomainParticipantManager - //============================================================ - DomainParticipantManager::DomainParticipantManager (void) - { - DDS4CCM_TRACE ("DomainParticipantManager::DomainParticipantManager"); - -#if (CIAO_DDS4CCM_NDDS==1) - ACE_Env_Value verbosity (ACE_TEXT("DDS4CCM_NDDS_LOG_VERBOSITY"), - NDDS_CONFIG_LOG_VERBOSITY_SILENT); - - NDDS_Config_LogVerbosity n_verbosity = - static_cast (verbosity.operator int()); - NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); -#elif (CIAO_DDS4CCM_OPENDDS==1) - ACE_Env_Value dcpsdl (ACE_TEXT("DDS4CCM_OPENDDS_LOG_LEVEL"), 0); - OpenDDS::DCPS::DCPS_debug_level = dcpsdl; - ACE_Env_Value dcpsdtl (ACE_TEXT("DDS4CCM_OPENDDS_TRANSPORT_LOG_LEVEL"), 0); - OpenDDS::DCPS::Transport_debug_level = dcpsdtl; -#endif - } - - DomainParticipantManager::~DomainParticipantManager (void) - { - DDS4CCM_TRACE ("DomainParticipantManager::~DomainParticipantManager"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::~DomainParticipantManager\n")); - } - - DDS::DomainParticipant_ptr - DomainParticipantManager::get_participant (const DDS::DomainId_t domain_id, - const char * qos_profile) - { - DDS4CCM_TRACE ("DomainParticipantManager::get_participant"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::get_participant - " - "Searching DomainParticipant for domain <%d> " - "with profile <%C>\n", - domain_id, qos_profile)); - - std::string profile; - if (qos_profile) - { - profile = qos_profile; - } - IdQosProfile idqos = std::make_pair (profile, domain_id); - DomainParticipants_iterator it_found = this->dps_.find (idqos); - - if (it_found != this->dps_.end () && it_found->second) - { - ::DDS::DomainParticipant_var dp = it_found->second->get_participant (); - it_found->second->_inc_ref (); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::get_participant - " - "DomainParticipant found. domain <%d> - " - "profile <%C> - ref_count <%d> - handle " - DDS_ENTITY_FORMAT_SPECIFIER "\n", - domain_id, - qos_profile, - it_found->second->_ref_count (), - DDS_ENTITY_LOG (dp.in ()))); - - return dp._retn (); - } - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::get_participant - " - "DomainParticipant for domain <%d> with profile <%C> " - "does not exist.\n", - domain_id, qos_profile)); - return ::DDS::DomainParticipant::_nil (); - } - - bool - DomainParticipantManager::register_participant ( - DDS::DomainId_t domain_id, - const char * qos_profile, - DDS::DomainParticipant_ptr dp) - { - DDS4CCM_TRACE ("DomainParticipantManager::register_participant"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); - - if (::CORBA::is_nil (dp)) - { - return false; - } - - std::string profile; - if (qos_profile) - { - profile = qos_profile; - } - IdQosProfile idqos = std::make_pair (profile, domain_id); - DomainParticipants_iterator it_found = this->dps_.find (idqos); - - if (it_found == this->dps_.end()) - { - DDSParticipantTopic * dpt = 0; - ACE_NEW_THROW_EX (dpt, - DDSParticipantTopic (dp), - ::CORBA::NO_MEMORY ()); - std::pair to_insert = - this->dps_.insert (std::make_pair (idqos, dpt)); - if (!to_insert.second) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DomainParticipantManager::register_participant - " - "Unable to insert a new DomainParticipant " - "for domain <%d> with profile <%C>.\n", - domain_id, qos_profile)); - return false; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::register_participant - " - "Added a new DomainParticipant " - "for domain <%d> with profile <%C> handle " - DDS_ENTITY_FORMAT_SPECIFIER ".\n", - domain_id, qos_profile, - DDS_ENTITY_LOG (dp))); - return true; - - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::register_participant - " - "Don't add participant for domain <%d> with profile <%C> since it already " - "exists as handle " - DDS_ENTITY_FORMAT_SPECIFIER "\n", - domain_id, qos_profile, - DDS_ENTITY_LOG (dp))); - return false; - } - - bool - DomainParticipantManager::unregister_participant ( - DDS::DomainId_t domain_id, - const char * qos_profile, - DDS::DomainParticipant_ptr dp) - { - DDS4CCM_TRACE ("DomainParticipantManager::unregister_participant"); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); - - if (::CORBA::is_nil (dp)) - { - return false; - } - - std::string profile; - if (qos_profile) - { - profile = qos_profile; - } - IdQosProfile idqos = std::make_pair (profile, domain_id); - DomainParticipants_iterator iter = this->dps_.find (idqos); - - if (iter != this->dps_.end ()) - { - if (iter->second->_ref_count () == 1) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO - "DomainParticipantManager::unregister_participant - " - "Delete participant " - DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> with profile <%C> since ref_count is one.\n", - DDS_ENTITY_LOG (dp), - domain_id, - qos_profile)); - delete iter->second; - - // Save to remove from list - this->dps_.erase (iter); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO - "DomainParticipantManager::unregister_participant - " - "Don't delete participant " - DDS_ENTITY_FORMAT_SPECIFIER - " for domain <%d> with profile <%C> since " - "it's still used - ref_count is <%d>\n", - DDS_ENTITY_LOG (dp), - domain_id, - qos_profile, - iter->second->_ref_count ())); - iter->second->_dec_ref (); - return false; - } - } - - return true; - } - - bool - DomainParticipantManager::close () - { - DDS4CCM_TRACE ("DomainParticipantManager::close"); - - if (this->dps_.empty ()) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DomainParticipantManager::close - " - "No participants anymore, shutting down DDS.\n")); -#if (CIAO_DDS4CCM_OPENDDS==1) - TheServiceParticipant->shutdown (); -#elif (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipantFactory::finalize_instance (); -#endif - return true; - } - - return false; - } - } -} - -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton * - ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h deleted file mode 100644 index 10f058402a2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h +++ /dev/null @@ -1,145 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - */ - -#ifndef DOMAINPARTICIPANTMANAGER_H_ -#define DOMAINPARTICIPANTMANAGER_H_ - -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -#include "ace/Singleton.h" -#include "tao/orbconf.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -#include -#include - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * - * @class DomainParticipantManager - * - * @brief - * - * Stores a DDSParticipantTopic per domain ID and QOS profile string. - * When several connectors are joining the same domain ID, using the - * same QOS settings (ie have the same QOS profile string), - * the DomainParticipant for that combination is shared. This is done - * to save resources (running threads/memory usage). - * - * The DomainParticipantManager is a singleton. - * - */ - class DDS4CCM_DDS_IMPL_Export DomainParticipantManager : private ACE_Copy_Disabled - { - friend class ACE_Singleton; - - /** - * @class DDSParticipantTopic - * - * Stores a list of topics for a specific domain. If - * several connectors run in the same process and those - * connectors are making use of the same topic, the topics - * are shared amongst the connectors. - * - * This class maintains a reference count. It's save to remove - * a topic once the reference count becomes one. - * - */ - class DDSParticipantTopic - { - public: - DDSParticipantTopic (DDS::DomainParticipant_ptr dp); - ~DDSParticipantTopic (void); - - DDS::DomainParticipant_ptr get_participant (); - - /** - * Returns the reference count of this class - */ - int _ref_count (); - /** - * Increments the reference count of this class - */ - void _inc_ref (); - /** - * Decrements the reference count of this class - */ - void _dec_ref (); - - private: - int ref_count_; - DDS::DomainParticipant_var dp_; - }; - - private: - /// Constructor - DomainParticipantManager (void); - - public: - /// Destructor - ~DomainParticipantManager (void); - - /** - * Searches for the DomainParticipant_ptr in the internal map. - * Search is based on the given domain ID and the given QOS - * (QOS profile string). If found, it'll increment the - * reference count of the DDSParticipantTopic instance. - */ - DDS::DomainParticipant_ptr get_participant (const DDS::DomainId_t domain_id, - const char * qos_profile); - - /** - * Adding a DDSParticipantTopic instance when the - * internal maps doesn't contain a reference. Returns - * false if there's already an DDSParticipantTopic - * available (base on domain ID and QOS) - */ - bool register_participant (DDS::DomainId_t domain_id, - const char * qos_profile, - DDS::DomainParticipant_ptr dp); - - /** - * Removes the DDSParticipantTopic instance when the - * reference count is one. - * Returns false if the reference count of the corresponding - * DDSParticipantTopic was not nil - */ - bool unregister_participant (DDS::DomainId_t domain_id, - const char * qos_profile, - DDS::DomainParticipant_ptr dp); - - /** - * Try to close the DPM, at the moment no domain participants are - * registered anymore we are going to shutdown DDS interaction - */ - bool close(); - - private: - TAO_SYNCH_MUTEX dps_mutex_; - - typedef std::pair IdQosProfile; - typedef std::map < IdQosProfile, DDSParticipantTopic *> DomainParticipants; - DomainParticipants dps_; - - typedef DomainParticipants::iterator DomainParticipants_iterator; - }; - - typedef ACE_Singleton Domain_Participant_Manager; - } -} - -#define DPMANAGER ::CIAO::DDS4CCM::Domain_Participant_Manager::instance () - -/// Declare a process wide singleton -DDS4CCM_DDS_IMPL_SINGLETON_DECLARE (ACE_Singleton, - ::CIAO::DDS4CCM::DomainParticipantManager, - TAO_SYNCH_MUTEX) - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp deleted file mode 100644 index 85ee254e6ca..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ /dev/null @@ -1,448 +0,0 @@ -// #include "dds4ccm/impl/Utils.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - Getter_Base_T::Getter_Base_T (void) - : condition_manager_ (0), - time_out_ (), - max_delivered_data_ (0) - { - DDS4CCM_TRACE ("Getter_Base_T::Getter_Base_T"); - } - - template - Getter_Base_T::~Getter_Base_T (void) - { - DDS4CCM_TRACE ("Getter_Base_T::~Getter_Base_T"); - } - - template - typename TYPED_DDS_READER::_ptr_type - Getter_Base_T::dds_reader (void) - { - if (this->dds_reader_) - { - return this->dds_reader_; - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "CIAO::DDS4CCM::Getter_Base_T::impl - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - } - - template - ::DDS::ReturnCode_t - Getter_Base_T::get ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples) - { - DDS4CCM_TRACE ("Getter_Base_T::get"); - - ::DDS::ReadCondition_var rc = this->condition_manager_->get_readcondition (); - if (! ::CORBA::is_nil (rc.in ())) - { - // Read, using the read condition - return this->get (data, - sample_info, - max_samples, - rc.in ()); - } - else - { - // A filter has been set. Use the appropriate query condition - // to read data from DDS. - ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_getter (); - if (::CORBA::is_nil (qc.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::get - " - "Unable to retrieve QueryCondition from " - "Condition manager\n")); - return ::DDS::RETCODE_ERROR; - } - return this->get (data, - sample_info, - max_samples, - qc.in ()); - } - } - - template - ::DDS::ReturnCode_t - Getter_Base_T::get ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples, - ::DDS::QueryCondition_ptr qc) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Getter_Base_T::get"); - - if (! ::CORBA::is_nil (qc)) - { - return this->dds_reader ()->read_w_condition (data, - sample_info, - max_samples, - qc); - } - return ::DDS::RETCODE_ERROR; - } - - template - ::DDS::ReturnCode_t - Getter_Base_T::get ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples, - ::DDS::ReadCondition_ptr rd) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Getter_Base_T::get"); - - if (! ::CORBA::is_nil (rd)) - { - return this->dds_reader ()->read_w_condition (data, - sample_info, - max_samples, - rd); - } - return ::DDS::RETCODE_ERROR; - } - - template - bool - Getter_Base_T::get_many ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos) - { - DDS4CCM_TRACE ("Getter_Base_T::get_many"); - - if (!this->condition_manager_->wait (this->time_out_)) - { - // Wait hasn't been triggered (no samples which match the attached - // conditions are received). - return false; - } - - ::CORBA::Long max_samples = this->max_delivered_data_; - if (max_samples == 0) - { - max_samples = ::DDS::LENGTH_UNLIMITED; - } - - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - ::DDS::ReturnCode_t const retcode = this->get (data, - sample_info, - max_samples); - - if (retcode == ::DDS::RETCODE_OK && data.length () >= 1) - { - // Determine which samples are valid and return these to - // the caller. - ::CORBA::ULong number_read = 0; - for (::CORBA::ULong index = 0; index < sample_info.length (); index ++) - { - if (sample_info[index].valid_data) - { - ++number_read; - } - } - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - ACE_TEXT ("Getter_Base_T::get_many: ") - ACE_TEXT ("read <%d> - valid <%d>\n"), - sample_info.length (), - number_read)); - infos.length (number_read); - instances.length (number_read); - number_read = 0; - for (::CORBA::ULong j = 0; j < data.length (); j ++) - { - if (sample_info[j].valid_data) - { - infos.operator[](number_read) <<= sample_info[j]; - instances.operator[](number_read) = data[j]; - ++number_read; - } - } - } - else - { - // RETCODE_NO_DATA should be an error - // because after a timeout there should be - // data. - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::get_many - " - "Error while reading from DDS: <%C>\n", - translate_retcode (retcode))); - - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::get_many - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - } - throw ::CCM_DDS::InternalError (retcode, 0); - } - - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::get_many - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - - throw ::CCM_DDS::InternalError (retcode, 0); - } - - return true; - } - - template - ::DDS::Duration_t - Getter_Base_T::time_out (void) - { - DDS4CCM_TRACE ("Getter_Base_T::time_out"); - - return this->time_out_; - } - - template - void - Getter_Base_T::time_out ( - const ::DDS::Duration_t & time_out) - { - this->time_out_ = time_out; - } - - template - ::CCM_DDS::DataNumber_t - Getter_Base_T::max_delivered_data (void) - { - return this->max_delivered_data_; - } - - template - void - Getter_Base_T::max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data) - { - this->max_delivered_data_ = max_delivered_data; - } - - template - void - Getter_Base_T::set_dds_reader ( - ::DDS::DataReader_ptr dr, - ::CIAO::DDS4CCM::ConditionManager * condition_manager) - { - DDS4CCM_TRACE ("Getter_Base_T::set_dds_reader"); - - this->dds_reader_ = TYPED_DDS_READER::_narrow (dr); - if (!::CORBA::is_nil (dr) && ::CORBA::is_nil (this->dds_reader_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::set_dds_reader - " - "narrow failed.\n")); - throw ::CORBA::INTERNAL (); - } - this->condition_manager_ = condition_manager; - } - - template - ::DDS::DataReader_ptr - Getter_Base_T::get_dds_reader (void) - { - return ::DDS::DataReader::_duplicate (this->dds_reader_.in ()); - } - - template - bool - Getter_T::get_one ( - typename VALUE_TYPE::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info) - { - DDS4CCM_TRACE ("Getter_T::get_one"); - - if (!this->condition_manager_->wait (this->time_out_)) - { - // None of the attached conditions have triggered wait. - return false; - } - - bool valid_data_read = false; - - // Read the samples one by one until a valid sample - // has been found. - while (!valid_data_read) - { - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - ::DDS::ReturnCode_t const retcode = this->get (data, sample_info, 1); - - if (retcode == ::DDS::RETCODE_NO_DATA) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Getter_T::get_one - " - "DDS returned <%C>. No data available in DDS.\n", - translate_retcode (retcode))); - return false; - } - else if (retcode != ::DDS::RETCODE_OK) - { - // Something went wrong. - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_T::get_one - " - "Error while reading from DDS: <%C>\n", - translate_retcode (retcode))); - - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_Base_T::get_one - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - } - - throw ::CCM_DDS::InternalError (retcode, 0); - } - else if (data.length () == 1 && sample_info[0].valid_data) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Getter_T::get_one - " - "Read one valid sample from DDS.\n")); - - // Add the valid sample to the list which will be returned - // to the caller - info <<= sample_info[0]; - an_instance = data[0]; - valid_data_read = true; - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Getter_T::get_one - " - "No valid data available in DDS.\n")); - } - - // Return the loan of each read. - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_T::get_one - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - - throw ::CCM_DDS::InternalError (retcode, 0); - } - } - - return valid_data_read; - } - - template - bool - Getter_T::get_one ( - typename VALUE_TYPE::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info) - { - DDS4CCM_TRACE ("Getter_T::get_one"); - - an_instance = 0; - ACE_NEW_THROW_EX (an_instance, - VALUE_TYPE, - ::CORBA::NO_MEMORY ()); - if (!this->condition_manager_->wait (this->time_out_)) - { - // None of the attached conditions have triggered wait. - return false; - } - - bool valid_data_read = false; - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - // Read the samples one by one until a valid sample - // has been found. - while (!valid_data_read) - { - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - ::DDS::ReturnCode_t const retcode = this->get (data, - sample_info, - 1); - if (retcode == ::DDS::RETCODE_NO_DATA) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Getter_T::get_one - " - "DDS returned <%C>. No data available in DDS.\n", - translate_retcode (retcode))); - return false; - } - else if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_T::get_one - " - "Error while reading from DDS: <%C>\n", - translate_retcode (retcode))); - - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_T::get_one - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - } - throw ::CCM_DDS::InternalError (retcode, 0); - } - else if (data.length () == 1 && sample_info[0].valid_data) - { - // Add the valid sample to the list which will be returned - // to the caller - info <<= sample_info[0]; - *an_instance = data[0]; - valid_data_read = true; - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "Getter_T::get_one - " - "No valid available in DDS.\n")); - } - // Return the loan of each read. - ::DDS::ReturnCode_t const retval = this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Getter_T::get_one - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - throw ::CCM_DDS::InternalError (retval, 0); - } - } - - return valid_data_read; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h deleted file mode 100644 index 9413db25fcc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.h +++ /dev/null @@ -1,173 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef GETTER_T_H_ -#define GETTER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -#if (CIAO_DDS4CCM_NDDS==1) -# include "dds4ccm/impl/ndds/Condition.h" -# include "dds4ccm/impl/ndds/ReadCondition.h" -# include "dds4ccm/impl/ndds/QueryCondition.h" -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * @class Getter_Base_T - * - * @brief Templated base class for the Getter port. - * - * Spec: Get operations are performed with the following parameters - * . SampleStateMask: NO_READ, - * . ViewStateMask: NEW or NOT_NEW, - * . InstanceStateMask: ALIVE or NOT_ALIVE, - * . Through the query (if any) of the Reader associated to the port, - * . Within the time limit specified in time_out. - * - * All methods return a boolean as result indicating whether actual data - * are provided (TRUE) or if the time-out occurred (FALSE). - */ - template - class Getter_Base_T : - public virtual GETTER_TYPE, - public virtual LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - Getter_Base_T (void); - - /// Destructor - virtual ~Getter_Base_T (void); - - /** - * Spec : get_many returns all the available samples - * in the limits set by the attribute max_delivered_data. - * In case there are more available samples, the first - * max_delivered_data are returned. The default value for - * that attribute is UNLIMITED (0) - */ - virtual bool get_many ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos); - - /** - * @name time_out - * Accessors for time_out - */ - //@{ - virtual ::DDS::Duration_t time_out (void); - virtual void time_out (const ::DDS::Duration_t & time_out); - //@} - - /** - * @name max_delivered_data - * Accessors for max_delivered_data - */ - //@{ - virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); - virtual void max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data); - //@} - - /** - * Set the actual pointer to DDS Datareader - */ - void set_dds_reader (::DDS::DataReader_ptr reader, - ::CIAO::DDS4CCM::ConditionManager * condition_manager); - ::DDS::DataReader_ptr get_dds_reader (void); - protected: - typename TYPED_DDS_READER::_var_type dds_reader_; - ::CIAO::DDS4CCM::ConditionManager * condition_manager_; - - ::DDS::Duration_t time_out_; - ::CCM_DDS::DataNumber_t max_delivered_data_; - - typename TYPED_DDS_READER::_ptr_type dds_reader (void); - - /** - * @name get - * - * Generic helper methods which perform the actual - * DDS reading. - */ - //@{ - ::DDS::ReturnCode_t get (SEQ_VALUE_TYPE& data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples); - ::DDS::ReturnCode_t get ( - SEQ_VALUE_TYPE& data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples, - ::DDS::QueryCondition_ptr qc); - - ::DDS::ReturnCode_t get ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - const ::CORBA::Long & max_samples, - ::DDS::ReadCondition_ptr rd); - //@} - }; - - template - class Getter_T; - - /** - * @brief Implementation of the Getter port for variable sized data types. - */ - template - class Getter_T : - public Getter_Base_T - { - public: - /** - * - * @brief get_one implementation for variable sized datatypes. - * - * Spec : get_one returns the next sample to be gotten. - * - * @retval false When 'wait' times out or when no valid data could be read - * from DDS. - * @retval true When 'wait' is triggered. - */ - virtual bool get_one ( - typename VALUE_TYPE::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info); - }; - - /** - * @brief Implementation of the Getter port for fixed sized data types. - * - */ - template - class Getter_T : - public Getter_Base_T - { - public: - /** - * @brief get_one implementation for fixed sized datatypes. - * - * Spec : get_one returns the next sample to be gotten. - * - * @retval false When 'wait' times out or when no valid data could be read - * from DDS. - * @retval true When 'wait' is triggered. - */ - virtual bool get_one ( - typename VALUE_TYPE::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info); - }; - } -} - -#include "dds4ccm/impl/Getter_T.cpp" - -#endif /* GETTER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp deleted file mode 100644 index 4dbe6e8780b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "CCM_DataReader.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - InstanceHandleManager_T::InstanceHandleManager_T (void) - { - } - - template - InstanceHandleManager_T::~InstanceHandleManager_T (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T"); - } - - template - typename WRITER_TYPE::_ptr_type - InstanceHandleManager_T::dds_writer (void) - { - if (!::CORBA::is_nil (this->dds_writer_.in ())) - { - return this->dds_writer_.in (); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "InstanceHandleManager_T::dds_writer - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - } - - template - ::DDS::InstanceHandle_t - InstanceHandleManager_T::register_instance (const VALUE_TYPE& datum) - { - return this->dds_writer ()->register_instance (datum); - } - - template - void - InstanceHandleManager_T::unregister_instance ( - const VALUE_TYPE& datum, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - this->dds_writer ()->unregister_instance (datum, instance_handle); - } - - template - void - InstanceHandleManager_T::set_dds_writer ( - ::DDS::DataWriter_ptr dds_writer) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_dds_writer"); - - this->dds_writer_ = WRITER_TYPE::_narrow (dds_writer); - - if (!::CORBA::is_nil (dds_writer) && ::CORBA::is_nil (this->dds_writer_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "InstanceHandleManager_T::set_dds_writer - " - "narrow failed.\n")); - throw ::CORBA::INTERNAL (); - } - } - - template - ::DDS::DataWriter_ptr - InstanceHandleManager_T::get_dds_writer (void) - { - return ::DDS::DataWriter::_duplicate (this->dds_writer_.in ()); - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h deleted file mode 100644 index 8c4470c0299..00000000000 --- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef INSTANCEHANDLEMANGER_T_H_ -#define INSTANCEHANDLEMANGER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/LocalObject.h" -#include "dds4ccm/impl/LocalObject_T.h" -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class InstanceHandleManager_T : - public virtual BASE_TYPE, - public virtual LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - InstanceHandleManager_T (void); - - /// Destructor - virtual ~InstanceHandleManager_T (void); - - virtual ::DDS::InstanceHandle_t register_instance ( - const VALUE_TYPE& datum); - - virtual void unregister_instance ( - const VALUE_TYPE& datum, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - void set_dds_writer (::DDS::DataWriter_ptr dds_writer); - - ::DDS::DataWriter_ptr get_dds_writer (void); - - protected: - /// This method doesn't increment the refcount, only for internal - /// usage - typename WRITER_TYPE::_ptr_type dds_writer (void); - - private: - typename WRITER_TYPE::_var_type dds_writer_; - }; - } -} - -#include "dds4ccm/impl/InstanceHandleManager_T.cpp" - -#endif /* INSTANCEHANDLEMANGER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject.cpp deleted file mode 100644 index 5e670f775b2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/LocalObject.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "dds4ccm/impl/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - LocalObject::LocalObject (void) - { - } - - LocalObject::~LocalObject (void) - { - } - - ::CORBA::Object_ptr - LocalObject::_get_component (void) - { - return CORBA::Object::_duplicate (this->component_.in ()); - } - - void - LocalObject::_set_component (::CORBA::Object_ptr component) - { - this->component_ = ::CORBA::Object::_duplicate (component); - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject.h b/CIAO/connectors/dds4ccm/impl/LocalObject.h deleted file mode 100644 index 0818037c712..00000000000 --- a/CIAO/connectors/dds4ccm/impl/LocalObject.h +++ /dev/null @@ -1,33 +0,0 @@ -// -*- C++ -*- -#ifndef DDS4CCM_LOCALOBJECT_H_ -#define DDS4CCM_LOCALOBJECT_H_ - -#include "tao/LocalObject.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * Base class for all DDS4CCM local facets. It stores - * an object reference to the component this local - * facet belongs too. - */ - class DDS4CCM_DDS_IMPL_Export LocalObject - : public virtual ::CORBA::LocalObject - { - public: - LocalObject (void); - virtual ~LocalObject (void); - - void _set_component (::CORBA::Object_ptr component); - virtual ::CORBA::Object_ptr _get_component (void); - - private: - ::CORBA::Object_var component_; - }; - } -} - -#endif /* DDS4CCM_LOCALOBJECT_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp deleted file mode 100644 index 02ff07683ce..00000000000 --- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp +++ /dev/null @@ -1,35 +0,0 @@ -namespace CIAO -{ - namespace DDS4CCM - { - template - LocalObject_Auto_Ptr_T::LocalObject_Auto_Ptr_T (void) : l (new LOCAL_OBJECT) - { - } - - template - LocalObject_Auto_Ptr_T::~LocalObject_Auto_Ptr_T (void) - { - ::CORBA::release (l); - } - - template - LocalObject_Auto_Ptr_T::LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject) - : l (lobject) - { - } - - template - LOCAL_OBJECT* - LocalObject_Auto_Ptr_T::operator-> (void) const - { - return this->l; - } - - template - LocalObject_Auto_Ptr_T::operator LOCAL_OBJECT *& (void) - { - return this->l; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h deleted file mode 100644 index fb367ee4917..00000000000 --- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h +++ /dev/null @@ -1,36 +0,0 @@ -// -*- C++ -*- -#ifndef DDS4CCM_LOCALOBJECT_T_H_ -#define DDS4CCM_LOCALOBJECT_T_H_ - -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * Helper template that allocates a new LOCAL_OBJECT from the heap and that - * makes sure we call ::CORBA::release() at destruction - */ - template - class LocalObject_Auto_Ptr_T : private ACE_Copy_Disabled - { - public: - LocalObject_Auto_Ptr_T (void); - - ~LocalObject_Auto_Ptr_T (void); - - explicit LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject); - - LOCAL_OBJECT* operator-> (void) const; - - operator LOCAL_OBJECT *& (void); - private: - LOCAL_OBJECT* l; - }; - } -} - -#include "dds4ccm/impl/LocalObject_T.cpp" - -#endif /* DDS4CCM_LOCALOBJECT_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp deleted file mode 100644 index 66c8808f062..00000000000 --- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp +++ /dev/null @@ -1,233 +0,0 @@ -#include "dds4ccm/impl/PortStatusListener.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/DDSCallbackStatusHandler.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO -{ - namespace DDS4CCM - { - PortStatusListener::PortStatusListener ( - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ACE_Reactor* reactor) - : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener)), - reactor_ (reactor) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::PortStatusListener"); - } - - PortStatusListener::~PortStatusListener (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::~PortStatusListener"); - } - - void - PortStatusListener::on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::on_requested_deadline_missed"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last instance") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - status.total_count, status.total_count_change, - DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); - - if (! ::CORBA::is_nil (this->port_status_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler ( - this->port_status_listener_.in (), the_reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->port_status_listener_->on_requested_deadline_missed (the_reader, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "PortStatusListener::on_requested_deadline_missed"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "PortStatusListener::on_requested_deadline_missed"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_requested_deadline_missed - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ") - ACE_TEXT ("No portstatus listener installed\n"))); - } - } - - void - PortStatusListener::on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::on_sample_lost"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PortStatusListener::on_sample_lost: ") - ACE_TEXT ("total count <%d> - total change <%d>\n"), - status.total_count, status.total_count_change)); - - if (! ::CORBA::is_nil (this->port_status_listener_.in ())) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnSampleLostHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnSampleLostHandler ( - this->port_status_listener_.in (), - the_reader, - status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("PortStatusListener::on_sample_lost: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->port_status_listener_->on_sample_lost (the_reader, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "PortStatusListener::on_sample_lost"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "PortStatusListener::on_sample_lost"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_sample_lost - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - ACE_TEXT ("PortStatusListener::on_sample_lost: ") - ACE_TEXT ("No portstatus listener installed\n"))); - } - } - - void - PortStatusListener::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_requested_incompatible_qos - " - "Unexpected callback occurred\n")); - } - - void - PortStatusListener::on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_sample_rejected - " - "Unexpected callback occurred\n")); - } - - void - PortStatusListener::on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_liveliness_changed - " - "Unexpected callback occurred\n")); - } - - void - PortStatusListener::on_data_available (::DDS::DataReader_ptr ) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_data_available - " - "Unexpected callback occurred\n")); - } - - void - PortStatusListener::on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PortStatusListener::on_subscription_matched - " - "Unexpected callback occurred\n")); - } - - ::DDS::StatusMask - PortStatusListener::get_mask ( - ::CCM_DDS::PortStatusListener_ptr psl) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener::get_mask"); - - ::DDS::StatusMask mask = 0; - if (! ::CORBA::is_nil (psl) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | - ::DDS::SAMPLE_LOST_STATUS; - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "PortStatusListener::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.h b/CIAO/connectors/dds4ccm/impl/PortStatusListener.h deleted file mode 100644 index 3fe6e1c089b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef PORTSTATUSLISTENER_T_H_ -#define PORTSTATUSLISTENER_T_H_ - -#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export PortStatusListener : - public ::DDS::DataReaderListener - { - public: - /// Constructor - PortStatusListener ( - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~PortStatusListener (void); - - virtual void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - - virtual void - on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void - on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ); - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::PortStatusListener_ptr psl); - - private: - ::CCM_DDS::PortStatusListener_var port_status_listener_; - protected: - ACE_Reactor* reactor_; - }; - } -} - -#endif /* PORTSTATUSLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp deleted file mode 100644 index b95d1a141ac..00000000000 --- a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp +++ /dev/null @@ -1,350 +0,0 @@ -#include "dds4ccm/impl/PublisherListener.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/DataReaderHandler_T.h" -#include "dds4ccm/impl/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO -{ - namespace DDS4CCM - { - PublisherListener::PublisherListener ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) - : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::PublisherListener"); - } - - PublisherListener::~PublisherListener (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::~PublisherListener"); - } - - void - PublisherListener::on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_unexpected_status"); - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( - this->error_listener_, entity, status_kind)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_unexpected_status: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_unexpected_status (entity, status_kind); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "PublisherListener::on_unexpected_status"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "PublisherListener::on_unexpected_status"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PublisherListener::on_unexpected_status - " - "Unexpected exception caught for <%C>\n", - translate_statuskind (status_kind))); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_unexpected_status: ") - ACE_TEXT ("No error listener connected for <%C>\n"), - translate_statuskind (status_kind))); - } - } - - void - PublisherListener::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_offered_deadline_missed"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_deadline_missed: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last instance handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - status.total_count, status.total_count_change, - DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler ( - this->error_listener_, the_Writer, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_deadline_missed - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_offered_deadline_missed (the_Writer, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "PublisherListener::on_offered_deadline_missed"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "PublisherListener::on_offered_deadline_missed"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PublisherListener::on_offered_deadline_missed - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_deadline_missed: ") - ACE_TEXT ("No error listener connected\n"))); - } - } - - void - PublisherListener::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_offered_incompatible_qos"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_incompatible_qos: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last policy id <%C> - policies:\n"), - status.total_count, status.total_count_change, - translate_qospolicyid_t (status.last_policy_id))); - for (CORBA::ULong i = 0; i < status.policies.length (); ++i) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("\t\tid <%C> - count <%d>\n"), - translate_qospolicyid_t (status.policies[i].policy_id), - status.policies[i].count)); - } - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler ( - this->error_listener_, the_Writer, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_incompatible_qos - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_offered_incompatible_qos (the_Writer, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "PublisherListener::on_offered_incompatible_qos"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "PublisherListener::on_offered_incompatible_qos"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "PublisherListener::on_offered_incompatible_qos - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_offered_incompatible_qos - ") - ACE_TEXT ("No error listener connected\n"))); - } - } - - void - PublisherListener::on_liveliness_lost ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_liveliness_lost"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_liveliness_lost: ") - ACE_TEXT ("total count <%d> - count change <%d>\n"), - status.total_count, status.total_count_change)); - - this->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS); - } - - void - PublisherListener::on_publication_matched ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_publication_matched"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::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 ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - status.total_count, status.total_count_change, - status.current_count, status.current_count_change, - DDS_INSTANCE_HANDLE_LOG (status.last_subscription_handle))); - - this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS); - } - - #if (CIAO_DDS4CCM_NDDS==1) - void - PublisherListener::on_reliable_writer_cache_changed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::ReliableWriterCacheChangedStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_reliable_writer_cache_changed"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::on_reliable_writer_cache_changed: ") - ACE_TEXT ("empty_reliable_writer_cache.total_count <%d> - ") - ACE_TEXT ("empty_reliable_writer_cache.total_count_change <%d> - ") - ACE_TEXT ("full_reliable_writer_cache.total_count <%d> - ") - ACE_TEXT ("full_reliable_writer_cache.total_count_change <%d> - ") - ACE_TEXT ("low_watermark_reliable_writer_cache.total_count <%d> - ") - ACE_TEXT ("low_watermark_reliable_writer_cache.total_count_change <%d> - ") - ACE_TEXT ("high_watermark_reliable_writer_cache.total_count <%d> - ") - ACE_TEXT ("high_watermark_reliable_writer_cache.total_count_change <%d> - ") - ACE_TEXT ("unacknowledged_sample_count <%d> - ") - ACE_TEXT ("unacknowledged_sample_count_peak <%d>\n"), - status.empty_reliable_writer_cache.total_count, - status.empty_reliable_writer_cache.total_count_change, - status.full_reliable_writer_cache.total_count, - status.full_reliable_writer_cache.total_count_change, - status.low_watermark_reliable_writer_cache.total_count, - status.low_watermark_reliable_writer_cache.total_count_change, - status.high_watermark_reliable_writer_cache.total_count, - status.high_watermark_reliable_writer_cache.total_count_change, - status.unacknowledged_sample_count, - status.unacknowledged_sample_count_peak)); - - this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS); - } - - void - PublisherListener::on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::ReliableReaderActivityChangedStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener::on_reliable_reader_activity_changed"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("PublisherListener::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 ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"), - status.active_count, status.active_count_change, - status.inactive_count, status.inactive_count_change, - DDS_INSTANCE_HANDLE_LOG(status.last_instance_handle))); - - this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); - } - #endif - - ::DDS::StatusMask - PublisherListener::get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener) - { - ::DDS::StatusMask mask = 0; - - if (! ::CORBA::is_nil (error_listener) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::OFFERED_DEADLINE_MISSED_STATUS | - ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS | - #if (CIAO_DDS4CCM_NDDS==1) - ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS | - ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS | - #endif - ::DDS::LIVELINESS_LOST_STATUS | - ::DDS::PUBLICATION_MATCHED_STATUS; - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "PublisherListener::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/PublisherListener.h deleted file mode 100644 index be265f12591..00000000000 --- a/CIAO/connectors/dds4ccm/impl/PublisherListener.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef PUBLISHERLISTENER_T_H_ -#define PUBLISHERLISTENER_T_H_ - -#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export PublisherListener : - public ::DDS::PublisherListener - { - public: - /// Constructor - PublisherListener ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~PublisherListener (void); - - virtual void on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual void on_liveliness_lost ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::LivelinessLostStatus & status); - - virtual void on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedIncompatibleQosStatus & status); - - virtual void on_publication_matched ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::PublicationMatchedStatus & status); - -#if (CIAO_DDS4CCM_NDDS==1) - virtual void on_reliable_writer_cache_changed ( - ::DDS::DataWriter_ptr the_writer, - const ::DDS::ReliableWriterCacheChangedStatus & status); - - virtual void on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::ReliableReaderActivityChangedStatus & status); -#endif - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener); - - private: - virtual void on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - - ACE_Reactor* reactor_; - }; - } -} - -#endif /* PUBLISHERLISTENER_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp deleted file mode 100644 index 70ce29db2d4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ /dev/null @@ -1,385 +0,0 @@ -// #include "dds4ccm/impl/Utils.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/SampleInfo.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - Reader_T::Reader_T (void) - : condition_manager_ (0) - { - DDS4CCM_TRACE ("Reader_T::Reader_T"); - } - - template - Reader_T::~Reader_T (void) - { - DDS4CCM_TRACE ("Reader_T::~Reader_T"); - } - - template - ::DDS::InstanceHandle_t - Reader_T::check_handle ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("Reader_T::check_handle"); - - ::DDS::InstanceHandle_t const lookup_hnd = - this->dds_reader ()->lookup_instance (an_instance); - - return this->condition_manager_->check_handle (instance_handle, - lookup_hnd); - } - - template - CORBA::ULong - Reader_T::get_nr_valid_samples ( - const ::DDS::SampleInfoSeq& sample_infos, - const bool determine_last) - { - DDS4CCM_TRACE ("Reader_T::get_nr_valid_samples"); - - CORBA::ULong nr_of_samples = 0; - if (determine_last) - { - for (::CORBA::ULong i = 0 ; i < sample_infos.length(); ++i) - { - if (sample_infos[i].valid_data && - sample_infos[i].sample_rank == 0) - { - ++nr_of_samples; - } - } - } - else - { - for (::CORBA::ULong i = 0 ; i < sample_infos.length(); ++i) - { - if (sample_infos[i].valid_data) - { - ++nr_of_samples; - } - } - } - return nr_of_samples; - } - - template - void - Reader_T::convert_data ( - const SEQ_VALUE_TYPE & all_data, - SEQ_VALUE_TYPE & data_to_return, - ::CCM_DDS::ReadInfoSeq& infos, - const ::DDS::SampleInfoSeq & sample_info) - { - DDS4CCM_TRACE ("Reader_T::convert_data"); - - CORBA::ULong samples_to_return = this->get_nr_valid_samples (sample_info, - false); - infos.length (samples_to_return); - data_to_return.length (samples_to_return); - - CORBA::ULong ix = 0; - for (::CORBA::ULong i = 0 ; i < sample_info.length(); ++i) - { - if (sample_info[i].valid_data) - { - infos[ix] <<= sample_info[i]; - data_to_return[ix] = all_data[i]; - ++ix; - } - } - } - - template - void - Reader_T::read_w_instance ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - DDS_INSTANCE_HANDLE_T_IN lookup_hnd) - { - DDS4CCM_TRACE ("Reader_T::read_w_instance"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("Reader_T::read_w_instance - ") - ACE_TEXT ("Start reading with instance ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - DDS_INSTANCE_HANDLE_LOG (lookup_hnd))); - ::DDS::ReturnCode_t const retval = this->dds_reader ()->read_instance ( - data, - sample_info, - ::DDS::LENGTH_UNLIMITED, - lookup_hnd, - ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE); - if (retval != ::DDS::RETCODE_OK && retval != ::DDS::RETCODE_NO_DATA) - { - // Return the loan but don't throw an exception since an error returning - // the loan is less important than an error during the retrieval of - // data from DDS. - this->return_loan (data, sample_info, false); - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Reader_T::read_w_instance - ") - ACE_TEXT ("retval is %C\n"), - ::CIAO::DDS4CCM::translate_retcode(retval))); - throw ::CCM_DDS::InternalError (retval, 0); - } - } - - template - void - Reader_T::read_wo_instance ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq & sample_info, - ::DDS::QueryCondition_ptr qc) - { - DDS4CCM_TRACE ("Reader_T::read_wo_instance"); - - ::DDS::ReturnCode_t retval = ::DDS::RETCODE_ERROR; - - if (! ::CORBA::is_nil (qc)) - { - retval = this->dds_reader ()->read_w_condition ( - data, - sample_info, - ::DDS::LENGTH_UNLIMITED, - qc); - } - else - { - retval = this->dds_reader ()->read ( - data, - sample_info, - ::DDS::LENGTH_UNLIMITED, - ::DDS::READ_SAMPLE_STATE | ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE); - } - if (retval != ::DDS::RETCODE_OK && retval != ::DDS::RETCODE_NO_DATA) - { - // Return the loan but don't throw an exception since an error returning - // the loan is less important than an error during the retrieval of - // data from DDS. - this->return_loan (data, sample_info, false); - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Reader_T::read_wo_instance - ") - ACE_TEXT ("retval is %C\n"), - ::CIAO::DDS4CCM::translate_retcode(retval))); - throw ::CCM_DDS::InternalError (retval, 0); - } - } - - template - void - Reader_T::return_loan ( - SEQ_VALUE_TYPE & data, - ::DDS::SampleInfoSeq sample_info, - bool throw_exception) - { - DDS4CCM_TRACE ("Reader_T::return_loan"); - - // Return the loan - ::DDS::ReturnCode_t const retval = - this->dds_reader ()->return_loan (data, sample_info); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Reader_T::return_loan - " - "Error returning loan to DDS - <%C>\n", - translate_retcode (retval))); - if (throw_exception) - { - throw ::CCM_DDS::InternalError (retval, 0); - } - } - } - - template - void - Reader_T::read_last ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos) - { - DDS4CCM_TRACE ("Reader_T::read_last"); - - // This function has to return the last sample of all instances - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_reader (); - this->read_wo_instance (data, - sample_info, - qc.in ()); - - // Determine how many samples to return - CORBA::ULong samples_to_return = this->get_nr_valid_samples (sample_info, - true); - infos.length (samples_to_return); - instances.length (samples_to_return); - ::CORBA::ULong ix = 0; - for (::CORBA::ULong i = 0 ; i < sample_info.length(); ++i) - { - if (sample_info[i].valid_data && sample_info[i].sample_rank == 0) - { - infos[ix] <<= sample_info[i]; - instances[ix] = data[i]; - ++ix; - } - } - this->return_loan (data, sample_info); - } - - template - void - Reader_T::read_all ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos) - { - DDS4CCM_TRACE ("Reader_T::read_all"); - - // This function has to return all samples of all instances - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - ::DDS::QueryCondition_var qc = this->condition_manager_->get_querycondition_reader (); - this->read_wo_instance (data, - sample_info, - qc.in ()); - - this->convert_data (data, instances, infos, sample_info); - this->return_loan (instances, sample_info); - } - - template - void - Reader_T::read_one_last ( - VALUE_TYPE& an_instance, - ::CCM_DDS::ReadInfo_out info, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("Reader_T::read_one_last"); - - ::DDS::InstanceHandle_t const lookup_hnd = - this->check_handle (an_instance, instance_handle); - - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - this->read_w_instance (data, - sample_info, - lookup_hnd); - - ::CORBA::Long sample = data.length(); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - ACE_TEXT ("Reader_T::read_one_last - ") - ACE_TEXT ("total number of samples <%u>\n"), - sample)); - while (sample > 0 && !sample_info[sample-1].valid_data) - { - --sample; - } - if (sample > 0) - { - if (sample_info[sample-1].valid_data) - { - an_instance = data[sample-1]; - info <<= sample_info[sample-1]; - } - } - this->return_loan (data, sample_info); - } - - template - void - Reader_T::read_one_all ( - const VALUE_TYPE& an_instance, - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("Reader_T::read_one_all"); - - ::DDS::InstanceHandle_t const lookup_hnd = - this->check_handle (an_instance, instance_handle); - - ::DDS::SampleInfoSeq sample_info; - SEQ_VALUE_TYPE data; - - this->read_w_instance (data, - sample_info, - lookup_hnd); - this->convert_data (data, instances, infos, sample_info); - this->return_loan (instances, sample_info); - } - - template - ::CCM_DDS::QueryFilter * - Reader_T::query (void) - { - DDS4CCM_TRACE ("Reader_T::query"); - - return this->condition_manager_->query (); - } - - template - void - Reader_T::query ( - const ::CCM_DDS::QueryFilter & query) - { - DDS4CCM_TRACE ("Reader_T::query"); - - return this->condition_manager_->query (query); - } - - template - void - Reader_T::set_dds_reader ( - ::DDS::DataReader_ptr dr, - ConditionManager * condition_manager) - { - DDS4CCM_TRACE ("Reader_T::set_dds_reader"); - - this->dds_reader_ = TYPED_DDS_READER::_narrow (dr); - if (!::CORBA::is_nil (dr) && ::CORBA::is_nil (this->dds_reader_.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Reader_T::set_dds_reader - " - "narrow failed.\n")); - throw ::CORBA::INTERNAL (); - } - this->condition_manager_ = condition_manager; - } - - template - ::DDS::DataReader_ptr - Reader_T::get_dds_reader (void) - { - DDS4CCM_TRACE ("Reader_T::get_dds_reader"); - - return ::DDS::DataReader::_duplicate (this->dds_reader_.in ()); - } - - template - typename TYPED_DDS_READER::_ptr_type - Reader_T::dds_reader (void) - { - if (! ::CORBA::is_nil (this->dds_reader_)) - { - return this->dds_reader_; - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Reader_T::dds_reader - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.h b/CIAO/connectors/dds4ccm/impl/Reader_T.h deleted file mode 100644 index bde38f6ae7d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.h +++ /dev/null @@ -1,104 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef READER_T_H_ -#define READER_T_H_ - -#include "dds4ccm/idl/ccm_ddsC.h" -#include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class ConditionManager; - - template - class Reader_T : - public virtual READER_TYPE, - public virtual LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - Reader_T (void); - - /// Destructor - virtual ~Reader_T (void); - - virtual void read_last ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos); - - virtual void read_all ( - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos); - - virtual void read_one_last ( - VALUE_TYPE& an_instance, - ::CCM_DDS::ReadInfo_out info, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - virtual void read_one_all ( - const VALUE_TYPE& an_instance, - SEQ_VALUE_TYPE& instances, - ::CCM_DDS::ReadInfoSeq& infos, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - virtual ::CCM_DDS::QueryFilter *query (void); - - virtual void query (const ::CCM_DDS::QueryFilter & filter); - - void set_dds_reader (::DDS::DataReader_ptr dr, - ::CIAO::DDS4CCM::ConditionManager * condition_manager); - - ::DDS::DataReader_ptr get_dds_reader (void); - - private: - typename TYPED_DDS_READER::_var_type dds_reader_; - ::CIAO::DDS4CCM::ConditionManager * condition_manager_; - - typename TYPED_DDS_READER::_ptr_type dds_reader (void); - - // Helper methods - ::CORBA::ULong get_nr_valid_samples ( - const ::DDS::SampleInfoSeq& sample_infos, - const bool determine_last); - - ::DDS::InstanceHandle_t check_handle ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - void convert_data ( - const SEQ_VALUE_TYPE& all_data, - SEQ_VALUE_TYPE& data_to_return, - ::CCM_DDS::ReadInfoSeq& infos, - const ::DDS::SampleInfoSeq & sample_info); - - void read_wo_instance ( - SEQ_VALUE_TYPE& data, - ::DDS::SampleInfoSeq & sample_info, - ::DDS::QueryCondition_ptr qc); - - void read_w_instance ( - SEQ_VALUE_TYPE& data, - ::DDS::SampleInfoSeq & sample_info, - DDS_INSTANCE_HANDLE_T_IN lookup_hnd); - - void return_loan ( - SEQ_VALUE_TYPE& data, - ::DDS::SampleInfoSeq sample_info, - bool throw_exception=true); - }; - } -} - -#include "dds4ccm/impl/Reader_T.cpp" - -#endif /* READER_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/SampleInfo.h deleted file mode 100644 index 4b7d3434111..00000000000 --- a/CIAO/connectors/dds4ccm/impl/SampleInfo.h +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef SAMPLE_INFO_H -#define SAMPLE_INFO_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - - -inline void -operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS::SampleInfo& sample_info) -{ - ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp; - if (sample_info.sample_state == ::DDS::NOT_READ_SAMPLE_STATE) - { - ccm_dds_readinfo.access_status = ::CCM_DDS::FRESH_INFO; - } - else if (sample_info.sample_state == ::DDS::READ_SAMPLE_STATE) - { - ccm_dds_readinfo.access_status = ::CCM_DDS::ALREADY_SEEN; - } - - ccm_dds_readinfo.instance_handle = sample_info.instance_handle; - - if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && - sample_info.view_state == ::DDS::NEW_VIEW_STATE) - { - // Instance_status new - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED; - } - else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - // Instance_status deleted - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED; - } - else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && - sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) || - sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) - { - // Instance_status updated - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp deleted file mode 100644 index 877fb84c9af..00000000000 --- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- -template -CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T (void) - : is_filter_interpreted_ (false) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T"); -} - -template -CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T (void) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T"); -} - -template -::CORBA::Boolean -CCM_DDS_StateListenerControl_T::is_filter_interpreted (void) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); - - return this->is_filter_interpreted_.value (); -} - -template -void -CCM_DDS_StateListenerControl_T::is_filter_interpreted ( - ::CORBA::Boolean is_filter_interpreted) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); - - this->is_filter_interpreted_ = is_filter_interpreted; -} diff --git a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h deleted file mode 100644 index 7eb0afa4038..00000000000 --- a/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h +++ /dev/null @@ -1,36 +0,0 @@ -// -*- C++ -*- -#ifndef STATELISTENERCONTROL_T_H_ -#define STATELISTENERCONTROL_T_H_ - -#include "dds4ccm/impl/DataListenerControl_T.h" -#include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class CCM_DDS_StateListenerControl_T - : public virtual CCM_DDS_DataListenerControl_T -{ -public: - /// Constructor - CCM_DDS_StateListenerControl_T (void); - - /// Destructor - virtual ~CCM_DDS_StateListenerControl_T (void); - - /// Set the is_filter_interpreted - virtual ::CORBA::Boolean is_filter_interpreted (void); - - /// Get the is_filter_interpreted - virtual void is_filter_interpreted (::CORBA::Boolean is_filter_interpreted); - -private: - ACE_Atomic_Op is_filter_interpreted_; -}; - -#include "dds4ccm/impl/StateListenerControl_T.cpp" - -#endif /* STATELISTENERCONTROL_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp deleted file mode 100644 index 803f638b2d5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp +++ /dev/null @@ -1,334 +0,0 @@ -#include "dds4ccm/impl/SubscriberListener.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/Utils.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO -{ - namespace DDS4CCM - { - SubscriberListener::SubscriberListener ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) - : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::SubscriberListener"); - } - - SubscriberListener::~SubscriberListener (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::~SubscriberListener"); - } - - void - SubscriberListener::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr reader, - const ::DDS::RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_requested_incompatible_qos"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_requested_incompatible_qos: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last policy id <%C> - policies:\n"), - status.total_count, status.total_count_change, - translate_qospolicyid_t (status.last_policy_id))); - for (CORBA::ULong i = 0; i < status.policies.length (); ++i) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("\t\tid <%C> - count <%d>\n"), - translate_qospolicyid_t (status.policies[i].policy_id), - status.policies[i].count)); - } - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler ( - this->error_listener_, reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::") - ACE_TEXT ("on_requested_incompatible_qos - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_requested_incompatible_qos (reader, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "SubscriberListener::on_requested_incompatible_qos"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "SubscriberListener::on_requested_incompatible_qos"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_requested_incompatible_qos - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_requested_incompatible_qos - ") - ACE_TEXT ("No error listener connected\n"))); - } - } - - void - SubscriberListener::on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_unexpected_status"); - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( - this->error_listener_, entity, status_kind)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_unexpected_status - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_unexpected_status (entity, status_kind); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "SubscriberListener::on_unexpected_status"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "SubscriberListener::on_unexpected_status"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_unexpected_status - " - "Unexpected exception caught for <%C>\n", - translate_statuskind (status_kind))); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_unexpected_status - ") - ACE_TEXT ("No error listener connected for <%C>\n"), - translate_statuskind (status_kind))); - } - } - - void - SubscriberListener::on_liveliness_changed ( - ::DDS::DataReader* reader, - const ::DDS::LivelinessChangedStatus& status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_liveliness_changed"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_liveliness_changed: ") - ACE_TEXT ("alive count <%d> - not alive count <%d> - ") - ACE_TEXT ("alive count change <%d> - not alive count change <%d> ") - ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - status.alive_count, status.not_alive_count, - status.alive_count_change, status.not_alive_count_change, - DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle))); - - this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS); - } - - void - SubscriberListener::on_sample_rejected ( - ::DDS::DataReader_ptr reader, - const ::DDS::SampleRejectedStatus& status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_sample_rejected"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_sample_rejected: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last reason <%C> - last instance handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - status.total_count, status.total_count_change, - translate_rejectedstatuskind (status.last_reason), - DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); - - if (! ::CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnSampleRejectedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnSampleRejectedHandler ( - this->error_listener_, reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_sample_rejected - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_sample_rejected (reader, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "SubscriberListener::on_sample_rejected"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "SubscriberListener::on_sample_rejected"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_sample_rejected - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_sample_rejected - ") - ACE_TEXT ("No error listener connected\n"))); - } - } - - void - SubscriberListener::on_subscription_matched ( - ::DDS::DataReader* reader, - const ::DDS::SubscriptionMatchedStatus& status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_subscription_matched"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("SubscriberListener::on_subscription_matched: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - status.total_count, status.total_count_change, - status.current_count, status.current_count_change, - DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle))); - - this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS); - } - - void - SubscriberListener::on_data_on_readers ( - ::DDS::Subscriber *) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener::on_data_on_readers"); - //do nothing by design - } - - void - SubscriberListener::on_requested_deadline_missed ( - ::DDS::DataReader_ptr, - const ::DDS::RequestedDeadlineMissedStatus &) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_requested_deadline_missed - " - "Unexpected callback occurred\n")); - } - - void - SubscriberListener::on_data_available ( - ::DDS::DataReader_ptr) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_data_available - " - "Unexpected callback occurred\n")); - } - - void - SubscriberListener::on_sample_lost ( - ::DDS::DataReader_ptr, - const ::DDS::SampleLostStatus &) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "SubscriberListener::on_sample_lost - " - "Unexpected callback occurred\n")); - } - - ::DDS::StatusMask - SubscriberListener::get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr csl) - { - ::DDS::StatusMask mask = 0; - - if (! ::CORBA::is_nil (csl) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS | - ::DDS::SAMPLE_REJECTED_STATUS | - ::DDS::LIVELINESS_CHANGED_STATUS | - ::DDS::SUBSCRIPTION_MATCHED_STATUS; - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "SubscriberListener::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/SubscriberListener.h deleted file mode 100644 index c0bb0b35b14..00000000000 --- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef SUBSCRIBERLISTENER_T_H_ -#define SUBSCRIBERLISTENER_T_H_ - -#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export SubscriberListener : - public ::DDS::SubscriberListener - { - public: - /// Constructor - SubscriberListener ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~SubscriberListener (void); - - virtual void on_requested_incompatible_qos ( - ::DDS::DataReader_ptr reader, - const ::DDS::RequestedIncompatibleQosStatus & status); - - virtual void on_liveliness_changed( - ::DDS::DataReader* reader, - const ::DDS::LivelinessChangedStatus& status); - - virtual void on_sample_rejected( - ::DDS::DataReader* reader, - const ::DDS::SampleRejectedStatus& status); - - virtual void on_subscription_matched( - ::DDS::DataReader* reader, - const ::DDS::SubscriptionMatchedStatus& status); - - virtual void on_data_on_readers( - ::DDS::Subscriber* subscriber); - - virtual void on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ); - - virtual void on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ); - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr csl); - - private: - virtual void on_unexpected_status( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - - ACE_Reactor* reactor_; - }; - } -} - -#endif /* SUBSCRIBERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h deleted file mode 100644 index dbb7476a908..00000000000 --- a/CIAO/connectors/dds4ccm/impl/TimeUtilities.h +++ /dev/null @@ -1,38 +0,0 @@ -//============================================================================= -/** - * @file TimeUtilities.h - * - * @author Marcel Smit (msmit@remedy.nl) - */ -//============================================================================= - - -#ifndef DDS4CCM_TIME_UTILITIES_H -#define DDS4CCM_TIME_UTILITIES_H - -#include "ace/Time_Value.h" -#include "ace/Truncate.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -inline void -operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time) -{ - dds_time.sec = ACE_Utils::truncate_cast (ace_time.sec ()); - dds_time.nanosec = ace_time.usec () * 1000; -} - -inline void -operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Time_t &dds_time) -{ - ace_time.sec (dds_time.sec); - ace_time.usec (dds_time.nanosec/1000); -} - -inline void -operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Duration_t &dds_time) -{ - ace_time.sec (dds_time.sec); - ace_time.usec (dds_time.nanosec/1000); -} - -#endif /* DDS4CCM_TIME_UTILITIES_H */ diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp deleted file mode 100644 index c4819269863..00000000000 --- a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp +++ /dev/null @@ -1,118 +0,0 @@ -#include "dds4ccm/impl/TopicListener.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ace/Reactor.h" - -namespace CIAO -{ - namespace DDS4CCM - { - TopicListener::TopicListener ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) : - error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::TopicListener"); - } - - TopicListener::~TopicListener (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::~TopicListener"); - } - - void - TopicListener::on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - const ::DDS::InconsistentTopicStatus & status) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::on_inconsistent_topic"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("TopicListener::on_inconsistent_topic: ") - ACE_TEXT ("total count <%d> - total change <%d> - "), - status.total_count, status.total_count_change)); - - if (! ::CORBA::is_nil (this->error_listener_.in ())) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnInconsistentTopicHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnInconsistentTopicHandler ( - this->error_listener_, - the_topic, - status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("TopicListener::on_inconsistent_topic - ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_inconsistent_topic (the_topic, status); - } - } - catch (const ::CORBA::BAD_INV_ORDER& ex) - { - DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ACTION, - ex, - "TopicListener::on_inconsistent_topic"); - } - catch (const ::CORBA::Exception& ex) - { - DDS4CCM_PRINT_CORBA_EXCEPTION ( - DDS4CCM_LOG_LEVEL_ERROR, - ex, - "TopicListener::on_inconsistent_topic"); - } - catch (...) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "TopicListener::on_inconsistent_topic - " - "Unexpected exception caught\n")); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("TopicListener::on_inconsistent_topic - ") - ACE_TEXT ("No error listener connected\n"))); - } - } - - ::DDS::StatusMask - TopicListener::get_mask ( - CCM_DDS::ConnectorStatusListener_ptr error_listener) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener::get_mask"); - - ::DDS::StatusMask mask = 0; - - if (! ::CORBA::is_nil (error_listener) || - DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - mask = ::DDS::INCONSISTENT_TOPIC_STATUS; - } - - if (DDS4CCM_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS) - { - ACE_CString msk; - translate_statusmask (msk, mask); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO - "TopicListener::get_mask - " - "Mask becomes %C\n", - msk.c_str ())); - } - return mask; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.h b/CIAO/connectors/dds4ccm/impl/TopicListener.h deleted file mode 100644 index be6ab188113..00000000000 --- a/CIAO/connectors/dds4ccm/impl/TopicListener.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ -#ifndef TOPICLISTENER_T_H_ -#define TOPICLISTENER_T_H_ - -#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_DDS_IMPL_Export TopicListener : - public ::DDS::TopicListener - { - public: - /// Constructor - TopicListener (::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ::ACE_Reactor* reactor); - - /// Destructor - virtual ~TopicListener (void); - - virtual void on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - const ::DDS::InconsistentTopicStatus & status); - - static ::DDS::StatusMask get_mask ( - CCM_DDS::ConnectorStatusListener_ptr error_listener); - - private: - CCM_DDS::ConnectorStatusListener_var error_listener_; - ACE_Reactor* reactor_; - }; - } -} - -#endif /* TOPICLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp deleted file mode 100644 index c1ee9b3f6a2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp +++ /dev/null @@ -1,319 +0,0 @@ -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/Coherent_Changes_Guard.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - Updater_T::Updater_T (void) - : InstanceHandleManager_T (), - is_global_scope_ (false), - is_coherent_write_ (false) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T"); - } - - template - Updater_T::~Updater_T (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T"); - } - - template - bool - Updater_T::is_global_scope (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope"); - return this->is_global_scope_; - } - - template - bool - Updater_T::is_coherent_write (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); - return this->is_coherent_write_; - } - - template - void - Updater_T::is_coherent_write (bool value) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); - this->is_coherent_write_ = value; - } - - template - void - Updater_T::create_i ( - const VALUE_TYPE& an_instance, - ::CCM_DDS::DataNumber_t index) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i"); - ::DDS::InstanceHandle_t const hnd = - this->dds_writer ()->register_instance (an_instance); - if (hnd == ::DDS::HANDLE_NIL) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::create_i: ") - ACE_TEXT ("Unable to unregister instance, nil handle.\n"))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, index); - } - ::DDS::ReturnCode_t const result = this->dds_writer ()->write (an_instance, hnd); - if (result != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::create_i: ") - ACE_TEXT ("Unable to update data, error %C.\n"), - translate_retcode (result))); - throw ::CCM_DDS::InternalError (result, index); - } - } - - template - void - Updater_T::create_one ( - const VALUE_TYPE& an_instance) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one"); - ::DDS::InstanceHandle_t const hnd = this->dds_writer ()->lookup_instance (an_instance); - if (hnd != ::DDS::HANDLE_NIL) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::create_one: ") - ACE_TEXT ("Instance already registered with handle") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT (".\n"), - DDS_INSTANCE_HANDLE_LOG (hnd))); - throw CCM_DDS::AlreadyCreated (0); - } - - this->create_i (an_instance, 0); - } - - template - void - Updater_T::update_i ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i"); - ::DDS::ReturnCode_t const result = - this->dds_writer ()->write (an_instance, instance_handle); - if (result != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::update_i: ") - ACE_TEXT ("Unable to update data, error %C.\n"), - translate_retcode (result))); - throw ::CCM_DDS::InternalError (result, index); - } - } - - template - void - Updater_T::update_one ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one"); - ::DDS::InstanceHandle_t hnd = instance_handle; - if (hnd == ::DDS::HANDLE_NIL) - { - hnd = this->dds_writer ()->lookup_instance (an_instance); - } - else - { - // Check explicitly if the instance handle matches the instance, this - // is not checked by RTI DDS - ::DDS::InstanceHandle_t const instance_handle_l = - this->dds_writer ()->lookup_instance (an_instance); - - if (hnd != instance_handle_l) - { - throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - } - if (hnd == ::DDS::HANDLE_NIL) - { - throw CCM_DDS::NonExistent (0); - } - this->update_i (an_instance, instance_handle, 0); - } - - template - void - Updater_T::delete_i ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i"); - - ::DDS::InstanceHandle_t hnd = instance_handle; - if (instance_handle == ::DDS::HANDLE_NIL) - { - hnd = this->dds_writer ()->lookup_instance (an_instance); - } - - ::DDS::ReturnCode_t result = - this->dds_writer ()->dispose (an_instance, hnd); - if (result != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::delete_i: ") - ACE_TEXT ("Unable to dispose instance, error %C.\n"), - translate_retcode (result))); - throw ::CCM_DDS::InternalError (result, index); - } - result = this->dds_writer ()->unregister_instance (an_instance, hnd); - if (result != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Updater_T::delete_i: ") - ACE_TEXT ("Unable to unregister instance, error %C.\n"), - translate_retcode (result))); - throw ::CCM_DDS::InternalError (result, index); - } - } - - template - void - Updater_T::delete_one ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one"); - ::DDS::InstanceHandle_t hnd = instance_handle; - if (instance_handle == ::DDS::HANDLE_NIL) - { - hnd = this->dds_writer ()->lookup_instance (an_instance); - } - else - { - // Check explicitly if the instance handle matches the instance, this - // is not checked by RTI DDS - ::DDS::InstanceHandle_t const l_instance_handle = - this->dds_writer ()->lookup_instance (an_instance); - - if (hnd != l_instance_handle) - { - throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - } - if (hnd == ::DDS::HANDLE_NIL) - { - throw CCM_DDS::NonExistent (0); - } - this->delete_i (an_instance, hnd, 0); - } - - template - void - Updater_T::create_many ( - const SEQ_VALUE_TYPE& data) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many"); - - // Check for existence of instances - this->check_already_created (data); - - ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher(); - Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_); - - for (::CORBA::ULong index = 0; index < data.length (); index++) - { - this->create_i (data[index], index); - } - } - - template - void - Updater_T::check_existent ( - const SEQ_VALUE_TYPE& data) - { - ::CCM_DDS::NonExistent exception; - for (::CORBA::ULong index = 0; index < data.length (); index++) - { - ::DDS::InstanceHandle_t const hnd = - this->dds_writer ()->lookup_instance (data[index]); - if (hnd == ::DDS::HANDLE_NIL) - { - CORBA::ULong const length = exception.indexes.length (); - exception.indexes.length (length + 1); - exception.indexes[length] = index; - } - } - - if (exception.indexes.length () > 0) - { - throw exception; - } - } - - template - void - Updater_T::check_already_created ( - const SEQ_VALUE_TYPE& data) - { - ::CCM_DDS::AlreadyCreated exception; - for (::CORBA::ULong index = 0; index < data.length (); index++) - { - ::DDS::InstanceHandle_t const hnd = - this->dds_writer ()->lookup_instance (data[index]); - if (hnd != ::DDS::HANDLE_NIL) - { - ::CORBA::ULong const length = exception.indexes.length (); - exception.indexes.length (length + 1); - exception.indexes[length] = index; - } - } - - if (exception.indexes.length () > 0) - { - throw exception; - } - } - - template - void - Updater_T::update_many ( - const SEQ_VALUE_TYPE& data) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many"); - - // Check for existence of instances - this->check_existent (data); - - ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher(); - Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_); - - for (::CORBA::ULong index = 0; index < data.length (); index++) - { - this->update_i (data[index], ::DDS::HANDLE_NIL, index); - } - } - - template - void - Updater_T::delete_many ( - const SEQ_VALUE_TYPE& data) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many"); - - // Check for existence of instances - this->check_existent (data); - - ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher(); - Coherent_Changes_Guard guard (pub.in (), this->is_coherent_write_); - - for (::CORBA::ULong index = 0; index < data.length (); index++) - { - this->delete_i (data[index], ::DDS::HANDLE_NIL, index); - } - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.h b/CIAO/connectors/dds4ccm/impl/Updater_T.h deleted file mode 100644 index 598ac1738cf..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Updater_T.h +++ /dev/null @@ -1,85 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef UPDATER_T_H_ -#define UPDATER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" -#include "InstanceHandleManager_T.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class Updater_T - : public InstanceHandleManager_T - { - public: - /// Constructor - Updater_T (void); - - /// Destructor - virtual ~Updater_T (void); - - virtual void create_one ( - const VALUE_TYPE& an_instance); - - virtual void update_one ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - virtual void delete_one ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - virtual void create_many (const SEQ_VALUE_TYPE& data); - - virtual void update_many (const SEQ_VALUE_TYPE& data); - - virtual void delete_many (const SEQ_VALUE_TYPE& data); - - virtual bool is_global_scope (); - - /** - * @name is_coherent_write - * Accessors for is_coherent_write - */ - //@{ - virtual bool is_coherent_write (); - - virtual void is_coherent_write (bool value_); - //@} - - private: - void create_i ( - const VALUE_TYPE& an_instance, - ::CCM_DDS::DataNumber_t index); - - void update_i ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index); - - void delete_i ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index); - - void check_existent (const SEQ_VALUE_TYPE& data); - - void check_already_created (const SEQ_VALUE_TYPE& data); - - bool is_global_scope_; - bool is_coherent_write_; - }; - } -} - -#include "dds4ccm/impl/Updater_T.cpp" - -#endif /* UPDATER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/Utils.cpp b/CIAO/connectors/dds4ccm/impl/Utils.cpp deleted file mode 100644 index b8011148d18..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Utils.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include "Utils.h" - -namespace CIAO -{ - namespace DDS4CCM - { - QOS_XML_Noop::QOS_XML_Noop (void) - { - } - - QOS_XML_Noop::~QOS_XML_Noop (void) - { - } - - DDS::ReturnCode_t - QOS_XML_Noop::init ( - const ACE_TCHAR * /*qos_profile*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_datawriter_qos ( - DDS::DataWriterQos& /*dw_qos*/, - const char * /*qos_profile*/, - const char* /*topic_name*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_datareader_qos ( - DDS::DataReaderQos& /*dr_qos*/, - const char * /*qos_profile*/, - const char* /*topic_name*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_publisher_qos ( - DDS::PublisherQos& /*pub_qos*/, - const char * /*qos_profile*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_subscriber_qos ( - DDS::SubscriberQos& /*sub_qos*/, - const char * /*qos_profile*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_topic_qos ( - DDS::TopicQos& /*topic_qos*/, - const char * /*qos_profile*/, - const ACE_TCHAR * /*topic_name*/) - { - return ::DDS::RETCODE_OK; - } - - DDS::ReturnCode_t - QOS_XML_Noop::get_participant_qos ( - DDS::DomainParticipantQos& /*part_qos*/, - const char * /*qos_profile*/) - { - return ::DDS::RETCODE_OK; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/Utils.h b/CIAO/connectors/dds4ccm/impl/Utils.h deleted file mode 100644 index ab6a0131b66..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Utils.h +++ /dev/null @@ -1,217 +0,0 @@ -/** - * @file Utils.h - * @author William R. Otte - * - * Misc utility classes for DDS4CCM. - */ - -#ifndef DDS4CCM_UTILS_H -#define DDS4CCM_UTILS_H - -#if (CIAO_DDS4CCM_NDDS==1) -# include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#else -# include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#endif - -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" - -#include "ace/String_Base.h" - -namespace CIAO -{ - namespace DDS4CCM - { - /** - * Enum controlling the semantics of the - * DDS4CCM listeners. - */ - enum DDS4CCM_LISTENER_READ_TAKE - { - /// Listener does a DDS read - DDS4CCM_READ, - /// Listener does a DDS take - DDS4CCM_TAKE - }; - - /// Helper method translating a DDS ReturnCode_t into - /// a readable string - inline const char * translate_retcode (::DDS::ReturnCode_t ret) - { -#define DDS4CCM_RETCODE(X) case X: return #X - switch (ret) - { - DDS4CCM_RETCODE (DDS::RETCODE_OK); - DDS4CCM_RETCODE (DDS::RETCODE_ERROR); - DDS4CCM_RETCODE (DDS::RETCODE_UNSUPPORTED); - DDS4CCM_RETCODE (DDS::RETCODE_BAD_PARAMETER); - DDS4CCM_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET); - DDS4CCM_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES); - DDS4CCM_RETCODE (DDS::RETCODE_NOT_ENABLED); - DDS4CCM_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY); - DDS4CCM_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY); - DDS4CCM_RETCODE (DDS::RETCODE_ALREADY_DELETED); - DDS4CCM_RETCODE (DDS::RETCODE_TIMEOUT); - DDS4CCM_RETCODE (DDS::RETCODE_NO_DATA); - DDS4CCM_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION); - } - return "***Unknown enum value, update CIAO::DDS4CCM::translate_retcode()"; -#undef DDS4CCM_RETCODE - } - - inline const char * translate_statuskind (DDS::StatusKind ret) - { -#define DDS4CCM_RETCODE(X) case X: return #X - switch (ret) - { - DDS4CCM_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS); - DDS4CCM_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS); - DDS4CCM_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS); - DDS4CCM_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS); - DDS4CCM_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS); - DDS4CCM_RETCODE (DDS::SAMPLE_LOST_STATUS); - DDS4CCM_RETCODE (DDS::SAMPLE_REJECTED_STATUS); - DDS4CCM_RETCODE (DDS::DATA_ON_READERS_STATUS); - DDS4CCM_RETCODE (DDS::DATA_AVAILABLE_STATUS); - DDS4CCM_RETCODE (DDS::LIVELINESS_LOST_STATUS); - DDS4CCM_RETCODE (DDS::LIVELINESS_CHANGED_STATUS); - DDS4CCM_RETCODE (DDS::PUBLICATION_MATCHED_STATUS); - DDS4CCM_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS); -#if (CIAO_DDS4CCM_NDDS==1) - DDS4CCM_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS); - DDS4CCM_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); -#endif - //DDS4CCM_RETCODE (DDS::DATA_WRITER_CACHE_STATUS); - //DDS4CCM_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS); - //DDS4CCM_RETCODE (DDS::DATA_READER_CACHE_STATUS); - //DDS4CCM_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS); - } - return "***Unknown enum value, update CIAO::DDS4CCM::translate_statuskind()"; -#undef DDS4CCM_RETCODE - } - - inline const char * translate_rejectedstatuskind (DDS::SampleRejectedStatusKind ret) - { -#define DDS4CCM_RETCODE(X) case X: return #X - switch (ret) - { - DDS4CCM_RETCODE (DDS::NOT_REJECTED); - DDS4CCM_RETCODE (DDS::REJECTED_BY_INSTANCES_LIMIT); - DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_LIMIT); - DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT); -#if (CIAO_DDS4CCM_NDDS==1) - DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_LIMIT); - DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_PER_INSTANCE_LIMIT); - DDS4CCM_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_REMOTE_WRITER_LIMIT); - DDS4CCM_RETCODE (DDS::REJECTED_BY_VIRTUAL_WRITERS_LIMIT); /* RTI DDS 5.0.0 Extension */ - DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITERS_PER_SAMPLE_LIMIT); /* RTI DDS 5.0.0 Extension */ - DDS4CCM_RETCODE (DDS::REJECTED_BY_REMOTE_WRITER_SAMPLES_PER_VIRTUAL_QUEUE_LIMIT); /* RTI DDS 5.0.0 Extension */ -#endif - } - return "***Unknown enum value, update CIAO::DDS4CCM::translate_rejectedstatuskind()"; -#undef DDS4CCM_RETCODE - } - - inline void translate_statusmask (ACE_CString &ret, ::DDS::StatusMask mask) - { -#define DDS4CCM_CHECK_MASK(X, Y, Z) \ - if (X & Y) { \ - if (Z.length () != 0) \ - Z += " | "; \ - Z += translate_statuskind (Y); \ - } - DDS4CCM_CHECK_MASK (mask, ::DDS::INCONSISTENT_TOPIC_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::OFFERED_DEADLINE_MISSED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::REQUESTED_DEADLINE_MISSED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::SAMPLE_LOST_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::SAMPLE_REJECTED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::DATA_ON_READERS_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::DATA_AVAILABLE_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::LIVELINESS_LOST_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::LIVELINESS_CHANGED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::PUBLICATION_MATCHED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::SUBSCRIPTION_MATCHED_STATUS, ret); -#if (CIAO_DDS4CCM_NDDS==1) - DDS4CCM_CHECK_MASK (mask, ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS, ret); - DDS4CCM_CHECK_MASK (mask, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS, ret); -#endif - -#undef DDS4CCM_CHECK_MASK - } - - inline const char * translate_qospolicyid_t (DDS::QosPolicyId_t id) - { -#define DDS4CCM_DDS_POLICYID_T(X) case X: return #X - switch (id) - { - DDS4CCM_DDS_POLICYID_T (DDS::INVALID_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::USERDATA_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::DURABILITY_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::PRESENTATION_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::DEADLINE_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::LATENCYBUDGET_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::OWNERSHIP_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::OWNERSHIPSTRENGTH_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::LIVELINESS_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::TIMEBASEDFILTER_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::PARTITION_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::RELIABILITY_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::DESTINATIONORDER_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::HISTORY_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::RESOURCELIMITS_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::ENTITYFACTORY_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::WRITERDATALIFECYCLE_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::READERDATALIFECYCLE_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::TOPICDATA_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::GROUPDATA_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::TRANSPORTPRIORITY_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::LIFESPAN_QOS_POLICY_ID); - DDS4CCM_DDS_POLICYID_T (DDS::DURABILITYSERVICE_QOS_POLICY_ID); - } - return "***Unknown enum value, update CIAO::DDS4CCM::translate_qospolicyid_t()"; - #undef DDS4CCM_DDS_POLICYID_T - } - - class DDS4CCM_DDS_IMPL_Export QOS_XML_Noop - { - public: - QOS_XML_Noop (void); - ~QOS_XML_Noop (void); - - DDS::ReturnCode_t - init (const ACE_TCHAR * qos_profile); - - DDS::ReturnCode_t - get_datawriter_qos (DDS::DataWriterQos& dw_qos, - const char *qos_profile, - const char* topic_name); - - DDS::ReturnCode_t - get_datareader_qos (DDS::DataReaderQos& dr_qos, - const char *qos_profile, - const char* topic_name); - - DDS::ReturnCode_t - get_publisher_qos (DDS::PublisherQos& pub_qos, - const char *qos_profile); - - DDS::ReturnCode_t - get_subscriber_qos (DDS::SubscriberQos& sub_qos, - const char *qos_profile); - - DDS::ReturnCode_t - get_topic_qos (DDS::TopicQos& topic_qos, - const char *qos_profile, - const ACE_TCHAR *topic_name); - - DDS::ReturnCode_t - get_participant_qos (DDS::DomainParticipantQos& part_qos, - const char *qos_profile); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp deleted file mode 100644 index c478c39982e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/Coherent_Changes_Guard.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - Writer_T::Writer_T (void) - : InstanceHandleManager_T (), - is_coherent_write_ (false) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T"); - } - - template - Writer_T::~Writer_T (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T"); - } - - template - void - Writer_T::write_i ( - const VALUE_TYPE& datum, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i"); - - ::DDS::ReturnCode_t const retval = this->dds_writer ()->write (datum, instance_handle); - - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "Writer_T::write_i - " - "Write unsuccessful, received error code %C\n", - translate_retcode (retval))); - throw ::CCM_DDS::InternalError (retval, index); - } - } - - template - void - Writer_T::write_one ( - const VALUE_TYPE & an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one"); - - this->write_i (an_instance, instance_handle, 0); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO - "Writer_T::write_one - " - "Write successful\n")); - } - - template - void - Writer_T::write_many ( - const SEQ_VALUE_TYPE& instances) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many"); - - ::DDS::Publisher_var pub = this->dds_writer ()->get_publisher (); - if (::CORBA::is_nil (pub.in ())) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("Writer_T::write_many - ") - ACE_TEXT ("Publisher on DataWriter seems to be NIL\n"))); - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - Coherent_Changes_Guard guard ( - pub.in (), - this->is_coherent_write_); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "Writer_T::write_many - " - "Preparing to write to DDS\n")); - - for (::CORBA::ULong index = 0; index < instances.length(); index++) - { - this->write_i (instances[index], ::DDS::HANDLE_NIL, index); - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO - "Writer_T::write_many - " - "Write successful\n")); - } - - template - ::CORBA::Boolean - Writer_T::is_coherent_write (void) - { - return this->is_coherent_write_; - } - - template - void - Writer_T::is_coherent_write ( - ::CORBA::Boolean value) - { - this->is_coherent_write_ = value; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.h b/CIAO/connectors/dds4ccm/impl/Writer_T.h deleted file mode 100644 index abf2e019be9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/Writer_T.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef WRITER_T_H_ -#define WRITER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "InstanceHandleManager_T.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class Writer_T - : public InstanceHandleManager_T - { - public: - /// Constructor - Writer_T (void); - - /// Destructor - virtual ~Writer_T (void); - - virtual void write_one ( - const VALUE_TYPE& an_instance, - DDS_INSTANCE_HANDLE_T_IN instance_handle); - - virtual void write_many (const SEQ_VALUE_TYPE& instances); - - /** - * @name is_coherent_write - * Accessors for is_coherent_write - */ - //@{ - virtual ::CORBA::Boolean is_coherent_write (void); - - virtual void is_coherent_write ( ::CORBA::Boolean value); - //@} - - private: - void write_i (const VALUE_TYPE& datum, - DDS_INSTANCE_HANDLE_T_IN instance_handle, - ::CCM_DDS::DataNumber_t index); - - bool is_coherent_write_; - }; - } -} - -#include "dds4ccm/impl/Writer_T.cpp" - -#endif /* WRITER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h deleted file mode 100644 index 5cfc599f2d1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h +++ /dev/null @@ -1,50 +0,0 @@ - -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Configuration file for DDS4CCM. - */ - -#ifndef DDS4CCM_CONF_H_ -#define DDS4CCM_CONF_H_ - -/** - * CIAO_DDS4CCM_CONTEXT_SWITCH defines whether DDS4CCM - * does use the ORB core reactor thread when a DDS callback - * has been received. - * - * If this is defined to 1 DDS4CCM will pass the DDS callback to the - * ORB Core Reactor thread which means a thread context switch - * - * If this is defined to 0 no context switch takes place and the DDS - * callback is delivered to the user code on the DDS thread - * - * If the user doesn't explicitly choose a value we will default to 1 - */ -#if !defined (CIAO_DDS4CCM_CONTEXT_SWITCH) -# define CIAO_DDS4CCM_CONTEXT_SWITCH 1 -#endif /* CIAO_DDS4CCM_CONTEXT_SWITCH */ - -#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) && !defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) -# error For using the DDS4CCM context switch ACE_HAS_REACTOR_NOTIFICATION_QUEUE must be defined -#endif - -#if (CIAO_DDS4CCM_NDDS==1) -# include "dds4ccm/impl/Utils.h" -# define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t & -# define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t -# define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>") -# define DDS_INSTANCE_HANDLE_LOG(X) X.value[0], X.value[1], X.value[2], X.value[3], X.value[4], X.value[5], X.value[6], X.value[7], X.value[8], X.value[9], X.value[10], X.value[11], X.value[12], X.value[13], X.value[14], X.value[15], X.length, X.isValid -# define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>") -# define DDS_ENTITY_LOG(X) X->get_instance_handle ().value[0], X->get_instance_handle ().value[1], X->get_instance_handle ().value[2], X->get_instance_handle ().value[3], X->get_instance_handle ().value[4], X->get_instance_handle ().value[5], X->get_instance_handle ().value[6], X->get_instance_handle ().value[7], X->get_instance_handle ().value[8], X->get_instance_handle ().value[9], X->get_instance_handle ().value[10], X->get_instance_handle ().value[11], X->get_instance_handle ().value[12], X->get_instance_handle ().value[13], X->get_instance_handle ().value[14], X->get_instance_handle ().value[15], X->get_instance_handle ().length, X->get_instance_handle ().isValid -# define DDS_XML_QOS_PARSER_TYPE CIAO::DDS4CCM::QOS_XML_Noop -#elif (CIAO_DDS4CCM_OPENDDS==1) -# define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t -# define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t -# define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%d>") -# define DDS_INSTANCE_HANDLE_LOG(X) X -# define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%d:%@>") -# define DDS_ENTITY_LOG(X) X->get_instance_handle (), X -# define DDS_XML_QOS_PARSER_TYPE OpenDDS::DCPS::QOS_XML_Loader -#endif -#endif /* DDS4CCM_CONF_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h deleted file mode 100644 index fd09437021c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- -// Definition for Win32 Export directives. -// ------------------------------ -#ifndef DDS4CCM_DDS_IMPL_EXPORT_H -#define DDS4CCM_DDS_IMPL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_DDS_IMPL_HAS_DLL) -# define DDS4CCM_DDS_IMPL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_DDS_IMPL_HAS_DLL */ - -#if !defined (DDS4CCM_DDS_IMPL_HAS_DLL) -# define DDS4CCM_DDS_IMPL_HAS_DLL 1 -#endif /* ! DDS4CCM_DDS_IMPL_HAS_DLL */ - -#if defined (DDS4CCM_DDS_IMPL_HAS_DLL) && (DDS4CCM_DDS_IMPL_HAS_DLL == 1) -# if defined (DDS4CCM_DDS_IMPL_BUILD_DLL) -# define DDS4CCM_DDS_IMPL_Export ACE_Proper_Export_Flag -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DDS4CCM_DDS_IMPL_BUILD_DLL */ -# define DDS4CCM_DDS_IMPL_Export ACE_Proper_Import_Flag -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DDS4CCM_DDS_IMPL_BUILD_DLL */ -#else /* DDS4CCM_DDS_IMPL_HAS_DLL == 1 */ -# define DDS4CCM_DDS_IMPL_Export -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARATION(T) -# define DDS4CCM_DDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DDS4CCM_DDS_IMPL_HAS_DLL == 1 */ - -// Set DDS4CCM_DDS_IMPL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDS4CCM_DDS_IMPL_NTRACE) -# if (ACE_NTRACE == 1) -# define DDS4CCM_DDS_IMPL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDS4CCM_DDS_IMPL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDS4CCM_DDS_IMPL_NTRACE */ - -#if (DDS4CCM_DDS_IMPL_NTRACE == 1) -# define DDS4CCM_DDS_IMPL_TRACE(X) -#else /* (DDS4CCM_DDS_IMPL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_DDS_IMPL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDS4CCM_DDS_IMPL_NTRACE == 1) */ - -#endif /* DDS4CCM_DDS_IMPL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc deleted file mode 100644 index aae76fa4d17..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ /dev/null @@ -1,33 +0,0 @@ -project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ - ciao_output, ccm_stub, dds4ccm_logger, dds4ccm_base { - - dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL - macros += BUILDING_DDS_LIB - Header_Files { - *.h - } - - Template_Files { - *_T.cpp - } - - Source_Files { - ConditionManager.cpp - Coherent_Changes_Guard.cpp - ContentFilterSetting.cpp - CCM_DataReader.cpp - CCM_DataWriter.cpp - DDSCallbackStatusHandler.cpp - LocalObject.cpp - PortStatusListener.cpp - PublisherListener.cpp - SubscriberListener.cpp - TopicListener.cpp - Utils.cpp - DomainParticipantManager.cpp - } - - specific { - install_dir = connectors/dds4ccm/impl - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h deleted file mode 100644 index 94687d7f9a6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_utils.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file dds4ccm_utils.h - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Misc utility classes for DDS4CCM. - */ - -#ifndef DDS4CCM_UTILS_UTILS_H -#define DDS4CCM_UTILS_UTILS_H - -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/idl/ccm_ddsC.h" - -namespace CIAO -{ - namespace DDS4CCM - { - inline const char * translate_ccm_dds_accessstatus (::CCM_DDS::AccessStatus ret) - { -#define DDS4CCM_DDS_ACCESSSTATUS(X) case X: return #X - switch (ret) - { - DDS4CCM_DDS_ACCESSSTATUS (CCM_DDS::FRESH_INFO); - DDS4CCM_DDS_ACCESSSTATUS (CCM_DDS::ALREADY_SEEN); - } - return "***Unknown enum value, update CIAO::DDS4CCM::translate_ccm_dds_accessstatus()"; -#undef DDS4CCM_DDS_ACCESSSTATUS - } - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h b/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h deleted file mode 100644 index af004632352..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/DDS4CCM_Logger_Export.h +++ /dev/null @@ -1,57 +0,0 @@ - -// -*- C++ -*- -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl DDS4CCM_Logger -// ------------------------------ -#ifndef DDS4CCM_LOGGER_EXPORT_H -#define DDS4CCM_LOGGER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL) -# define DDS4CCM_LOGGER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */ - -#if !defined (DDS4CCM_LOGGER_HAS_DLL) -# define DDS4CCM_LOGGER_HAS_DLL 1 -#endif /* ! DDS4CCM_LOGGER_HAS_DLL */ - -#if defined (DDS4CCM_LOGGER_HAS_DLL) && (DDS4CCM_LOGGER_HAS_DLL == 1) -# if defined (DDS4CCM_LOGGER_BUILD_DLL) -# define DDS4CCM_Logger_Export ACE_Proper_Export_Flag -# define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DDS4CCM_LOGGER_BUILD_DLL */ -# define DDS4CCM_Logger_Export ACE_Proper_Import_Flag -# define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DDS4CCM_LOGGER_BUILD_DLL */ -#else /* DDS4CCM_LOGGER_HAS_DLL == 1 */ -# define DDS4CCM_Logger_Export -# define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) -# define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DDS4CCM_LOGGER_HAS_DLL == 1 */ - -// Set DDS4CCM_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDS4CCM_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define DDS4CCM_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDS4CCM_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDS4CCM_LOGGER_NTRACE */ - -#if (DDS4CCM_LOGGER_NTRACE == 1) -# define DDS4CCM_LOGGER_TRACE(X) -#else /* (DDS4CCM_LOGGER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDS4CCM_LOGGER_NTRACE == 1) */ - -#endif /* DDS4CCM_LOGGER_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp deleted file mode 100644 index 6721de9956c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Log_Macros.h" - -DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level = 0; - -DDS4CCM_Logger_Export ACE_Log_Category DDS4CCM_log_category ("DDS4CCM"); diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h deleted file mode 100644 index 65c54686c59..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h +++ /dev/null @@ -1,161 +0,0 @@ -/** - * @file Log_Macros.h - * @author William R. Otte - * - * Macros used for logging in DDS4CCM - */ - -#ifndef DDS4CCM_LOG_MACROS_H_ -#define DDS4CCM_LOG_MACROS_H_ - -// default information printed with CIAO logging messages. -#include "DDS4CCM_Logger_Export.h" -#include "ace/Log_Msg.h" -#include "ace/Log_Category.h" - -#if !defined (DDS4CCM_INFO) -# define DDS4CCM_INFO "(%P|%t) [%M] - %T - " -#endif - -// Defines for log levels -#define DDS4CCM_LOG_LEVEL_ERROR 1 -#define DDS4CCM_LOG_LEVEL_CAST_ERROR 2 -#define DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN 3 -#define DDS4CCM_LOG_LEVEL_4 4 //unused -#define DDS4CCM_LOG_LEVEL_5 5 //unused -#define DDS4CCM_LOG_LEVEL_ACTION 6 -#define DDS4CCM_LOG_LEVEL_UNIMP_ACTION 7 -#define DDS4CCM_LOG_LEVEL_ACTION_STARTING 8 -#define DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL 9 -#define DDS4CCM_LOG_LEVEL_DDS_STATUS 10 - -extern DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level; - -extern DDS4CCM_Logger_Export ACE_Log_Category DDS4CCM_log_category; - -// By default tracing is turned off. -#if !defined (DDS4CCM_NTRACE) -# define DDS4CCM_NTRACE 1 -#endif /* DDS4CCM_NTRACE */ - -#if (DDS4CCM_NTRACE == 1) -# if !defined (ACE_NTRACE) -# define DDS4CCM_TRACE(X) do {} while (0) -# define DDS4CCM_ENABLE_TRACE() do {} while (0) -# define DDS4CCM_DISABLE_TRACE() do {} while (0) -# else -# if (ACE_NTRACE == 0) -# error DDS4CCM_TRACE cannot be disabled if ACE_TRACE is enabled -# else -# define DDS4CCM_TRACE(X) do {} while (0) -# define DDS4CCM_ENABLE_TRACE() do {} while (0) -# define DDS4CCM_DISABLE_TRACE() do {} while (0) -# endif -# endif -#else -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_TRACE(X) ACE_TRACE_IMPL(X) -# define DDS4CCM_ENABLE_TRACE() ACE_Trace::start_tracing () -# define DDS4CCM_DISABLE_TRACE() ACE_Trace::stop_tracing () -# undef DDS4CCM_INFO // Make log messages indent with tracing. -# define DDS4CCM_INFO "%I(%P|%t) [%M] - %T - " -# include "ace/Trace.h" -#endif /* DDS4CCM_NTRACE */ - -#if defined (DDS4CCM_NLOGGING) -# define DDS4CCM_ERROR(L, X) do {} while (0) -# define DDS4CCM_DEBUG(L, X) do {} while (0) -# define DDS4CCM_PRINT_INTERNAL_EXCEPTION(L, E, X) do {} while (0) -# define DDS4CCM_PRINT_CORBA_EXCEPTION(L, E, X) do {} while (0) -# define DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION(L, E, X) do {} while (0) -# define DDS4CCM_ERROR_RETURN(L, X, Y) return (Y) -# define DDS4CCM_ERROR_BREAK(L, X) { break; } -#else -# if !defined (DDS4CCM_ERROR) -# define DDS4CCM_ERROR(L, X) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \ - ace___->log X; \ - } \ - } while (0) -# endif - -# if !defined (DDS4CCM_DEBUG) -# define DDS4CCM_DEBUG(L, X) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ - ace___->log X; \ - } \ - } while (0) -# endif - -# if !defined (DDS4CCM_PRINT_INTERNAL_EXCEPTION) -# define DDS4CCM_PRINT_INTERNAL_EXCEPTION(L, E, X) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - ACE_CString msg (X);\ - msg += " - Caught CCM_DDS internal exception: error <";\ - msg += E; \ - msg += ">\n";\ - DDS4CCM_ERROR (L, (LM_ERROR, msg.c_str ()));\ - } \ - } while (0) -# endif -# if !defined (DDS4CCM_PRINT_CORBA_EXCEPTION) -# define DDS4CCM_PRINT_CORBA_EXCEPTION(L, E, X) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - ACE_CString msg (X);\ - msg += " - Caught CORBA exception.\n";\ - DDS4CCM_ERROR (L, (LM_ERROR, msg.c_str ()));\ - E._tao_print_exception (X);\ - } \ - } while (0) -# endif -# if !defined (DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION) -# define DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION(L, E, X) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - ACE_CString msg (X);\ - msg += " - Caught CORBA exception.\n";\ - DDS4CCM_DEBUG (L, (LM_DEBUG, msg.c_str ()));\ - E._tao_print_exception (X);\ - } \ - } while (0) -# endif -# if !defined (DDS4CCM_ERROR_RETURN) -# define DDS4CCM_ERROR_RETURN(L, X, Y) \ - do { \ - if (DDS4CCM_debug_level >= L) \ - { \ - int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ - ACE_Log_Category_TSS *ace___ = DDS4CCM_log_category.per_thr_obj (); \ - if (ace___ == 0) break; \ - ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \ - ace___->log X; \ - } \ - return Y; \ - } while (0) -# endif -# if !defined (DDS4CCM_ERROR_BREAK) -# define DDS4CCM_ERROR_BREAK(L, X) { DDS4CCM_ERROR (L, X); break; } -# endif -#endif - - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp deleted file mode 100644 index 2d88ca354ea..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include "Logger_Service.h" -#include "Log_Macros.h" -#include "ace/Get_Opt.h" -#include "ace/CORBA_macros.h" -#include "ace/Env_Value_T.h" -#include "tao/SystemException.h" -#include "ace/Service_Config.h" -#include "ace/Arg_Shifter.h" -#include "ace/Log_Msg_Backend.h" -#include "ace/Dynamic_Service.h" - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -// Needed to set ACE_LOG_MSG::msg_ostream() -// FUZZ: disable check_for_streams_include -# include "ace/streams.h" -#endif /* !ACE_LACKS_IOSTREAM_TOTALLY */ - -CIAO::DDS4CCM::Logger_Service::Logger_Service (void) - : filename_ (ACE_TEXT("")), - trace_ (false) -{ -} - -void -CIAO::DDS4CCM::Logger_Service::init () -{ - // Get prospective values from the environment first, those given on - // command line can override - ACE_Env_Value log (ACE_TEXT("DDS4CCM_LOG_LEVEL"), DDS4CCM_debug_level); - DDS4CCM_debug_level = log; - - ACE_Env_Value trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0); - this->trace_ = (trace != 0); - - if (this->trace_) - { - DDS4CCM_ENABLE_TRACE (); - } - else - { - DDS4CCM_DISABLE_TRACE (); - } - - - ACE_Env_Value filename (ACE_TEXT("DDS4CCM_LOG_FILE"), this->filename_.c_str ()); - this->filename_ = filename; - - ACE_Env_Value backend (ACE_TEXT("DDS4CCM_LOG_BACKEND"), this->backend_.c_str ()); - this->backend_ = backend; -} - -int -CIAO::DDS4CCM::Logger_Service::init (int argc, ACE_TCHAR * argv[]) -{ - this->init (); - this->parse_args (argc, argv); - - if (this->filename_.length () > 0) - { -#if defined (ACE_LACKS_IOSTREAM_TOTALLY) - - FILE* output_stream = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT ("a")); - - ACE_LOG_MSG->msg_ostream (output_stream, 1); -#else /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - ofstream* output_stream = 0; - - ACE_NEW_THROW_EX (output_stream, - ofstream (), - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - 0, - ENOMEM), - CORBA::COMPLETED_NO)); - - output_stream->open (ACE_TEXT_ALWAYS_CHAR (this->filename_.c_str ()), - ios::out | ios::app); - - if (!output_stream->bad ()) - { - ACE_LOG_MSG->msg_ostream (output_stream, 1); - } -#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - } - - if (this->backend_.length () > 0) - { - - ACE_Log_Msg_Backend* logger_be = - ACE_Dynamic_Service::instance(this->backend_.c_str ()); - - // backend->open (""); - - if (logger_be == 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, - (LM_EMERGENCY, DDS4CCM_INFO - "Logger_Service::init - " - "Unable to load backend %s\n", - this->backend_.c_str ())); - return -1; - } - - ACE_Log_Msg::msg_backend (logger_be); - - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::CUSTOM); - } - - return 0; -} - -void -CIAO::DDS4CCM::Logger_Service::parse_args (int argc, ACE_TCHAR **argv) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Logger_Service::parse_args"); - - ACE_Arg_Shifter arg_shifter (argc, argv); - - while (arg_shifter.is_anything_left ()) - { - const ACE_TCHAR *current_arg = 0; - if (0 != (current_arg = - arg_shifter.get_the_parameter - (ACE_TEXT ("-DDS4CCMLogLevel")))) - { - DDS4CCM_debug_level = ACE_OS::atoi (current_arg); - - arg_shifter.consume_arg (); - } - else if (0 == arg_shifter.cur_arg_strncasecmp - (ACE_TEXT ("-DDS4CCMTraceEnable"))) - { - this->trace_ = true; - - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = - arg_shifter.get_the_parameter - (ACE_TEXT ("-DDS4CCMLogFile")))) - { - this->filename_ = current_arg; - - arg_shifter.consume_arg (); - } - else - { - // Can't interpret this argument. Move on to the next - // argument. Any arguments that don't match are ignored - // so that the caller can still use them. - arg_shifter.ignore_arg (); - } - } -} - -int -CIAO::DDS4CCM::Logger_Service::Initializer (void) -{ - return ACE_Service_Config::process_directive (ace_svc_desc_DDS4CCM_LOGGER_SERVICE); -} - -ACE_STATIC_SVC_DEFINE (DDS4CCM_LOGGER_SERVICE, - ACE_TEXT ("DDS4CCM_Logger"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (DDS4CCM_LOGGER_SERVICE), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) -ACE_FACTORY_DEFINE (DDS4CCM_Logger, DDS4CCM_LOGGER_SERVICE) - diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h b/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h deleted file mode 100644 index 9c166a65587..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/Logger_Service.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef DDS4CCM_LOGGER_SERVICE_H_ -#define DDS4CCM_LOGGER_SERVICE_H_ - -#include "DDS4CCM_Logger_Export.h" -#include "ace/Service_Object.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_Logger_Export Logger_Service : public ACE_Service_Object - { - public: - Logger_Service (void); - virtual int init (int ARGC, ACE_TCHAR * ARGV[]); - - void init (); - - static int Initializer (void); - private: - void parse_args (int argc, ACE_TCHAR **argv); - - ACE_TString filename_; - ACE_TString backend_; - bool trace_; - }; - } -} - -static int TAO_Requires_DDS4CCM_Logger_Service_Initializer = - ::CIAO::DDS4CCM::Logger_Service::Initializer (); - -typedef ::CIAO::DDS4CCM::Logger_Service DDS4CCM_LOGGER_SERVICE; - -ACE_STATIC_SVC_DECLARE (DDS4CCM_LOGGER_SERVICE) -ACE_FACTORY_DECLARE (DDS4CCM_Logger, DDS4CCM_LOGGER_SERVICE) - -#endif /*LOGGER_SERVICE_H_*/ diff --git a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc deleted file mode 100644 index b40efede048..00000000000 --- a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc +++ /dev/null @@ -1,21 +0,0 @@ -// -*- MPC -*- -project(DDS4CCM_Logger): install, ciao_lib, taolib, acelib { - sharedname = DDS4CCM_Logger - dynamicflags += DDS4CCM_LOGGER_BUILD_DLL - - Source_Files { - Logger_Service.cpp - Log_Macros.cpp - } - - Header_Files { - DDS4CCM_Logger_Export.h - Logger_Service.h - Log_Macros.h - } - - specific { - install_dir = connectors/dds4ccm/impl/logger - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp deleted file mode 100644 index 35441752b2c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "Condition.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_Condition_i::DDS_Condition_i (DDSCondition * condition) - : rti_entity_ (condition) - { - DDS4CCM_TRACE ("DDS_Condition_i::DDS_Condition_i"); - } - - DDS_Condition_i::~DDS_Condition_i (void) - { - DDS4CCM_TRACE ("DDS_Condition_i::~DDS_Condition_i"); - } - - ::CORBA::Boolean - DDS_Condition_i::get_trigger_value (void) - { - DDS4CCM_TRACE ("DDS_Condition_i::get_trigger_value"); - - return this->rti_entity ()->get_trigger_value (); - } - - DDSCondition * - DDS_Condition_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_Condition_i::set_rti_entity (DDSCondition * cond) - { - this->rti_entity_ = cond; - } - - DDSCondition * - DDS_Condition_i::rti_entity (void) - { - if (!this->rti_entity_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h deleted file mode 100644 index 904941b25ab..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef CONDITION_H_ -#define CONDITION_H_ - -#include "ndds_dcpsC.h" -#include "tao/LocalObject.h" - -#include "dds4ccm_ndds_export.h" - -class DDSCondition; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_Condition_i : - public virtual ::DDS::Condition, - public virtual ::CORBA::LocalObject - { - - public: - /// Constructor - DDS_Condition_i (DDSCondition * condition); - - /// Destructor - virtual ~DDS_Condition_i (void); - - virtual ::CORBA::Boolean - get_trigger_value (void); - - DDSCondition * get_rti_entity (void); - - void set_rti_entity (DDSCondition * cond); - - private: - DDSCondition * rti_entity_; - - DDSCondition * rti_entity (); - }; - } -} - -#endif /* CONDITION_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp deleted file mode 100644 index a353736a936..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include "dds4ccm/impl/ndds/ContentFilteredTopic.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/ndds/convertors/StringSeq.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_ContentFilteredTopic_i::DDS_ContentFilteredTopic_i ( - ::DDSContentFilteredTopic * cft, - ::DDS::DomainParticipant_ptr dp) - : rti_entity_ (cft), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - } - - DDS_ContentFilteredTopic_i::~DDS_ContentFilteredTopic_i (void) - { - } - - char * - DDS_ContentFilteredTopic_i::get_filter_expression (void) - { - DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_filter_expression"); - return CORBA::string_dup (this->rti_entity ()->get_filter_expression ()); - } - - ::DDS::ReturnCode_t - DDS_ContentFilteredTopic_i::get_expression_parameters ( - ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_expression_parameters"); - DDS_StringSeq parameters; - ::DDS::ReturnCode_t retval = - this->rti_entity ()->get_expression_parameters (parameters); - expression_parameters <<= parameters; - return retval; - } - - ::DDS::ReturnCode_t - DDS_ContentFilteredTopic_i::set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::set_expression_parameters"); - - DDS_StringSeq parameters; - parameters <<= expression_parameters; - return this->rti_entity ()->set_expression_parameters (parameters); - } - - ::DDS::Topic_ptr - DDS_ContentFilteredTopic_i::get_related_topic (void) - { - DDS4CCM_TRACE ("DDS_ContentFilteredTopic_i::get_related_topic"); - - ::DDS::Topic_var retval; - DDSTopic *topic = this->rti_entity ()->get_related_topic (); - ACE_NEW_THROW_EX (retval, - DDS_Topic_i (topic, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - return retval._retn (); - } - - char * - DDS_ContentFilteredTopic_i::get_type_name (void) - { - return CORBA::string_dup (this->rti_entity ()->get_type_name ()); - } - - char * - DDS_ContentFilteredTopic_i::get_name (void) - { - return CORBA::string_dup (this->rti_entity ()->get_name ()); - } - - ::DDS::DomainParticipant_ptr - DDS_ContentFilteredTopic_i::get_participant (void) - { - return ::DDS::DomainParticipant::_duplicate (this->dp_.in ()); - } - - DDSContentFilteredTopic * - DDS_ContentFilteredTopic_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_ContentFilteredTopic_i::set_rti_entity (DDSContentFilteredTopic * cft) - { - this->rti_entity_ = cft; - } - - DDSContentFilteredTopic * - DDS_ContentFilteredTopic_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_ContentFilteredTopic_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h deleted file mode 100644 index 96f9c01520b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef CONTENFILTEREDTOPIC_T_H_ -#define CONTENFILTEREDTOPIC_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSContentFilteredTopic; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_ContentFilteredTopic_i : - public virtual ::DDS::ContentFilteredTopic, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - explicit DDS_ContentFilteredTopic_i (::DDSContentFilteredTopic * cft, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_ContentFilteredTopic_i (void); - - virtual char * get_filter_expression (void); - - virtual ::DDS::ReturnCode_t get_expression_parameters ( - ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::ReturnCode_t set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::Topic_ptr get_related_topic (void); - - virtual char * get_type_name (void); - - virtual char * get_name (void); - - virtual ::DDS::DomainParticipant_ptr get_participant (void); - - ::DDSContentFilteredTopic * get_rti_entity (void); - - void set_rti_entity (::DDSContentFilteredTopic * cft); - - private: - ::DDSContentFilteredTopic * rti_entity_; - ::DDS::DomainParticipant_var dp_; - - DDSContentFilteredTopic * rti_entity (void); - }; - } -} - -#endif /* CONTENFILTEREDTOPIC_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp deleted file mode 100644 index 8683b6ce1cc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "dds4ccm/impl/ndds/DataReader.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DataReader_Base::~DDS_DataReader_Base (void) - { - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h deleted file mode 100644 index 988d06d2dc8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DATAREADER_H -#define DATAREADER_H - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "tao/LocalObject.h" - -class DDSDataReader; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DataReader_Base - : public virtual ::DDS::DataReader, - public virtual ::CORBA::LocalObject - { - public: - virtual ~DDS_DataReader_Base (void); - - virtual ::DDSDataReader * get_rti_entity (void) = 0; - - virtual void set_rti_entity (::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp) = 0; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp deleted file mode 100644 index 88d30b88595..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "dds4ccm/impl/ndds/DataReaderListener.h" -#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DataReaderListener_i::DDS_DataReaderListener_i ( - ::DDS::DataReaderListener_ptr p, - ::DDS::DataReader_ptr dr) - : impl_ (::DDS::DataReaderListener::_duplicate (p)), - dr_ (::DDS::DataReader::_duplicate (dr)) - { - } - - DDS_DataReaderListener_i::~DDS_DataReaderListener_i (void) - { - } - - void - DDS_DataReaderListener_i::on_requested_deadline_missed ( - ::DDSDataReader* , - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_requested_deadline_missed"); - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_deadline_missed (this->dr_, ddsstatus); - } - - void - DDS_DataReaderListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* , - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_requested_incompatible_qos"); - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_incompatible_qos (this->dr_, ddsstatus); - } - - void - DDS_DataReaderListener_i::on_sample_rejected ( - ::DDSDataReader* , - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_sample_rejected"); - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_rejected (this->dr_, ddsstatus); - } - - void - DDS_DataReaderListener_i::on_liveliness_changed ( - ::DDSDataReader* , - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_liveliness_changed"); - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_liveliness_changed (this->dr_, ddsstatus); - } - - void - DDS_DataReaderListener_i::on_data_available(::DDSDataReader *) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_data_available"); - this->impl_->on_data_available (this->dr_); - } - - void - DDS_DataReaderListener_i::on_subscription_matched ( - ::DDSDataReader* , - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_subscription_matched"); - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_subscription_matched (this->dr_, ddsstatus); - } - - void - DDS_DataReaderListener_i::on_sample_lost ( - ::DDSDataReader* , - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("DDS_DataReaderListener_i::on_sample_lost"); - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_lost (this->dr_, ddsstatus); - } - - ::DDS::DataReaderListener_ptr - DDS_DataReaderListener_i::get_datareaderlistener (void) - { - return ::DDS::DataReaderListener::_duplicate (this->impl_.in ()); - } - - void - DDS_DataReaderListener_i::set_dds_entity (::DDS::DataReader_ptr dr) - { - this->dr_ = ::DDS::DataReader::_duplicate (dr); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h deleted file mode 100644 index 80ced9465a3..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDSDATAREADERLISTENER_T_H_ -#define DDSDATAREADERLISTENER_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DataReaderListener_i : - public ::DDSDataReaderListener - { - public: - /// Constructor - DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p, - ::DDS::DataReader_ptr typed_dr); - - /// Destructor - virtual ~DDS_DataReaderListener_i (void); - - virtual void on_requested_deadline_missed(::DDSDataReader* reader, - const ::DDS_RequestedDeadlineMissedStatus& status); - - virtual void on_liveliness_changed(::DDSDataReader* reader, - const ::DDS_LivelinessChangedStatus& status); - - virtual void on_requested_incompatible_qos(::DDSDataReader* reader, - const ::DDS_RequestedIncompatibleQosStatus& status); - - virtual void on_sample_rejected(::DDSDataReader* reader, - const ::DDS_SampleRejectedStatus& status); - - virtual void on_data_available(::DDSDataReader* reader); - - virtual void on_sample_lost(::DDSDataReader* reader, - const ::DDS_SampleLostStatus& status); - - virtual void on_subscription_matched(::DDSDataReader* reader, - const ::DDS_SubscriptionMatchedStatus& status); - - ::DDS::DataReaderListener_ptr get_datareaderlistener (void); - - void set_dds_entity (::DDS::DataReader_ptr typed_dr); - private: - ::DDS::DataReaderListener_var impl_; - ::DDS::DataReader_var dr_; - }; - } -} - -#endif /* DDSDATAREADERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp deleted file mode 100644 index 7a56d7b2b58..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp +++ /dev/null @@ -1,1003 +0,0 @@ -#include "dds4ccm/impl/ndds/DataReaderListener.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/ndds/ReadCondition.h" -#include "dds4ccm/impl/ndds/QueryCondition.h" -#include "dds4ccm/impl/ndds/Subscriber.h" -#include "dds4ccm/impl/ndds/TopicDescription.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/ContentFilteredTopic.h" -#include "dds4ccm/impl/Utils.h" - -#include "dds4ccm/impl/ndds/convertors/SampleInfoSeq.h" -#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h" -#include "dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h" -#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h" -#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h" -#include "dds4ccm/impl/ndds/convertors/StringSeq.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - template - DataReader_T ::DataReader_T ( - DDSDataReader * dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub) - : rti_entity_ (0) - , dp_ (::DDS::DomainParticipant::_duplicate (dp)) - , sub_ (::DDS::Subscriber::_duplicate (sub)) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::DataReader_T"); - if (dr) - { - this->rti_entity_ = TYPED_DDS_READER::narrow (dr); - } - } - - template - DataReader_T ::~DataReader_T (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::~DataReader_T"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::complete_read ( - RTI_SEQ_TYPE & dds_data_values, - SEQ_TYPE & data_values, - DDS_SampleInfoSeq & dds_sample_infos, - ::DDS::SampleInfoSeq & sample_infos, - const ::DDS::ReturnCode_t & retcode, - const char * method_name) - { - if (retcode == ::DDS::RETCODE_OK) - { - data_values.length (dds_data_values.length ()); - sample_infos.length (dds_sample_infos.length ()); - - for (::DDS_Long i = 0 ; i < dds_sample_infos.length(); ++i) - { - sample_infos[i] <<= dds_sample_infos[i]; - data_values[i] = dds_data_values[i]; - } - } - else if (retcode != ::DDS::RETCODE_NO_DATA) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReader_T::%C - ") - ACE_TEXT ("Error while reading samples from DDS - <%C>\n"), - method_name, - ::CIAO::DDS4CCM::translate_retcode (retcode))); - } - ::DDS::ReturnCode_t const retcode_return_loan = - this->rti_entity ()->return_loan (dds_data_values, dds_sample_infos); - if (retcode_return_loan != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - ACE_TEXT ("DataReader_T::%C - ") - ACE_TEXT ("Error returning loan to DDS - <%C>\n"), - method_name, - ::CIAO::DDS4CCM::translate_retcode (retcode_return_loan))); - // In case a read action from DDS causes errors, the users wants to see - // this error (and not the return loan error). - if (retcode == ::DDS::RETCODE_OK) - return retcode_return_loan; - } - return retcode; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read"); - - DDS_SampleInfoSeq dds_sample_infos; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_read = - this->rti_entity ()->read (dds_data_values, - dds_sample_infos, - max_samples, - sample_states, - view_states, - instance_states); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_read, "read"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take"); - - DDS_SampleInfoSeq dds_sample_infos; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_take = - this->rti_entity ()->take (dds_data_values, - dds_sample_infos, - max_samples, - sample_states, - view_states, - instance_states); - - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_take, "take"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::ReadCondition_ptr a_condition) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_w_condition"); - - DDS_SampleInfoSeq dds_sample_infos; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t retcode_read_w_condition = ::DDS::RETCODE_ERROR; - - DDS_ReadCondition_i * dds_rc_proxy = - dynamic_cast (a_condition); - - if (dds_rc_proxy) - { - DDSReadCondition * dds_rc = - dds_rc_proxy->get_rti_entity (); - retcode_read_w_condition = this->rti_entity ()->read_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - dds_rc); - } - else - { - DDS_QueryCondition_i * dds_qc_proxy = - dynamic_cast (a_condition); - if (dds_qc_proxy) - { - DDSQueryCondition * dds_qc = - dds_qc_proxy->get_rti_entity (); - retcode_read_w_condition = this->rti_entity ()->read_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - dds_qc); - } - else - { - retcode_read_w_condition = this->rti_entity ()->read_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - 0); - } - } - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_read_w_condition, "read_w_condition"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::ReadCondition_ptr a_condition) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_w_condition"); - - DDS_SampleInfoSeq dds_sample_infos; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t retcode_take_w_condition = ::DDS::RETCODE_ERROR; - - DDS_ReadCondition_i * dds_rc_proxy = - dynamic_cast (a_condition); - - if (dds_rc_proxy) - { - DDSReadCondition * dds_rc = - dds_rc_proxy->get_rti_entity (); - retcode_take_w_condition = this->rti_entity ()->take_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - dds_rc); - } - else - { - DDS_QueryCondition_i * dds_qc_proxy = - dynamic_cast (a_condition); - if (dds_qc_proxy) - { - DDSQueryCondition * dds_qc = - dds_qc_proxy->get_rti_entity (); - retcode_take_w_condition = this->rti_entity ()->take_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - dds_qc); - } - else - { - retcode_take_w_condition = this->rti_entity ()->take_w_condition ( - dds_data_values, - dds_sample_infos, - max_samples, - 0); - } - } - - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_take_w_condition, "read_w_condition"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read_next_sample ( - VALUE_TYPE & data_values, - ::DDS::SampleInfo & sample_info) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_sample"); - - DDS_SampleInfo dds_sample_info; - - ::DDS::ReturnCode_t const retcode_read_next_sample = - this->rti_entity ()->read_next_sample (data_values, - dds_sample_info); - sample_info <<= dds_sample_info; - return retcode_read_next_sample; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take_next_sample ( - VALUE_TYPE & data_values, - ::DDS::SampleInfo & sample_info) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_sample"); - - DDS_SampleInfo dds_sample_info; - - ::DDS::ReturnCode_t const retcode_take_next_sample = - this->rti_entity ()->take_next_sample (data_values, - dds_sample_info); - sample_info <<= dds_sample_info; - return retcode_take_next_sample ; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_instance"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= a_handle; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_read_instance = - this->rti_entity ()->read_instance (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - sample_states, - view_states, - instance_states); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_read_instance, "read_instance"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_instance"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= a_handle; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_take_instance = - this->rti_entity ()->take_instance (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - sample_states, - view_states, - instance_states); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_take_instance, "take_instance"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read_next_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_instance"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= a_handle; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_read_next_instance = - this->rti_entity ()->read_next_instance (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - sample_states, - view_states, - instance_states); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_read_next_instance, "read_next_instance"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take_next_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_instance"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= a_handle; - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_take_next_instance = - this->rti_entity ()->take_next_instance (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - sample_states, - view_states, - instance_states); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_take_next_instance, "take_next_instance"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::read_next_instance_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::ReadCondition_ptr a_condition) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::read_next_instance_w_condition"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= previous_handle; - - DDS_ReadCondition_i * dds_condition_proxy = - dynamic_cast (a_condition); - DDSReadCondition * dds_condition = 0; - if (dds_condition_proxy) - { - dds_condition = dds_condition_proxy->get_rti_entity (); - } - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_read_next_instance_w_condition = - this->rti_entity ()->read_next_instance_w_condition (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - dds_condition); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_read_next_instance_w_condition, - "read_next_instance_w_condition"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::take_next_instance_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::ReadCondition_ptr a_condition) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::take_next_instance_w_condition"); - - DDS_SampleInfoSeq dds_sample_infos; - - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= previous_handle; - - DDS_ReadCondition_i * dds_condition_proxy = - dynamic_cast (a_condition); - DDSReadCondition * dds_condition = 0; - if (dds_condition_proxy) - { - dds_condition = dds_condition_proxy->get_rti_entity (); - } - - RTI_SEQ_TYPE dds_data_values; - - ::DDS::ReturnCode_t const retcode_take_next_instance_w_condition = - this->rti_entity ()->take_next_instance_w_condition (dds_data_values, - dds_sample_infos, - max_samples, - dds_handle, - dds_condition); - return this->complete_read (dds_data_values, data_values, - dds_sample_infos, sample_infos, - retcode_take_next_instance_w_condition, - "take_next_instance_w_condition"); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::return_loan ( - SEQ_TYPE & /*data_values*/, - ::DDS::SampleInfoSeq & /*sample_infos*/) - { - // No need to implement this since a return_loan is - // done every read/take operation in this proxy - return ::DDS::RETCODE_OK; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_key_value ( - VALUE_TYPE & key_holder, - const ::DDS::InstanceHandle_t & handle) - { - ::DDS_InstanceHandle_t dds_handle = ::DDS_HANDLE_NIL; - dds_handle <<= handle; - - return this->rti_entity ()->get_key_value (key_holder, - dds_handle); - } - - template - ::DDS::InstanceHandle_t - DataReader_T ::lookup_instance ( - const VALUE_TYPE& an_instance) - { - ::DDS_InstanceHandle_t hnd = - this->rti_entity ()->lookup_instance (an_instance); - ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; - ret <<= hnd; - return ret; - } - - template - TYPED_DDS_READER * - DataReader_T ::rti_entity (void) - { - if (this->rti_entity_) - { - return this->rti_entity_; - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DataReader_T ::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - } - - template - ::DDS::ReturnCode_t - DataReader_T ::enable (void) - { - return this->rti_entity ()->enable (); - } - - template - ::DDS::StatusCondition_ptr - DataReader_T ::get_statuscondition (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_statuscondition"); - - ::DDS::StatusCondition_var retval; - DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - template - ::DDS::StatusMask - DataReader_T ::get_status_changes (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_status_changes"); - - return this->rti_entity ()->get_status_changes (); - } - - template - DDS_INSTANCE_HANDLE_T_RETN - DataReader_T ::get_instance_handle (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_instance_handle"); - - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - template - ::DDS::ReadCondition_ptr - DataReader_T ::create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::create_readcondition"); - - ::DDS::ReadCondition_var retval; - DDSReadCondition* rc = - this->rti_entity ()->create_readcondition (sample_states, - view_states, - instance_states); - if (rc) - { - ACE_NEW_THROW_EX (retval, - DDS_ReadCondition_i (rc, this), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - template - ::DDS::QueryCondition_ptr - DataReader_T ::create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::create_querycondition"); - - ::DDS::QueryCondition_var retval; - DDS_StringSeq parameters; - parameters <<= query_parameters; - DDSQueryCondition* qc = this->rti_entity ()->create_querycondition ( - sample_states, - view_states, - instance_states, - query_expression, - parameters); - - if (qc) - { - ACE_NEW_THROW_EX (retval, - DDS_QueryCondition_i (qc, this), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::delete_readcondition"); - - ::DDSReadCondition * dds_rc = 0; - DDS_ReadCondition_i * rc = dynamic_cast< DDS_ReadCondition_i *> (a_condition); - DDS_QueryCondition_i * qc = dynamic_cast< DDS_QueryCondition_i *> (a_condition); - - if (!rc) - { - if (!qc) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DataReader_T::delete_readcondition - ") - ACE_TEXT ("Unable to cast provided condition to a typed ") - ACE_TEXT ("read condition nor a typed query condition\n"))); - return ::DDS::RETCODE_BAD_PARAMETER; - } - dds_rc = dynamic_cast < ::DDSReadCondition *> (qc->get_rti_entity ()); - if (!dds_rc) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DataReader_T::delete_readcondition - ") - ACE_TEXT ("Unable to cast DDSQueryCondition to a ") - ACE_TEXT ("DDSReadCondition\n"))); - return ::DDS::RETCODE_BAD_PARAMETER; - } - } - else - { - dds_rc = rc->get_rti_entity (); - } - - if (rc) - { - rc->set_rti_entity (0); - } - if (qc) - { - qc->set_rti_entity (0); - } - - return this->rti_entity ()->delete_readcondition (dds_rc); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::delete_contained_entities (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::delete_contained_entities"); - - return this->rti_entity ()->delete_contained_entities (); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::set_qos ( - const ::DDS::DataReaderQos &qos) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_qos"); - - ::DDS_DataReaderQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DataReader_T::set_qos - " - "Error: Unable to retrieve qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_qos (ccm_dds_qos); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_qos ( - ::DDS::DataReaderQos &qos) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_qos"); - - ::DDS_DataReaderQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS_ReturnCode_t const retval = this->rti_entity ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T ::set_listener"); - - // Retrieve the previously set listener - DDSDataReaderListener *old_listener = this->rti_entity ()->get_listener (); - - DDSDataReaderListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_DataReaderListener_i ( - a_listener, - this), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - delete old_listener; - } - - return retcode; - } - - template - ::DDS::DataReaderListener_ptr - DataReader_T ::get_listener (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T ::get_listener"); - - DDSDataReaderListener *drl = this->rti_entity ()->get_listener (); - DDS_DataReaderListener_i *ccm_dds_drl = - dynamic_cast (drl); - if (!ccm_dds_drl) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, "DataReader_T" - "::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DataReaderListener::_nil (); - } - return ccm_dds_drl->get_datareaderlistener (); - } - - template - ::DDS::TopicDescription_ptr - DataReader_T ::get_topicdescription (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_topicdescription"); - - ::DDS::TopicDescription_var dds_td; - DDSTopicDescription* td = this->rti_entity ()->get_topicdescription (); - DDSTopic * tp = 0; - if (td) - { - tp = DDSTopic::narrow (td); - - if (tp) - { - ACE_NEW_THROW_EX (dds_td, - DDS_Topic_i (tp, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - else - { - ::DDSContentFilteredTopic * cft = - DDSContentFilteredTopic::narrow (td); - if (cft) - { - ACE_NEW_THROW_EX (dds_td, - DDS_ContentFilteredTopic_i (cft, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - } - } - return dds_td._retn (); - } - - template - ::DDS::Subscriber_ptr - DataReader_T ::get_subscriber (void) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_subscriber"); - - return ::DDS::Subscriber::_duplicate (this->sub_.in ()); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_sample_rejected_status ( - ::DDS::SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_sample_rejected_status"); - - DDS_SampleRejectedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_sample_rejected_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_liveliness_changed_status"); - - DDS_LivelinessChangedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_liveliness_changed_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_requested_deadline_missed_status"); - - DDS_RequestedDeadlineMissedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_requested_deadline_missed_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_requested_incompatible_qos_status"); - - DDS_RequestedIncompatibleQosStatus ddsstatus; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_requested_incompatible_qos_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_subscription_matched_status"); - - ::DDS_SubscriptionMatchedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_subscription_matched_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_sample_lost_status ( - ::DDS::SampleLostStatus & status) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_sample_lost_status"); - - DDS_SampleLostStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_sample_lost_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::wait_for_historical_data ( - const ::DDS::Duration_t & max_wait) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::wait_for_historical_data"); - - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->rti_entity ()->wait_for_historical_data (rtiduration); - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T ::get_matched_publications"); - - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_matched_publications (rtiseq); - publication_handles <<= rtiseq; - return retval; - } - - template - ::DDS::ReturnCode_t - DataReader_T ::get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::get_matched_publication_data"); - - ::DDS_PublicationBuiltinTopicData ccm_dds_pub_data; - ::DDS_InstanceHandle_t ccm_dds_pub_handle; - - ccm_dds_pub_data <<= publication_data; - ccm_dds_pub_handle <<= publication_handle; - ::DDS::ReturnCode_t const retcode = this->rti_entity ()-> - get_matched_publication_data (ccm_dds_pub_data, - ccm_dds_pub_handle); - publication_data <<= ccm_dds_pub_data; - return retcode; - } - - template - void - DataReader_T ::set_rti_entity ( - ::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp) - { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_rti_entity"); - - if (dr) - { - this->rti_entity_ = TYPED_DDS_READER::narrow (dr); - } - else - { - this->rti_entity_ = 0; - } - this->dp_ = ::DDS::DomainParticipant::_duplicate (dp); - } - - template - ::DDSDataReader* - DataReader_T ::get_rti_entity (void) - { - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h deleted file mode 100644 index 5cdee526065..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h +++ /dev/null @@ -1,228 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Common dataReader class for the Getter, Reader, - * and, Listen port - */ -#ifndef DATAREADER_T_H_ -#define DATAREADER_T_H_ - -#include "dds4ccm/impl/ndds/DataReader.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" - -namespace CIAO -{ - namespace NDDS - { - template - class DataReader_T - : public virtual DDS_DataReader_Base, - public virtual TYPED_READER_TYPE - { - public: - /// Constructor - explicit DataReader_T (::DDSDataReader * dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub); - - /// Destructor - virtual ~DataReader_T (void); - - virtual ::DDS::ReturnCode_t read ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t take ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t read_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t take_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t read_next_sample ( - VALUE_TYPE & data_values, - ::DDS::SampleInfo & sample_info); - - virtual ::DDS::ReturnCode_t take_next_sample ( - VALUE_TYPE & data_values, - ::DDS::SampleInfo & sample_info); - - virtual ::DDS::ReturnCode_t read_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t take_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & a_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t read_next_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t take_next_instance ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t read_next_instance_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t take_next_instance_w_condition ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos, - ::CORBA::Long max_samples, - const ::DDS::InstanceHandle_t & previous_handle, - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t return_loan ( - SEQ_TYPE & data_values, - ::DDS::SampleInfoSeq & sample_infos); - - virtual ::DDS::ReturnCode_t get_key_value ( - VALUE_TYPE & key_holder, - const ::DDS::InstanceHandle_t & handle); - - virtual ::DDS::InstanceHandle_t lookup_instance ( - const VALUE_TYPE& an_instance); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - - virtual ::DDS::ReadCondition_ptr - create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::QueryCondition_ptr - create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters); - - virtual ::DDS::ReturnCode_t - delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - set_listener (::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DataReaderListener_ptr get_listener (void); - - virtual ::DDS::TopicDescription_ptr get_topicdescription (void); - - virtual ::DDS::Subscriber_ptr get_subscriber (void); - - virtual ::DDS::ReturnCode_t - get_sample_rejected_status (::DDS::SampleRejectedStatus & status); - - virtual ::DDS::ReturnCode_t - get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status); - - virtual ::DDS::ReturnCode_t - get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status); - - virtual ::DDS::ReturnCode_t - get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status); - - virtual ::DDS::ReturnCode_t - get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status); - - virtual ::DDS::ReturnCode_t - get_sample_lost_status (::DDS::SampleLostStatus & status); - - virtual ::DDS::ReturnCode_t - wait_for_historical_data (const ::DDS::Duration_t & max_wait); - - virtual ::DDS::ReturnCode_t - get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles); - - virtual ::DDS::ReturnCode_t - get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle); - - virtual void set_rti_entity (::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp); - - ::DDSDataReader * get_rti_entity (void); - - private: - TYPED_DDS_READER * rti_entity_; - ::DDS::DomainParticipant_var dp_; - ::DDS::Subscriber_var sub_; - - TYPED_DDS_READER * rti_entity (void); - - ::DDS::ReturnCode_t complete_read ( - RTI_SEQ_TYPE & dds_data_values, - SEQ_TYPE & data_values, - DDS_SampleInfoSeq & dds_sample_infos, - ::DDS::SampleInfoSeq & sample_infos, - const ::DDS::ReturnCode_t & retcode, - const char * method_name); - }; - } -} - -#include "dds4ccm/impl/ndds/DataReader_T.cpp" - -#endif /* DATAREADER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp deleted file mode 100644 index fda2bba2aba..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "dds4ccm/impl/ndds/DataWriter.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DataWriter_Base::DDS_DataWriter_Base (void) - { - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h deleted file mode 100644 index 269c92d3e02..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAWRITER_H -#define DDS4CCM_DATAWRITER_H - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" - -#include "tao/LocalObject.h" - -class DDSDataWriter; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DataWriter_Base - : public virtual ::DDS::DataWriter, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_DataWriter_Base (void); - - virtual ::DDSDataWriter * get_rti_entity (void) = 0; - - virtual void set_rti_entity (::DDSDataWriter * dw) = 0; - }; - } -} - -#endif /* DDS4CCM_DATAWRITER_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp deleted file mode 100644 index f27f595e6e2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "dds4ccm/impl/ndds/DataWriterListener.h" -#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - - DDS_DataWriterListener_i::DDS_DataWriterListener_i ( - ::DDS::DataWriterListener_ptr s, - ::DDS::DataWriter_ptr dw) - : impl_ (::DDS::DataWriterListener::_duplicate (s)), - dw_ (::DDS::DataWriter::_duplicate (dw)) - { - } - - DDS_DataWriterListener_i::~DDS_DataWriterListener_i (void) - { - } - - void - DDS_DataWriterListener_i::on_offered_deadline_missed ( - ::DDSDataWriter *, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_offered_deadline_missed"); - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_offered_deadline_missed (this->dw_, ddsstatus); - } - - - void - DDS_DataWriterListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter *, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_offered_incompatible_qos"); - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_offered_incompatible_qos (this->dw_, ddsstatus); - } - - void - DDS_DataWriterListener_i::on_liveliness_lost ( - ::DDSDataWriter *, - const ::DDS_LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_liveliness_lost"); - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_liveliness_lost (this->dw_, ddsstatus); - } - - void - DDS_DataWriterListener_i::on_publication_matched ( - ::DDSDataWriter *, - const ::DDS_PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_DataWriterListener_i::on_publication_matched"); - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_publication_matched (this->dw_, ddsstatus); - } - - ::DDS::DataWriterListener_ptr - DDS_DataWriterListener_i::get_datawriterlistener (void) - { - return ::DDS::DataWriterListener::_duplicate (this->impl_.in ()); - } - - void - DDS_DataWriterListener_i::set_dds_entity (::DDS::DataWriter_ptr dw) - { - this->dw_ = ::DDS::DataWriter::_duplicate (dw); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h deleted file mode 100644 index 4adf86b0a17..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDSDATAWRITERLISTENER_T_H_ -#define DDSDATAWRITERLISTENER_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DataWriterListener_i : - public ::DDSDataWriterListener - { - public: - /// Constructor - DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p, - ::DDS::DataWriter_ptr dw); - - /// Destructor - virtual ~DDS_DataWriterListener_i (void); - - virtual void on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status); - - virtual void on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status); - - virtual void on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status); - - virtual void on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status); - - ::DDS::DataWriterListener_ptr get_datawriterlistener (void); - - void set_dds_entity (::DDS::DataWriter_ptr dw); - - private: - ::DDS::DataWriterListener_var impl_; - ::DDS::DataWriter_var dw_; - }; - } -} - -#endif /* DDSDATAWRITERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp deleted file mode 100644 index d1f20d80317..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp +++ /dev/null @@ -1,490 +0,0 @@ -#include "dds4ccm/impl/ndds/DataWriter.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/ndds/Publisher.h" -#include "dds4ccm/impl/ndds/DataWriterListener.h" -#include "dds4ccm/impl/ndds/Topic.h" - -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h" -#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h" -#include "dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - template - DataWriter_T::DataWriter_T ( - ::DDSDataWriter * dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub) - : rti_entity_ (0) - , dp_ (::DDS::DomainParticipant::_duplicate (dp)) - , pub_ (::DDS::Publisher::_duplicate (pub)) - { - if (dw) - { - this->rti_entity_ = TYPED_DDS_WRITER::narrow (dw); - } - } - - template - ::DDS::ReturnCode_t - DataWriter_T::set_qos (const ::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("DataWriter_T::set_qos"); - ::DDS_DataWriterQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DataWriter_T::set_qos - " - "Error: Unable to retrieve qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_qos (ccm_dds_qos); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_qos (::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("DataWriter_T::get_qos"); - ::DDS_DataWriterQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::set_listener ( - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DataWriter_T::set_listener"); - - // Retrieve the previously set listener - DDSDataWriterListener *old_listener = this->rti_entity ()->get_listener (); - - DDSDataWriterListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_DataWriterListener_i ( - a_listener, - this), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - delete old_listener; - } - - return retcode; - } - - template - ::DDS::DataWriterListener_ptr - DataWriter_T::get_listener (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_listener"); - - DDSDataWriterListener *wr = this->rti_entity ()->get_listener (); - DDS_DataWriterListener_i * list_proxy = - dynamic_cast (wr); - if (!list_proxy) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DataWriter_T::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DataWriterListener::_nil (); - } - return list_proxy->get_datawriterlistener (); - } - - template - ::DDS::Topic_ptr - DataWriter_T::get_topic (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_topic"); - - ::DDS::Topic_var retval; - DDSTopic* t = this->rti_entity ()->get_topic (); - ACE_NEW_THROW_EX (retval, - DDS_Topic_i (t, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - return retval._retn (); - } - - template - ::DDS::Publisher_ptr - DataWriter_T::get_publisher (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_publisher"); - - return ::DDS::Publisher::_duplicate (this->pub_.in ()); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) - { - DDS4CCM_TRACE ("DataWriter_T::wait_for_acknowledgments"); - - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->rti_entity ()->wait_for_acknowledgments (rtiduration); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("DataWriter_T::get_liveliness_lost_status"); - - ::DDS_LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_liveliness_lost_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_offered_deadline_missed_status ( - ::DDS::OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DataWriter_T::get_offered_deadline_missed_status"); - - ::DDS_OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_offered_deadline_missed_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_offered_incompatible_qos_status ( - ::DDS::OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DataWriter_T::get_offered_incompatible_qos_status"); - - ::DDS_OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_offered_incompatible_qos_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_publication_matched_status ( - ::DDS::PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("DataWriter_T::get_publication_matched_status"); - - ::DDS_PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_publication_matched_status (ddsstatus); - status <<= ddsstatus; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::assert_liveliness (void) - { - DDS4CCM_TRACE ("DataWriter_T::assert_liveliness"); - - return this->rti_entity ()->assert_liveliness (); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_matched_subscriptions ( - ::DDS::InstanceHandleSeq & subscription_handles) - { - DDS4CCM_TRACE ("DataWriter_T::get_matched_subscription"); - - ::DDS_InstanceHandleSeq rtiseq; - rtiseq <<= subscription_handles; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_matched_subscriptions (rtiseq); - subscription_handles <<= rtiseq; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_matched_subscription_data ( - ::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle) - { - DDS4CCM_TRACE ("DataWriter_T::get_matched_subscription_data"); - - ::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->rti_entity ()->get_matched_subscription_data (ccm_dds_sub_data, - ccm_dds_sub_handle); - subscription_data <<= ccm_dds_sub_data; - return retval; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::enable (void) - { - DDS4CCM_TRACE ("DataWriter_T::enable"); - - return this->rti_entity ()->enable (); - } - - template - ::DDS::StatusCondition_ptr - DataWriter_T::get_statuscondition (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_statuscondition"); - - ::DDS::StatusCondition_var retval; - DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - return retval._retn (); - } - - template - ::DDS::StatusMask - DataWriter_T::get_status_changes (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_status_changes"); - - return this->rti_entity ()->get_status_changes (); - } - - template - DDS_INSTANCE_HANDLE_T_RETN - DataWriter_T::get_instance_handle (void) - { - DDS4CCM_TRACE ("DataWriter_T::get_instance_handle"); - - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - template - ::DDS::InstanceHandle_t - DataWriter_T::register_instance ( - const VALUE_TYPE & instance_data) - { - DDS4CCM_TRACE ("DataWriter_T::register_instance"); - - ::DDS::InstanceHandle_t dds_handle; - ::DDS_InstanceHandle_t const handle = this->rti_entity ()->register_instance (instance_data); - dds_handle <<= handle; - return dds_handle; - } - - template - ::DDS::InstanceHandle_t - DataWriter_T::register_instance_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::Time_t & source_timestamp) - { - DDS4CCM_TRACE ("DataWriter_T::register_instance_w_timestamp"); - - ::DDS_Time_t time; - time <<= source_timestamp; - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->register_instance_w_timestamp (instance_data, time); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - template - ::DDS::ReturnCode_t - DataWriter_T::unregister_instance ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle) - { - DDS4CCM_TRACE ("DataWriter_T::unregister_instance"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - return this->rti_entity ()->unregister_instance (instance_data, instance_handle); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::unregister_instance_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle, - const ::DDS::Time_t & source_timestamp) - { - DDS4CCM_TRACE ("DataWriter_T::unregister_instance_w_timestamp"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - ::DDS_Time_t time; - time <<= source_timestamp; - return this->rti_entity ()->unregister_instance_w_timestamp (instance_data, - instance_handle, - time); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::write ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle) - { - DDS4CCM_TRACE ("DataWriter_T::write"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - return this->rti_entity ()->write (instance_data, instance_handle); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::write_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle, - const ::DDS::Time_t & source_timestamp) - { - DDS4CCM_TRACE ("DataWriter_T::write_w_timestamp"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - ::DDS_Time_t time; - time <<= source_timestamp; - return this->rti_entity ()->write_w_timestamp (instance_data, - instance_handle, - time); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::dispose ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle) - { - DDS4CCM_TRACE ("DataWriter_T::dispose"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - return this->rti_entity ()->dispose (instance_data, instance_handle); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::dispose_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle, - const ::DDS::Time_t & source_timestamp) - { - DDS4CCM_TRACE ("DataWriter_T::dispose_w_timestamp"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - ::DDS_Time_t time; - time <<= source_timestamp; - return this->rti_entity ()->dispose_w_timestamp (instance_data, - instance_handle, - time); - } - - template - ::DDS::ReturnCode_t - DataWriter_T::get_key_value ( - VALUE_TYPE & key_holder, - const ::DDS::InstanceHandle_t & handle) - { - DDS4CCM_TRACE ("DataWriter_T::get_key_value"); - - ::DDS_InstanceHandle_t instance_handle = ::DDS_HANDLE_NIL; - instance_handle <<= handle; - return this->rti_entity ()->get_key_value (key_holder, instance_handle); - } - - template - ::DDS::InstanceHandle_t - DataWriter_T::lookup_instance ( - const VALUE_TYPE & instance_data) - { - DDS4CCM_TRACE ("DataWriter_T::lookup_instance"); - - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->lookup_instance (instance_data); - ::DDS::InstanceHandle_t handle = DDS::HANDLE_NIL; - handle <<= rtihandle; - return handle; - } - - template - void - DataWriter_T::set_rti_entity (DDSDataWriter * dw) - { - if (dw) - { - this->rti_entity_ = TYPED_DDS_WRITER::narrow (dw); - } - else - { - this->rti_entity_ = 0; - } - } - - template - DDSDataWriter * - DataWriter_T::get_rti_entity (void) - { - return this->rti_entity_; - } - - template - TYPED_DDS_WRITER* - DataWriter_T::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DataWriter_T::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h deleted file mode 100644 index 7bf8288f89b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h +++ /dev/null @@ -1,131 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DATAWRITER_T_H_ -#define DATAWRITER_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/ndds/DataWriter.h" - -namespace CIAO -{ - namespace NDDS - { - template - class DataWriter_T - : public virtual DDS_DataWriter_Base, - public virtual TYPED_WRITER_TYPE - { - public: - explicit DataWriter_T (::DDSDataWriter * dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos); - - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DataWriterListener_ptr get_listener (void); - - virtual ::DDS::Topic_ptr get_topic (void); - - virtual ::DDS::Publisher_ptr get_publisher (void); - - virtual ::DDS::ReturnCode_t wait_for_acknowledgments ( - const ::DDS::Duration_t & max_wait); - - virtual ::DDS::ReturnCode_t get_liveliness_lost_status ( - ::DDS::LivelinessLostStatus & status); - - virtual ::DDS::ReturnCode_t get_offered_deadline_missed_status ( - ::DDS::OfferedDeadlineMissedStatus & status); - - virtual ::DDS::ReturnCode_t get_offered_incompatible_qos_status ( - ::DDS::OfferedIncompatibleQosStatus & status); - - virtual ::DDS::ReturnCode_t get_publication_matched_status ( - ::DDS::PublicationMatchedStatus & status); - - virtual ::DDS::ReturnCode_t assert_liveliness (void); - - virtual ::DDS::ReturnCode_t get_matched_subscriptions ( - ::DDS::InstanceHandleSeq & subscription_handles); - - virtual ::DDS::ReturnCode_t get_matched_subscription_data ( - ::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - - virtual ::DDS::InstanceHandle_t register_instance ( - const VALUE_TYPE & instance_data); - - virtual ::DDS::InstanceHandle_t register_instance_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::Time_t & source_timestamp); - - virtual ::DDS::ReturnCode_t unregister_instance ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle); - - virtual ::DDS::ReturnCode_t unregister_instance_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle, - const ::DDS::Time_t & source_timestamp); - - virtual ::DDS::ReturnCode_t write ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle); - - virtual ::DDS::ReturnCode_t write_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & handle, - const ::DDS::Time_t & source_timestamp); - - virtual ::DDS::ReturnCode_t dispose ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual ::DDS::ReturnCode_t dispose_w_timestamp ( - const VALUE_TYPE & instance_data, - const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::Time_t & source_timestamp); - - virtual ::DDS::ReturnCode_t get_key_value ( - VALUE_TYPE & key_holder, - const ::DDS::InstanceHandle_t & handle); - - virtual ::DDS::InstanceHandle_t lookup_instance ( - const VALUE_TYPE & instance_data); - - virtual ::DDSDataWriter * get_rti_entity (void); - - virtual void set_rti_entity (::DDSDataWriter * dw); - - private: - TYPED_DDS_WRITER * rti_entity_; - ::DDS::DomainParticipant_var dp_; - ::DDS::Publisher_var pub_; - - TYPED_DDS_WRITER * rti_entity (void); - }; - } -} - -#include "dds4ccm/impl/ndds/DataWriter_T.cpp" - -#endif /* DATAWRITER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp deleted file mode 100644 index 76da9e0ff8c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ /dev/null @@ -1,1189 +0,0 @@ -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/Subscriber.h" -#include "dds4ccm/impl/ndds/Publisher.h" -#include "dds4ccm/impl/ndds/ContentFilteredTopic.h" -#include "dds4ccm/impl/ndds/TopicDescription.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/DomainParticipantListener.h" -#include "dds4ccm/impl/ndds/PublisherListener.h" -#include "dds4ccm/impl/ndds/SubscriberListener.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" - -#include "dds4ccm/impl/ndds/TopicListener.h" -#include "dds4ccm/impl/ndds/Utils.h" - -#include "dds4ccm/impl/ndds/convertors/PublisherQos.h" -#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h" -#include "dds4ccm/impl/ndds/convertors/TopicQos.h" -#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" -#include "dds4ccm/impl/ndds/convertors/Time_t.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h" -#include "dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h" -#include "dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -#include "ace/CORBA_macros.h" - -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DomainParticipant_i::DDS_DomainParticipant_i ( - ::DDSDomainParticipant * dp) : rti_entity_ (dp) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::DDS_DomainParticipant_i"); - } - - DDS_DomainParticipant_i::~DDS_DomainParticipant_i (void) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::~DDS_DomainParticipant_i"); - } - - ::DDS::Publisher_ptr - DDS_DomainParticipant_i::create_publisher_with_profile ( - const char * qos_profile, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " - "Start creating Publisher\n", - qos_profile)); - DDS_PublisherListener_i *ccm_dds_pl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_pl, - DDS_PublisherListener_i (a_listener, this), - ::CORBA::NO_MEMORY ()); - } - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - DDSPublisher * ccm_dds_pub = 0; - - if (lib_name != 0 && prof_name != 0) - { - ccm_dds_pub = this->rti_entity ()->create_publisher_with_profile ( - lib_name, - prof_name, - ccm_dds_pl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - if (!ccm_dds_pub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " - "Error: Unable to create Publisher\n", - qos_profile)); - delete ccm_dds_pl; - return ::DDS::Publisher::_nil (); - } - - ::DDS::Publisher_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Publisher_i (ccm_dds_pub, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " - "Successfully created a DDSPublisher\n", - qos_profile)); - - DDS_ReturnCode_t retcode = ccm_dds_pub->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_publisher_with_profile <%C> - " - "Error: Unable to create Publisher: <%C>\n", - qos_profile, - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_pl; - throw ::CORBA::INTERNAL (); - } - return retval._retn (); - } - - - ::DDS::Publisher_ptr - DDS_DomainParticipant_i::create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher - " - "Start creating Publisher\n")); - - DDS_PublisherQos ccm_dds_qos; - DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_publisher_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_publisher - " - "Error: Unable to retrieve default publisher qos\n")); - return ::DDS::Publisher::_nil (); - } - ccm_dds_qos <<= qos; - - DDS_PublisherListener_i *ccm_dds_pl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_pl, - DDS_PublisherListener_i (a_listener, this), - ::CORBA::NO_MEMORY ()); - } - - DDSPublisher * ccm_dds_pub = - this->rti_entity ()->create_publisher (ccm_dds_qos, - ccm_dds_pl, - mask); - - if (!ccm_dds_pub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_publisher - " - "Error: Unable to create Publisher\n")); - delete ccm_dds_pl; - return ::DDS::Publisher::_nil (); - } - - ::DDS::Publisher_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Publisher_i (ccm_dds_pub, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher - " - "Successfully created a DDSPublisher\n")); - - retcode = ccm_dds_pub->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_publisher - " - "Error: Unable to enable the Publisher: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_pl; - throw ::CORBA::INTERNAL (); - } - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_publisher ( - ::DDS::Publisher_ptr p) - { - DDS_Publisher_i *ccm_dds_pub = - dynamic_cast < DDS_Publisher_i * > (p); - - if (!ccm_dds_pub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::delete_publisher - " - "Unable to cast provided object reference to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::delete_publisher - " - "Successfully casted provided object reference to " - "DDS_Publisher_i\n")); - - DDSPublisher* pub = ccm_dds_pub->get_rti_entity (); - ccm_dds_pub->set_rti_entity (0); - DDS_ReturnCode_t const retval = this->rti_entity ()->delete_publisher (pub); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::delete_publisher - " - "Error: RTI delete_publisher returned non-ok error code %C\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_publisher - " - "Provided publisher successfully deleted\n")); - } - - return retval; - } - - - ::DDS::Subscriber_ptr - DDS_DomainParticipant_i::create_subscriber_with_profile ( - const char * qos_profile, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_subscriber_with_profile <%C> - " - "Creating Subscriber\n", - qos_profile)); - - DDS_SubscriberListener_i *ccm_dds_sl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_sl, - DDS_SubscriberListener_i (a_listener, this), - ::CORBA::NO_MEMORY ()); - } - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - DDSSubscriber * ccm_dds_sub = 0; - - if (lib_name != 0 && prof_name != 0) - { - ccm_dds_sub = this->rti_entity ()->create_subscriber_with_profile ( - lib_name, - prof_name, - ccm_dds_sl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - if (!ccm_dds_sub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::" - "create_subscriber_with_profile <%C> - " - "Error: RTI DDS returned a nil subscriber.\n", - qos_profile)); - delete ccm_dds_sl; - return ::DDS::Subscriber::_nil (); - } - - ::DDS::Subscriber_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Subscriber_i (ccm_dds_sub, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - " - "Successfully created a DDSSubscriber\n", - qos_profile)); - - DDS_ReturnCode_t retcode = ccm_dds_sub->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - " - "Error: Unable to enable the DDSSubscriber: <%C>\n", - qos_profile, - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_sl; - throw ::CORBA::INTERNAL (); - } - return retval._retn (); - } - - - ::DDS::Subscriber_ptr - DDS_DomainParticipant_i::create_subscriber ( - const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber - " - "Creating Subscriber\n")); - - DDS_SubscriberListener_i *ccm_dds_sl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_sl, - DDS_SubscriberListener_i (a_listener, this), - ::CORBA::NO_MEMORY ()); - } - - DDS_SubscriberQos ccm_dds_qos; - DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_subscriber_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_subscriber - " - "Error: Unable to retrieve default subscriber qos\n")); - return ::DDS::Subscriber::_nil (); - } - ccm_dds_qos <<= qos; - - DDSSubscriber * ccm_dds_sub = - this->rti_entity ()->create_subscriber (ccm_dds_qos, - ccm_dds_sl, - mask); - - if (!ccm_dds_sub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::" - "create_subscriber - " - "Error: RTI DDS returned a nil subscriber.\n")); - delete ccm_dds_sl; - return ::DDS::Subscriber::_nil (); - } - - ::DDS::Subscriber_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Subscriber_i (ccm_dds_sub, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber - " - "Successfully created a DDSSubscriber\n")); - - retcode = ccm_dds_sub->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber - " - "Error: Unable to enable the DDSSubscriber: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_sl; - throw ::CORBA::INTERNAL (); - } - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_subscriber ( - ::DDS::Subscriber_ptr s) - { - DDS_Subscriber_i *ccm_dds_sub = dynamic_cast < DDS_Subscriber_i * > (s); - - if (!ccm_dds_sub) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_subscriber - Unable to cast " - "provided object reference to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_subscriber - Successfully casted " - "provided object reference to Subscriber_type\n")); - - DDSSubscriber* sub = ccm_dds_sub->get_rti_entity (); - ccm_dds_sub->set_rti_entity (0); - DDS_ReturnCode_t const retval = - this->rti_entity ()->delete_subscriber (sub); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_subscriber - Error: RTI " - "delete_subscriber returned non-ok error code %C\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_subscriber - " - "Provided subscriber successfully deleted\n")); - } - - return retval; - } - - ::DDS::Subscriber_ptr - DDS_DomainParticipant_i::get_builtin_subscriber (void) - { - ::DDS::Subscriber_var retval; - DDSSubscriber* sub = this->rti_entity ()->get_builtin_subscriber (); - if (sub) - { - ACE_NEW_THROW_EX (retval, - DDS_Subscriber_i (sub, this), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - ::DDS::Topic_ptr - DDS_DomainParticipant_i::create_topic ( - const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic - " - "Attempting to create topic with name <%C> and type <%C>\n", - impl_name, type_name)); - - DDS_TopicListener_i *ccm_dds_tl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - // Topic will be set later (using set_dds_topic) - ACE_NEW_THROW_EX (ccm_dds_tl, - DDS_TopicListener_i (::DDS::Topic::_nil (), a_listener), - ::CORBA::NO_MEMORY ()); - } - - DDS_TopicQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_topic_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::create_topic - " - "Error: Unable to retrieve default topic qos\n")); - return ::DDS::Topic::_nil (); - } - ccm_dds_qos <<= qos; - - DDSTopic * dds_tp = this->rti_entity ()->create_topic (impl_name, - type_name, - ccm_dds_qos, - ccm_dds_tl, - mask); - - if (!dds_tp) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic - " - "Error: RTI DDS returned a nil topic " - "with name <%C> and type <%C>\n", - impl_name, type_name)); - delete ccm_dds_tl; - return ::DDS::Topic::_nil (); - } - - ::DDS::Topic_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Topic_i (dds_tp, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic - " - "Successfully created topic with name <%C> and type <%C>\n", - impl_name, type_name)); - - if (ccm_dds_tl) - { - ccm_dds_tl->set_dds_topic (retval.in ()); - } - - return retval._retn (); - } - - - ::DDS::Topic_ptr - DDS_DomainParticipant_i::create_topic_with_profile ( - const char *impl_name, - const char *type_name, - const char *qos_profile, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile"); - - if (impl_name == 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " - "Error: provided nil topic name\n", - qos_profile)); - return ::DDS::Topic::_nil (); - } - - if (type_name == 0) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " - "Error: provided nil type name\n", - qos_profile)); - return ::DDS::Topic::_nil (); - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " - "Attempting to create topic with name %C and type %C\n", - qos_profile, - impl_name, type_name)); - - DDS_TopicListener_i *ccm_dds_tl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - // Topic will be set later (using set_dds_topic) - ACE_NEW_THROW_EX (ccm_dds_tl, - DDS_TopicListener_i (::DDS::Topic::_nil (), a_listener), - ::CORBA::NO_MEMORY ()); - } - - DDSTopic * dds_tp = 0; - - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - if (lib_name != 0 && prof_name != 0) - { - dds_tp = this->rti_entity ()->create_topic_with_profile ( - impl_name, - type_name, - lib_name, - prof_name, - ccm_dds_tl, - mask); - } - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - if (!dds_tp) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " - "Error: RTI DDS returned a nil topic\n", - qos_profile)); - delete ccm_dds_tl; - return ::DDS::Topic::_nil (); - } - - ::DDS::Topic_var retval; - ACE_NEW_THROW_EX (retval, - DDS_Topic_i (dds_tp, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " - "Successfully created topic with name %C and type %C\n", - qos_profile, - impl_name, type_name)); - - if (ccm_dds_tl) - { - ccm_dds_tl->set_dds_topic (retval.in ()); - } - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic"); - CORBA::String_var topic_name = a_topic->get_name (); - DDSTopicDescription * dds_td = - this->rti_entity ()->lookup_topicdescription (topic_name.in ()); - DDSTopic * tp = 0; - if (dds_td) - { - tp = DDSTopic::narrow (dds_td); - } - - if (!tp) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_topic <%C> - Unable to cast " - "provided object reference to servant.\n", - topic_name.in ())); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_topic <%C> - " - "Successfully casted provided object reference to servant.\n", - topic_name.in ())); - - DDS_ReturnCode_t const retcode = this->rti_entity ()->delete_topic (tp); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_topic <%C> - " - "delete_topic returned error code <%C>\n", - topic_name.in (), - ::CIAO::DDS4CCM::translate_retcode (retcode))); - - return retcode; - } - - - ::DDS::Topic_ptr - DDS_DomainParticipant_i::find_topic (const char * impl_name, - const ::DDS::Duration_t & timeout) - { - ::DDS::Topic_var retval; - ::DDS_Duration_t ddstimeout; - ddstimeout <<= timeout; - ::DDSTopic* topic = this->rti_entity ()->find_topic (impl_name, ddstimeout); - if (topic) - { - ACE_NEW_RETURN (retval, - DDS_Topic_i (topic, this), - ::DDS::Topic::_nil ()); - } - return retval._retn (); - } - - - ::DDS::TopicDescription_ptr - DDS_DomainParticipant_i::lookup_topicdescription (const char * name) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::lookup_topicdescription"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::lookup_topicdescription - " - "Looking up topic: name <%C>\n", - name)); - - ::DDS::TopicDescription_var retval; - ::DDSTopicDescription* topic = this->rti_entity ()->lookup_topicdescription (name); - if (topic) - { - // Check the entity: is it a Topic or a ContentFilteredTopic - ::DDSTopic * tp = dynamic_cast < ::DDSTopic *> (topic); - if (tp) - { - ACE_NEW_THROW_EX (retval, - DDS_Topic_i (tp, this), - ::CORBA::NO_MEMORY ()); - } - else - { - ::DDSContentFilteredTopic * cftp = - dynamic_cast < ::DDSContentFilteredTopic *>(topic); - if (cftp) - { - ACE_NEW_THROW_EX (retval, - DDS_ContentFilteredTopic_i (cftp, this), - ::CORBA::NO_MEMORY ()); - } - } - } - return retval._retn (); - } - - - ::DDS::ContentFilteredTopic_ptr - DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic"); - - DDS_Topic_i *top = dynamic_cast< DDS_Topic_i *> (related_topic); - if (!top) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_contentfilteredtopic - " - "Unable to cast provided topic.\n")); - return ::DDS::ContentFilteredTopic::_nil (); - } - - const char** parameterlist = 0; - ACE_NEW_THROW_EX (parameterlist, - const char*[expression_parameters.length ()], - ::CORBA::NO_MEMORY ()); - - for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) - { - parameterlist[i] = expression_parameters[i].in (); - } - DDS_StringSeq parameters (expression_parameters.length ()); - parameters.from_array (parameterlist, expression_parameters.length ()); - - DDSContentFilteredTopic * ccm_dds_cft = this->rti_entity ()->create_contentfilteredtopic ( - name, - top->get_rti_entity (), - filter_expression, - parameters); - delete [] parameterlist; - if (!ccm_dds_cft) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_contentfilteredtopic - " - "RTI DDS returned a nil ContentFilteredTopic for " - "name <%C> and filter expression <%C>.\n", - name, filter_expression)); - return ::DDS::ContentFilteredTopic::_nil (); - } - - ::DDS::ContentFilteredTopic_var retval; - ACE_NEW_THROW_EX (retval, - DDS_ContentFilteredTopic_i (ccm_dds_cft, this), - ::CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_contentfilteredtopic - " - "Successfully created contentfilteredtopic with name <%C> and " - "filter expression <%C>\n", - name, filter_expression)); - - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_contentfilteredtopic ( - ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic"); - DDS_ContentFilteredTopic_i *ccm_dds_cft = - dynamic_cast < DDS_ContentFilteredTopic_i *> (a_contentfilteredtopic); - if (!ccm_dds_cft) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::delete_contentfilteredtopic - " - "Unable to cast provided ContentFilteredTopic.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - DDSContentFilteredTopic* tp = ccm_dds_cft->get_rti_entity (); - ccm_dds_cft->set_rti_entity (0); - return this->rti_entity ()->delete_contentfilteredtopic (tp); - } - - - ::DDS::MultiTopic_ptr - DDS_DomainParticipant_i::create_multitopic ( - const char * name, - const char * type_name, - const char * subscription_expression, - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic"); - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (type_name); - ACE_UNUSED_ARG (subscription_expression); - ACE_UNUSED_ARG (expression_parameters); - //Not implemented in version ndds.4.5b.rev01 of RTI DDS. - throw ::CORBA::NO_IMPLEMENT (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_multitopic ( - ::DDS::MultiTopic_ptr a_multitopic) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic"); - ACE_UNUSED_ARG (a_multitopic); - //Not implemented in version ndds.4.5b.rev01 of RTI DDS. - throw ::CORBA::NO_IMPLEMENT (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::delete_contained_entities (void) - { - return this->rti_entity ()->delete_contained_entities (); - - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::set_qos ( - const ::DDS::DomainParticipantQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos"); - ::DDS_DomainParticipantQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::set_qos - " - "Error: Unable to retrieve participant qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_qos ( - ::DDS::DomainParticipantQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos"); - ::DDS_DomainParticipantQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()-> get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::set_listener ( - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_listener"); - - // Retrieve the previously set listener - DDSDomainParticipantListener *old_listener = this->rti_entity ()->get_listener (); - - DDSDomainParticipantListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_DomainParticipantListener_i (a_listener), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - delete old_listener; - } - - return retcode; - } - - ::DDS::DomainParticipantListener_ptr - DDS_DomainParticipant_i::get_listener (void) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener"); - - DDSDomainParticipantListener *ccm_dds_dp_list = this->rti_entity ()->get_listener (); - DDS_DomainParticipantListener_i * list_proxy = - dynamic_cast (ccm_dds_dp_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DomainParticipantListener::_nil (); - } - return list_proxy->get_domainparticipantlistener (); - } - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::ignore_participant ( - DDS_INSTANCE_HANDLE_T_IN handle) - { - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->rti_entity ()->ignore_participant (ccm_dds_handle); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::ignore_topic ( - DDS_INSTANCE_HANDLE_T_IN handle) - { - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->rti_entity ()->ignore_topic (ccm_dds_handle); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::ignore_publication ( - DDS_INSTANCE_HANDLE_T_IN handle) - { - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->rti_entity ()->ignore_publication (ccm_dds_handle); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::ignore_subscription ( - DDS_INSTANCE_HANDLE_T_IN handle) - { - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->rti_entity ()->ignore_subscription (ccm_dds_handle); - } - - - ::DDS::DomainId_t - DDS_DomainParticipant_i::get_domain_id (void) - { - return this->rti_entity ()->get_domain_id (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::assert_liveliness (void) - { - return this->rti_entity ()->assert_liveliness (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::set_default_publisher_qos ( - const ::DDS::PublisherQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos"); - ::DDS_PublisherQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_publisher_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::set_default_publisher_qos - " - "Error: Unable to retrieve default publisher qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_default_publisher_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_default_publisher_qos ( - ::DDS::PublisherQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos"); - ::DDS_PublisherQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()-> get_default_publisher_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::set_default_subscriber_qos ( - const ::DDS::SubscriberQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos"); - ::DDS_SubscriberQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_subscriber_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::set_default_subscriber_qos - " - "Error: Unable to retrieve default subscriber qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_default_subscriber_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_default_subscriber_qos ( - ::DDS::SubscriberQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); - ::DDS_SubscriberQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()-> get_default_subscriber_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::set_default_topic_qos ( - const ::DDS::TopicQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos"); - ::DDS_TopicQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_topic_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i" - "::set_default_topic_qos - " - "Error: Unable to retrieve default topic qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_default_topic_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_default_topic_qos ( - ::DDS::TopicQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); - ::DDS_TopicQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()-> get_default_topic_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_discovered_participants ( - ::DDS::InstanceHandleSeq & impl_handles) - { - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_discovered_participants (rtiseq); - impl_handles <<= rtiseq; - return retval; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_discovered_participant_data ( - ::DDS::ParticipantBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data"); - DDS_ParticipantBuiltinTopicData dds_part_data; - dds_part_data <<= impl_data; - ::DDS_InstanceHandle_t dds_hnd; - dds_hnd <<= impl_handle; - ::DDS_ReturnCode_t retcode = - this->rti_entity ()->get_discovered_participant_data (dds_part_data, - dds_hnd); - impl_data <<= dds_part_data; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_discovered_topics ( - ::DDS::InstanceHandleSeq & impl_handles) - { - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_discovered_topics (rtiseq); - impl_handles <<= rtiseq; - return retval; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_discovered_topic_data ( - ::DDS::TopicBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data"); - DDS_TopicBuiltinTopicData dds_tp_data; - dds_tp_data <<= impl_data; - ::DDS_InstanceHandle_t dds_hnd; - dds_hnd <<= impl_handle; - ::DDS_ReturnCode_t retcode = - this->rti_entity ()->get_discovered_topic_data (dds_tp_data, - dds_hnd); - impl_data <<= dds_tp_data; - return retcode; - } - - - ::CORBA::Boolean - DDS_DomainParticipant_i::contains_entity ( - DDS_INSTANCE_HANDLE_T_IN a_handle) - { - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= a_handle; - return this->rti_entity ()->contains_entity (ccm_dds_handle); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::get_current_time ( - ::DDS::Time_t & current_time) - { - DDS_Time_t ccm_dds_time; - ::DDS::ReturnCode_t const retval = this->rti_entity ()->get_current_time (ccm_dds_time); - current_time <<= ccm_dds_time; - return retval; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipant_i::enable (void) - { - return this->rti_entity ()->enable (); - } - - - ::DDS::StatusCondition_ptr - DDS_DomainParticipant_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval; - DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - - ::DDS::StatusMask - DDS_DomainParticipant_i::get_status_changes (void) - { - return this->rti_entity ()->get_status_changes (); - } - - - DDS_INSTANCE_HANDLE_T_RETN - DDS_DomainParticipant_i::get_instance_handle (void) - { - ::DDS_InstanceHandle_t const rtihandle = this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - - DDSDomainParticipant * - DDS_DomainParticipant_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - - void - DDS_DomainParticipant_i::set_rti_entity ( - DDSDomainParticipant * dp) - { - this->rti_entity_ = dp; - } - - - DDSDomainParticipant * - DDS_DomainParticipant_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_DomainParticipant_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h deleted file mode 100644 index 678a9c069d8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h +++ /dev/null @@ -1,187 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DOMAINPARTICIPANT_T_H_ -#define DOMAINPARTICIPANT_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "tao/LocalObject.h" - -class DDSDomainParticipant; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DomainParticipant_i : - public virtual ::DDS::DomainParticipant, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_DomainParticipant_i (DDSDomainParticipant * dp); - - /// Destructor - virtual ~DDS_DomainParticipant_i (void); - - virtual ::DDS::Publisher_ptr create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::Publisher_ptr create_publisher_with_profile ( - const char* qos_profile, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); - - virtual ::DDS::Subscriber_ptr create_subscriber ( - const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( - const char* qos_profile, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s); - - virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void); - - virtual ::DDS::Topic_ptr create_topic ( - const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::Topic_ptr create_topic_with_profile ( - const char * impl_name, - const char * type_name, - const char* qos_profile, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic); - - virtual ::DDS::Topic_ptr find_topic ( - const char * impl_name, - const ::DDS::Duration_t & timeout); - - virtual ::DDS::TopicDescription_ptr lookup_topicdescription ( - const char * name); - - virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic ( - const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::ReturnCode_t delete_contentfilteredtopic ( - ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic); - - virtual ::DDS::MultiTopic_ptr create_multitopic ( - const char * name, - const char * type_name, - const char * subscription_expression, - const ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::ReturnCode_t delete_multitopic ( - ::DDS::MultiTopic_ptr a_multitopic); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::ReturnCode_t set_qos ( - const ::DDS::DomainParticipantQos & qos); - - virtual ::DDS::ReturnCode_t get_qos ( - ::DDS::DomainParticipantQos & qos); - - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DomainParticipantListener_ptr get_listener (void); - - virtual ::DDS::ReturnCode_t ignore_participant ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_topic ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_publication ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_subscription ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::DomainId_t get_domain_id (void); - - virtual ::DDS::ReturnCode_t assert_liveliness (void); - - virtual ::DDS::ReturnCode_t set_default_publisher_qos ( - const ::DDS::PublisherQos & qos); - - virtual ::DDS::ReturnCode_t get_default_publisher_qos ( - ::DDS::PublisherQos & qos); - - virtual ::DDS::ReturnCode_t set_default_subscriber_qos ( - const ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t get_default_subscriber_qos ( - ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t set_default_topic_qos ( - const ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_default_topic_qos ( - ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_discovered_participants ( - ::DDS::InstanceHandleSeq & impl_handles); - - virtual ::DDS::ReturnCode_t get_discovered_participant_data ( - ::DDS::ParticipantBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); - - virtual ::DDS::ReturnCode_t get_discovered_topics ( - ::DDS::InstanceHandleSeq & impl_handles); - - virtual ::DDS::ReturnCode_t get_discovered_topic_data ( - ::DDS::TopicBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); - - virtual ::CORBA::Boolean contains_entity ( - DDS_INSTANCE_HANDLE_T_IN a_handle); - - virtual ::DDS::ReturnCode_t get_current_time ( - ::DDS::Time_t & current_time); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - - ::DDSDomainParticipant * get_rti_entity (void); - - void set_rti_entity (::DDSDomainParticipant * dp); - - protected: - ::DDSDomainParticipant *rti_entity_; - ::DDSDomainParticipant * rti_entity (void); - }; - } -} - -#endif /* DOMAINPARTICIPANT_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp deleted file mode 100644 index 9ebe40e3fd6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp +++ /dev/null @@ -1,340 +0,0 @@ -#include "dds4ccm/impl/ndds/DomainParticipantFactory.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/DomainParticipantListener.h" -#include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h" -#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h" -#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DomainParticipantFactory_i::DDS_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::DDS_DomainParticipantFactory_i"); - } - - DDS_DomainParticipantFactory_i::~DDS_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::~DDS_DomainParticipantFactory_i"); - } - - ::DDS::DomainParticipant_ptr - DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::create_participant"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant - " - "Start creating domain participant for domain <%d>\n", - domain_id)); - - DDS_DomainParticipantListener_i *ccm_dds_dpl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dpl, - DDS_DomainParticipantListener_i (a_listener), - ::CORBA::NO_MEMORY ()); - } - - ACE_CString qos_profile = "default"; - - DDS_DomainParticipantQos ccm_dds_qos; - DDS_ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance()->get_default_participant_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::create_participant - " - "Error: Unable to retrieve default participant qos\n")); - return ::DDS::DomainParticipant::_nil (); - } - ccm_dds_qos <<= qos; - DDSDomainParticipant * dds_dp = DDSDomainParticipantFactory::get_instance ()-> - create_participant (domain_id, - ccm_dds_qos, - ccm_dds_dpl, - mask); - - if (!dds_dp) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::create_participant - " - "Error: Unable to create DomainParticipant for domain <%d>\n", - domain_id)); - delete ccm_dds_dpl; - return ::DDS::DomainParticipant::_nil (); - } - - ::DDS::DomainParticipant_var retval; - ACE_NEW_THROW_EX (retval, - DDS_DomainParticipant_i (dds_dp), - ::CORBA::NO_MEMORY ()); - retcode = dds_dp->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::create_participant - " - "Error: Unable to enable the domainparticipant " - "for domain <%d>: <%C>\n", - domain_id, - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_dpl; - throw ::CORBA::INTERNAL (); - } - - if (ccm_dds_dpl) - { - ccm_dds_dpl->set_dds_dp (retval.in ()); - } - - return retval._retn (); - } - - - ::DDS::DomainParticipant_ptr - DDS_DomainParticipantFactory_i::create_participant_with_profile ( - ::DDS::DomainId_t domain_id, - const char * qos_profile, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::" - "create_participant_with_profile"); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Start creating domain participant: " - "profile <%C> - domain <%d>\n", - qos_profile, domain_id)); - DDS_DomainParticipantListener_i *ccm_dds_dpl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dpl, - DDS_DomainParticipantListener_i (a_listener), - ::CORBA::NO_MEMORY ()); - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Creating participant: profile <%C> - domain <%d>\n", - qos_profile, - domain_id)); - - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - DDSDomainParticipant * dds_dp = 0; - if (lib_name != 0 && prof_name != 0) - { - dds_dp = DDSDomainParticipantFactory::get_instance ()-> - create_participant_with_profile (domain_id, - lib_name, - prof_name, - ccm_dds_dpl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - if (!dds_dp) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - " - "Error: Unable to create DomainParticipant for domain <%d>\n", - qos_profile, - domain_id)); - delete ccm_dds_dpl; - return ::DDS::DomainParticipant::_nil (); - } - ::DDS::DomainParticipant_var retval; - ACE_NEW_THROW_EX (retval, - DDS_DomainParticipant_i (dds_dp), - ::CORBA::NO_MEMORY ()); - DDS_ReturnCode_t retcode = dds_dp->enable (); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - " - "Error: Unable to enable DomainParticipant for domain <%d>: <%C>\n", - qos_profile, - domain_id, - ::CIAO::DDS4CCM::translate_retcode (retcode))); - delete ccm_dds_dpl; - throw ::CORBA::INTERNAL (); - } - - if (ccm_dds_dpl) - { - ccm_dds_dpl->set_dds_dp (retval.in ()); - } - DDS_DomainParticipant_i * typed_dp = - dynamic_cast < DDS_DomainParticipant_i *> - (retval.in ()); - - if (typed_dp) - { - typed_dp->set_rti_entity (dds_dp); - } - - return retval._retn (); - } - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::delete_participant ( - ::DDS::DomainParticipant_ptr a_participant) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::delete_participant"); - - DDS_DomainParticipant_i *part = - dynamic_cast< DDS_DomainParticipant_i * > (a_participant); - - if (!part) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::delete_participant - " - "Unable to cast provided object reference to servant " - "type, bailing.\n")); - return DDS::RETCODE_ERROR; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::delete_participant - " - "Successfully casted provided object reference to servant type.\n")); - - const DDS_ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance ()-> - delete_participant (part->get_rti_entity ()); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::delete_participant - " - "delete_participant returned non-ok error code %C\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::delete_participant - " - "Successfully deleted provided participant.\n")); - } - return retcode; - } - - - ::DDS::DomainParticipant_ptr - DDS_DomainParticipantFactory_i::lookup_participant ( - ::DDS::DomainId_t domain_id) - { - ::DDS::DomainParticipant_var retval; - ::DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance () - ->lookup_participant (domain_id); - ACE_NEW_THROW_EX (retval, - DDS_DomainParticipant_i (dp), - ::CORBA::NO_MEMORY ()); - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::set_default_participant_qos ( - const ::DDS::DomainParticipantQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::" - "set_default_participant_qos"); - DDS_DomainParticipantQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = DDSDomainParticipantFactory::get_instance()->get_default_participant_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::set_default_participant_qos - " - "Error: Unable to retrieve default participant qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return DDSDomainParticipantFactory::get_instance ()-> - set_default_participant_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::get_default_participant_qos ( - ::DDS::DomainParticipantQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::" - "get_default_participant_qos"); - DDS_DomainParticipantQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - DDSDomainParticipantFactory::get_instance ()-> - get_default_participant_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::set_qos ( - const ::DDS::DomainParticipantFactoryQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::set_qos"); - DDS_DomainParticipantFactoryQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i" - "::set_qos - " - "Error: Unable to retrieve participant factory qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return DDSDomainParticipantFactory::get_instance ()->set_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::get_qos ( - ::DDS::DomainParticipantFactoryQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::get_qos"); - DDS_DomainParticipantFactoryQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS::ReturnCode_t const retcode = - DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos); - ccm_dds_qos <<= qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( - const char * qos_profile) - { - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - ::DDS::ReturnCode_t retcode = ::DDS::RETCODE_ERROR; - if (lib_name != 0 && prof_name != 0) - { - retcode = DDSDomainParticipantFactory::get_instance ()-> - set_default_participant_qos_with_profile (lib_name, prof_name); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - return retcode; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h deleted file mode 100644 index 2d52267b1e0..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DOMAINPARTICIPANTFACTORY_T_H_ -#define DOMAINPARTICIPANTFACTORY_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DomainParticipantFactory_i : - public virtual ::DDS::DomainParticipantFactory, - public virtual ::CORBA::LocalObject - { - - public: - friend class ACE_Singleton; - - /// Constructor - DDS_DomainParticipantFactory_i (void); - - /// Destructor - virtual ~DDS_DomainParticipantFactory_i (void); - - 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_with_profile ( - ::DDS::DomainId_t domain_id, - const char * qos_profile, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::ReturnCode_t delete_participant ( - ::DDS::DomainParticipant_ptr a_participant); - - virtual ::DDS::DomainParticipant_ptr lookup_participant ( - ::DDS::DomainId_t domain_id); - - virtual - ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); - - virtual - ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos); - - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos); - - virtual - ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); - - virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( - const char * qos_profile); - }; - } -} - -#endif /* DOMAINPARTICIPANTFACTORY_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp deleted file mode 100644 index 15afb558dd5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp +++ /dev/null @@ -1,264 +0,0 @@ -#include "dds4ccm/impl/ndds/DomainParticipantListener.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/ndds/TypeSupport.h" - -#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h" -#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h" - -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/Subscriber.h" -#include "dds4ccm/impl/ndds/Publisher.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_DomainParticipantListener_i::DDS_DomainParticipantListener_i ( - ::DDS::DomainParticipantListener_ptr p) - : impl_ (::DDS::DomainParticipantListener::_duplicate (p)) - { - } - - DDS_DomainParticipantListener_i::~DDS_DomainParticipantListener_i (void) - { - } - - ::DDS::DataReader_ptr - DDS_DomainParticipantListener_i::create_datareader (DDSDataReader * reader) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::create_datareader"); - - ::DDS::Subscriber_var sub; - ACE_NEW_THROW_EX (sub, - DDS_Subscriber_i (reader->get_subscriber (), - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - - ::DDS::DataReader_var dr = DDS_TypeSupport_i::create_datareader ( - reader, - this->dp_.in (), - sub.in ()); - return dr.in (); - } - - ::DDS::DataWriter_ptr - DDS_DomainParticipantListener_i::create_datawriter (DDSDataWriter * writer) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::create_datawriter"); - - ::DDS::Publisher_var pub; - ACE_NEW_THROW_EX (pub, - DDS_Publisher_i (writer->get_publisher (), - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - - ::DDS::DataWriter_var dw = DDS_TypeSupport_i::create_datawriter ( - writer, - this->dp_.in (), - pub.in ()); - return dw.in (); - } - - void - DDS_DomainParticipantListener_i::on_inconsistent_topic ( - ::DDSTopic * tp, - const ::DDS_InconsistentTopicStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_inconsistent_topic"); - - ::DDS::InconsistentTopicStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::Topic_var topic; - ACE_NEW_THROW_EX (topic, - DDS_Topic_i (tp, - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - this->impl_->on_inconsistent_topic (topic.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_requested_deadline_missed ( - ::DDSDataReader * reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_requested_deadline_missed"); - - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_requested_deadline_missed (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_requested_incompatible_qos ( - ::DDSDataReader * reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_requested_incompatible_qos"); - - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_requested_incompatible_qos (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_sample_rejected ( - ::DDSDataReader * reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_sample_rejected"); - - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_sample_rejected (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_liveliness_changed ( - ::DDSDataReader * reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_liveliness_changed"); - - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_liveliness_changed (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_data_available ( - ::DDSDataReader* reader) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_data_available"); - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_data_available (dr.in ()); - } - - void - DDS_DomainParticipantListener_i::on_subscription_matched ( - ::DDSDataReader * reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_subscription_matched"); - - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_subscription_matched (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_sample_lost ( - ::DDSDataReader * reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_sample_lost"); - - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataReader_var dr = this->create_datareader (reader); - this->impl_->on_sample_lost (dr.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_offered_deadline_missed ( - ::DDSDataWriter * writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_offered_deadline_missed"); - - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataWriter_var dw = this->create_datawriter (writer); - this->impl_->on_offered_deadline_missed (dw.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter * writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_offered_incompatible_qos"); - - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataWriter_var dw = this->create_datawriter (writer); - this->impl_->on_offered_incompatible_qos (dw.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_liveliness_lost ( - ::DDSDataWriter * writer, - const ::DDS_LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_liveliness_lost"); - - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataWriter_var dw = this->create_datawriter (writer); - this->impl_->on_liveliness_lost (dw.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_publication_matched ( - ::DDSDataWriter * writer, - const ::DDS_PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_DomainParticipantListener_i::on_publication_matched"); - - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - - ::DDS::DataWriter_var dw = this->create_datawriter (writer); - this->impl_->on_publication_matched (dw.in (), ddsstatus); - } - - void - DDS_DomainParticipantListener_i::on_data_on_readers ( - ::DDSSubscriber* subscriber) - { - ::DDS::Subscriber_var sub; - ACE_NEW_THROW_EX (sub, - DDS_Subscriber_i (subscriber, - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - this->impl_->on_data_on_readers (sub.in ()); - } - - ::DDS::DomainParticipantListener_ptr - DDS_DomainParticipantListener_i::get_domainparticipantlistener (void) - { - return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ()); - } - - void - DDS_DomainParticipantListener_i::set_dds_dp (::DDS::DomainParticipant_ptr dp) - { - this->dp_ = ::DDS::DomainParticipant::_duplicate (dp); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h deleted file mode 100644 index a481dc54a18..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DOMAINPARTICIPANTLISTENER_H_ -#define DOMAINPARTICIPANTLISTENER_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_DomainParticipantListener_i : - public ::DDSDomainParticipantListener - { - public: - /// Constructor - DDS_DomainParticipantListener_i (::DDS::DomainParticipantListener_ptr p); - - /// Destructor - virtual ~DDS_DomainParticipantListener_i (void); - - ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void); - - virtual void - on_inconsistent_topic ( - ::DDSTopic*, - const ::DDS_InconsistentTopicStatus & ); - - virtual void - on_requested_deadline_missed ( - ::DDSDataReader* , - const ::DDS_RequestedDeadlineMissedStatus & ); - - virtual void - on_requested_incompatible_qos ( - ::DDSDataReader* , - const ::DDS_RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDSDataReader*, - const ::DDS_SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDSDataReader* , - const ::DDS_LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDSDataReader* ); - - virtual void - on_subscription_matched ( - ::DDSDataReader* , - const ::DDS_SubscriptionMatchedStatus & ); - - virtual void - on_sample_lost ( - ::DDSDataReader* , - const ::DDS_SampleLostStatus & ); - - virtual void - on_offered_deadline_missed ( - ::DDSDataWriter* , - const ::DDS_OfferedDeadlineMissedStatus & ); - - virtual void - on_offered_incompatible_qos ( - ::DDSDataWriter* , - const ::DDS_OfferedIncompatibleQosStatus & ); - - virtual void - on_liveliness_lost ( - ::DDSDataWriter* , - const ::DDS_LivelinessLostStatus & ); - - virtual void - on_publication_matched ( - ::DDSDataWriter* , - const ::DDS_PublicationMatchedStatus & ); - - virtual void - on_data_on_readers ( - ::DDSSubscriber* ); - - - void set_dds_dp (::DDS::DomainParticipant_ptr dp); - private: - ::DDS::DomainParticipantListener_var impl_; - ::DDS::DomainParticipant_var dp_; - - ::DDS::DataReader_ptr - create_datareader (DDSDataReader * reader); - - ::DDS::DataWriter_ptr - create_datawriter (DDSDataWriter * writer); - - }; - } -} - -#endif /* DOMAINPARTICIPANTLISTENER_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp deleted file mode 100644 index a0a3951145b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp +++ /dev/null @@ -1,471 +0,0 @@ -#include "dds4ccm/impl/ndds/Publisher.h" -#include "dds4ccm/impl/ndds/PublisherListener.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/DataWriter_T.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/ndds/DataWriterListener.h" -#include "dds4ccm/impl/ndds/TypeSupport.h" -#include "dds4ccm/impl/ndds/Utils.h" - -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" -#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h" -#include "dds4ccm/impl/ndds/convertors/PublisherQos.h" -#include "dds4ccm/impl/ndds/convertors/TopicQos.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_Publisher_i::DDS_Publisher_i (::DDSPublisher * p, - ::DDS::DomainParticipant_ptr dp) - : rti_entity_ (p), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - DDS4CCM_TRACE ("DDS_Publisher_i::DDS_Publisher_i"); - } - - DDS_Publisher_i::~DDS_Publisher_i (void) - { - DDS4CCM_TRACE ("DDS_Publisher_i::~DDS_Publisher_i"); - } - - ::DDS::DataWriter_ptr - DDS_Publisher_i::create_datawriter ( - ::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos &qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Publisher_i::create_datawriter"); - - DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter - " - "Error: Unable to cast provided topic to its servant.\n")); - return ::DDS::DataWriter::_nil (); - } - - DDS_DataWriterListener_i *ccm_dds_dwl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dwl, - DDS_DataWriterListener_i (a_listener, 0), - ::CORBA::NO_MEMORY ()); - } - DDS_DataWriterQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i" - "::create_datawriter - " - "Error: Unable to retrieve default datawriter qos\n")); - return ::DDS::DataWriter::_nil (); - } - ccm_dds_qos <<= qos; - DDSDataWriter *ccm_dds_dw = this->rti_entity ()->create_datawriter ( - topic->get_rti_entity (), - ccm_dds_qos, - ccm_dds_dwl, - mask); - - if (!ccm_dds_dw) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter - " - "Error: RTI Topic returned a nil datawriter.\n")); - delete ccm_dds_dwl; - return ::DDS::DataWriter::_nil (); - } - - ::DDS::DataWriter_var retval = DDS_TypeSupport_i::create_datawriter (ccm_dds_dw, - this->dp_.in (), - this); - if (ccm_dds_dwl) - { - ccm_dds_dwl->set_dds_entity (retval.in ()); - } - return retval._retn (); - } - - - ::DDS::DataWriter_ptr - DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* qos_profile, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Publisher_i::create_datawriter_with_profile"); - - DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile <%C>- " - "Error: Unable to cast provided topic to its servant.\n", - qos_profile)); - return ::DDS::DataWriter::_nil (); - } - - DDS_DataWriterListener_i *ccm_dds_dwl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dwl, - DDS_DataWriterListener_i (a_listener, 0), - ::CORBA::NO_MEMORY ()); - } - - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - DDSDataWriter *ccm_dds_dw = 0; - - if (lib_name != 0 && prof_name != 0) - { - ccm_dds_dw = this->rti_entity ()->create_datawriter_with_profile ( - topic->get_rti_entity (), - lib_name, - prof_name, - ccm_dds_dwl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - if (!ccm_dds_dw) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile <%C> - " - "Error: RTI Topic returned a nil datawriter.\n", - qos_profile)); - delete ccm_dds_dwl; - return ::DDS::DataWriter::_nil (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile - " - "Successfully created datawriter with profile <%C>.\n", - qos_profile)); - } - - ::DDS::DataWriter_var retval = - DDS_TypeSupport_i::create_datawriter (ccm_dds_dw, - this->dp_.in (), - this); - if (ccm_dds_dwl) - { - ccm_dds_dwl->set_dds_entity (retval.in ()); - } - return retval._retn (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter) - { - DDS4CCM_TRACE ("DDS_Publisher_i::delete_datawriter"); - - DDS_DataWriter_Base *dw = dynamic_cast< DDS_DataWriter_Base * > (a_datawriter); - - if (!dw) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::delete_datawriter - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_Publisher_i::delete_datawriter - " - "Successfully casted provided object reference to servant.\n")); - - DDSDataWriter* rti_dw = dw->get_rti_entity (); - dw->set_rti_entity (0); - DDS_ReturnCode_t const retval = - this->rti_entity ()->delete_datawriter (rti_dw); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::delete_datawriter - " - "Error: RTI delete_datawriter returned non-ok error code %C\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_Publisher_i::delete_datawriter - " - "Provided datawriter successfully deleted\n")); - } - - return retval; - } - - - ::DDS::DataWriter_ptr - DDS_Publisher_i::lookup_datawriter (const char * impl_name) - { - DDSDataWriter* dw = this->rti_entity ()->lookup_datawriter (impl_name); - ::DDS::DataWriter_var retval = - DDS_TypeSupport_i::create_datawriter (dw, - this->dp_.in (), - this); - return retval._retn (); - } - - ::DDS::ReturnCode_t - DDS_Publisher_i::delete_contained_entities (void) - { - return this->rti_entity ()->delete_contained_entities (); - } - - ::DDS::ReturnCode_t - DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & qos) - { - DDS4CCM_TRACE ("DDS_Publisher_i::set_qos"); - ::DDS_PublisherQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i" - "::set_qos - " - "Error: Unable to retrieve publisher qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::get_qos (::DDS::PublisherQos & qos) - { - DDS4CCM_TRACE ("DDS_Publisher_i::get_qos"); - ::DDS_PublisherQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::set_listener ( - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Publisher_i::set_listener"); - - // Retrieve the previously set listener - DDSPublisherListener *old_listener = this->rti_entity ()->get_listener (); - - DDSPublisherListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_PublisherListener_i ( - a_listener, - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - delete old_listener; - } - - return retcode; - } - - - ::DDS::PublisherListener_ptr - DDS_Publisher_i::get_listener (void) - { - DDS4CCM_TRACE ("DDS_Publisher_i::get_listener"); - - DDSPublisherListener *ccm_dds_pub_list = this->rti_entity ()->get_listener (); - DDS_PublisherListener_i * list_proxy = - dynamic_cast (ccm_dds_pub_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Publisher_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::PublisherListener::_nil (); - } - return list_proxy->get_publisher_listener (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::suspend_publications (void) - { - return this->rti_entity ()->suspend_publications (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::resume_publications (void) - { - return this->rti_entity ()->resume_publications (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::begin_coherent_changes (void) - { - return this->rti_entity ()->begin_coherent_changes (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::end_coherent_changes (void) - { - return this->rti_entity ()->end_coherent_changes (); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::wait_for_acknowledgments ( - const ::DDS::Duration_t & max_wait) - { - DDS_Duration_t ccm_dds_dds_duration; - ccm_dds_dds_duration <<= max_wait; - return this->rti_entity ()->wait_for_acknowledgments (ccm_dds_dds_duration); - } - - - ::DDS::DomainParticipant_ptr - DDS_Publisher_i::get_participant (void) - { - DDS4CCM_TRACE ("DDS_Publisher_i::get_participant"); - return ::DDS::DomainParticipant::_duplicate (this->dp_.in ()); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("DDS_Publisher_i::set_default_datawriter_qos"); - ::DDS_DataWriterQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i" - "::set_default_datawriter - " - "Error: Unable to retrieve default datawriter qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_default_datawriter_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("DDS_Publisher_i::get_default_datawriter_qos"); - ::DDS_DataWriterQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, - const ::DDS::TopicQos & a_impl_qos) - { - DDS4CCM_TRACE ("DDS_Publisher_i::copy_from_topic_qos"); - ::DDS_DataWriterQos ccm_dds_qos; - ::DDS_TopicQos ccm_dds_topic_qos; - - ccm_dds_qos <<= a_dataimpl_qos; - ccm_dds_topic_qos <<= a_impl_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->copy_from_topic_qos (ccm_dds_qos, ccm_dds_topic_qos); - a_dataimpl_qos <<= ccm_dds_qos; - return retcode; - } - - ::DDS::ReturnCode_t - DDS_Publisher_i::enable (void) - { - return this->rti_entity ()->enable (); - } - - ::DDS::StatusCondition_ptr - DDS_Publisher_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval; - DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - ::DDS::StatusMask - DDS_Publisher_i::get_status_changes (void) - { - return this->rti_entity ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - DDS_Publisher_i::get_instance_handle (void) - { - ::DDS_InstanceHandle_t const rtihandle = this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - DDSPublisher * - DDS_Publisher_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_Publisher_i::set_rti_entity (DDSPublisher * pub) - { - this->rti_entity_ = pub; - } - - DDSPublisher * - DDS_Publisher_i::rti_entity (void) - { - if (!this->rti_entity_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h deleted file mode 100644 index 17684167e26..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h +++ /dev/null @@ -1,120 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef PUBLISHER_T_H_ -#define PUBLISHER_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSPublisher; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_Publisher_i : - public virtual ::DDS::Publisher, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_Publisher_i (DDSPublisher * p, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_Publisher_i (void); - - virtual - ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos & qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DataWriter_ptr create_datawriter_with_profile ( - ::DDS::Topic_ptr a_topic, - const char* qos_profile, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter); - - virtual - ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name); - - virtual - ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos); - - virtual - ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos); - - virtual - ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::PublisherListener_ptr get_listener (void); - - virtual - ::DDS::ReturnCode_t suspend_publications (void); - - virtual - ::DDS::ReturnCode_t resume_publications (void); - - virtual - ::DDS::ReturnCode_t begin_coherent_changes (void); - - virtual - ::DDS::ReturnCode_t end_coherent_changes (void); - - virtual - ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); - - virtual - ::DDS::DomainParticipant_ptr get_participant (void); - - virtual - ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, - const ::DDS::TopicQos & a_impl_qos); - - virtual - ::DDS::ReturnCode_t enable (void); - - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual - ::DDS::StatusMask get_status_changes (void); - - virtual - ::DDS::InstanceHandle_t get_instance_handle (void); - - DDSPublisher * get_rti_entity (void); - - void set_rti_entity (::DDSPublisher * sub); - - private: - DDSPublisher *rti_entity_; - ::DDS::DomainParticipant_var dp_; - - DDSPublisher *rti_entity (void); - }; - } -} - -#endif /* PUBLISHER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp deleted file mode 100644 index 94b867fbb07..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include "dds4ccm/impl/ndds/PublisherListener.h" -#include "dds4ccm/impl/ndds/Publisher.h" -#include "dds4ccm/impl/ndds/DataWriter_T.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/TypeSupport.h" - -#include "dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h" -#include "dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h" -#include "dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_PublisherListener_i::DDS_PublisherListener_i ( - ::DDS::PublisherListener_ptr p, - ::DDS::DomainParticipant_ptr dp) - : impl_ (::DDS::PublisherListener::_duplicate (p)), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::DDS_PublisherListener_i"); - } - - DDS_PublisherListener_i::~DDS_PublisherListener_i (void) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::~DDS_PublisherListener_i"); - } - - void - DDS_PublisherListener_i::on_offered_deadline_missed ( - ::DDSDataWriter* the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_offered_deadline_missed"); - - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ::DDS::DataWriter_var proxy = - DDS_TypeSupport_i::create_datawriter (the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_offered_deadline_missed (proxy.in (), ddsstatus); - } - - void - DDS_PublisherListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter* the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_offered_incompatible_qos"); - - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter ( - the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_offered_incompatible_qos (proxy.in (), ddsstatus); - } - - void - DDS_PublisherListener_i::on_liveliness_lost ( - ::DDSDataWriter* the_writer, - const ::DDS_LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_liveliness_lost"); - - ::DDS::LivelinessLostStatus ddsstatus; - ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter ( - the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_liveliness_lost (proxy.in (), ddsstatus); - } - - void - DDS_PublisherListener_i::on_publication_matched ( - ::DDSDataWriter* the_writer, - const ::DDS_PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_publication_matched"); - - ::DDS::PublicationMatchedStatus ddsstatus; - ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter ( - the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_publication_matched (proxy.in (), ddsstatus); - } - - void - DDS_PublisherListener_i::on_reliable_reader_activity_changed ( - ::DDSDataWriter *the_writer, - const ::DDS_ReliableReaderActivityChangedStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_reliable_reader_activity_changed"); - - ::DDS::ReliableReaderActivityChangedStatus ddsstatus; - ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter ( - the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_reliable_reader_activity_changed (proxy.in (), ddsstatus); - } - - void - DDS_PublisherListener_i::on_reliable_writer_cache_changed ( - ::DDSDataWriter* the_writer, - const ::DDS_ReliableWriterCacheChangedStatus & status) - { - DDS4CCM_TRACE ("DDS_PublisherListener_i::on_reliable_writer_cache_changed"); - - ::DDS::ReliableWriterCacheChangedStatus ddsstatus; - ::DDS::DataWriter_var proxy = DDS_TypeSupport_i::create_datawriter ( - the_writer, - this->dp_.in (), - ::DDS::Publisher::_nil ()); - ddsstatus <<= status; - this->impl_->on_reliable_writer_cache_changed (proxy.in (), ddsstatus); - } - - ::DDS::PublisherListener_ptr - DDS_PublisherListener_i::get_publisher_listener (void) - { - return ::DDS::PublisherListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h deleted file mode 100644 index c0ea9458030..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDSPUBLISHERLISTENER_T_H_ -#define DDSPUBLISHERLISTENER_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_PublisherListener_i : - public ::DDSPublisherListener - { - public: - /// Constructor - DDS_PublisherListener_i ( - ::DDS::PublisherListener_ptr p, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_PublisherListener_i (void); - - virtual void - on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status); - - virtual void - on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status); - - virtual void - on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status); - - virtual void - on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status); - - virtual void - on_reliable_reader_activity_changed ( - ::DDSDataWriter *the_writer, - const ::DDS_ReliableReaderActivityChangedStatus & status); - - virtual void - on_reliable_writer_cache_changed ( - ::DDSDataWriter *the_writer, - const ::DDS_ReliableWriterCacheChangedStatus & status); - - ::DDS::PublisherListener_ptr get_publisher_listener (void); - private: - ::DDS::PublisherListener_var impl_; - ::DDS::DomainParticipant_var dp_; - }; - } -} - -#endif /* DDSPUBLISHERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp deleted file mode 100644 index 8fcb74d4d95..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include "dds4ccm/impl/ndds/QueryCondition.h" -#include "dds4ccm/impl/ndds/convertors/StringSeq.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_QueryCondition_i::DDS_QueryCondition_i ( - ::DDSQueryCondition * qc, - ::DDS::DataReader_ptr dr) - : rti_entity_ (qc), - dr_ (::DDS::DataReader::_duplicate (dr)) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::DDS_QueryCondition_i"); - } - - DDS_QueryCondition_i::~DDS_QueryCondition_i (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::~DDS_QueryCondition_i"); - } - - ::CORBA::Boolean - DDS_QueryCondition_i::get_trigger_value (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_trigger_value"); - - return this->rti_entity ()->get_trigger_value (); - } - - ::DDS::SampleStateMask - DDS_QueryCondition_i::get_sample_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_sample_state_mask"); - - return this->rti_entity ()->get_sample_state_mask (); - } - - ::DDS::ViewStateMask - DDS_QueryCondition_i::get_view_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_view_state_mask"); - - return this->rti_entity ()->get_view_state_mask (); - } - - ::DDS::InstanceStateMask - DDS_QueryCondition_i::get_instance_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_instance_state_mask"); - - return this->rti_entity ()->get_instance_state_mask (); - } - - ::DDS::DataReader_ptr - DDS_QueryCondition_i::get_datareader (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_datareader"); - - return ::DDS::DataReader::_duplicate (this->dr_.in ()); - } - - char * - DDS_QueryCondition_i::get_query_expression (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_query_expression"); - - return ::CORBA::string_dup (this->rti_entity ()->get_query_expression ()); - } - - ::DDS::ReturnCode_t - DDS_QueryCondition_i::get_query_parameters ( - ::DDS::StringSeq & query_parameters) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::get_query_parameters"); - - DDS_StringSeq parameters; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_query_parameters (parameters); - query_parameters <<= parameters; - return retval; - } - - ::DDS::ReturnCode_t - DDS_QueryCondition_i::set_query_parameters ( - const ::DDS::StringSeq & query_parameters) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_QueryCondition_i::set_query_parameters"); - - DDS_StringSeq parameters; - parameters <<= query_parameters; - - return this->rti_entity ()->set_query_parameters (parameters); - } - - DDSQueryCondition * - DDS_QueryCondition_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_QueryCondition_i::set_rti_entity (DDSQueryCondition *entity) - { - this->rti_entity_ = entity; - } - - DDSQueryCondition * - DDS_QueryCondition_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_QueryCondition_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h deleted file mode 100644 index 046069c13b4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef QUERYCONDITION_T_H_ -#define QUERYCONDITION_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSQueryCondition; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_QueryCondition_i : - public virtual ::DDS::QueryCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_QueryCondition_i (::DDSQueryCondition * qc, - ::DDS::DataReader_ptr dr); - - /// Destructor - virtual ~DDS_QueryCondition_i (void); - - virtual ::CORBA::Boolean get_trigger_value (void); - - virtual ::DDS::SampleStateMask get_sample_state_mask (void); - - virtual ::DDS::ViewStateMask get_view_state_mask (void); - - virtual ::DDS::InstanceStateMask get_instance_state_mask (void); - - virtual ::DDS::DataReader_ptr get_datareader (void); - - virtual char *get_query_expression (void); - - virtual ::DDS::ReturnCode_t - get_query_parameters (::DDS::StringSeq & query_parameters); - - virtual ::DDS::ReturnCode_t - set_query_parameters (const ::DDS::StringSeq & query_parameters); - - ::DDSQueryCondition * get_rti_entity (void); - - void set_rti_entity (::DDSQueryCondition *entity); - - private: - ::DDSQueryCondition * rti_entity_; - ::DDS::DataReader_var dr_; - - ::DDSQueryCondition * rti_entity (); - }; - } -} - -#endif /* QUERYCONDITION_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp deleted file mode 100644 index 8f949b17d6e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "dds4ccm/impl/ndds/ReadCondition.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_ReadCondition_i::DDS_ReadCondition_i ( - ::DDSReadCondition * rc, - ::DDS::DataReader_ptr dr) - : rti_entity_ (rc), - dr_ (::DDS::DataReader::_duplicate (dr)) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::DDS_ReadCondition_i"); - } - - DDS_ReadCondition_i::~DDS_ReadCondition_i (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::~DDS_ReadCondition_i"); - } - - ::CORBA::Boolean - DDS_ReadCondition_i::get_trigger_value (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_trigger_value"); - - return this->rti_entity ()->get_trigger_value (); - } - - ::DDS::SampleStateMask - DDS_ReadCondition_i::get_sample_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_sample_state_mask"); - - return this->rti_entity ()->get_sample_state_mask (); - } - - ::DDS::ViewStateMask - DDS_ReadCondition_i::get_view_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_view_state_mask"); - - return this->rti_entity ()->get_view_state_mask (); - } - - ::DDS::InstanceStateMask - DDS_ReadCondition_i::get_instance_state_mask (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_instance_state_mask"); - - return this->rti_entity ()->get_instance_state_mask (); - } - - ::DDS::DataReader_ptr - DDS_ReadCondition_i::get_datareader (void) - { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_ReadCondition_i::get_datareader"); - - return ::DDS::DataReader::_duplicate (this->dr_.in ()); - } - - DDSReadCondition * - DDS_ReadCondition_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_ReadCondition_i::set_rti_entity (DDSReadCondition *entity) - { - this->rti_entity_ = entity; - } - - DDSReadCondition * - DDS_ReadCondition_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_ReadCondition_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h deleted file mode 100644 index 3446e6c9c67..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef READCONDITION_T_H_ -#define READCONDITION_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSReadCondition; -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_ReadCondition_i : - public virtual ::DDS::ReadCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_ReadCondition_i (::DDSReadCondition * rc, - ::DDS::DataReader_ptr dr); - - /// Destructor - virtual ~DDS_ReadCondition_i (void); - - virtual ::CORBA::Boolean get_trigger_value (void); - - virtual ::DDS::SampleStateMask get_sample_state_mask (void); - - virtual ::DDS::ViewStateMask get_view_state_mask (void); - - virtual ::DDS::InstanceStateMask get_instance_state_mask (void); - - virtual ::DDS::DataReader_ptr get_datareader (void); - - ::DDSReadCondition * get_rti_entity (void); - - void set_rti_entity (::DDSReadCondition* entity); - - private: - ::DDSReadCondition *rti_entity_; - ::DDS::DataReader_var dr_; - - ::DDSReadCondition * rti_entity (void); - }; - } -} - -#endif /* READCONDITION_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp deleted file mode 100644 index 80c0865e472..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_StatusCondition_i::DDS_StatusCondition_i ( - ::DDSStatusCondition * sc, - ::DDS::Entity_ptr entity) : - rti_entity_ (sc), - entity_ (::DDS::Entity::_duplicate (entity)) - { - } - - DDS_StatusCondition_i::~DDS_StatusCondition_i (void) - { - } - - ::CORBA::Boolean - DDS_StatusCondition_i::get_trigger_value (void) - { - return this->rti_entity ()->get_trigger_value (); - } - - ::DDS::StatusMask - DDS_StatusCondition_i::get_enabled_statuses (void) - { - return this->rti_entity ()->get_enabled_statuses (); - } - - ::DDS::ReturnCode_t - DDS_StatusCondition_i::set_enabled_statuses ( - ::DDS::StatusMask mask) - { - return this->rti_entity ()->set_enabled_statuses (mask); - } - - ::DDS::Entity_ptr - DDS_StatusCondition_i::get_entity (void) - { - return ::DDS::Entity::_duplicate (this->entity_.in ()); - } - - ::DDSStatusCondition * - DDS_StatusCondition_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_StatusCondition_i::set_rti_entity (::DDSStatusCondition * status_condition) - { - this->rti_entity_ = status_condition; - } - - ::DDSStatusCondition * - DDS_StatusCondition_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_StatusCondition_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h deleted file mode 100644 index 360a0984670..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h +++ /dev/null @@ -1,53 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_STATUSCONDITION_H -#define DDS4CCM_STATUSCONDITION_H - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSStatusCondition; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_StatusCondition_i : - public virtual ::DDS::StatusCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_StatusCondition_i (::DDSStatusCondition *sc, - ::DDS::Entity_ptr entity); - - /// Destructor - virtual ~DDS_StatusCondition_i (void); - - virtual ::CORBA::Boolean get_trigger_value (void); - - virtual ::DDS::StatusMask get_enabled_statuses (void); - - virtual ::DDS::ReturnCode_t set_enabled_statuses (::DDS::StatusMask mask); - - virtual ::DDS::Entity_ptr get_entity (void); - - ::DDSStatusCondition * get_rti_entity (void); - - void set_rti_entity (::DDSStatusCondition * status_condition); - - private: - ::DDSStatusCondition * rti_entity_; - ::DDS::Entity_var entity_; - ::DDSStatusCondition * rti_entity (void); - }; - } -} - -#endif /* DDS4CCM_STATUSCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp deleted file mode 100644 index 8f9f859f162..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ /dev/null @@ -1,617 +0,0 @@ -#include "dds4ccm/impl/ndds/Subscriber.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/ContentFilteredTopic.h" -#include "dds4ccm/impl/ndds/DataReader_T.h" -#include "dds4ccm/impl/ndds/DataReaderListener.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/TypeSupport.h" -#include "dds4ccm/impl/ndds/Utils.h" - -#include "dds4ccm/impl/ndds/SubscriberListener.h" - -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h" -#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h" -#include "dds4ccm/impl/ndds/convertors/TopicQos.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_Subscriber_i::DDS_Subscriber_i (::DDSSubscriber * sub, - ::DDS::DomainParticipant_ptr dp) - : rti_entity_ (sub), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::DDS_Subscriber_i"); - } - - DDS_Subscriber_i::~DDS_Subscriber_i (void) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::~DDS_Subscriber_i"); - } - - ::DDS::ReturnCode_t - DDS_Subscriber_i::enable (void) - { - return this->rti_entity ()->enable (); - } - - ::DDS::StatusCondition_ptr - DDS_Subscriber_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval; - ::DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - ::DDS::StatusMask - DDS_Subscriber_i::get_status_changes (void) - { - return this->rti_entity ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - DDS_Subscriber_i::get_instance_handle (void) - { - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - DDSDataReader * - DDS_Subscriber_i::create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos) - { - DDS_DataReaderQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i" - "::create_datareader - " - "Error: Unable to retrieve default datareader qos\n")); - return 0; - } - - ccm_dds_qos <<= qos; - return this->rti_entity ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, - mask); - } - - DDSDataReader * - DDS_Subscriber_i::create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos) - { - DDS_DataReaderQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i" - "::create_datareader - " - "Error: Unable to retrieve default datareader qos\n")); - return 0; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, - mask); - } - - DDSDataReader * - DDS_Subscriber_i::create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char * qos_profile, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask) - { - char * lib_name = get_library_name(qos_profile); - char * prof_name = get_profile_name(qos_profile); - - DDSDataReader * dr = 0; - - if (lib_name != 0 && prof_name != 0) - { - dr = this->rti_entity ()->create_datareader_with_profile ( - topic, - lib_name, - prof_name, - ccm_dds_drl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - - return dr; - } - - DDSDataReader * - DDS_Subscriber_i::create_datareader_with_profile ( - DDSTopic * topic, - const char * qos_profile, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask) - { - char * lib_name = get_library_name (qos_profile); - char * prof_name = get_profile_name (qos_profile); - - DDSDataReader * dr = 0; - - if (lib_name != 0 && prof_name != 0) - { - dr = this->rti_entity ()->create_datareader_with_profile (topic, - lib_name, - prof_name, - ccm_dds_drl, - mask); - } - - ACE_OS::free (lib_name); - ACE_OS::free (prof_name); - return dr; - } - - ::DDS::DataReader_ptr - DDS_Subscriber_i::create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & qos, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::create_datareader"); - DDS_DataReaderListener_i *ccm_dds_drl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - DDS_DataReaderListener_i (a_listener, - ::DDS::DataReader::_nil ()), - ::CORBA::NO_MEMORY ()); - } - - DDSDataReader * ccm_dds_dr = 0; - DDS_Topic_i* topic = dynamic_cast < DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS_ContentFilteredTopic_i * cf_topic = - dynamic_cast < DDS_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader - Error: Unable to " - "cast provided topic to one of its servant.\n")); - delete ccm_dds_drl; - return ::DDS::DataReader::_nil (); - } - else - ccm_dds_dr = this->create_datareader (cf_topic->get_rti_entity (), - ccm_dds_drl, - mask, - qos); - } - else - ccm_dds_dr = this->create_datareader (topic->get_rti_entity (), - ccm_dds_drl, - mask, - qos); - - if (!ccm_dds_dr) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_Subscriber_i" - "::create_datareader - " - "Error: RTI Topic returned a nil datareader.\n")); - delete ccm_dds_drl; - return ::DDS::DataReader::_nil (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader - " - "Successfully created datareader.\n")); - } - - ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader ( - ccm_dds_dr, - this->dp_.in (), - this); - if (ccm_dds_drl) - { - ccm_dds_drl->set_dds_entity (reader.in ()); - } - return reader._retn (); - } - - - ::DDS::DataReader_ptr - DDS_Subscriber_i::create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char * qos_profile, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::create_datareader_with_profile"); - DDS_DataReaderListener_i *ccm_dds_drl = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - DDS_DataReaderListener_i (a_listener, ::DDS::DataReader::_nil ()), - ::CORBA::NO_MEMORY ()); - } - - DDSDataReader * ccm_dds_dr = 0; - DDS_Topic_i * topic = dynamic_cast < DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS_ContentFilteredTopic_i * cf_topic = - dynamic_cast < DDS_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile <%C> - " - "Error: Unable to cast provided topic to one " - "of its servant.\n", - qos_profile)); - delete ccm_dds_drl; - return ::DDS::DataReader::_nil (); - } - else - { - ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_rti_entity (), - qos_profile, - ccm_dds_drl, - mask); - } - } - else - { - ccm_dds_dr = this->create_datareader_with_profile (topic->get_rti_entity (), - qos_profile, - ccm_dds_drl, - mask); - } - - if (!ccm_dds_dr) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile <%C>- " - "Error: RTI Topic returned a nil datareader.\n", - qos_profile)); - delete ccm_dds_drl; - return ::DDS::DataReader::_nil (); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader with profile <%C>.\n", - qos_profile)); - } - - ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader (ccm_dds_dr, - this->dp_.in (), - this); - if (ccm_dds_drl) - { - ccm_dds_drl->set_dds_entity (reader.in ()); - } - return reader._retn (); - } - - ::DDS::ReturnCode_t - DDS_Subscriber_i::delete_datareader ( - ::DDS::DataReader_ptr a_datareader) - { - DDS_DataReader_Base *dr = dynamic_cast< DDS_DataReader_Base *> (a_datareader); - if (!dr) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::delete_datareader - Unable to cast " - "provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, DDS4CCM_INFO - "DDS_Subscriber_i::delete_datareader - " - "Successfully casted provided object reference " - "to servant.\n")); - - DDSDataReader* rti_dr = dr->get_rti_entity (); - dr->set_rti_entity (0, ::DDS::DomainParticipant::_nil ()); - DDS_ReturnCode_t const retval = - this->rti_entity ()->delete_datareader (rti_dr); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::delete_datareader - " - "Error: Returned non-ok error code %C\n", - ::CIAO::DDS4CCM::translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_Subscriber_i::delete_datareader - " - "Datareader successfully deleted\n")); - } - - return retval; - } - - ::DDS::ReturnCode_t - DDS_Subscriber_i::delete_contained_entities (void) - { - return this->rti_entity ()->delete_contained_entities (); - } - - ::DDS::DataReader_ptr - DDS_Subscriber_i::lookup_datareader ( - const char * impl_name) - { - ::DDS::DataReader_var retval; - DDSDataReader* dr = this->rti_entity ()->lookup_datareader (impl_name); - if (dr) - { - retval = DDS_TypeSupport_i::create_datareader (dr, - this->dp_.in (), - this); - } - return retval._retn(); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::get_datareaders ( - ::DDS::DataReaderSeq & readers, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::get_datareaders"); - ::DDSDataReaderSeq dds_readers; - - ::DDS_ReturnCode_t retcode = - this->rti_entity ()->get_datareaders (dds_readers, - sample_states, - view_states, - instance_states); - if (retcode == DDS_RETCODE_OK) - { - readers.length (dds_readers.length ()); - for (::DDS_Long i = 0; i < dds_readers.length (); ++i) - { - ::DDS::DataReader_var rdr = DDS_TypeSupport_i::create_datareader ( - dds_readers[i], - this->dp_.in (), - this); - readers [i] = rdr._retn (); - } - } - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::notify_datareaders (void) - { - return this->rti_entity ()->notify_datareaders (); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::set_qos ( - const ::DDS::SubscriberQos & qos) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::set_qos"); - ::DDS_SubscriberQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i" - "::set_qos - " - "Error: Unable to retrieve subscriber qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->get_qos (ccm_dds_qos); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::get_qos ( - ::DDS::SubscriberQos & qos) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::get_qos"); - ::DDS_SubscriberQos ccm_dds_qos; - ccm_dds_qos <<= qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::set_listener"); - - // Retrieve the previously set listener - DDSSubscriberListener *old_listener = this->rti_entity ()->get_listener (); - - DDSSubscriberListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_SubscriberListener_i ( - a_listener, - this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - delete old_listener; - } - - return retcode; - } - - - ::DDS::SubscriberListener_ptr - DDS_Subscriber_i::get_listener (void) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::get_listener"); - - DDSSubscriberListener *ccm_dds_impl_list = this->rti_entity ()->get_listener (); - DDS_SubscriberListener_i *list_proxy = - dynamic_cast (ccm_dds_impl_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Subscriber_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::SubscriberListener::_nil (); - } - return list_proxy->get_subscriber_listener (); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::begin_access (void) - { - return this->rti_entity ()->begin_access (); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::end_access (void) - { - return this->rti_entity ()->end_access (); - } - - - ::DDS::DomainParticipant_ptr - DDS_Subscriber_i::get_participant (void) - { - return DDS::DomainParticipant::_duplicate (this->dp_.in ()); - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::set_default_datareader_qos ( - const ::DDS::DataReaderQos & qos) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::set_default_datareader_qos"); - ::DDS_DataReaderQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i" - "::set_default_datareader_qos - " - "Error: Unable to retrieve default datareader qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->set_default_datareader_qos (ccm_dds_qos); - } - - ::DDS::ReturnCode_t - DDS_Subscriber_i::get_default_datareader_qos ( - ::DDS::DataReaderQos & qos) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::get_default_datareader_qos"); - ::DDS_DataReaderQos ccm_dds_qos; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; - } - - - ::DDS::ReturnCode_t - DDS_Subscriber_i::copy_from_topic_qos ( - ::DDS::DataReaderQos & a_datareader_qos, - const ::DDS::TopicQos & a_impl_qos) - { - DDS4CCM_TRACE ("DDS_Subscriber_i::copy_from_topic_qos"); - ::DDS_DataReaderQos ccm_dds_qos; - ::DDS_TopicQos ccm_dds_topic_qos; - DDS_ReturnCode_t retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i" - "::copy_from_topic_qos - " - "Error: Unable to retrieve default datareader qos\n")); - return retcode; - } - - ccm_dds_qos <<= a_datareader_qos; - ccm_dds_topic_qos <<= a_impl_qos; - retcode = - this->rti_entity ()->copy_from_topic_qos (ccm_dds_qos, - ccm_dds_topic_qos); - a_datareader_qos <<= ccm_dds_qos; - return retcode; - } - - DDSSubscriber * - DDS_Subscriber_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_Subscriber_i::set_rti_entity (DDSSubscriber * sub) - { - this->rti_entity_ = sub; - } - - DDSSubscriber * - DDS_Subscriber_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_Subscriber_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h deleted file mode 100644 index 2bbe6fda2b2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h +++ /dev/null @@ -1,141 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef SUBSCRIBER_T_H_ -#define SUBSCRIBER_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/DataReader_T.h" -#include "tao/LocalObject.h" - -class DDSSubscriber; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_Subscriber_i : - public virtual ::DDS::Subscriber, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_Subscriber_i (::DDSSubscriber * sub, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_Subscriber_i (void); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual ::DDS::InstanceHandle_t get_instance_handle (void); - - virtual ::DDS::DataReader_ptr create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & qos, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DataReader_ptr - create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char * qos_profile, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::ReturnCode_t - delete_datareader (::DDS::DataReader_ptr a_datareader); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::DataReader_ptr lookup_datareader (const char * impl_name); - - virtual ::DDS::ReturnCode_t - get_datareaders ( - ::DDS::DataReaderSeq & readers, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t notify_datareaders (void); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t - set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::SubscriberListener_ptr get_listener (void); - - virtual ::DDS::ReturnCode_t begin_access (void); - - virtual ::DDS::ReturnCode_t end_access (void); - - virtual ::DDS::DomainParticipant_ptr get_participant (void); - - virtual ::DDS::ReturnCode_t - set_default_datareader_qos ( - const ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - get_default_datareader_qos ( - ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - copy_from_topic_qos ( - ::DDS::DataReaderQos & a_datareader_qos, - const ::DDS::TopicQos & a_impl_qos); - - ::DDSSubscriber * get_rti_entity (void); - - void set_rti_entity (::DDSSubscriber * sub); - - private: - DDSSubscriber *rti_entity_; - ::DDS::DomainParticipant_var dp_; - - DDSSubscriber *rti_entity (void); - - DDSDataReader * - create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos); - - DDSDataReader * - create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos); - - DDSDataReader * - create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char * qos_profile, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask); - - DDSDataReader * - create_datareader_with_profile ( - DDSTopic * topic, - const char * qos_profile, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask); - }; - } -} - -#endif /* SUBSCRIBER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp deleted file mode 100644 index e34424b37ec..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "dds4ccm/impl/ndds/SubscriberListener.h" -#include "dds4ccm/impl/ndds/Subscriber.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/TypeSupport.h" - -#include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" -#include "dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h" -#include "dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h" -#include "dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_SubscriberListener_i::DDS_SubscriberListener_i ( - ::DDS::SubscriberListener_ptr p, - ::DDS::DomainParticipant_ptr dp) - : impl_ ( ::DDS::SubscriberListener::_duplicate (p)) - , dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::DDS_SubscriberListener_i"); - } - - DDS_SubscriberListener_i::~DDS_SubscriberListener_i (void) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::~DDS_SubscriberListener_i"); - } - - void - DDS_SubscriberListener_i::on_data_on_readers ( - ::DDSSubscriber* the_subscriber) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_data_on_readers"); - - ::DDS::Subscriber_var sub; - ACE_NEW (sub, - DDS_Subscriber_i (the_subscriber, dp_.in ())); - this->impl_->on_data_on_readers (sub.in ()); - the_subscriber->notify_datareaders (); - } - - void - DDS_SubscriberListener_i::on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_requested_deadline_missed"); - - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_requested_deadline_missed (proxy.in (), ddsstatus); - } - - void - DDS_SubscriberListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_requested_incompatible_qos"); - - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_requested_incompatible_qos (proxy.in (), ddsstatus); - } - - void - DDS_SubscriberListener_i::on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_sample_rejected"); - - ::DDS::SampleRejectedStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_sample_rejected (proxy.in (), ddsstatus); - } - - void - DDS_SubscriberListener_i::on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_liveliness_changed"); - - ::DDS::LivelinessChangedStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_liveliness_changed (proxy.in (), ddsstatus); - } - - void - DDS_SubscriberListener_i::on_data_available ( - ::DDSDataReader* the_reader) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_data_available"); - - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - this->impl_->on_data_available (proxy.in ()); - } - - void - DDS_SubscriberListener_i::on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_subscription_matched"); - - ::DDS::SubscriptionMatchedStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_subscription_matched (proxy.in (), ddsstatus); - } - - void - DDS_SubscriberListener_i::on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("DDS_SubscriberListener_i::on_sample_lost"); - - ::DDS::SampleLostStatus ddsstatus; - ::DDS::DataReader_var proxy = DDS_TypeSupport_i::create_datareader ( - the_reader, - this->dp_.in (), - ::DDS::Subscriber::_nil ()); - ddsstatus <<= status; - this->impl_->on_sample_lost (proxy.in (), ddsstatus); - } - - ::DDS::SubscriberListener_ptr - DDS_SubscriberListener_i::get_subscriber_listener (void) - { - return ::DDS::SubscriberListener::_duplicate (this->impl_.in ()); - } - } -} - - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h deleted file mode 100644 index c4fd656e008..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDSSUBSCRIBERLISTENER_T_H_ -#define DDSSUBSCRIBERLISTENER_T_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_SubscriberListener_i : - public ::DDSSubscriberListener - { - public: - /// Constructor - DDS_SubscriberListener_i ( - ::DDS::SubscriberListener_ptr s, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_SubscriberListener_i (void); - - virtual void - on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status); - - virtual void - on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status); - - virtual void - on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status); - - virtual void - on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status); - - virtual void - on_data_available ( - ::DDSDataReader* the_reader); - - virtual void - on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status); - - virtual void - on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status); - - virtual void - on_data_on_readers ( - ::DDSSubscriber* the_subscriber); - - ::DDS::SubscriberListener_ptr get_subscriber_listener (void); - private: - ::DDS::SubscriberListener_var impl_; - ::DDS::DomainParticipant_var dp_; - }; - } -} - -#endif /* DDSSUBSCRIBERLISTENER_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp deleted file mode 100644 index c1a625ceb25..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp +++ /dev/null @@ -1,204 +0,0 @@ -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/ndds/TopicListener.h" - -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h" -#include "dds4ccm/impl/ndds/convertors/TopicQos.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_Topic_i::DDS_Topic_i (::DDSTopic* topic, - ::DDS::DomainParticipant_ptr dp) - : rti_entity_ (topic), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - DDS4CCM_TRACE ("DDS_Topic_i::DDS_Topic_i"); - } - - DDS_Topic_i::~DDS_Topic_i (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::~DDS_Topic_i"); - } - - ::DDS::ReturnCode_t - DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos) - { - DDS4CCM_TRACE ("DDS_Topic_i::set_qos"); - ::DDS_TopicQos ccm_dds_qos; - DDS_ReturnCode_t const retcode = this->rti_entity ()->get_qos (ccm_dds_qos); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Topic_i" - "::set_qos - " - "Error: Unable to retrieve topic qos\n")); - return retcode; - } - ccm_dds_qos <<= qos; - return this->rti_entity ()->get_qos (ccm_dds_qos); - } - - ::DDS::ReturnCode_t - DDS_Topic_i::get_qos (::DDS::TopicQos &qos) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_qos"); - ::DDS_TopicQos ccm_dds_qos; - ccm_dds_qos <<= qos; - ::DDS_ReturnCode_t const retval = this->rti_entity ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retval; - } - - ::DDS::ReturnCode_t - DDS_Topic_i::set_listener ( - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_Topic_i::set_listener"); - - // Retrieve the previously set listener - DDSTopicListener *old_listener = this->rti_entity ()->get_listener (); - - DDSTopicListener *listener = 0; - if (! ::CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (listener, - DDS_TopicListener_i ( - this, - a_listener), - ::CORBA::NO_MEMORY ()); - } - - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->set_listener (listener, mask); - - if (retcode != ::DDS::RETCODE_OK) - { - delete listener; - } - else - { - this->topic_listener_ = ::DDS::TopicListener::_duplicate (a_listener); - delete old_listener; - } - - return retcode; - } - - ::DDS::TopicListener_ptr - DDS_Topic_i::get_listener (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_listener"); - - return ::DDS::TopicListener::_duplicate (this->topic_listener_.in ()); - } - - ::DDS::ReturnCode_t - DDS_Topic_i::get_inconsistent_topic_status ( - ::DDS::InconsistentTopicStatus & a_status) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_inconsistent_topic_status"); - - DDS_InconsistentTopicStatus ddsstatus; - ::DDS::ReturnCode_t const retval = - this->rti_entity ()->get_inconsistent_topic_status (ddsstatus); - a_status <<= ddsstatus; - return retval; - } - - ::DDS::ReturnCode_t - DDS_Topic_i::enable (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::enable"); - - return this->rti_entity ()->enable (); - } - - ::DDS::StatusCondition_ptr - DDS_Topic_i::get_statuscondition (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_statuscondition"); - - ::DDS::StatusCondition_var retval; - DDSStatusCondition* sc = this->rti_entity ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - DDS_StatusCondition_i (sc, this->dp_.in ()), - ::CORBA::NO_MEMORY ()); - return retval._retn (); - } - - ::DDS::StatusMask - DDS_Topic_i::get_status_changes (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_status_changes"); - - return this->rti_entity ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - DDS_Topic_i::get_instance_handle (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_instance_handle"); - - ::DDS_InstanceHandle_t const rtihandle = - this->rti_entity ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; - } - - char * - DDS_Topic_i::get_type_name (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_type_name"); - - return CORBA::string_dup (this->rti_entity ()->get_type_name ()); - } - - char * - DDS_Topic_i::get_name (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_name"); - - return CORBA::string_dup (this->rti_entity ()->get_name ()); - } - - ::DDS::DomainParticipant_ptr - DDS_Topic_i::get_participant (void) - { - DDS4CCM_TRACE ("DDS_Topic_i::get_participant"); - - return ::DDS::DomainParticipant::_duplicate (this->dp_.in ()); - } - - DDSTopic * - DDS_Topic_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_Topic_i::set_rti_entity (::DDSTopic* topic) - { - this->rti_entity_ = topic; - } - - DDSTopic * - DDS_Topic_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_Topic_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h deleted file mode 100644 index 1755858aa62..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef NDDS_TOPIC_H -#define NDDS_TOPIC_H - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSTopic; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_Topic_i : - public virtual ::DDS::Topic, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_Topic_i (::DDSTopic* topic, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_Topic_i (void); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::TopicListener_ptr get_listener (void); - - virtual ::DDS::ReturnCode_t get_inconsistent_topic_status ( - ::DDS::InconsistentTopicStatus & a_status); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual ::DDS::InstanceHandle_t get_instance_handle (void); - - virtual char * get_type_name (void); - - virtual char * get_name (void); - - virtual ::DDS::DomainParticipant_ptr get_participant (void); - - ::DDSTopic * get_rti_entity (void); - - void set_rti_entity (::DDSTopic* topic); - - private: - ::DDSTopic * rti_entity_; - ::DDS::DomainParticipant_var dp_; - ::DDS::TopicListener_var topic_listener_; - - DDSTopic * rti_entity (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp deleted file mode 100644 index c76c5cb99c5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "dds4ccm/impl/ndds/TopicDescription.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_TopicDescription_i::DDS_TopicDescription_i ( - ::DDSTopicDescription * rc, - ::DDS::DomainParticipant_ptr dp) : - rti_entity_ (rc), - dp_ (::DDS::DomainParticipant::_duplicate (dp)) - { - } - - DDS_TopicDescription_i::~DDS_TopicDescription_i (void) - { - } - - char * - DDS_TopicDescription_i::get_type_name (void) - { - return CORBA::string_dup (this->rti_entity ()->get_type_name ()); - } - - char * - DDS_TopicDescription_i::get_name (void) - { - return CORBA::string_dup (this->rti_entity ()->get_name ()); - } - - ::DDS::DomainParticipant_ptr - DDS_TopicDescription_i::get_participant (void) - { - return ::DDS::DomainParticipant::_duplicate (this->dp_.in ()); - } - - ::DDSTopicDescription * - DDS_TopicDescription_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - ::DDSTopicDescription * - DDS_TopicDescription_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_TopicDescription_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h deleted file mode 100644 index 4fb709dcc0f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef TOPICDESCRIPTION_T_H_ -#define TOPICDESCRIPTION_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -class DDSTopicDescription; - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_TopicDescription_i : - public virtual ::DDS::TopicDescription, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - DDS_TopicDescription_i (::DDSTopicDescription * rc, - ::DDS::DomainParticipant_ptr dp); - - /// Destructor - virtual ~DDS_TopicDescription_i (void); - - virtual char * get_type_name (void); - - virtual char * get_name (void); - - virtual ::DDS::DomainParticipant_ptr get_participant (void); - - ::DDSTopicDescription * get_rti_entity (void); - - private: - ::DDSTopicDescription * rti_entity_; - ::DDS::DomainParticipant_var dp_; - - ::DDSTopicDescription * rti_entity (void); - }; - } -} - -#endif /* TOPICDESCRIPTION_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp deleted file mode 100644 index ca8fe2b5078..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "dds4ccm/impl/ndds/TopicListener.h" -#include "dds4ccm/impl/ndds/Topic.h" -#include "dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_TopicListener_i::DDS_TopicListener_i ( - ::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr topic_listener) - : topic_ (::DDS::Topic::_duplicate (topic)), - topic_listener_ (::DDS::TopicListener::_duplicate (topic_listener)) - { - } - - DDS_TopicListener_i::~DDS_TopicListener_i (void) - { - } - - void - DDS_TopicListener_i::on_inconsistent_topic ( - ::DDSTopic*, - const ::DDS_InconsistentTopicStatus & status) - { - DDS4CCM_TRACE ("DDS_TopicListener_i::on_inconsistent_topic"); - - ::DDS::InconsistentTopicStatus ddsstatus; - ddsstatus <<= status; - this->topic_listener_->on_inconsistent_topic (this->topic_.in (), ddsstatus); - } - - void - DDS_TopicListener_i::set_dds_topic (::DDS::Topic_ptr topic) - { - this->topic_ = ::DDS::Topic::_duplicate (topic); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h deleted file mode 100644 index 131459e2257..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDSTOPICLISTENER_T_H_ -#define DDSTOPICLISTENER_T_H_ - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "ndds/ndds_cpp.h" - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_TopicListener_i : - public ::DDSTopicListener - { - public: - /// Constructor - DDS_TopicListener_i (::DDS::Topic_ptr topic, - ::DDS::TopicListener_ptr topic_listener); - - /// Destructor - virtual ~DDS_TopicListener_i (void); - - virtual void on_inconsistent_topic( - ::DDSTopic* topic, - const ::DDS_InconsistentTopicStatus& status); - - void set_dds_topic (::DDS::Topic_ptr topic); - - private: - ::DDS::Topic_var topic_; - ::DDS::TopicListener_var topic_listener_; - }; - } -} - -#endif /* TOPICLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp deleted file mode 100644 index f743968462a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp +++ /dev/null @@ -1,329 +0,0 @@ -#include "dds4ccm/impl/ndds/TypeSupport.h" - -namespace CIAO -{ - namespace NDDS - { - DDS_TypeFactory_i_var::DDS_TypeFactory_i_var ( - DDS_TypeFactory_i* tf) - : ref_count_ (1), - tf_ (tf) - { - DDS4CCM_TRACE ("DDS_TypeFactory_i_var::DDS_TypeFactory_i_var"); - } - - DDS_TypeFactory_i_var::~DDS_TypeFactory_i_var (void) - { - DDS4CCM_TRACE ("DDS_TypeFactory_i_var::~DDS_TypeFactory_i_var"); - } - - DDS_TypeFactory_i* - DDS_TypeFactory_i_var::get_factory () - { - DDS4CCM_TRACE ("DDS_TypeFactory_i_var::get_typefactory"); - - return tf_; - } - - long - DDS_TypeFactory_i_var::_inc_ref () - { - DDS4CCM_TRACE ("DDS_TypeFactory_i_var::_inc_ref"); - - return ++this->ref_count_; - } - - long - DDS_TypeFactory_i_var::_dec_ref () - { - DDS4CCM_TRACE ("DDS_TypeFactory_i_var::_dec_ref"); - - return --this->ref_count_; - } - - std::map < ::DDS::DomainParticipant_ptr, ::CIAO::NDDS::DDS_TypeSupport_i::typefactories > - CIAO::NDDS::DDS_TypeSupport_i::participant_factories; - - DDS_TypeFactory_i::~DDS_TypeFactory_i (void) - { - } - - DDS_TypeFactory_i* - DDS_TypeSupport_i::get_factory_i (::DDS::DomainParticipant_ptr dp, - const char* type) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::get_factory_i"); - - DDS_TypeFactory_i* tfi = 0; - participantfactories::iterator entry = participant_factories.find(dp); - if (entry != participant_factories.end()) - { - // We have found the domain participant, now search for a type factory - // within the domain participant - typefactories tf = entry->second; - typefactories::iterator it = tf.find(type); - if (it != tf.end()) - { - tfi = it->second->get_factory (); - } - } - - if (tfi) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::get_factory_i - " - "A factory for domain participant <%@> of type <%C> " - "has been found\n", - dp, - type)); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::get_factory_i - " - "A factory for domain participant <%@> of type <%C> " - "has not been found\n", - dp, - type)); - } - - return tfi; - } - - bool - DDS_TypeSupport_i::register_type (::DDS::DomainParticipant_ptr dp, - const char* type, DDS_TypeFactory_i* f) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::register_type"); - - participantfactories::iterator dp_entry = participant_factories.find(dp); - - if (dp_entry == participant_factories.end()) - { - // The domain participant has not been found, insert the domain - // participant first - typefactories tf; - std::pair dp_ret = participant_factories.insert( - std::pair< ::DDS::DomainParticipant_ptr, typefactories > (dp, tf)); - if (!dp_ret.second) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::register_type - " - "Unable to create new DomainParticipant entry: " - "type <%C> - DomainParticipant <%@>\n", - type, - dp)); - return false; - } - } - - // DomainParticipant is in the list or has been added - dp_entry = participant_factories.find(dp); - typefactories tf = dp_entry->second; - // tf contains the list of type-factory combinations. - // search for the given type - typefactories::iterator tf_entry = tf.find(type); - bool retval = false; - if (tf_entry == tf.end()) - { - // Factory not registered for specified type. - // Register it - DDS_TypeFactory_i_var *tf_var = 0; - ACE_NEW_RETURN (tf_var, - DDS_TypeFactory_i_var (f), - false); - - std::pair tf_ret = - tf.insert(typefactories::value_type (type, tf_var)); - if (tf_ret.second) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::register_type - " - "Created new factory entry for type <%C> for participant <%@>\n", - type, dp)); - // assign the type-factory combination to the DomainParticipant entry. - dp_entry->second = tf; - retval = true; - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::register_type - " - "Unable to create new factory entry type <%C> for participant <%@>\n", - type, dp)); - delete tf_var; - } - } - else - { - long const refcount = tf_entry->second->_inc_ref (); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::register_type - " - "Incremented refcount to <%d> for type-factory for participant <%@> since " - "it already exists for type <%C>\n", - refcount, dp, - type)); - } - return retval; - } - - bool - DDS_TypeSupport_i::unregister_type (::DDS::DomainParticipant_ptr dp, - const char* type) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::unregister_type"); - - bool retval = false; - participantfactories::iterator dp_entry = participant_factories.find(dp); - - if (dp_entry != participant_factories.end()) - { - // Found the domain participant - typefactories tf = dp_entry->second; - typefactories::iterator it = tf.find(type); - if (it != tf.end()) - { - // Let us drop the refcount on the type factory, when it drops - // to zero we delete it - long const refcount = it->second->_dec_ref (); - retval = true; - if (refcount == 0) - { - DDS_TypeFactory_i_var* f_var = it->second; - tf.erase(it); - dp_entry->second = tf; - DDS_TypeFactory_i* f = f_var->get_factory(); - delete f; - delete f_var; - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::unregister_type - " - "Deleted type factory for participant <%@> and type <%C> " - "refcount dropped to zero\n", - dp, - type)); - if (tf.size () == 0UL) - { // no more entries -> remove the participant from - // the list - participant_factories.erase(dp_entry); - - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::unregister_type - " - "Erased participant entry for participant <%@>, " - "no type factories left anymore\n", - dp)); - } - } - else - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_TypeSupport_i::unregister_type - " - "Decremented refcount to <%d> for factory for participant <%@> and type <%C>\n", - refcount, - dp, - type)); - } - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::unregister_type - " - "Could not find the correct factory belonging to participant <%@> " - "and type <%C>. Unable to remove.\n", - dp, - type)); - } - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::unregister_type - " - "Could not find the entry for participant <%@>. " - "Unable to remove.\n", - dp)); - } - return retval; - } - - ::DDS::DataWriter_ptr - DDS_TypeSupport_i::create_datawriter (DDSDataWriter* dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::create_datawriter"); - - const char* type = dw->get_topic ()->get_type_name(); - - DDS_TypeFactory_i *f = get_factory_i(dp, type); - if (f) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_TypeSupport_i::create_datawriter - " - "Created DDSDataWriter for type <%C> for " - "participant <%@>\n", type, dp)); - - return f->create_datawriter (dw, dp, pub); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::create_datawriter - " - "Error creating DDSDataWriter for type <%C> " - "for participant <%@>\n", type, dp)); - } - - return ::DDS::DataWriter::_nil (); - } - - ::DDS::DataReader_ptr - DDS_TypeSupport_i::create_datareader (DDSDataReader* dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::create_datareader"); - - const char* type = dr->get_topicdescription ()->get_type_name(); - DDS_TypeFactory_i *f = get_factory_i(dp, type); - if (f) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_TypeSupport_i::create_datareader - " - "Created DDSDataReader for type <%C> " - "for participant <%@>\n", type, dp)); - - return f->create_datareader (dr, dp, sub); - } - else - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_TypeSupport_i::create_datareader - " - "Error creating DDSDataReader for type <%C> " - "for participant <%@>\n", type, dp)); - } - - return ::DDS::DataReader::_nil (); - } - - void - DDS_TypeSupport_i::close (void) - { - DDS4CCM_TRACE ("DDS_TypeSupport_i::close"); - - for(participantfactories::iterator i = participant_factories.begin(); - i != participant_factories.end(); - ++i) - { - typefactories tf = i->second; - - for(typefactories::iterator j = tf.begin(); - j != tf.end(); - ++j) - { - delete j->second; - } - tf.clear(); - } - participant_factories.clear (); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h deleted file mode 100644 index 7c685ff208e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h +++ /dev/null @@ -1,149 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * NDDS TypeSupport - */ - -#ifndef NDDS_TYPESUPPORT_H_ -#define NDDS_TYPESUPPORT_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/impl/ndds/DataWriter_T.h" -#include "dds4ccm/impl/ndds/DataReader_T.h" - -#include - -namespace CIAO -{ - namespace NDDS - { - class DDS4CCM_NDDS_Export DDS_TypeFactory_i - { - public: - virtual ~DDS_TypeFactory_i (void); - virtual DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub) = 0; - virtual DDS::DataReader_ptr create_datareader (DDSDataReader* dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub) = 0; - }; - - template - class DDS_TypeFactory_T : public DDS_TypeFactory_i - { - public: - DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub) - { - typedef CIAO::NDDS::DataWriter_T< - typename DDS_TYPE::datawriter_type, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type> - DataWriter_type; - return new DataWriter_type (dw, dp, pub); - } - DDS::DataReader_ptr create_datareader (DDSDataReader* dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub) - { - typedef CIAO::NDDS::DataReader_T< - typename DDS_TYPE::datareader_type, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - typename DDS_TYPE::dds_seq_type> - DataReader_type; - return new DataReader_type (dr, dp, sub); - } - }; - - /** - * Helper class to administrate the type factory and how many times - * it has been registered - */ - class DDS_TypeFactory_i_var - { - public: - DDS_TypeFactory_i_var (DDS_TypeFactory_i* tf); - ~DDS_TypeFactory_i_var (void); - - DDS_TypeFactory_i* get_factory (); - - /** - * Increments the reference count - */ - long _inc_ref (); - /** - * Decrements the reference count - */ - long _dec_ref (); - - private: - long ref_count_; - DDS_TypeFactory_i* tf_; - }; - - class DDS4CCM_NDDS_Export DDS_TypeSupport_i - { - public: - /** - * Clears all internal maps, freeing the memory. - */ - static void close (void); - - /** - * Registering a type-factory combination per DomainParticipant. - * @retval false Insertions to one of the maps fails or if there's - * already a factory for the given type registered. - * @retval true Insertions succeeded - */ - static bool register_type (::DDS::DomainParticipant_ptr dp, - const char* type, DDS_TypeFactory_i* factory); - - /** - * Unregistering a type-factory combination for a specific - * DomainParticipant. At the moment the type factory isn't used anymore - * it is automatically destructed. - * @retval false Unregistering the type factory failed - * @retval true Unregistering the type factory succeeded - */ - static bool unregister_type (::DDS::DomainParticipant_ptr dp, - const char* type); - - /** - * Create a type specific datawriter - */ - static ::DDS::DataWriter_ptr create_datawriter (DDSDataWriter* dw, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Publisher_ptr pub); - /** - * Create a type specific datareader - */ - static ::DDS::DataReader_ptr create_datareader (DDSDataReader* dr, - ::DDS::DomainParticipant_ptr dp, - ::DDS::Subscriber_ptr sub); - private: - DDS_TypeSupport_i (void); - ~DDS_TypeSupport_i (void); - - /// Store for a specific DDS type a type factory var with its own refcount - typedef std::map < ACE_CString, DDS_TypeFactory_i_var* > typefactories; - - /// For each domain participant we store a map with type factories for the - /// types that participant has - typedef std::map< ::DDS::DomainParticipant_ptr, typefactories > participantfactories; - static participantfactories participant_factories; - - /** - * Searches for a TypeFactory, based on a type and DomainParticipant - */ - static DDS_TypeFactory_i* get_factory_i (::DDS::DomainParticipant_ptr dp, - const char* type); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp deleted file mode 100644 index bcd67e3ab7e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ace/Tokenizer_T.h" - -namespace CIAO -{ - namespace NDDS - { - char * get_library_name (const char * qos_profile) - { - char* buf = ACE_OS::strdup (qos_profile); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - const char * lib_name = tok.next (); - - if (lib_name == 0) - { - ACE_OS::free (buf); - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "get_library_name <%C> - " - "Error: malformed qos_profile. Expected format: " - "#\n", - qos_profile)); - return 0; - } - - char * ret = ACE_OS::strdup (lib_name); - ACE_OS::free (buf); - return ret; - } - - char * get_profile_name (const char * qos_profile) - { - char* buf = ACE_OS::strdup (qos_profile); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - const char * lib_name = tok.next (); - const char * prof_name = tok.next (); - - if (lib_name == 0 || prof_name == 0 || tok.next () != 0) - { - ACE_OS::free (buf); - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "get_profile_name <%C> - " - "Error: malformed qos_profile. Expected format: " - "#\n", - qos_profile)); - return 0; - } - - char * ret = ACE_OS::strdup (prof_name); - ACE_OS::free (buf); - return ret; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h deleted file mode 100644 index aeb9b9a562f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Utils.h - * @author Marcel Smit (msmit@remedy.nl) - * - * Misc utility classes for NDDS. - */ - -#ifndef NDDS_UTILS_H_ -#define NDDS_UTILS_H_ - -#include "ace/String_Base.h" - -namespace CIAO -{ - namespace NDDS - { - char * get_library_name (const char * qos_profile); - char * get_profile_name (const char * qos_profile); - } -} - -#endif /* NDDS_UTILS_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp deleted file mode 100644 index 7d3ad599c0c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp +++ /dev/null @@ -1,233 +0,0 @@ -#include "WaitSet.h" -#include "dds4ccm/impl/ndds/Condition.h" -#include "dds4ccm/impl/ndds/QueryCondition.h" -#include "dds4ccm/impl/ndds/ReadCondition.h" -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ndds/ndds_cpp.h" - - -namespace CIAO -{ - namespace NDDS - { - DDS_WaitSet_i::DDS_WaitSet_i () - : rti_entity_ (0) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::DDS_WaitSet_i"); - } - - DDS_WaitSet_i::~DDS_WaitSet_i (void) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::~DDS_WaitSet_i"); - - delete this->rti_entity_; - } - - ::DDS::ReturnCode_t - DDS_WaitSet_i::wait (::DDS::ConditionSeq & active_conditions, - const ::DDS::Duration_t & timeout) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::wait"); - - DDS_Duration_t dds_timeout; - dds_timeout <<= timeout; - - DDSConditionSeq dds_conditions; - DDS_ReturnCode_t const retcode = - this->rti_entity ()->wait (dds_conditions, dds_timeout); - - this->convert_conditions (dds_conditions, active_conditions); - - return retcode; - } - - ::DDS::ReturnCode_t - DDS_WaitSet_i::attach_condition (::DDS::Condition_ptr cond) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::attach_condition"); - - ::DDS::ReadCondition_var rc_cond = ::DDS::ReadCondition::_narrow (cond); - ::DDS::QueryCondition_var qc_cond = ::DDS::QueryCondition::_narrow (cond); - - if (! ::CORBA::is_nil (qc_cond.in ())) - { - DDS_QueryCondition_i * qc_proxy = - dynamic_cast (qc_cond.in ()); - if (qc_proxy) - { - return this->rti_entity ()->attach_condition (qc_proxy->get_rti_entity ()); - } - } - else if (! ::CORBA::is_nil (rc_cond.in ())) - { - DDS_ReadCondition_i * rc_proxy = - dynamic_cast (rc_cond.in ()); - if (rc_proxy) - { - return this->rti_entity ()->attach_condition (rc_proxy->get_rti_entity ()); - } - } - return ::DDS::RETCODE_BAD_PARAMETER; - } - - ::DDS::ReturnCode_t - DDS_WaitSet_i::detach_condition (::DDS::Condition_ptr cond) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::detach_condition"); - - ::DDS::ReadCondition_var rc_cond = ::DDS::ReadCondition::_narrow (cond); - ::DDS::QueryCondition_var qc_cond = ::DDS::QueryCondition::_narrow (cond); - - if (! ::CORBA::is_nil (qc_cond.in ())) - { - DDS_QueryCondition_i * qc_proxy = - dynamic_cast (qc_cond.in ()); - if (qc_proxy) - { - return this->rti_entity ()->detach_condition (qc_proxy->get_rti_entity ()); - } - } - else if (! ::CORBA::is_nil (rc_cond.in ())) - { - DDS_ReadCondition_i * rc_proxy = - dynamic_cast (rc_cond.in ()); - if (rc_proxy) - { - return this->rti_entity ()->detach_condition (rc_proxy->get_rti_entity ()); - } - } - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_WaitSet_i::detach_condition - " - "Unable to narrow the given condition to a ReadCondition " - "nor a QueryCondition\n")); - - return ::DDS::RETCODE_BAD_PARAMETER; - } - - ::DDS::ReturnCode_t - DDS_WaitSet_i::get_conditions (::DDS::ConditionSeq & attached_conditions) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::get_conditions"); - - DDSConditionSeq dds_seq; - ::DDS::ReturnCode_t const retcode = - this->rti_entity ()->get_conditions (dds_seq); - - if (retcode != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_WaitSet_i::get_conditions - " - "Error while calling get_conditions: <%C>\n", - CIAO::DDS4CCM::translate_retcode (retcode))); - return retcode; - } - this->convert_conditions (dds_seq, attached_conditions); - return retcode; - } - - ::DDS::InstanceHandle_t - DDS_WaitSet_i::check_handle ( - const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle, - bool & error, - bool & non_existent) - { - ::DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - - ::DDS_InstanceHandle_t lookup_hnd = ::DDS_HANDLE_NIL; - lookup_hnd <<= lookup_handle; - - ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; - - if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) && - !DDS_InstanceHandle_equals (&hnd, &lookup_hnd)) - { - error = true; - } - else if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) - { - non_existent = true; - } - else - { - ret <<= lookup_hnd; - } - return ret; - } - - DDSWaitSet * - DDS_WaitSet_i::get_rti_entity (void) - { - return this->rti_entity_; - } - - void - DDS_WaitSet_i::init (void) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::init"); - if (!this->rti_entity_) - { - ACE_NEW_THROW_EX (this->rti_entity_, - DDSWaitSet (), - ::CORBA::NO_MEMORY ()); - } - } - - void - DDS_WaitSet_i::convert_conditions (const DDSConditionSeq & dds_conditions, - ::DDS::ConditionSeq & conditions) - { - DDS4CCM_TRACE ("DDS_WaitSet_i::convert_conditions"); - - conditions.length (dds_conditions.length ()); - - for (DDS_Long i = 0; - i < dds_conditions.length(); - ++i) - { - DDSQueryCondition * dds_qc = - dynamic_cast (dds_conditions[i]); - if (dds_qc) - { - ::DDS::QueryCondition_var cond; - ACE_NEW_THROW_EX (cond, - DDS_QueryCondition_i (dds_qc, - ::DDS::DataReader::_nil ()), - ::CORBA::NO_MEMORY ()); - conditions[i] = ::DDS::QueryCondition::_duplicate (cond.in ()); - } - else - { - DDSReadCondition * dds_rc = - dynamic_cast (dds_conditions[i]); - if (dds_rc) - { - ::DDS::ReadCondition_var cond; - ACE_NEW_THROW_EX (cond, - DDS_ReadCondition_i (dds_rc, - ::DDS::DataReader::_nil ()), - ::CORBA::NO_MEMORY ()); - conditions[i] = ::DDS::ReadCondition::_duplicate (cond.in ()); - } - } - } - } - - DDSWaitSet * - DDS_WaitSet_i::rti_entity (void) - { - if (!this->rti_entity_) - { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, - "DDS_WaitSet_i::rti_entity - " - "Throwing BAD_INV_ORDER.\n")); - throw ::CORBA::BAD_INV_ORDER (); - } - return this->rti_entity_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h deleted file mode 100644 index ce9fe23d8eb..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h +++ /dev/null @@ -1,121 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef WAITSET_H_ -#define WAITSET_H_ - -#include "dds4ccm/idl/ndds/ndds_dcpsC.h" -#include "tao/LocalObject.h" - -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" - -class DDSWaitSet; -struct DDSConditionSeq; - -namespace CIAO -{ - namespace NDDS - { - /** - * @class DDS_WaitSet_i - * - * @brief Representative (proxy) class for the RTI waitset. - * - * Implementation of the RTI waitset functionality. - */ - class DDS4CCM_NDDS_Export DDS_WaitSet_i : - public virtual ::DDS::WaitSet, - public virtual ::CORBA::LocalObject - { - - public: - /// Constructor - DDS_WaitSet_i (); - - /// Destructor - virtual ~DDS_WaitSet_i (void); - - /** - * Waits for DDS until the attached read/query conditions are met - * or when a timeout occurs. - * - * active_conditions will contain conditions DDS has found. - */ - virtual ::DDS::ReturnCode_t - wait (::DDS::ConditionSeq & active_conditions, - const ::DDS::Duration_t & timeout); - - /** - * Attaches a condition to the waitset. 'wait' will be waiting for - * this condition. - */ - virtual ::DDS::ReturnCode_t - attach_condition (::DDS::Condition_ptr cond); - - /** - * Detaches a condition from the waitset. 'wait' won't be waiting - * for this condition anymore. - */ - virtual ::DDS::ReturnCode_t - detach_condition (::DDS::Condition_ptr cond); - - /** - * Retrieves a list of attached conditions. - */ - virtual ::DDS::ReturnCode_t - get_conditions (::DDS::ConditionSeq & attached_conditions); - - /** - * Returns the RTI waitset - */ - DDSWaitSet * get_rti_entity (void); - - /** - * Used in the Reader in order to check whether whether the - * user has supplied the correct handle with the type specific - * instance. See Reader_T::read_one_last and the DDS4CCM spec - * for more info. - * - * Checks whether two DDS-handles are equal. If no error - * occurs and the lookup_handle exists, this method will return - * the lookup_handle. - * - * @todo We actually want this method to be in the DDS4CCM - * connector but since we're not allowed to use RTI specific code - * there it's located here. - * - * 'error' will be true if instance_handle != DDS_HANDLE_NIL and - * when instance_handle != lookup_handle. - * - * non_existent will be true is lookup_hnd is DDS_HANDLE_NIL - */ - ::DDS::InstanceHandle_t - check_handle (const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle, - bool & error, - bool & non_existent); - - /** - * Creates the RTI waitset. - */ - void init (void); - - private: - DDSWaitSet * rti_entity_; - - DDSWaitSet * rti_entity (); - - /** - * Converts the RTI condition(s) to the DDS4CCM condition(s) - */ - void - convert_conditions (const DDSConditionSeq& dds_conditions, - ::DDS::ConditionSeq & conditions); - }; - } -} - -#endif /* WAITSET_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h deleted file mode 100644 index c50f0db9717..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/BuiltinTopicKey_t.h +++ /dev/null @@ -1,22 +0,0 @@ - /** - * @author Marcel Smit - */ - -#ifndef BUILTINTOPICKEY_T_H_ -#define BUILTINTOPICKEY_T_H_ - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey) -{ - ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); -} - -inline void -operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey) -{ - ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); -} - -#endif /* BUILTINTOPICKEY_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h deleted file mode 100644 index 632bd08d8cd..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADERQOS_H -#define DDS4CCM_DATAREADERQOS_H - -#include "DurabilityQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "TimeBasedFilterQosPolicy.h" -#include "ReaderDataLifecycleQosPolicy.h" -#include "DataReaderResourceLimitsQosPolicy.h" -#include "TypeConsistencyEnforcementQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos) -{ - ddsqos.durability <<= qos.durability; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.user_data <<= qos.user_data; - ddsqos.ownership <<= qos.ownership; - ddsqos.time_based_filter <<= qos.time_based_filter; - ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle; - ddsqos.reader_resource_limits <<= qos.reader_resource_limits; -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - ddsqos.type_consistency <<= qos.type_consistency; -#endif -} - -inline void -operator<<= (::DDS_DataReaderQos &ddsqos, const ::DDS::DataReaderQos & qos) -{ - ddsqos.durability <<= qos.durability; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.user_data <<= qos.user_data; - ddsqos.ownership <<= qos.ownership; - ddsqos.time_based_filter <<= qos.time_based_filter; - ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle; - ddsqos.reader_resource_limits <<= qos.reader_resource_limits; -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - ddsqos.type_consistency <<= qos.type_consistency; -#endif -} - -#endif /* DDS4CCM_DATAREADERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h deleted file mode 100644 index cb1ec1f71c5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H -#define DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DataReaderResourceLimitsQosPolicy &ddsqos, const ::DDS_DataReaderResourceLimitsQosPolicy & qos) -{ - ddsqos.max_remote_writers = qos.max_remote_writers; - ddsqos.max_remote_writers_per_instance = qos.max_remote_writers_per_instance; - ddsqos.max_samples_per_remote_writer = qos.max_samples_per_remote_writer; - ddsqos.max_infos = qos.max_infos; - ddsqos.initial_remote_writers = qos.initial_remote_writers; - ddsqos.initial_remote_writers_per_instance = qos.initial_remote_writers_per_instance; - ddsqos.initial_infos = qos.initial_infos; - ddsqos.initial_outstanding_reads = qos.initial_outstanding_reads; - ddsqos.max_outstanding_reads = qos.max_outstanding_reads; - ddsqos.max_samples_per_read = qos.max_samples_per_read; - ddsqos.disable_fragmentation_support = qos.disable_fragmentation_support; - ddsqos.max_fragmented_samples = qos.max_fragmented_samples; - ddsqos.initial_fragmented_samples = qos.initial_fragmented_samples; - ddsqos.max_fragmented_samples_per_remote_writer = qos.max_fragmented_samples_per_remote_writer; - ddsqos.max_fragments_per_sample = qos.max_fragments_per_sample; - ddsqos.dynamically_allocate_fragmented_samples = qos.dynamically_allocate_fragmented_samples; - ddsqos.max_total_instances = qos.max_total_instances; - ddsqos.max_remote_virtual_writers_per_instance = qos.max_remote_virtual_writers_per_instance; - ddsqos.initial_remote_virtual_writers_per_instance = qos.initial_remote_virtual_writers_per_instance; - ddsqos.max_query_condition_filters = qos.max_query_condition_filters; -} - -inline void -operator<<= (::DDS_DataReaderResourceLimitsQosPolicy &ddsqos, const ::DDS::DataReaderResourceLimitsQosPolicy & qos) -{ - ddsqos.max_remote_writers = qos.max_remote_writers; - ddsqos.max_remote_writers_per_instance = qos.max_remote_writers_per_instance; - ddsqos.max_samples_per_remote_writer = qos.max_samples_per_remote_writer; - ddsqos.max_infos = qos.max_infos; - ddsqos.initial_remote_writers = qos.initial_remote_writers; - ddsqos.initial_remote_writers_per_instance = qos.initial_remote_writers_per_instance; - ddsqos.initial_infos = qos.initial_infos; - ddsqos.initial_outstanding_reads = qos.initial_outstanding_reads; - ddsqos.max_outstanding_reads = qos.max_outstanding_reads; - ddsqos.max_samples_per_read = qos.max_samples_per_read; - ddsqos.disable_fragmentation_support = qos.disable_fragmentation_support; - ddsqos.max_fragmented_samples = qos.max_fragmented_samples; - ddsqos.initial_fragmented_samples = qos.initial_fragmented_samples; - ddsqos.max_fragmented_samples_per_remote_writer = qos.max_fragmented_samples_per_remote_writer; - ddsqos.max_fragments_per_sample = qos.max_fragments_per_sample; - ddsqos.dynamically_allocate_fragmented_samples = qos.dynamically_allocate_fragmented_samples; - ddsqos.max_total_instances = qos.max_total_instances; - ddsqos.max_remote_virtual_writers_per_instance = qos.max_remote_virtual_writers_per_instance; - ddsqos.initial_remote_virtual_writers_per_instance = qos.initial_remote_virtual_writers_per_instance; - ddsqos.max_query_condition_filters = qos.max_query_condition_filters; -} - -#endif /* DDS4CCM_DDS_DATAREADERRESOURCELIMITSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h deleted file mode 100644 index a622058a597..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAWRITERQOS_H -#define DDS4CCM_DATAWRITERQOS_H - -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "TransportPriorityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "WriterDataLifecycleQosPolicy.h" -#include "DataWriterResourceLimitsQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos) -{ - ddsqos.durability <<= qos.durability; - ddsqos.durability_service <<= qos.durability_service; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.transport_priority <<= qos.transport_priority; - ddsqos.lifespan <<= qos.lifespan; - ddsqos.user_data <<= qos.user_data; - ddsqos.ownership <<= qos.ownership; - ddsqos.ownership_strength <<= qos.ownership_strength; - ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle; - ddsqos.writer_resource_limits <<= qos.writer_resource_limits; -} - -inline void -operator<<= (::DDS_DataWriterQos &ddsqos, const ::DDS::DataWriterQos & qos) -{ - ddsqos.durability <<= qos.durability; - ddsqos.durability_service <<= qos.durability_service; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.transport_priority <<= qos.transport_priority; - ddsqos.lifespan <<= qos.lifespan; - ddsqos.user_data <<= qos.user_data; - ddsqos.ownership <<= qos.ownership; - ddsqos.ownership_strength <<= qos.ownership_strength; - ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle; - ddsqos.writer_resource_limits <<= qos.writer_resource_limits; -} - -#endif /* DDS4CCM_DATAWRITERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h deleted file mode 100644 index 75fb46b4b5b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H -#define DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DataWriterResourceLimitsQosPolicy &ddsqos, const ::DDS_DataWriterResourceLimitsQosPolicy & qos) -{ - ddsqos.initial_concurrent_blocking_threads = qos.initial_concurrent_blocking_threads; - ddsqos.max_concurrent_blocking_threads = qos.max_concurrent_blocking_threads; - ddsqos.max_remote_reader_filters = qos.max_remote_reader_filters; - ddsqos.initial_batches = qos.initial_batches; - ddsqos.max_batches = qos.max_batches; - ddsqos.cookie_max_length = qos.cookie_max_length; - ddsqos.instance_replacement = static_cast < ::DDS::DataWriterResourceLimitsInstanceReplacementKind> (qos.instance_replacement); - ddsqos.replace_empty_instances = qos.replace_empty_instances; - ddsqos.autoregister_instances = qos.autoregister_instances; -} - -inline void -operator<<= (::DDS_DataWriterResourceLimitsQosPolicy &ddsqos, const ::DDS::DataWriterResourceLimitsQosPolicy & qos) -{ - ddsqos.initial_concurrent_blocking_threads = qos.initial_concurrent_blocking_threads; - ddsqos.max_concurrent_blocking_threads = qos.max_concurrent_blocking_threads; - ddsqos.max_remote_reader_filters = qos.max_remote_reader_filters; - ddsqos.initial_batches = qos.initial_batches; - ddsqos.max_batches = qos.max_batches; - ddsqos.cookie_max_length = qos.cookie_max_length; - ddsqos.instance_replacement = static_cast < ::DDS_DataWriterResourceLimitsInstanceReplacementKind> (qos.instance_replacement); - ddsqos.replace_empty_instances = qos.replace_empty_instances; - ddsqos.autoregister_instances = qos.autoregister_instances; -} - -#endif /* DDS4CCM_DDS_DATAWRITERRESOURCELIMITSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h deleted file mode 100644 index 4a2b18ab597..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DEADLINEQOSPOLICY_H -#define DDS4CCM_DEADLINEQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos) -{ - ddsqos.period <<= qos.period; -} - -inline void -operator<<= (::DDS_DeadlineQosPolicy &ddsqos, const ::DDS::DeadlineQosPolicy & qos) -{ - ddsqos.period <<= qos.period; -} - -#endif /* DDS4CCM_DEADLINEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h deleted file mode 100644 index e20ec4770ca..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H -#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::DestinationOrderQosPolicyKind> (qos.kind); - ddsqos.scope = static_cast < ::DDS::DestinationOrderQosPolicyScopeKind> (qos.scope); - ddsqos.source_timestamp_tolerance <<= qos.source_timestamp_tolerance; -} - -inline void -operator<<= (::DDS_DestinationOrderQosPolicy &ddsqos, const ::DDS::DestinationOrderQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind); - ddsqos.scope = static_cast < ::DDS_DestinationOrderQosPolicyScopeKind> (qos.scope); - ddsqos.source_timestamp_tolerance <<= qos.source_timestamp_tolerance; -} - -#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h deleted file mode 100644 index ac7af8d7e5f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H -#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H - -#include "EntityFactoryQosPolicy.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos) -{ - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_DomainParticipantFactoryQos &ddsqos, const ::DDS::DomainParticipantFactoryQos & qos) -{ - ddsqos.entity_factory <<= qos.entity_factory; -} - -#endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h deleted file mode 100644 index 299daad6af9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DomainParticipantQos.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H -#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H - -#include "UserDataQosPolicy.h" -#include "EntityFactoryQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos) -{ - ddsqos.user_data <<= qos.user_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_DomainParticipantQos &ddsqos, const ::DDS::DomainParticipantQos & qos) -{ - ddsqos.user_data <<= qos.user_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -#endif /* DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h deleted file mode 100644 index a8c114e867b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURABILITYQOSPOLICY_H -#define DDS4CCM_DURABILITYQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::DurabilityQosPolicyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_DurabilityQosPolicy &ddsqos, const ::DDS::DurabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind); -} - -#endif /* DDS4CCM_DURABILITYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h deleted file mode 100644 index 4f5d6b61635..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H -#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos) -{ - ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay; - ddsqos.history_kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.history_kind); - ddsqos.history_depth = qos.history_depth; - ddsqos.max_samples = qos.max_samples; - ddsqos.max_instances = qos.max_instances; - ddsqos.max_samples_per_instance = qos.max_samples_per_instance; -} - -inline void -operator<<= (::DDS_DurabilityServiceQosPolicy &ddsqos, const ::DDS::DurabilityServiceQosPolicy & qos) -{ - ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay; - ddsqos.history_kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.history_kind); - ddsqos.history_depth = qos.history_depth; - ddsqos.max_samples = qos.max_samples; - ddsqos.max_instances = qos.max_instances; - ddsqos.max_samples_per_instance = qos.max_samples_per_instance; -} - -#endif /* DDS4CCM_DURABILITYSERVICEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h deleted file mode 100644 index 72fa927d5f6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Duration_t.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURATION_T_H_ -#define DDS4CCM_DURATION_T_H_ - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration) -{ - ddsduration.sec = duration.sec; - ddsduration.nanosec = duration.nanosec; -} - -inline void -operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration) -{ - ddsduration.sec = duration.sec; - ddsduration.nanosec = duration.nanosec; -} - -#endif /* DDS4CCM_DURATION_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h deleted file mode 100644 index bc94bb4a1a2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H -#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos) -{ - ddsqos.autoenable_created_entities = qos.autoenable_created_entities; -} - -inline void -operator<<= (::DDS_EntityFactoryQosPolicy &ddsqos, const ::DDS::EntityFactoryQosPolicy & qos) -{ - ddsqos.autoenable_created_entities = qos.autoenable_created_entities; -} - -#endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h deleted file mode 100644 index 49f8bef51d0..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H -#define DDS4CCM_GROUPDATAQOSPOLICY_H - -#include "OctetSeq.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h deleted file mode 100644 index 91f06cb5a49..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_HISTORYQOSPOLICY_H -#define DDS4CCM_HISTORYQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.kind); - ddsqos.depth = qos.depth; - ddsqos.refilter = static_cast < ::DDS::RefilterQosPolicyKind> (qos.refilter); -} - -inline void -operator<<= (::DDS_HistoryQosPolicy &ddsqos, const ::DDS::HistoryQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.kind); - ddsqos.depth = qos.depth; - ddsqos.refilter = static_cast < ::DDS_RefilterQosPolicyKind> (qos.refilter); -} - -#endif /* DDS4CCM_HISTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h deleted file mode 100644 index 5a8d6ca0f37..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InconsistentTopicStatus.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H -#define DDS4CCM_INCONSISTENTTOPICSTATUS_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -#endif /* DDS4CCM_INCONSISTENTTOPICSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h deleted file mode 100644 index 5624cbfdad4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INSTANCEHANDLESEQ_H -#define DDS4CCM_INSTANCEHANDLESEQ_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -template -void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) { - target.length (source.length ()); - for (::DDS_Long index = 0; index < source.length (); index++) - { - target[index] <<= source[index]; - } -} - -inline void -operator<<= (::DDS::InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS_InstanceHandleSeq & instancehandleseq) -{ - convert_dds_to_corba_sequence (ddsinstancehandleseqseq, instancehandleseq); -} - -inline void -operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::InstanceHandleSeq & instancehandleseq) -{ - ddsinstancehandleseqseq.length (instancehandleseq.length ()); - for (::DDS::InstanceHandleSeq::size_type index = 0; index < instancehandleseq.length (); index++) - { - ddsinstancehandleseqseq[index] <<= instancehandleseq[index]; - } -} - -#endif /* DDS4CCM_INSTANCEHANDLESEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h deleted file mode 100644 index 3ece45658ff..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INSTANCEHANDLE_T_H_ -#define DDS4CCM_INSTANCEHANDLE_T_H_ - -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h" - -#endif /* DDS4CCM_INSTANCEHANDLE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h deleted file mode 100644 index 7d28c13774b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H -#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -inline void -operator<<= (::DDS_LatencyBudgetQosPolicy &ddsqos, const ::DDS::LatencyBudgetQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -#endif /* DDS4CCM_LATENCYBUDGETQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h deleted file mode 100644 index a9c50b56848..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIFESPANQOSPOLICY_H -#define DDS4CCM_LIFESPANQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -inline void -operator<<= (::DDS_LifespanQosPolicy &ddsqos, const ::DDS::LifespanQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -#endif /* DDS4CCM_LIFESPANQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h deleted file mode 100644 index f0689c9020b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessChangedStatus.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H -#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status) -{ - ddsstatus.alive_count = status.alive_count; - ddsstatus.not_alive_count = status.not_alive_count; - ddsstatus.alive_count_change = status.alive_count_change; - ddsstatus.not_alive_count_change = status.not_alive_count_change; - ddsstatus.last_publication_handle <<= status.last_publication_handle; -} - -inline void -operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status) -{ - ddsstatus.alive_count = status.alive_count; - ddsstatus.not_alive_count = status.not_alive_count; - ddsstatus.alive_count_change = status.alive_count_change; - ddsstatus.not_alive_count_change = status.not_alive_count_change; - ddsstatus.last_publication_handle <<= status.last_publication_handle; -} - -#endif /* DDS4CCM_LIVELINESSCHANGEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h deleted file mode 100644 index c489af08b40..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessLostStatus.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H -#define DDS4CCM_LIVELINESSLOSTSTATUS_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator<<= (::DDS_LivelinessLostStatus &ddsstatus, const ::DDS::LivelinessLostStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -#endif /* DDS4CCM_LIVELINESSLOSTSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h deleted file mode 100644 index c232c71973c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H -#define DDS4CCM_LIVELINESSQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::LivelinessQosPolicyKind> (qos.kind); - ddsqos.lease_duration <<= qos.lease_duration; -} - -inline void -operator<<= (::DDS_LivelinessQosPolicy &ddsqos, const ::DDS::LivelinessQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_LivelinessQosPolicyKind> (qos.kind); - ddsqos.lease_duration <<= qos.lease_duration; -} - -#endif /* DDS4CCM_LIVELINESSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h deleted file mode 100644 index 1e97618cbac..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OctetSeq.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OCTETSEQ_H -#define DDS4CCM_OCTETSEQ_H - -inline void -operator<<= (::DDS::OctetSeq &ddsseq, const ::DDS_OctetSeq & seq) -{ - ddsseq.length (seq.length ()); - for (::DDS_Long i = 0; i < seq.length (); ++i) - { - ddsseq[i] = seq[i]; - } -} - -inline void -operator<<= (::DDS_OctetSeq &ddsseq, const ::DDS::OctetSeq & seq) -{ - ddsseq.length (seq.length ()); - for (::CORBA::ULong i = 0; i < seq.length (); ++i) - { - ddsseq[i] = seq[i]; - } -} - -#endif /* DDS4CCM_OCTETSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h deleted file mode 100644 index d5b53a4ca18..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedDeadlineMissedStatus.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H -#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -inline void -operator<<= (::DDS_OfferedDeadlineMissedStatus &ddsstatus, const ::DDS::OfferedDeadlineMissedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -#endif /* DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h deleted file mode 100644 index 1fd24c3a002..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OfferedIncompatibleQosStatus.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H -#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H - -#include "QosPolicyCountSeq.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = status.last_policy_id; - ddsstatus.policies <<= status.policies; -} - -inline void -operator<<= (::DDS_OfferedIncompatibleQosStatus &ddsstatus, const ::DDS::OfferedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = static_cast (status.last_policy_id); - ddsstatus.policies <<= status.policies; -} - -#endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h deleted file mode 100644 index a21e88f381e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H -#define DDS4CCM_OWNERSHIPQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::OwnershipQosPolicyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_OwnershipQosPolicy &ddsqos, const ::DDS::OwnershipQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind); -} - -#endif /* DDS4CCM_OWNERSHIPQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h deleted file mode 100644 index f5fc5457ca0..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H -#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -inline void -operator<<= (::DDS_OwnershipStrengthQosPolicy &ddsqos, const ::DDS::OwnershipStrengthQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -#endif /* DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h deleted file mode 100644 index dde39e49a9b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ParticipantBuiltinTopicData.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PARTICIPANTBUILTINTOPICDATA_H_ -#define PARTICIPANTBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "UserDataQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::ParticipantBuiltinTopicData &ddstopicdata, const ::DDS_ParticipantBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.user_data <<= topicdata.user_data; -} - -inline void -operator<<= (::DDS_ParticipantBuiltinTopicData & ddstopicdata, const ::DDS::ParticipantBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.user_data <<= topicdata.user_data; -} - -#endif /* PARTICIPANTBUILTINTOPICDATA_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h deleted file mode 100644 index 82287c4b600..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PARTITIONQOSPOLICY_H -#define DDS4CCM_PARTITIONQOSPOLICY_H - -#include "StringSeq.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos) -{ - ddsqos.name <<= qos.name; -} - -inline void -operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos) -{ - ddsqos.name <<= qos.name; -} - -#endif /* DDS4CCM_PARTITIONQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h deleted file mode 100644 index 2442e3e4fbf..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H -#define DDS4CCM_PRESENTATIONQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos) -{ - ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope); - ddsqos.coherent_access = qos.coherent_access; - ddsqos.ordered_access = qos.ordered_access; -} - -inline void -operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos) -{ - ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope); - ddsqos.coherent_access = qos.coherent_access; - ddsqos.ordered_access = qos.ordered_access; -} - -#endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h deleted file mode 100644 index 69d471c64bf..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationBuiltinTopicData.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PUBLICATIONBUILTINTOPICDATA_H_ -#define PUBLICATIONBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "PresentationQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "TopicDataQosPolicy.h" -#include "GroupDataQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = topicdata.topic_name; - ddstopicdata.type_name = topicdata.type_name; - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.durability_service <<= topicdata.durability_service; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.lifespan <<= topicdata.lifespan; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.ownership_strength <<= topicdata.ownership_strength; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -inline void -operator<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name); - ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name); - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.durability_service <<= topicdata.durability_service; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.lifespan <<= topicdata.lifespan; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.ownership_strength <<= topicdata.ownership_strength; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h deleted file mode 100644 index 1b6b49dbc41..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublicationMatchedStatus.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H -#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.current_count = status.current_count; - ddsstatus.current_count_change = status.current_count_change; - ddsstatus.last_subscription_handle <<= status.last_subscription_handle; -} - -inline void -operator<<= (::DDS_PublicationMatchedStatus &ddsstatus, const ::DDS::PublicationMatchedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.current_count = status.current_count; - ddsstatus.current_count_change = status.current_count_change; - ddsstatus.last_subscription_handle <<= status.last_subscription_handle; -} - -#endif /* DDS4CCM_PUBLICATIONMATCHEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h deleted file mode 100644 index 471f42b3d7d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/PublisherQos.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLISHERQOS_H -#define DDS4CCM_PUBLISHERQOS_H - -#include "PresentationQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "GroupDataQosPolicy.h" -#include "EntityFactoryQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_PublisherQos &ddsqos, const ::DDS::PublisherQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -#endif /* DDS4CCM_PUBLISHERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h deleted file mode 100644 index f53a2e7b705..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/QosPolicyCountSeq.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H -#define DDS4CCM_QOSPOLICYCOUNTSEQ_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount) -{ - ddspolicycount.length (policycount.length ()); - for (::DDS_Long i = 0 ; i < policycount.length (); ++i) - { - ddspolicycount[i].policy_id = policycount[i].policy_id; - ddspolicycount[i].count = policycount[i].count; - } -} - -inline void -operator<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount) -{ - ddspolicycount.length (policycount.length ()); - for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i) - { - ddspolicycount[i].policy_id = static_cast (policycount[i].policy_id); - ddspolicycount[i].count = policycount[i].count; - } -} - -#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h deleted file mode 100644 index d8c6745116d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H -#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#include "Duration_t.h" - -inline void -operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos) -{ - ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; - ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; -} - -inline void -operator<<= (::DDS_ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS::ReaderDataLifecycleQosPolicy & qos) -{ - ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; - ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; -} - -#endif /* DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h deleted file mode 100644 index 536b64e2181..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H -#define DDS4CCM_RELIABILITYSQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::ReliabilityQosPolicyKind> (qos.kind); - ddsqos.max_blocking_time <<= qos.max_blocking_time; -} - -inline void -operator<<= (::DDS_ReliabilityQosPolicy &ddsqos, const ::DDS::ReliabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_ReliabilityQosPolicyKind> (qos.kind); - ddsqos.max_blocking_time <<= qos.max_blocking_time; -} - -#endif /* DDS4CCM_RELIABILITYSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h deleted file mode 100644 index 61e94abd558..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableReaderActivityChangedStatus.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H -#define DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H - -#include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::ReliableReaderActivityChangedStatus &ddsstatus, const ::DDS_ReliableReaderActivityChangedStatus & status) -{ - ddsstatus.active_count = status.active_count; - ddsstatus.active_count_change = status.active_count_change; - ddsstatus.inactive_count = status.inactive_count; - ddsstatus.inactive_count_change = status.inactive_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -inline void -operator<<= (::DDS_ReliableReaderActivityChangedStatus &ddsstatus, const ::DDS::ReliableReaderActivityChangedStatus & status) -{ - ddsstatus.active_count = status.active_count; - ddsstatus.active_count_change = status.active_count_change; - ddsstatus.inactive_count = status.inactive_count; - ddsstatus.inactive_count_change = status.inactive_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -#endif /* DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h deleted file mode 100644 index 422bcde03aa..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ReliableWriterCacheChangedStatus.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H -#define DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::ReliableWriterCacheChangedStatus &ddsstatus, const ::DDS_ReliableWriterCacheChangedStatus & status) -{ - ddsstatus.empty_reliable_writer_cache.total_count = status.empty_reliable_writer_cache.total_count; - ddsstatus.empty_reliable_writer_cache.total_count_change = status.empty_reliable_writer_cache.total_count_change; - ddsstatus.full_reliable_writer_cache.total_count = status.full_reliable_writer_cache.total_count; - ddsstatus.full_reliable_writer_cache.total_count_change = status.full_reliable_writer_cache.total_count_change; - ddsstatus.low_watermark_reliable_writer_cache.total_count = status.low_watermark_reliable_writer_cache.total_count; - ddsstatus.low_watermark_reliable_writer_cache.total_count_change = status.low_watermark_reliable_writer_cache.total_count_change; - ddsstatus.high_watermark_reliable_writer_cache.total_count = status.high_watermark_reliable_writer_cache.total_count; - ddsstatus.high_watermark_reliable_writer_cache.total_count_change = status.high_watermark_reliable_writer_cache.total_count_change; - ddsstatus.unacknowledged_sample_count = status.unacknowledged_sample_count; - ddsstatus.unacknowledged_sample_count_peak = status.unacknowledged_sample_count_peak; -} - -inline void -operator<<= (::DDS_ReliableWriterCacheChangedStatus &ddsstatus, const ::DDS::ReliableWriterCacheChangedStatus & status) -{ - ddsstatus.empty_reliable_writer_cache.total_count = status.empty_reliable_writer_cache.total_count; - ddsstatus.empty_reliable_writer_cache.total_count_change = status.empty_reliable_writer_cache.total_count_change; - ddsstatus.full_reliable_writer_cache.total_count = status.full_reliable_writer_cache.total_count; - ddsstatus.full_reliable_writer_cache.total_count_change = status.full_reliable_writer_cache.total_count_change; - ddsstatus.low_watermark_reliable_writer_cache.total_count = status.low_watermark_reliable_writer_cache.total_count; - ddsstatus.low_watermark_reliable_writer_cache.total_count_change = status.low_watermark_reliable_writer_cache.total_count_change; - ddsstatus.high_watermark_reliable_writer_cache.total_count = status.high_watermark_reliable_writer_cache.total_count; - ddsstatus.high_watermark_reliable_writer_cache.total_count_change = status.high_watermark_reliable_writer_cache.total_count_change; - ddsstatus.unacknowledged_sample_count = status.unacknowledged_sample_count; - ddsstatus.unacknowledged_sample_count_peak = status.unacknowledged_sample_count_peak; -} - -#endif /* DDS4CCM_RELIABLEWRITERCACHECHANGEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h deleted file mode 100644 index 991af987adb..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedDeadlineMissedStatus.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H -#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H - -#include "InstanceHandle_t.h" - -inline void -operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -inline void -operator<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::RequestedDeadlineMissedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -#endif /* DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h deleted file mode 100644 index 0d725e519aa..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/RequestedIncompatibleQosStatus.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H -#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H - -#include "QosPolicyCountSeq.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = status.last_policy_id; - ddsstatus.policies <<= status.policies; -} - -inline void -operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = static_cast (status.last_policy_id); - ddsstatus.policies <<= status.policies; -} - -#endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h deleted file mode 100644 index 721dd99685a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H -#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos) -{ - ddsqos.max_samples = qos.max_samples; - ddsqos.max_instances = qos.max_instances; - ddsqos.max_samples_per_instance = qos.max_samples_per_instance; - ddsqos.initial_samples = qos.initial_samples; - ddsqos.initial_instances = qos.initial_instances; - ddsqos.instance_hash_buckets = qos.instance_hash_buckets; -} - -inline void -operator<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQosPolicy & qos) -{ - ddsqos.max_samples = qos.max_samples; - ddsqos.max_instances = qos.max_instances; - ddsqos.max_samples_per_instance = qos.max_samples_per_instance; - ddsqos.initial_samples = qos.initial_samples; - ddsqos.initial_instances = qos.initial_instances; - ddsqos.instance_hash_buckets = qos.instance_hash_buckets; -} - -#endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h deleted file mode 100644 index 3c7b697c193..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleInfoSeq.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef SAMPLEINFOSEQ_H -#define SAMPLEINFOSEQ_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#include "Time_t.h" -#include "InstanceHandle_t.h" - -inline void -operator<<= (::DDS::SampleInfo& sample_info, const ::DDS_SampleInfo& dds_sample_info) -{ - sample_info.sample_state = dds_sample_info.sample_state; - sample_info.view_state = dds_sample_info.view_state; - sample_info.instance_state = dds_sample_info.instance_state; - sample_info.source_timestamp <<= dds_sample_info.source_timestamp; - sample_info.instance_handle <<= dds_sample_info.instance_handle; - sample_info.publication_handle <<= dds_sample_info.publication_handle; - sample_info.disposed_generation_count = dds_sample_info.disposed_generation_count; - sample_info.no_writers_generation_count = dds_sample_info.no_writers_generation_count; - sample_info.sample_rank = dds_sample_info.sample_rank; - sample_info.generation_rank = dds_sample_info.generation_rank; - sample_info.absolute_generation_rank = dds_sample_info.absolute_generation_rank; - sample_info.valid_data = dds_sample_info.valid_data; -} - -inline void -operator<<= (::DDS::SampleInfoSeq &ddsinfo_seq, const ::DDS_SampleInfoSeq & info_seq) -{ - ddsinfo_seq.length (info_seq.length ()); - for (::DDS_Long i = 0; i < info_seq.length (); ++i) - { - ddsinfo_seq[i] <<= info_seq[i]; - } -} - -#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h deleted file mode 100644 index b2680e01242..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleLostStatus.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SAMPLELOSTSTATUS_H -#define DDS4CCM_SAMPLELOSTSTATUS_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & ddsstatus) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h deleted file mode 100644 index f20f7d6d98d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SampleRejectedStatus.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H -#define DDS4CCM_SAMPLEREJECTEDSTATUS_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_reason = static_cast < ::DDS::SampleRejectedStatusKind> (status.last_reason); - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -inline void -operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason); - ddsstatus.last_instance_handle <<= status.last_instance_handle; -} - -#endif /* DDS4CCM_SAMPLEREJECTEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h deleted file mode 100644 index 654eadca5b6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/StringSeq.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - * @author Johnny Willemsen (jwillemsen@remedy.nl) - */ - -#ifndef DDS4CCM_STRINGSEQ_T_H_ -#define DDS4CCM_STRINGSEQ_T_H_ - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq) -{ - string_seq.length (dds_string_seq.length ()); - for (::DDS_Long i = 0 ; i < dds_string_seq.length(); ++i) - { - string_seq[i] = CORBA::string_dup (dds_string_seq[i]); - } -} - -inline void -operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_seq) -{ - const char** parameterlist = new const char*[string_seq.length ()]; - - for (CORBA::ULong i = 0; i < string_seq.length (); ++i) - { - parameterlist[i] = string_seq[i].in (); - } - dds_string_seq.maximum(string_seq.length ()); - dds_string_seq.length (string_seq.length ()); - dds_string_seq.from_array (parameterlist, string_seq.length ()); - delete [] parameterlist; -} - -#endif /* DDS4CCM_STRINGSEQ_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h deleted file mode 100644 index 040a1ea52d8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriberQos.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIBERQOS_H -#define DDS4CCM_SUBSCRIBERQOS_H - -#include "EntityFactoryQosPolicy.h" -#include "GroupDataQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "PresentationQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_SubscriberQos &ddsqos, const ::DDS::SubscriberQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -#endif /* DDS4CCM_SUBSCRIBERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h deleted file mode 100644 index 4c2971970ef..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionBuiltinTopicData.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SUBSCRIPTIONBUILTINTOPICDATA_H_ -#define SUBSCRIPTIONBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "DurabilityQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "TimeBasedFilterQosPolicy.h" -#include "PresentationQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "TopicDataQosPolicy.h" -#include "GroupDataQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::SubscriptionBuiltinTopicData &ddstopicdata, const ::DDS_SubscriptionBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = topicdata.topic_name; - ddstopicdata.type_name = topicdata.type_name; - - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.time_based_filter <<= topicdata.time_based_filter; - - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -inline void -operator<<= (::DDS_SubscriptionBuiltinTopicData & ddstopicdata, const ::DDS::SubscriptionBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name); - ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name); - - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.time_based_filter <<= topicdata.time_based_filter; - - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -#endif /* SUBSCRIPTIONBUILTINTOPICDATA_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h deleted file mode 100644 index 0e76d65fd04..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/SubscriptionMatchedStatus.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H -#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H - -#include "InstanceHandle_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.current_count = status.current_count; - ddsstatus.current_count_change = status.current_count_change; - ddsstatus.last_publication_handle <<= status.last_publication_handle; -} - -inline void -operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.current_count = status.current_count; - ddsstatus.current_count_change = status.current_count_change; - ddsstatus.last_publication_handle <<= status.last_publication_handle; -} - -#endif /* DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H */ - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h deleted file mode 100644 index b17d84af9a8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H -#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H - -#include "Duration_t.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos) -{ - ddsqos.minimum_separation <<= qos.minimum_separation; -} - -inline void -operator<<= (::DDS_TimeBasedFilterQosPolicy &ddsqos, const ::DDS::TimeBasedFilterQosPolicy & qos) -{ - ddsqos.minimum_separation <<= qos.minimum_separation; -} - -#endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h deleted file mode 100644 index c768756e3fa..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/Time_t.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TIME_T_H_ -#define DDS4CCM_TIME_T_H_ - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time) -{ - ddstime.sec = time.sec; - ddstime.nanosec = time.nanosec; -} - -inline void -operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time) -{ - ddstime.sec = time.sec; - ddstime.nanosec = time.nanosec; -} - -#endif /* DDS4CCM_TIME_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h deleted file mode 100644 index eeea382b1ab..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicBuiltinTopicData.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TOPICBUILTINTOPICDATA_H_ -#define TOPICBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "TransportPriorityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "TopicDataQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::TopicBuiltinTopicData &ddstopicdata, const ::DDS_TopicBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.name = topicdata.name; - ddstopicdata.type_name = topicdata.type_name; - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.durability_service <<= topicdata.durability_service; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.transport_priority <<= topicdata.transport_priority; - ddstopicdata.lifespan <<= topicdata.lifespan; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.history <<= topicdata.history; - ddstopicdata.resource_limits <<= topicdata.resource_limits; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.topic_data <<= topicdata.topic_data; -} - -inline void -operator<<= (::DDS_TopicBuiltinTopicData & ddstopicdata, const ::DDS::TopicBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.name = CORBA::string_dup (topicdata.name); - ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name); - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.durability_service <<= topicdata.durability_service; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.transport_priority <<= topicdata.transport_priority; - ddstopicdata.lifespan <<= topicdata.lifespan; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.history <<= topicdata.history; - ddstopicdata.resource_limits <<= topicdata.resource_limits; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.topic_data <<= topicdata.topic_data; -} - -#endif /* TOPICBUILTINTOPICDATA_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h deleted file mode 100644 index 382d6e4b11b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TOPICDATAQOSPOLICY_H -#define DDS4CCM_TOPICDATAQOSPOLICY_H - -#include "OctetSeq.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_TopicDataQosPolicy &ddsqos, const ::DDS::TopicDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h deleted file mode 100644 index 67a1c5d878e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TopicQos.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TOPICQOS_H -#define DDS4CCM_TOPICQOS_H - -#include "TopicDataQosPolicy.h" -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "TransportPriorityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "OwnershipQosPolicy.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos) -{ - ddsqos.topic_data <<= qos.topic_data; - ddsqos.durability <<= qos.durability; - ddsqos.durability_service <<= qos.durability_service; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.transport_priority <<= qos.transport_priority; - ddsqos.lifespan <<= qos.lifespan; - ddsqos.ownership <<= qos.ownership; -} - -inline void -operator<<= (::DDS_TopicQos &ddsqos, const ::DDS::TopicQos & qos) -{ - ddsqos.topic_data <<= qos.topic_data; - ddsqos.durability <<= qos.durability; - ddsqos.durability_service <<= qos.durability_service; - ddsqos.deadline <<= qos.deadline; - ddsqos.latency_budget <<= qos.latency_budget; - ddsqos.liveliness <<= qos.liveliness; - ddsqos.reliability <<= qos.reliability; - ddsqos.destination_order <<= qos.destination_order; - ddsqos.history <<= qos.history; - ddsqos.resource_limits <<= qos.resource_limits; - ddsqos.transport_priority <<= qos.transport_priority; - ddsqos.lifespan <<= qos.lifespan; - ddsqos.ownership <<= qos.ownership; -} - -#endif /* DDS4CCM_TOPICQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h deleted file mode 100644 index 90a0535afe6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H -#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -inline void -operator<<= (::DDS_TransportPriorityQosPolicy &ddsqos, const ::DDS::TransportPriorityQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -#endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h deleted file mode 100644 index f34528ddea3..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H -#define DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - -inline void -operator<<= (::DDS::TypeConsistencyEnforcementQosPolicy &ddsqos, const ::DDS_TypeConsistencyEnforcementQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::TypeConsistencyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_TypeConsistencyEnforcementQosPolicy &ddsqos, const ::DDS::TypeConsistencyEnforcementQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_TypeConsistencyKind> (qos.kind); -} - -#endif - -#endif /* DDS4CCM_TYPECONSISTENCYENFORCEMENTQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h deleted file mode 100644 index 6b5a141f76f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_USERDATAQOSPOLICY_H -#define DDS4CCM_USERDATAQOSPOLICY_H - -#include "OctetSeq.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif /* DDS4CCM_USERDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h deleted file mode 100644 index 6c4133555c1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Johnny Willemsen (jwillemsen@remedy.nl) - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H -#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H - -#include "dds4ccm/impl/dds4ccm_conf.h" - -inline void -operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos) -{ - ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; -} - -inline void -operator<<= (::DDS_WriterDataLifecycleQosPolicy &ddsqos, const ::DDS::WriterDataLifecycleQosPolicy & qos) -{ - ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; -} - -#endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h deleted file mode 100644 index 19c64d6198c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h +++ /dev/null @@ -1,35 +0,0 @@ -// -*- C++ -*- -// Definition for Win32 Export directives. -// ------------------------------ -#ifndef DDS4CCM_DDS_NDDS_EXPORT_H -#define DDS4CCM_DDS_NDDS_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_NDDS_HAS_DLL) -# define DDS4CCM_NDDS_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_NDDS_HAS_DLL */ - -#if !defined (DDS4CCM_NDDS_HAS_DLL) -# define DDS4CCM_NDDS_HAS_DLL 1 -#endif /* ! DDS4CCM_NDDS_HAS_DLL */ - -#if defined (DDS4CCM_NDDS_HAS_DLL) && (DDS4CCM_NDDS_HAS_DLL == 1) -# if defined (DDS4CCM_DDS_NDDS_BUILD_DLL) -# define DDS4CCM_NDDS_Export ACE_Proper_Export_Flag -# define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DDS4CCM_DDS_NDDS_BUILD_DLL */ -# define DDS4CCM_NDDS_Export ACE_Proper_Import_Flag -# define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DDS4CCM_DDS_NDDS_BUILD_DLL */ -#else /* DDS4CCM_NDDS_HAS_DLL == 1 */ -# define DDS4CCM_NDDS_Export -# define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) -# define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DDS4CCM_NDDS_HAS_DLL == 1 */ - -#endif /* DDS4CCM_DDS_NDDS_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc deleted file mode 100644 index 0bf92524d97..00000000000 --- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc +++ /dev/null @@ -1,40 +0,0 @@ -// -*- MPC -*- -project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_idltocpp_stub, taolib, \ - ciao_output, dds4ccm_logger, nddslib { - - dynamicflags += DDS4CCM_DDS_NDDS_BUILD_DLL - macros += BUILDING_DDS_NDDS_LIB - Header_Files { - *.h - convertors/*.h - } - - Source_Files { - Condition.cpp - ContentFilteredTopic.cpp - DataReader.cpp - DataReaderListener.cpp - DataWriter.cpp - DataWriterListener.cpp - DomainParticipant.cpp - DomainParticipantFactory.cpp - DomainParticipantListener.cpp - Publisher.cpp - PublisherListener.cpp - QueryCondition.cpp - ReadCondition.cpp - StatusCondition.cpp - Subscriber.cpp - SubscriberListener.cpp - Topic.cpp - TopicDescription.cpp - TopicListener.cpp - TypeSupport.cpp - WaitSet.cpp - Utils.cpp - } - - specific { - install_dir = connectors/dds4ccm/impl/ndds - } -} diff --git a/CIAO/connectors/dds4ccm/models/README b/CIAO/connectors/dds4ccm/models/README deleted file mode 100644 index 422e7a46dea..00000000000 --- a/CIAO/connectors/dds4ccm/models/README +++ /dev/null @@ -1,12 +0,0 @@ - - -In order to use dds4ccm correctly, you must first create a PICML -model of the dds4ccm IDL files that can be used as a GME library -(called a PICML library from this point forward) for an project -that uses dds4ccm. The PICML library for dds4ccm needs to be created -only once and each time the IDL changes. To create the dds4ccm -PICML library, please execute steps: - -%> cd $CIAO_ROOT -%> idl_to_picml -x dds4ccm -r connectors/dds4ccm/idl -%> mv dds4ccm.xme connectors/dds4ccm/models diff --git a/CIAO/connectors/dds4ccm/models/dds4ccm.xme b/CIAO/connectors/dds4ccm/models/dds4ccm.xme deleted file mode 100644 index cacf7404132..00000000000 --- a/CIAO/connectors/dds4ccm/models/dds4ccm.xme +++ /dev/null @@ -1,17214 +0,0 @@ - - - - - dds4ccm - - - - - - - dds4ccm - - InterfaceDefinitions - - ccm_dds - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - Typed - - - - - - - - - - - - - - - - - InstanceHandleManager - - local - - - - - - - - - - - - - - - - - - register_instance - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - - - - - 260,60 - - - - - - - unregister_instance - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - Writer - - local - - - - - - - - - - - - - - - - - - write_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - write_many - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - is_coherent_write - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - Updater - - local - - - - - - - - - - - - - - - - - - create_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - update_one - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - delete_one - - - - - - 60,260 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - instance_handle - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - create_many - - - - - - 60,360 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - update_many - - - - - - 60,460 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - delete_many - - - - - - 60,560 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - is_global_scope - - - - - - 60,660 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - is_coherent_write - - - - - - 60,760 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - Reader - - local - - - - - - - - - - - - - - - - - - read_last - - - - - - 60,60 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - read_all - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - - - - - 260,60 - - - - - - - read_one_last - - - - - - 60,260 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - instance_handle - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - - - - - - 460,60 - - - - - - - read_one_all - - - - - - 60,360 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - data - - - - - - 160,60 - - - - - - infos - - - - - - 260,60 - - - - - - instance_handle - - - - - - 360,60 - - - - - - - - - - - - 460,60 - - - - - - - - - - - - 560,60 - - - - - - - query - - - - - - 60,460 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - - Getter - - local - - - - - - - - - - - - - - - - - - get_one - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - info - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - get_many - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - infos - - - - - - 260,60 - - - - - - - - - - - - 360,60 - - - - - - - time_out - - - - - - 60,260 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_delivered_data - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - on_one_data - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_many_data - - - - - - 60,160 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - - StateListener - - local - - - - - - - - - - - - - - - - - - on_creation - - - - - - 60,60 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_one_update - - - - - - 60,160 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - on_many_updates - - - - - - 60,260 - - - - - - - - - - - data - - - - - - 60,60 - - - - - - infos - - - - - - 160,60 - - - - - - - on_deletion - - - - - - 60,360 - - - - - - - - - - - datum - - - - - - 60,60 - - - - - - info - - - - - - 160,60 - - - - - - - - DDS_Write - - - - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_Update - - - - - - - - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_Read - - - - - - - - - - - - - - filter - - - - - - 60,360 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - status - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_Get - - - - - - - - - - - - - - filter - - - - - - 60,460 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - fresh_data - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - False - - - false - - - - status - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,560 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_Listen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - False - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_StateListen - - - - - - - - - - - - - - filter - - - - - - 60,560 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - - - 160,60 - - - - - - - data - - - - - - 60,60 - - - - - - - - - - - false - - - false - - - False - - - false - - - - data_listener - - - - - - 60,260 - - - - - - - - - - - false - - - false - - - false - - - - data_control - - - - - - 60,160 - - - - - - - - - - - false - - - false - - - False - - - false - - - - dds_entity - - - - - - 60,360 - - - - - - - - - - - false - - - false - - - False - - - false - - - - status - - - - - - 60,460 - - - - - - - - - - - false - - - false - - - false - - - - filter_config - - - - - - 60,660 - - - - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_State - - - - - - - - - - - C61798A6-7C26-11DF-8000-000C2958D27B - - - - - - observable - - - passive_observer - - - pull_observer - - - push_observer - - - push_state_observer - - - ConnectorInherits - - - - DDS_Event - - - - - - - - - - - C61798A6-7C26-11DF-8001-000C2958D27B - - - - - - supplier - - - pull_consumer - - - push_consumer - - - ConnectorInherits - - - - T - - - - - - 60,60 - - - - - - TSeq - - - - - - 160,60 - - - - - - - - - dds4ccm_Base - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - AccessStatus - - - - - - - - - - - - - - FRESH_INFO - - - - - - 60,60 - - - - - - ALREADY_SEEN - - - - - - 60,160 - - - - - - - InstanceStatus - - - - - - - - - - - - - - INSTANCE_CREATED - - - - - - 60,60 - - - - - - INSTANCE_FILTERED_IN - - - - - - 60,160 - - - - - - INSTANCE_UPDATED - - - - - - 60,260 - - - - - - INSTANCE_FILTERED_OUT - - - - - - 60,360 - - - - - - INSTANCE_DELETED - - - - - - 60,460 - - - - - - - ReadInfo - - - - - - - - - - - - - - access_status - - - - - - 60,260 - - - - - - instance_status - - - - - - 60,360 - - - - - - instance_handle - - - - - - 60,60 - - - - - - source_timestamp - - - - - - 60,160 - - - - - - - QueryFilter - - - - - - - - - - - - - - expression - - - - - - 60,60 - - - - - - parameters - - - - - - 60,160 - - - - - - - ListenerMode - - - - - - - - - - - - - - NOT_ENABLED - - - - - - 60,60 - - - - - - ONE_BY_ONE - - - - - - 60,160 - - - - - - MANY_BY_MANY - - - - - - 60,260 - - - - - - - AlreadyCreated - - - - - - - - - - - - - - indexes - - - - NonExistent - - - - - - - - - - - - - - indexes - - - - InternalError - - - - - - - - - - - - - - index - - - error_code - - - - NonChangeable - - - - - - - - - - - - - - - ContentFilterSetting - - local - - - - - - - - - - - - - - - - - - set_filter_parameters - - - - - - 60,60 - - - - - - - - - - - - - - - - - 160,60 - - - - - - parameters - - - - - - 60,60 - - - - - - - - ReadInfoSeq - - - - - - - - - - - - - - - - - - DataNumber_t - - - - - - - - - - - - - - - DataNumberSeq - - - - - - - - - - - - - - - - - - UNLIMITED - - - - - - - - 0 - - - - - - dds4ccm_Connector - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DDS_Base - - - - - - - - - - - C61798A6-7C26-11DF-8002-000C2958D27B - - - - - - domain_id - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - qos_profile - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - error_listener - - - - - - - - false - - - false - - - False - - - false - - - - - DDS_TopicBase - - - - - - - - - - - C61798A6-7C26-11DF-8003-000C2958D27B - - - - - - topic_name - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - key_fields - - - - - - - - - - - - - - 160,60 - - - - - - - - - - - - 60,60 - - - - - - - ConnectorInherits - - - - - - dds4ccm_ConnectorStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - ConnectorStatusListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - the_topic - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_deadline_missed - - - - - - 60,360 - - - - - - - - - - - the_writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,460 - - - - - - - - - - - the_writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_unexpected_status - - - - - - 60,560 - - - - - - - - - - - the_entity - - - - - - 60,60 - - - - - - status_kind - - - - - - 160,60 - - - - - - - - - - dds4ccm_DataListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - DataListenerControl - - local - - - - - - - - - - - - - - - - - - mode - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - max_delivered_data - - - - - - 60,160 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - - - - dds4ccm_PortStatusListener - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - PortStatusListener - - local - - - - - - - - - - - - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_lost - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - - - - dds4ccm_StateListenerControl - - connectors/dds4ccm/idl - - - - - - - - - - - - CCM_DDS - - - - - - - - - - - - - - - - - StateListenerControl - - local - - - - - - - - - - - - - - - - - - is_filter_interpreted - - - - - - 60,60 - - - - - - - - - - - - - - - - - 60,60 - - - - - - - Inherits - - - - - - dds_rtf2_dcps - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - BuiltinTopicKey_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - Duration_t - - - - - - - - - - - - - - sec - - - - - - 60,60 - - - - - - nanosec - - - - - - 60,160 - - - - - - - Time_t - - - - - - - - - - - - - - sec - - - - - - 60,60 - - - - - - nanosec - - - - - - 60,160 - - - - - - - InconsistentTopicStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - SampleLostStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - SampleRejectedStatusKind - - - - - - - - - - - - - - NOT_REJECTED - - - - - - 60,60 - - - - - - REJECTED_BY_INSTANCES_LIMIT - - - - - - 60,160 - - - - - - REJECTED_BY_SAMPLES_LIMIT - - - - - - 60,260 - - - - - - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - - - - - - 60,360 - - - - - - - SampleRejectedStatus - - - - - - - - - - - - - - last_reason - - - - - - 60,260 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,360 - - - - - - - LivelinessLostStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - LivelinessChangedStatus - - - - - - - - - - - - - - alive_count - - - - - - 60,60 - - - - - - not_alive_count - - - - - - 60,160 - - - - - - alive_count_change - - - - - - 60,260 - - - - - - not_alive_count_change - - - - - - 60,360 - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - - OfferedDeadlineMissedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - - RequestedDeadlineMissedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_instance_handle - - - - - - 60,260 - - - - - - - QosPolicyCount - - - - - - - - - - - - - - policy_id - - - - - - 60,60 - - - - - - count - - - - - - 60,160 - - - - - - - OfferedIncompatibleQosStatus - - - - - - - - - - - - - - policies - - - - - - 60,360 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - RequestedIncompatibleQosStatus - - - - - - - - - - - - - - policies - - - - - - 60,360 - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - last_policy_id - - - - - - 60,260 - - - - - - - PublicationMatchedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - current_count - - - - - - 60,260 - - - - - - current_count_change - - - - - - 60,360 - - - - - - last_subscription_handle - - - - - - 60,460 - - - - - - - SubscriptionMatchedStatus - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - current_count - - - - - - 60,260 - - - - - - current_count_change - - - - - - 60,360 - - - - - - last_publication_handle - - - - - - 60,460 - - - - - - - ReliableReaderActivityChangedStatus - - - - - - - - - - - - - - active_count - - - - - - 60,60 - - - - - - inactive_count - - - - - - 60,160 - - - - - - active_count_change - - - - - - 60,260 - - - - - - inactive_count_change - - - - - - 60,360 - - - - - - last_instance_handle - - - - - - 60,460 - - - - - - - ReliableWriterCacheEventCount - - - - - - - - - - - - - - total_count - - - - - - 60,60 - - - - - - total_count_change - - - - - - 60,160 - - - - - - - ReliableWriterCacheChangedStatus - - - - - - - - - - - - - - empty_reliable_writer_cache - - - - - - 60,60 - - - - - - full_reliable_writer_cache - - - - - - 60,160 - - - - - - low_watermark_reliable_writer_cache - - - - - - 60,260 - - - - - - high_watermark_reliable_writer_cache - - - - - - 60,360 - - - - - - unacknowledged_sample_count - - - - - - 60,460 - - - - - - unacknowledged_sample_count_peak - - - - - - 60,560 - - - - - - - Listener - - local - - - - - - - - - - - - - - - - - - - Entity - - local - - - - - - - - - - - - - - - - - - enable - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_statuscondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_status_changes - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_handle - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - TopicDescription - - local - - - - - - - - - - - - - - - - - - get_type_name - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_name - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - Topic - - local - - - - - - - - - - - - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_inconsistent_topic_status - - - - - - 60,460 - - - - - - - - - - - a_status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - Inherits - - - - ContentFilteredTopic - - local - - - - - - - - - - - - - - - - - - get_filter_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - get_related_topic - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - MultiTopic - - local - - - - - - - - - - - - - - - - - - get_subscription_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_expression_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - set_expression_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - expression_parameters - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriter - - local - - - - - - - - - - - - - - - - - - set_qos - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topic - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publisher - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_lost_status - - - - - - 60,760 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_deadline_missed_status - - - - - - 60,860 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_offered_incompatible_qos_status - - - - - - 60,960 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_publication_matched_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_subscriptions - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - subscription_handles - - - - - - 160,60 - - - - - - - get_matched_subscription_data - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - subscription_data - - - - - - 160,60 - - - - - - subscription_handle - - - - - - 260,60 - - - - - - - Inherits - - - - DataReader - - local - - - - - - - - - - - - - - - - - - create_readcondition - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - view_states - - - - - - 260,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - - create_querycondition - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_expression - - - - - - 460,60 - - - - - - query_parameters - - - - - - 560,60 - - - - - - sample_states - - - - - - 160,60 - - - - - - view_states - - - - - - 260,60 - - - - - - instance_states - - - - - - 360,60 - - - - - - - delete_readcondition - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_condition - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_topicdescription - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscriber - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_rejected_status - - - - - - 60,1060 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_liveliness_changed_status - - - - - - 60,1160 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_deadline_missed_status - - - - - - 60,1260 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_requested_incompatible_qos_status - - - - - - 60,1360 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_subscription_matched_status - - - - - - 60,1460 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_sample_lost_status - - - - - - 60,1560 - - - - - - - - - - - status - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_historical_data - - - - - - 60,1660 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_matched_publications - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - publication_handles - - - - - - 160,60 - - - - - - - get_matched_publication_data - - - - - - 60,1860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - publication_data - - - - - - 160,60 - - - - - - publication_handle - - - - - - 260,60 - - - - - - - Inherits - - - - Subscriber - - local - - - - - - - - - - - - - - - - - - create_datareader - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_datareader_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_datareader - - - - - - 60,260 - - - - - - - - - - - a_datareader - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datareader - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - get_datareaders - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - readers - - - - - - 160,60 - - - - - - sample_states - - - - - - 260,60 - - - - - - view_states - - - - - - 360,60 - - - - - - instance_states - - - - - - 460,60 - - - - - - - notify_datareaders - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_access - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_access - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datareader_qos - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_datareader_qos - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - copy_from_topic_qos - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datareader_qos - - - - - - 160,60 - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - - Inherits - - - - Publisher - - local - - - - - - - - - - - - - - - - - - create_datawriter - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_datawriter_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_topic - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - probile_name - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_datawriter - - - - - - 60,260 - - - - - - - - - - - a_datawriter - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_datawriter - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - delete_contained_entities - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_qos - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - set_listener - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 160,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - suspend_publications - - - - - - 60,960 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - resume_publications - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - begin_coherent_changes - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - end_coherent_changes - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - wait_for_acknowledgments - - - - - - 60,1360 - - - - - - - - - - - max_wait - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_participant - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_datawriter_qos - - - - - - 60,1560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - get_default_datawriter_qos - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - - copy_from_topic_qos - - - - - - 60,1760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_datawriter_qos - - - - - - 160,60 - - - - - - a_topic_qos - - - - - - 260,60 - - - - - - - Inherits - - - - TopicListener - - local - - - - - - - - - - - - - - - - - - on_inconsistent_topic - - - - - - 60,60 - - - - - - - - - - - the_topic - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - DataWriterListener - - local - - - - - - - - - - - - - - - - - - on_offered_deadline_missed - - - - - - 60,60 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_offered_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_liveliness_lost - - - - - - 60,260 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_publication_matched - - - - - - 60,360 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_reliable_writer_cache_changed - - - - - - 60,460 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_reliable_reader_activity_changed - - - - - - 60,560 - - - - - - - - - - - writer - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - PublisherListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - - DataReaderListener - - local - - - - - - - - - - - - - - - - - - on_requested_deadline_missed - - - - - - 60,60 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_requested_incompatible_qos - - - - - - 60,160 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_rejected - - - - - - 60,260 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_liveliness_changed - - - - - - 60,360 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_data_available - - - - - - 60,460 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - - on_subscription_matched - - - - - - 60,560 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - on_sample_lost - - - - - - 60,660 - - - - - - - - - - - the_reader - - - - - - 60,60 - - - - - - status - - - - - - 160,60 - - - - - - - Inherits - - - - SubscriberListener - - local - - - - - - - - - - - - - - - - - - on_data_on_readers - - - - - - 60,60 - - - - - - - - - - - the_subscriber - - - - - - 60,60 - - - - - - - Inherits - - - - DomainParticipantListener - - local - - - - - - - - - - - - - - - - - - Inherits - - - Inherits - - - Inherits - - - - Condition - - local - - - - - - - - - - - - - - - - - - get_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - WaitSet - - local - - - - - - - - - - - - - - - - - - wait - - - - - - 60,60 - - - - - - - - - - - active_conditions - - - - - - 160,60 - - - - - - timeout - - - - - - 260,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - attach_condition - - - - - - 60,160 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - detach_condition - - - - - - 60,260 - - - - - - - - - - - cond - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_conditions - - - - - - 60,360 - - - - - - - - - - - attached_conditions - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - GuardCondition - - local - - - - - - - - - - - - - - - - - - set_trigger_value - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - value - - - - - - 160,60 - - - - - - - Inherits - - - - StatusCondition - - local - - - - - - - - - - - - - - - - - - get_enabled_statuses - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_enabled_statuses - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 160,60 - - - - - - - get_entity - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - ReadCondition - - local - - - - - - - - - - - - - - - - - - get_sample_state_mask - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_view_state_mask - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_instance_state_mask - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_datareader - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - QueryCondition - - local - - - - - - - - - - - - - - - - - - get_query_expression - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_query_parameters - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_parameters - - - - - - 160,60 - - - - - - - set_query_parameters - - - - - - 60,260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - query_parameters - - - - - - 160,60 - - - - - - - Inherits - - - - UserDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TopicDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - GroupDataQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - TransportPriorityQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - LifespanQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - DurabilityQosPolicyKind - - - - - - - - - - - - - - VOLATILE_DURABILITY_QOS - - - - - - 60,60 - - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - 60,160 - - - - - - TRANSIENT_DURABILITY_QOS - - - - - - 60,260 - - - - - - PERSISTENT_DURABILITY_QOS - - - - - - 60,360 - - - - - - - DurabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - PresentationQosPolicyAccessScopeKind - - - - - - - - - - - - - - INSTANCE_PRESENTATION_QOS - - - - - - 60,60 - - - - - - TOPIC_PRESENTATION_QOS - - - - - - 60,160 - - - - - - GROUP_PRESENTATION_QOS - - - - - - 60,260 - - - - - - - PresentationQosPolicy - - - - - - - - - - - - - - access_scope - - - - - - 60,60 - - - - - - coherent_access - - - - - - 60,160 - - - - - - ordered_access - - - - - - 60,260 - - - - - - - DeadlineQosPolicy - - - - - - - - - - - - - - period - - - - - - 60,60 - - - - - - - LatencyBudgetQosPolicy - - - - - - - - - - - - - - duration - - - - - - 60,60 - - - - - - - OwnershipQosPolicyKind - - - - - - - - - - - - - - SHARED_OWNERSHIP_QOS - - - - - - 60,60 - - - - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - - 60,160 - - - - - - - OwnershipQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - OwnershipStrengthQosPolicy - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - - - LivelinessQosPolicyKind - - - - - - - - - - - - - - AUTOMATIC_LIVELINESS_QOS - - - - - - 60,60 - - - - - - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - - - - 60,160 - - - - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - - - - 60,260 - - - - - - - LivelinessQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - lease_duration - - - - - - 60,160 - - - - - - - TimeBasedFilterQosPolicy - - - - - - - - - - - - - - minimum_separation - - - - - - 60,60 - - - - - - - PartitionQosPolicy - - - - - - - - - - - - - - name - - - - - - 60,60 - - - - - - - ReliabilityQosPolicyKind - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - - - - 60,60 - - - - - - RELIABLE_RELIABILITY_QOS - - - - - - 60,160 - - - - - - - ReliabilityQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - max_blocking_time - - - - - - 60,160 - - - - - - - DestinationOrderQosPolicyKind - - - - - - - - - - - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,60 - - - - - - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - - - - - - 60,160 - - - - - - - DestinationOrderQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - - HistoryQosPolicyKind - - - - - - - - - - - - - - KEEP_LAST_HISTORY_QOS - - - - - - 60,60 - - - - - - KEEP_ALL_HISTORY_QOS - - - - - - 60,160 - - - - - - - HistoryQosPolicy - - - - - - - - - - - - - - kind - - - - - - 60,60 - - - - - - depth - - - - - - 60,160 - - - - - - - ResourceLimitsQosPolicy - - - - - - - - - - - - - - max_samples - - - - - - 60,60 - - - - - - max_instances - - - - - - 60,160 - - - - - - max_samples_per_instance - - - - - - 60,260 - - - - - - - EntityFactoryQosPolicy - - - - - - - - - - - - - - autoenable_created_entities - - - - - - 60,60 - - - - - - - WriterDataLifecycleQosPolicy - - - - - - - - - - - - - - autodispose_unregistered_instances - - - - - - 60,60 - - - - - - - ReaderDataLifecycleQosPolicy - - - - - - - - - - - - - - autopurge_nowriter_samples_delay - - - - - - 60,60 - - - - - - autopurge_disposed_samples_delay - - - - - - 60,160 - - - - - - - DurabilityServiceQosPolicy - - - - - - - - - - - - - - service_cleanup_delay - - - - - - 60,60 - - - - - - history_kind - - - - - - 60,160 - - - - - - history_depth - - - - - - 60,260 - - - - - - max_samples - - - - - - 60,360 - - - - - - max_instances - - - - - - 60,460 - - - - - - max_samples_per_instance - - - - - - 60,560 - - - - - - - DomainParticipantFactoryQos - - - - - - - - - - - - - - entity_factory - - - - - - 60,60 - - - - - - - DomainParticipantQos - - - - - - - - - - - - - - user_data - - - - - - 60,60 - - - - - - entity_factory - - - - - - 60,160 - - - - - - - TopicQos - - - - - - - - - - - - - - topic_data - - - - - - 60,60 - - - - - - durability - - - - - - 60,160 - - - - - - durability_service - - - - - - 60,260 - - - - - - deadline - - - - - - 60,360 - - - - - - latency_budget - - - - - - 60,460 - - - - - - liveliness - - - - - - 60,560 - - - - - - reliability - - - - - - 60,660 - - - - - - destination_order - - - - - - 60,760 - - - - - - history - - - - - - 60,860 - - - - - - resource_limits - - - - - - 60,960 - - - - - - transport_priority - - - - - - 60,1060 - - - - - - lifespan - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - - DataWriterQos - - - - - - - - - - - - - - durability - - - - - - 60,60 - - - - - - durability_service - - - - - - 60,160 - - - - - - deadline - - - - - - 60,260 - - - - - - latency_budget - - - - - - 60,360 - - - - - - liveliness - - - - - - 60,460 - - - - - - reliability - - - - - - 60,560 - - - - - - destination_order - - - - - - 60,660 - - - - - - history - - - - - - 60,760 - - - - - - resource_limits - - - - - - 60,860 - - - - - - transport_priority - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - writer_data_lifecycle - - - - - - 60,1460 - - - - - - - PublisherQos - - - - - - - - - - - - - - presentation - - - - - - 60,60 - - - - - - partition - - - - - - 60,160 - - - - - - group_data - - - - - - 60,260 - - - - - - entity_factory - - - - - - 60,360 - - - - - - - DataReaderQos - - - - - - - - - - - - - - durability - - - - - - 60,60 - - - - - - deadline - - - - - - 60,160 - - - - - - latency_budget - - - - - - 60,260 - - - - - - liveliness - - - - - - 60,360 - - - - - - reliability - - - - - - 60,460 - - - - - - destination_order - - - - - - 60,560 - - - - - - history - - - - - - 60,660 - - - - - - resource_limits - - - - - - 60,760 - - - - - - user_data - - - - - - 60,860 - - - - - - ownership - - - - - - 60,960 - - - - - - time_based_filter - - - - - - 60,1060 - - - - - - reader_data_lifecycle - - - - - - 60,1160 - - - - - - - SubscriberQos - - - - - - - - - - - - - - presentation - - - - - - 60,60 - - - - - - partition - - - - - - 60,160 - - - - - - group_data - - - - - - 60,260 - - - - - - entity_factory - - - - - - 60,360 - - - - - - - ParticipantBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - user_data - - - - - - 60,160 - - - - - - - TopicBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - durability - - - - - - 60,360 - - - - - - durability_service - - - - - - 60,460 - - - - - - deadline - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,760 - - - - - - reliability - - - - - - 60,860 - - - - - - transport_priority - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - destination_order - - - - - - 60,1160 - - - - - - history - - - - - - 60,1260 - - - - - - resource_limits - - - - - - 60,1360 - - - - - - ownership - - - - - - 60,1460 - - - - - - topic_data - - - - - - 60,1560 - - - - - - name - - - - - - 60,160 - - - - - - type_name - - - - - - 60,260 - - - - - - - PublicationBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - participant_key - - - - - - 60,160 - - - - - - durability - - - - - - 60,460 - - - - - - durability_service - - - - - - 60,560 - - - - - - deadline - - - - - - 60,660 - - - - - - latency_budget - - - - - - 60,760 - - - - - - liveliness - - - - - - 60,860 - - - - - - reliability - - - - - - 60,960 - - - - - - lifespan - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - ownership - - - - - - 60,1260 - - - - - - ownership_strength - - - - - - 60,1360 - - - - - - destination_order - - - - - - 60,1460 - - - - - - presentation - - - - - - 60,1560 - - - - - - partition - - - - - - 60,1660 - - - - - - topic_data - - - - - - 60,1760 - - - - - - group_data - - - - - - 60,1860 - - - - - - topic_name - - - - - - 60,260 - - - - - - type_name - - - - - - 60,360 - - - - - - - SubscriptionBuiltinTopicData - - - - - - - - - - - - - - key - - - - - - 60,60 - - - - - - participant_key - - - - - - 60,160 - - - - - - durability - - - - - - 60,460 - - - - - - deadline - - - - - - 60,560 - - - - - - latency_budget - - - - - - 60,660 - - - - - - liveliness - - - - - - 60,760 - - - - - - reliability - - - - - - 60,860 - - - - - - ownership - - - - - - 60,960 - - - - - - destination_order - - - - - - 60,1060 - - - - - - user_data - - - - - - 60,1160 - - - - - - time_based_filter - - - - - - 60,1260 - - - - - - presentation - - - - - - 60,1360 - - - - - - partition - - - - - - 60,1460 - - - - - - topic_data - - - - - - 60,1560 - - - - - - group_data - - - - - - 60,1660 - - - - - - topic_name - - - - - - 60,260 - - - - - - type_name - - - - - - 60,360 - - - - - - - DomainParticipant - - local - - - - - - - - - - - - - - - - - - create_publisher - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - mask - - - - - - 360,60 - - - - - - - create_publisher_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - - delete_publisher - - - - - - 60,260 - - - - - - - - - - - p - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_subscriber - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 160,60 - - - - - - a_listener - - - - - - 260,60 - - - - - - mask - - - - - - 360,60 - - - - - - - create_subscriber_with_profile - - - - - - 60,460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - mask - - - - - - 460,60 - - - - - - - delete_subscriber - - - - - - 60,560 - - - - - - - - - - - s - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_builtin_subscriber - - - - - - 60,660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_topic - - - - - - 60,760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 360,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - mask - - - - - - 560,60 - - - - - - - create_topic_with_profile - - - - - - 60,860 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 560,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - library_name - - - - - - 360,60 - - - - - - profile_name - - - - - - 460,60 - - - - - - mask - - - - - - 660,60 - - - - - - - delete_topic - - - - - - 60,960 - - - - - - - - - - - a_topic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - find_topic - - - - - - 60,1060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - timeout - - - - - - 260,60 - - - - - - topic_name - - - - - - 160,60 - - - - - - - lookup_topicdescription - - - - - - 60,1160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - name - - - - - - 160,60 - - - - - - - create_contentfilteredtopic - - - - - - 60,1260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - related_topic - - - - - - 260,60 - - - - - - name - - - - - - 160,60 - - - - - - filter_expression - - - - - - 360,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - delete_contentfilteredtopic - - - - - - 60,1360 - - - - - - - - - - - a_contentfilteredtopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - create_multitopic - - - - - - 60,1460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - name - - - - - - 160,60 - - - - - - type_name - - - - - - 260,60 - - - - - - subscription_expression - - - - - - 360,60 - - - - - - expression_parameters - - - - - - 460,60 - - - - - - - delete_multitopic - - - - - - 60,1560 - - - - - - - - - - - a_multitopic - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - delete_contained_entities - - - - - - 60,1660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,1760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,1860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_listener - - - - - - 60,1960 - - - - - - - - - - - a_listener - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - mask - - - - - - 260,60 - - - - - - - get_listener - - - - - - 60,2060 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - ignore_participant - - - - - - 60,2160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_topic - - - - - - 60,2260 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_publication - - - - - - 60,2360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - ignore_subscription - - - - - - 60,2460 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - handle - - - - - - 160,60 - - - - - - - get_domain_id - - - - - - 60,2560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - assert_liveliness - - - - - - 60,2660 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_publisher_qos - - - - - - 60,2760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_publisher_qos - - - - - - 60,2860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_subscriber_qos - - - - - - 60,2960 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_subscriber_qos - - - - - - 60,3060 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_topic_qos - - - - - - 60,3160 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_default_topic_qos - - - - - - 60,3260 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_discovered_participants - - - - - - 60,3360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_handles - - - - - - 160,60 - - - - - - - get_discovered_participant_data - - - - - - 60,3460 - - - - - - - - - - - participant_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - participant_handle - - - - - - 260,60 - - - - - - - get_discovered_topics - - - - - - 60,3560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_handles - - - - - - 160,60 - - - - - - - get_discovered_topic_data - - - - - - 60,3660 - - - - - - - - - - - topic_data - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - topic_handle - - - - - - 260,60 - - - - - - - contains_entity - - - - - - 60,3760 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_handle - - - - - - 160,60 - - - - - - - get_current_time - - - - - - 60,3860 - - - - - - - - - - - current_time - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - Inherits - - - - DomainParticipantFactory - - local - - - - - - - - - - - - - - - - - - create_participant - - - - - - 60,60 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - qos - - - - - - 260,60 - - - - - - a_listener - - - - - - 360,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - mask - - - - - - 460,60 - - - - - - - create_participant_with_profile - - - - - - 60,160 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - a_listener - - - - - - 460,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - library_name - - - - - - 260,60 - - - - - - profile_name - - - - - - 360,60 - - - - - - mask - - - - - - 560,60 - - - - - - - delete_participant - - - - - - 60,260 - - - - - - - - - - - a_participant - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - lookup_participant - - - - - - 60,360 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - domain_id - - - - - - 160,60 - - - - - - - set_default_participant_qos - - - - - - 60,460 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_default_participant_qos_with_profile - - - - - - 60,560 - - - - - - - - - - - ReturnType - - - - - - 60,60 - - - - - - library_name - - - - - - 160,60 - - - - - - profile_name - - - - - - 260,60 - - - - - - - get_default_participant_qos - - - - - - 60,660 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - set_qos - - - - - - 60,760 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - get_qos - - - - - - 60,860 - - - - - - - - - - - qos - - - - - - 160,60 - - - - - - ReturnType - - - - - - 60,60 - - - - - - - - TypeSupport - - local - - - - - - - - - - - - - - - - - - - SampleInfo - - - - - - - - - - - - - - source_timestamp - - - - - - 60,360 - - - - - - sample_state - - - - - - 60,60 - - - - - - view_state - - - - - - 60,160 - - - - - - instance_state - - - - - - 60,260 - - - - - - instance_handle - - - - - - 60,460 - - - - - - publication_handle - - - - - - 60,560 - - - - - - disposed_generation_count - - - - - - 60,660 - - - - - - no_writers_generation_count - - - - - - 60,760 - - - - - - sample_rank - - - - - - 60,860 - - - - - - generation_rank - - - - - - 60,960 - - - - - - absolute_generation_rank - - - - - - 60,1060 - - - - - - valid_data - - - - - - 60,1160 - - - - - - - QosPolicyCountSeq - - - - - - - - - - - - - - - - - - DataReaderSeq - - - - - - - - - - - - - - - - - - ConditionSeq - - - - - - - - - - - - - - - - - - SampleInfoSeq - - - - - - - - - - - - - - - - - - DomainId_t - - - - - - - - - - - - - - - ReturnCode_t - - - - - - - - - - - - - - - QosPolicyId_t - - - - - - - - - - - - - - - StringSeq - - - - - - - - - - - - - - - - - - LENGTH_UNLIMITED - - - - - - - - -1 - - - - DURATION_INFINITE_SEC - - - - - - - - 2147483647 - - - - DURATION_INFINITE_NSEC - - - - - - - - 2147483647 - - - - DURATION_ZERO_SEC - - - - - - - - 0 - - - - DURATION_ZERO_NSEC - - - - - - - - 0 - - - - TIME_INVALID_SEC - - - - - - - - -1 - - - - TIME_INVALID_NSEC - - - - - - - - 4294967295 - - - - RETCODE_OK - - - - - - - - 0 - - - - RETCODE_ERROR - - - - - - - - 1 - - - - RETCODE_UNSUPPORTED - - - - - - - - 2 - - - - RETCODE_BAD_PARAMETER - - - - - - - - 3 - - - - RETCODE_PRECONDITION_NOT_MET - - - - - - - - 4 - - - - RETCODE_OUT_OF_RESOURCES - - - - - - - - 5 - - - - RETCODE_NOT_ENABLED - - - - - - - - 6 - - - - RETCODE_IMMUTABLE_POLICY - - - - - - - - 7 - - - - RETCODE_INCONSISTENT_POLICY - - - - - - - - 8 - - - - RETCODE_ALREADY_DELETED - - - - - - - - 9 - - - - RETCODE_TIMEOUT - - - - - - - - 10 - - - - RETCODE_NO_DATA - - - - - - - - 11 - - - - RETCODE_ILLEGAL_OPERATION - - - - - - - - 12 - - - - StatusKind - - - - - - - - - - - - - - - StatusMask - - - - - - - - - - - - - - - INCONSISTENT_TOPIC_STATUS - - - - - - - - 1 - - - - OFFERED_DEADLINE_MISSED_STATUS - - - - - - - - 2 - - - - REQUESTED_DEADLINE_MISSED_STATUS - - - - - - - - 4 - - - - OFFERED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 32 - - - - REQUESTED_INCOMPATIBLE_QOS_STATUS - - - - - - - - 64 - - - - SAMPLE_LOST_STATUS - - - - - - - - 128 - - - - SAMPLE_REJECTED_STATUS - - - - - - - - 256 - - - - DATA_ON_READERS_STATUS - - - - - - - - 512 - - - - DATA_AVAILABLE_STATUS - - - - - - - - 1024 - - - - LIVELINESS_LOST_STATUS - - - - - - - - 2048 - - - - LIVELINESS_CHANGED_STATUS - - - - - - - - 4096 - - - - PUBLICATION_MATCHED_STATUS - - - - - - - - 8192 - - - - SUBSCRIPTION_MATCHED_STATUS - - - - - - - - 16384 - - - - RELIABLE_WRITER_CACHE_CHANGED_STATUS - - - - - - - - 16777216 - - - - RELIABLE_READER_ACTIVITY_CHANGED_STATUS - - - - - - - - 33554432 - - - - SampleStateKind - - - - - - - - - - - - - - - READ_SAMPLE_STATE - - - - - - - - 1 - - - - NOT_READ_SAMPLE_STATE - - - - - - - - 2 - - - - SampleStateMask - - - - - - - - - - - - - - - ANY_SAMPLE_STATE - - - - - - - - 65535 - - - - ViewStateKind - - - - - - - - - - - - - - - NEW_VIEW_STATE - - - - - - - - 1 - - - - NOT_NEW_VIEW_STATE - - - - - - - - 2 - - - - ViewStateMask - - - - - - - - - - - - - - - ANY_VIEW_STATE - - - - - - - - 65535 - - - - InstanceStateKind - - - - - - - - - - - - - - - ALIVE_INSTANCE_STATE - - - - - - - - 1 - - - - NOT_ALIVE_DISPOSED_INSTANCE_STATE - - - - - - - - 2 - - - - NOT_ALIVE_NO_WRITERS_INSTANCE_STATE - - - - - - - - 4 - - - - InstanceStateMask - - - - - - - - - - - - - - - ANY_INSTANCE_STATE - - - - - - - - 65535 - - - - NOT_ALIVE_INSTANCE_STATE - - - - - - - - 6 - - - - USERDATA_QOS_POLICY_NAME - - - - - - - - UserData - - - - DURABILITY_QOS_POLICY_NAME - - - - - - - - Durability - - - - PRESENTATION_QOS_POLICY_NAME - - - - - - - - Presentation - - - - DEADLINE_QOS_POLICY_NAME - - - - - - - - Deadline - - - - LATENCYBUDGET_QOS_POLICY_NAME - - - - - - - - LatencyBudget - - - - OWNERSHIP_QOS_POLICY_NAME - - - - - - - - Ownership - - - - OWNERSHIPSTRENGTH_QOS_POLICY_NAME - - - - - - - - OwnershipStrength - - - - LIVELINESS_QOS_POLICY_NAME - - - - - - - - Liveliness - - - - TIMEBASEDFILTER_QOS_POLICY_NAME - - - - - - - - TimeBasedFilter - - - - PARTITION_QOS_POLICY_NAME - - - - - - - - Partition - - - - RELIABILITY_QOS_POLICY_NAME - - - - - - - - Reliability - - - - DESTINATIONORDER_QOS_POLICY_NAME - - - - - - - - DestinationOrder - - - - HISTORY_QOS_POLICY_NAME - - - - - - - - History - - - - RESOURCELIMITS_QOS_POLICY_NAME - - - - - - - - ResourceLimits - - - - ENTITYFACTORY_QOS_POLICY_NAME - - - - - - - - EntityFactory - - - - WRITERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - WriterDataLifecycle - - - - READERDATALIFECYCLE_QOS_POLICY_NAME - - - - - - - - ReaderDataLifecycle - - - - TOPICDATA_QOS_POLICY_NAME - - - - - - - - TopicData - - - - GROUPDATA_QOS_POLICY_NAME - - - - - - - - TransportPriority - - - - LIFESPAN_QOS_POLICY_NAME - - - - - - - - Lifespan - - - - DURABILITYSERVICE_POLICY_NAME - - - - - - - - DurabilityService - - - - INVALID_QOS_POLICY_ID - - - - - - - - 0 - - - - USERDATA_QOS_POLICY_ID - - - - - - - - 1 - - - - DURABILITY_QOS_POLICY_ID - - - - - - - - 2 - - - - PRESENTATION_QOS_POLICY_ID - - - - - - - - 3 - - - - DEADLINE_QOS_POLICY_ID - - - - - - - - 4 - - - - LATENCYBUDGET_QOS_POLICY_ID - - - - - - - - 5 - - - - OWNERSHIP_QOS_POLICY_ID - - - - - - - - 6 - - - - OWNERSHIPSTRENGTH_QOS_POLICY_ID - - - - - - - - 7 - - - - LIVELINESS_QOS_POLICY_ID - - - - - - - - 8 - - - - TIMEBASEDFILTER_QOS_POLICY_ID - - - - - - - - 9 - - - - PARTITION_QOS_POLICY_ID - - - - - - - - 10 - - - - RELIABILITY_QOS_POLICY_ID - - - - - - - - 11 - - - - DESTINATIONORDER_QOS_POLICY_ID - - - - - - - - 12 - - - - HISTORY_QOS_POLICY_ID - - - - - - - - 13 - - - - RESOURCELIMITS_QOS_POLICY_ID - - - - - - - - 14 - - - - ENTITYFACTORY_QOS_POLICY_ID - - - - - - - - 15 - - - - WRITERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 16 - - - - READERDATALIFECYCLE_QOS_POLICY_ID - - - - - - - - 17 - - - - TOPICDATA_QOS_POLICY_ID - - - - - - - - 18 - - - - GROUPDATA_QOS_POLICY_ID - - - - - - - - 19 - - - - TRANSPORTPRIORITY_QOS_POLICY_ID - - - - - - - - 20 - - - - LIFESPAN_QOS_POLICY_ID - - - - - - - - 21 - - - - DURABILITYSERVICE_QOS_POLICY_ID - - - - - - - - 22 - - - - OctetSeq - - - - - - - - - - - - - - - - - - long_3 - - - - - dds_rtf2_dcps_instance_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - HANDLE_NIL - - - - - dds_rtf2_dcps_i_handle - - connectors/dds4ccm/idl - - - - - - - - - - - - DDS - - - - - - - - - - - - - - - - - NativeInstanceHandle_t - - - - - - - - - - - - - - value - - - - - - 60,60 - - - - - 16 - - - - length - - - - - - 60,160 - - - - - - isValid - - - - - - 60,260 - - - - - - - InstanceHandle_t - - - - - - - - - - - - - - - InstanceHandleSeq - - - - - - - - - - - - - - - - - - - - - ImplementationArtifacts - - - ComponentImplementations - - - PredefinedTypes - - Boolean - - - Byte - - - Char - - - WideChar - - - ShortInteger - - - LongInteger - - - LongLongInteger - - - UnsignedShortInteger - - - UnsignedLongInteger - - - UnsignedLongLongInteger - - - FloatNumber - - - DoubleNumber - - - LongDoubleNumber - - - GenericObject - - - GenericValue - - - GenericValueObject - - - String - - - WideString - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl deleted file mode 100644 index 3a0de67b9ba..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef LATENCY_BASE_IDL -#define LATENCY_BASE_IDL - -#pragma DCPS_DATA_TYPE "LatencyTest" - -const short MAX_DATA_SEQUENCE_LENGTH = 8192; -typedef sequence octet_sequence; - -struct LatencyTest { - long seq_num; - octet_sequence data; - }; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc deleted file mode 100644 index e50ada72fb8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc +++ /dev/null @@ -1,26 +0,0 @@ -project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Latency_Base_plain_stub - dynamicflags += LATENCY_BASE_STUB_BUILD_DLL - libout = ../lib - - requires += dds4ccm_ndds - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=LATENCY_BASE_STUB_Export \ - -Wb,stub_export_include=LATENCY_Base_plain_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Latency_Base.idl - } - - opendds_ts_flags += --export=LATENCY_BASE_STUB_Export - - DDSGenerator_Files { - Latency_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc deleted file mode 100644 index 544d885a738..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc +++ /dev/null @@ -1,15 +0,0 @@ -project(*latency_receiver_plain) : ndds_idltocpp, acelib, taolib, typecode { - after += DDS_Latency_Base_plain_stub - exename = DDS_receiver - libpaths += ../lib - libout = ../lib - libs += DDS_Latency_Base_plain_stub - includes += ../Base - - requires += dds4ccm_ndds - - Source_Files { - Latency_Receiver.cpp - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp deleted file mode 100644 index 13ccdbaddb4..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ /dev/null @@ -1,361 +0,0 @@ -#include "ace/Get_Opt.h" -#include "tao/ORB_Core.h" -#include "ace/High_Res_Timer.h" -#include "ace/Env_Value_T.h" -#include "ace/Tokenizer_T.h" -#if (CIAO_DDS4CCM_NDDS==1) -# include "Latency_Base.h" -# include "Latency_BaseSupport.h" -# include "Latency_BasePlugin.h" -# include -#else -# include "Latency_BaseC.h" -# include "Latency_BaseTypeSupportC.h" -#endif - - -bool shutdown_flag_ = false; - -CORBA::LongLong count_ = 0; // total count of all received messages - -LatencyTest * instance_ =0; -LatencyTestDataWriter * test_data_writer_ = 0; - -const char * lib_name_ = 0; -const char * prof_name_ = 0; - -CORBA::UShort domain_id_ = 0; -CORBA::Boolean both_read_write_ = false; - -void -split_qos (const char * qos) -{ - char* buf = ACE_OS::strdup (qos); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!lib_name_) - { - lib_name_ = ACE_OS::strdup (p); - } - else if (!prof_name_) - { - prof_name_ = ACE_OS::strdup (p); - } - } - ACE_OS::free (buf); - ACE_DEBUG ((LM_DEBUG, "Receiver : Found QoS profile %C %C\n", - lib_name_, - prof_name_)); -} - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:b:q:O")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'b': - both_read_write_ = true; - break; - case 'd': - domain_id_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'q': - { - const char * qos = get_opts.opt_arg (); - split_qos (qos); - } - break; - case '?': - default: - printf("c = <%c>\n",c); - ACE_ERROR_RETURN ((LM_ERROR, - "usage:\n\n" - " -d \n" - " -q \n" - " -b use both a writer and reader per topic.\n" - "\n"), - -1); - } - } - // Indicates successful parsing of the command line - return 0; -} - -/* The listener of events and data from the middleware */ -class HelloListener: public ::DDS::DataReaderListener { -public: - void on_data_available(::DDS::DataReader *reader); -}; - -/* The dummy listener of events and data from the middleware */ -class DummyListener: public ::DDS::DataReaderListener { -}; - -void -write_back (LatencyTest & an_instance) -{ - ++count_; - - try - { - test_data_writer_->write(an_instance, DDS_HANDLE_NIL); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing ping back.\n"))); - } -} - -int ACE_TMAIN(int argc, ACE_TCHAR** argv) -{ - ::DDS::ReturnCode_t retcode; - HelloListener listener; - DummyListener dum_listener; - ::DDS::DataReader *data_reader = 0; - ::DDS::DataReader *dum_data_reader = 0; - const char * type_name = 0; - ::DDS::Topic * send_topic = 0; - ::DDS::Topic * receive_topic = 0; - ::DDS::DataWriter * data_writer = 0; - ::DDS::DataWriter * dum_data_writer = 0; - - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); - domain_id_ = id; - - int main_result = 1; /* error by default */ - if (parse_args (argc, argv) != 0) - return 1; - - /* Create the domain participant on domain ID 0 */ - ::DDS::DomainParticipant *participant = - ::DDS::DomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id_, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Receiver : Unable to create domain participant.\n"))); - goto clean_exit; - } - /* Register type before creating topic */ - type_name = LatencyTestTypeSupport::get_type_name (); - retcode = LatencyTestTypeSupport::register_type (participant, type_name); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to register topic type.\n"))); - goto clean_exit; - } - - send_topic = participant->create_topic_with_profile ( - "send", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!send_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - receive_topic = participant->create_topic_with_profile ( - "receive", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!receive_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - /* Create the data reader using the default publisher */ - data_reader = participant->create_datareader_with_profile( - send_topic, - lib_name_, - prof_name_, - &listener, - DDS_DATA_AVAILABLE_STATUS); - - if (!data_reader ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* Create a data writer, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector - */ - if (both_read_write_) - { - dum_data_writer = participant->create_datawriter_with_profile( - send_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!dum_data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - } - /* Create the data writer using the default publisher */ - data_writer = participant->create_datawriter_with_profile( - receive_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Create a data reader, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector. - */ - if (both_read_write_) - { - dum_data_reader = participant->create_datareader_with_profile( - receive_topic, - lib_name_, - prof_name_, - &dum_listener, - DDS_DATA_AVAILABLE_STATUS); - - if (!dum_data_reader ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - } - - test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); - if (!test_data_writer_) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n"))); - goto clean_exit; - } - - /* --- Sleep During Asynchronous Reception ---------------------------- */ - - /* This thread sleeps forever. When a sample is received, RTI Data - * Distribution Service will call the on_data_available_callback function. - */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n"))); - for (;;) - { - ACE_OS::sleep (1); - if (shutdown_flag_) - { - break; - } - } - - /* --- Clean Up ------------------------------------------------------- */ - - main_result = 0; -clean_exit: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - if (count_ > 0) - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "Number of samples received: %u \n", - count_)); - } - else - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "No samples received\n ")); - } - if (participant) - { - retcode = participant->delete_contained_entities (); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance ()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - - DDSDomainParticipantFactory::finalize_instance (); - - return main_result; -} - -/* This method gets called back by DDS when one or more data samples - * have been received. - */ -void HelloListener::on_data_available(::DDS::DataReader *reader) -{ - /* Perform a safe type-cast from a generic data reader into a - * specific data reader for the type "LatencyTestDataReader" - */ - LatencyTestDataReader * test_reader = - LatencyTestDataReader::narrow (reader); - if (!test_reader) - { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n"))); - return; - } - - /* Loop until there are messages available in the queue */ - for(;;) - { - ::DDS::SampleInfoSeq info; - ::LatencyTestRTISeq sample_req; - ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); - if (retcode == DDS_RETCODE_NO_DATA) - { - /* No more samples */ - break; - } - else if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to take data from data reader," - " error %d.\n"), - retcode)); - return; - } - for (::DDS_Long i = 0; i < sample_req.length (); ++i) - { - if (info[i].valid_data) - { - write_back(sample_req[i]); - } - } - (void) test_reader->return_loan (sample_req, info); - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc deleted file mode 100644 index 503fbceb27b..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc +++ /dev/null @@ -1,31 +0,0 @@ -project(*latency_sender_plain) : nddslib, acelib, taolib, typecode { - after += DDS_Latency_Base_plain_stub - exename = DDS_Sender - avoids += ace_for_tao - libpaths += ../lib - libout = ../lib - includes += ../Base - libs += DDS_Latency_Base_plain_stub - - requires += dds4ccm_ndds - - Source_Files { - Latency_Sender.cpp - } -} - -project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, typecode { - after += DDS_Latency_Base_plain_stub - exename = DDS_NDDS_Sender - avoids += ace_for_tao - libpaths += ../lib - libout = ../lib - includes += ../Base - libs += DDS_Latency_Base_plain_stub - - requires += dds4ccm_ndds - - Source_Files { - NDDS_Latency_Sender.cpp - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp deleted file mode 100644 index 23ea9a9e5f6..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ /dev/null @@ -1,774 +0,0 @@ -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "tao/ORB_Core.h" -#include "ace/Timer_Queue.h" -#include "ace/Timer_Heap.h" -#include "ace/Reactor.h" -#include "ace/Env_Value_T.h" -#include "Latency_Base.h" -#include "Latency_BaseSupport.h" -#include "Latency_BasePlugin.h" -#include "ace/Tokenizer_T.h" -#include "ace/OS_NS_math.h" - -#include - -// Forward declarations -class WriteTicker; - -// Global variables -CORBA::UShort iterations_ = 1000; -CORBA::UShort datalen_ = 100; -CORBA::UShort datalen_idx_ = 0; -CORBA::UShort nr_of_runs_ = 10; -CORBA::UShort sleep_ = 2; -ACE_UINT64 tv_total_ = 0; -ACE_UINT64 tv_max_ = 0; -ACE_UINT64 tv_min_ = 0; -CORBA::UShort count_ = 0; -CORBA::UShort number_of_msg_ = 0; -bool received_ = false; -CORBA::Long seq_num_ = 0; -CORBA::Double sigma_duration_squared_; -ACE_UINT64 start_time_ = 0; -ACE_UINT64 start_time_test_ = 0; -ACE_UINT64 end_time_test_ = 0; - -ACE_UINT64 * duration_times_ = 0; -CORBA::Short * datalen_range_ = 0; -ACE_UINT64 clock_overhead_; - -ACE_UINT64 unexpected_count_ = 0; - -LatencyTest * instance_ = 0; - -LatencyTestDataWriter * test_data_writer_ = 0; - -const char * lib_name_ = 0; -const char * prof_name_ = 0; - -CORBA::UShort domain_id_ = 0; -CORBA::Boolean both_read_write_ = false; - -WriteTicker * ticker_ = 0; - -/* The listener of events and data from the middleware */ -class HelloListener: public DDSDataReaderListener -{ -public: - void on_data_available(DDSDataReader *reader); -}; - -// since this one is also created in the dds4ccm wrapper, we need -// to create one here as well. -class DummyPublisherListener : - public DDSPublisherListener -{ -public: - virtual void on_offered_deadline_missed ( - DDSDataWriter* writer, - const DDS_OfferedDeadlineMissedStatus& status); - virtual void on_liveliness_lost( - DDSDataWriter* writer, - const DDS_LivelinessLostStatus& status); - virtual void on_offered_incompatible_qos( - DDSDataWriter* writer, - const DDS_OfferedIncompatibleQosStatus& status); - virtual void on_publication_matched( - DDSDataWriter* writer, - const DDS_PublicationMatchedStatus& status); - virtual void on_reliable_writer_cache_changed( - DDSDataWriter* writer, - const DDS_ReliableWriterCacheChangedStatus& status); - virtual void on_reliable_reader_activity_changed ( - DDSDataWriter* writer, - const DDS_ReliableReaderActivityChangedStatus& status); -}; - -void DummyPublisherListener::on_offered_deadline_missed ( - DDSDataWriter* /*writer*/, - const DDS_OfferedDeadlineMissedStatus& /*status*/) -{ - ACE_DEBUG ((LM_DEBUG, "on_offered_deadline_missed\n")); - ++unexpected_count_; -} - -void DummyPublisherListener::on_liveliness_lost( - DDSDataWriter* /*writer*/, - const DDS_LivelinessLostStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_offered_incompatible_qos( - DDSDataWriter* /*writer*/, - const DDS_OfferedIncompatibleQosStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_publication_matched( - DDSDataWriter* /*writer*/, - const DDS_PublicationMatchedStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_reliable_writer_cache_changed( - DDSDataWriter* /*writer*/, - const DDS_ReliableWriterCacheChangedStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_reliable_reader_activity_changed ( - DDSDataWriter* /*writer*/, - const DDS_ReliableReaderActivityChangedStatus& /*status*/) -{ - ++unexpected_count_; -} - - -/* The dummy listener of events and data from the middleware */ -class DummyListener: public DDSDataReaderListener -{ -}; - -class WriteTicker :public ACE_Event_Handler -{ - public: - WriteTicker (void); - int handle_timeout (const ACE_Time_Value &, const void *); -}; - -void -split_qos (const char * qos) -{ - char* buf = ACE_OS::strdup (qos); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!lib_name_) - { - lib_name_ = ACE_OS::strdup (p); - } - else if (!prof_name_) - { - prof_name_ = ACE_OS::strdup (p); - } - } - ACE_OS::free (buf); - ACE_DEBUG ((LM_DEBUG, "Sender : Found QoS profile %C %C\n", - lib_name_, - prof_name_)); -} - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:d:i:s:q:O")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'd': - domain_id_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'i': - iterations_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 's': - sleep_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'b': - both_read_write_ = true; - break; - case 'q': - { - const char * qos = get_opts.opt_arg (); - split_qos (qos); - } - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage:\n\n" - " -d \n" - " -i \n" - " -s \n" - " -q \n" - " -b " - "\n"), - -1); - } - } - // Indicates successful parsing of the command line - return 0; -} - -void -calculate_clock_overhead (void) -{ - int num_of_loops_clock = 320; - ACE_UINT64 begin_time; - ACE_UINT64 clock_roundtrip_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (begin_time); - for (int i = 0; i < num_of_loops_clock; ++i) - { - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (clock_roundtrip_time); - } - ACE_UINT64 const total_time = clock_roundtrip_time - begin_time; - clock_overhead_ = (ACE_UINT64) (total_time / num_of_loops_clock); -} - -void -stop (void) -{ - if (ticker_) - { - ACE_Reactor::instance ()->cancel_timer (ticker_); - delete ticker_; - ticker_ = 0; - } -} - -void -init_values (void) -{ - delete [] duration_times_; - duration_times_ = new ACE_UINT64[iterations_]; - datalen_range_ = new CORBA::Short[nr_of_runs_]; - int start = 16; - for(int i = 0; i < nr_of_runs_; i++) - { - datalen_range_[i] = start; - start = 2 * start; - } - - datalen_ = datalen_range_[0]; - - // make instances of Topic - instance_->seq_num = 0; - instance_->data.length (datalen_); - calculate_clock_overhead (); -} - -void -record_time (ACE_UINT64 receive_time) -{ - ++count_; - ACE_UINT64 const interval = receive_time - start_time_; - ACE_UINT64 const duration = interval - clock_overhead_; - if (count_ > iterations_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Internal error while getting more " - "messages back as expected.\n")); - } - else - { - duration_times_[count_-1] = duration; - sigma_duration_squared_ += (double)duration * (double)duration; - tv_total_ += duration; - if (duration > tv_max_ || (tv_max_ == 0L)) - { - tv_max_ = duration; - } - if (duration < tv_min_ || (tv_min_ == 0L)) - { - tv_min_ = duration; - } - } -} - -void -reset_results (void) -{ - count_ = 0; - delete [] duration_times_; - duration_times_ = new ACE_UINT64[iterations_]; - tv_total_ = 0L; - tv_max_ = 0L; - tv_min_ = 0L; - number_of_msg_ = 0; - received_ = false; - seq_num_ = 0; - sigma_duration_squared_ = 0; -} - -static int compare_two_longs (const void * long1, const void * long2) -{ - return (int)((*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2)); -} - -void -calc_results() -{ - // Sort all duration times. - qsort(duration_times_, - count_, - sizeof(ACE_UINT64), - compare_two_longs); - - // Show latency_50_percentile, latency_90_percentile, - // latency_99_percentile and latency_99.99_percentile. - // For example duration_times[per50] is the median i.e. 50% of the - // samples have a latency time <= duration_times[per50] - int per50 = count_/2; - int per90 = (int)(count_ * 0.90); - int per99 = (int)(count_ * 0.990); - int per9999 = (int)(count_ * 0.9999); - - double avg = 0; - double roundtrip_time_std = 0; - if (count_ > 0) - { - avg = (double)(tv_total_ / count_); - // Calculate standard deviation. - roundtrip_time_std = sqrt( - (sigma_duration_squared_ / (double)count_) - - (avg * avg)); - } - - // Show values as float, in order to be comparable with RTI performance test. - if (count_ > 0) - { - if (datalen_idx_ == 0) - { - ACE_DEBUG ((LM_DEBUG, - "Collecting statistics on %d samples per message size.\n" - "This is the roundtrip time, *not* the one-way-latency\n" - "Clock overhead %d\n" - "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%," - " max us\n" - "------,-------,-------,-------,-------,-------,-------,-------," - "-------\n", count_, clock_overhead_)); - } - ACE_DEBUG ((LM_DEBUG, - "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n", - datalen_, - roundtrip_time_std, - avg, - (double)tv_min_, - (double)duration_times_[per50-1], - (double)duration_times_[per90-1], - (double)duration_times_[per99-1], - (double)duration_times_[per9999-1], - (double)tv_max_)); - } - else - { - ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " - "No samples reveived back.\n")); - } -} - - -void -write_one (void) -{ - if ((number_of_msg_ == 0) && (datalen_idx_ == 0)) - { - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time_test_); - } - // First message sent always, next messages only as previous sent message - // is received back. - if ((number_of_msg_ == 0) || received_) - { - // All messages send, stop timer. - if ((iterations_ != 0) && - (number_of_msg_ >= iterations_ )) - { - if (datalen_idx_ >= (nr_of_runs_ - 1)) - { - stop(); - calc_results(); - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time_test_); - ACE_Reactor::instance ()->end_reactor_event_loop (); - } - else - { - calc_results(); - reset_results(); - ++datalen_idx_; - datalen_ = datalen_range_[datalen_idx_]; - instance_->data.length (datalen_); - } - } - else - { - try - { - instance_->seq_num = number_of_msg_; - // Keep last sent seq_num, to control if message is sent back. - seq_num_ = number_of_msg_; - received_ = false; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time_); - test_data_writer_->write (*instance_, DDS_HANDLE_NIL); - } - catch (const ::CORBA::Exception& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing sample with sequence_number <%u>.\n"), - instance_->seq_num)); - } - ++number_of_msg_; - } - } -} - -void start (void) -{ - ticker_ = new WriteTicker(); - - // This->sleep_ is in ms - unsigned int sec = sleep_/1000; - unsigned int usec = (sleep_ % 1000) * 1000; - if (ACE_Reactor::instance ()->schedule_timer ( - ticker_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("start : ") - ACE_TEXT ("Error scheduling timer"))); - } - ACE_Reactor::instance ()->run_reactor_event_loop (); -} - -void -read (LatencyTest & an_instance, ACE_UINT64 receive_time) -{ - if (an_instance.seq_num == seq_num_) - { - record_time (receive_time); - received_ = true; - } -} - -int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) -{ - DDS_ReturnCode_t retcode; - ::DDS::DataReader * data_reader = 0; - ::DDS::DataReader * dum_data_reader = 0; - - HelloListener listener; - DummyListener dum_listener; - const char * type_name = 0; - int main_result = 1; /* error by default */ - - ::DDS::Topic * receive_topic = 0; - ::DDS::Topic * send_topic = 0; - ::DDS::DataWriter * data_writer = 0; - ::DDS::DataWriter * dum_data_writer = 0; - DummyPublisherListener * pub_listener = 0; - ::DDS::Publisher * pub = 0; - - typedef ACE_Timer_Heap_T timer_queue_type; - timer_queue_type hr_timer_q_; - - try - { - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); - domain_id_ = id; - - if (parse_args (argc, argv) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error arguments.\n"))); - return 1; - } - - (void) ACE_High_Res_Timer::global_scale_factor (); - ACE_Reactor::instance ()->timer_queue(&hr_timer_q_); - - /* Create the domain participant */ - DDSDomainParticipant * participant = - DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id_, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sender : Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Register type before creating topic */ - type_name = LatencyTestTypeSupport::get_type_name(); - retcode = LatencyTestTypeSupport::register_type (participant, - type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - - send_topic = participant->create_topic_with_profile ( - "send", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!send_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - receive_topic = participant->create_topic_with_profile ( - "receive", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!receive_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - pub_listener = new DummyPublisherListener (); - pub = participant->create_publisher_with_profile ( - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - - if (!pub) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); - goto clean_exit; - } - - /* Create the data writer using the publisher */ - data_writer = pub->create_datawriter_with_profile( - send_topic, - lib_name_, - prof_name_, - pub_listener, - DDS_OFFERED_DEADLINE_MISSED_STATUS | - DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | - DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | - DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | - DDS_LIVELINESS_LOST_STATUS | - DDS_PUBLICATION_MATCHED_STATUS); - - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Create a data reader, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector. - */ - if (both_read_write_) - { - dum_data_reader = participant->create_datareader_with_profile( - send_topic, - lib_name_, - prof_name_, - &dum_listener, - DDS_DATA_AVAILABLE_STATUS); - - if (!dum_data_reader ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); - goto clean_exit; - } - } - - data_reader = participant->create_datareader_with_profile( - receive_topic, - lib_name_, - prof_name_, - &listener, - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* Create a data writer, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector - */ - if (both_read_write_) - { - dum_data_writer = participant->create_datawriter_with_profile( - receive_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!dum_data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); - goto clean_exit; - } - } - - /* Create data sample for writing */ - instance_ = LatencyTestTypeSupport::create_data (); - if (instance_ == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } - - init_values(); - - test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); - if (!test_data_writer_) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); - goto clean_exit; - } - - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (5); - - // handle writing of messages - start(); - - /* --- Clean Up --- */ - ACE_OS::sleep (5); - main_result = 0; - - clean_exit: - const char * read_write_str; - if (both_read_write_) - { - read_write_str = "Used a extra dummy reader and writer per topic."; - } - else - { - read_write_str = "Used a reader for one topic and a writer for other topic."; - } - - if((nr_of_runs_ -1) != datalen_idx_) - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" - " Number of messages sent of last run (%u): %u\n" - "%C\n\n", - datalen_idx_, - nr_of_runs_, - datalen_idx_ + 1, - number_of_msg_, - read_write_str)); - } - else - { - ACE_UINT64 test_time_usec = end_time_test_ - start_time_test_; - - double sec = (double)test_time_usec / (1000 * 1000); - ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " - "%u messages in %3.3f seconds.\n" - "%C\n\n", - nr_of_runs_, - number_of_msg_, - sec, - read_write_str)); - } - ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", - unexpected_count_)); - if (participant) - { - retcode = participant->delete_contained_entities (); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant (participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); - main_result = 1; - } - delete [] datalen_range_; - delete [] duration_times_; - delete pub_listener; - DDSDomainParticipantFactory::finalize_instance (); - ACE_Reactor::instance ()->timer_queue(0); - return main_result; -} - -void HelloListener::on_data_available(DDSDataReader *reader) -{ - LatencyTestDataReader * test_reader = - LatencyTestDataReader::narrow (reader); - if (!test_reader) - { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataReader::narrow failed.\n"))); - return; - } - - /* Loop until there are messages available in the queue */ - for(;;) - { - ::DDS::SampleInfoSeq info; - ::LatencyTestRTISeq sample_req; - ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); - if (retcode == DDS_RETCODE_NO_DATA) - { - /* No more samples */ - break; - } - else if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to take data from data reader," - " error %d.\n"), - retcode)); - return; - } - for (::DDS_Long i = 0; i < sample_req.length (); ++i) - { - if (info[i].valid_data) - { - ACE_UINT64 receive_time = 0; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (receive_time); - read(sample_req[i], receive_time); - } - } - (void) test_reader->return_loan (sample_req, info); - } -} - -//============================================================ -// WriteTickerHandler -//============================================================ -WriteTicker::WriteTicker () -{ -} - -int -WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) -{ - write_one(); - return 0; -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp deleted file mode 100644 index 752f1971d50..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp +++ /dev/null @@ -1,715 +0,0 @@ -#include "ace/Get_Opt.h" -#include "tao/ORB_Core.h" -#include "ace/Env_Value_T.h" -#include "Latency_Base.h" -#include "Latency_BaseSupport.h" -#include "Latency_BasePlugin.h" -#include "ace/Tokenizer_T.h" -#include "ace/OS_NS_math.h" - -#include -#include -#include - -// Global variables -CORBA::UShort iterations_ = 1000; -CORBA::UShort datalen_ = 100; -CORBA::UShort datalen_idx_ = 0; -CORBA::UShort nr_of_runs_ = 10; -CORBA::UShort sleep_ = 2; -ACE_UINT64 tv_total_ = 0; -ACE_UINT64 tv_max_ = 0; -ACE_UINT64 tv_min_ = 0; -CORBA::UShort count_ = 0; -CORBA::UShort number_of_msg_ = 0; -bool received_ = false; -CORBA::Long seq_num_ = 0; -CORBA::Double sigma_duration_squared_; -struct RTINtpTime start_time_; - -ACE_UINT64 * duration_times_ = 0; -CORBA::Short * datalen_range_ = 0; -ACE_UINT64 clock_overhead_; -RTIClock *timer = 0; -LatencyTest * instance_ = 0; - -ACE_UINT64 unexpected_count_ = 0; - -LatencyTestDataWriter * test_data_writer_ = 0; - -const char * lib_name_ = 0; -const char * prof_name_ = 0; - -CORBA::UShort domain_id_ = 0; -CORBA::Boolean both_read_write_ = false; - -/* The listener of events and data from the middleware */ -class HelloListener: public DDSDataReaderListener -{ -public: - void on_data_available(DDSDataReader *reader); -}; - -/* The dummy listener of events and data from the middleware */ -class DummyListener: public DDSDataReaderListener -{ -}; - -// since this one is also created in the dds4ccm wrapper, we need -// to create one here as well. -class DummyPublisherListener : - public DDSPublisherListener -{ -public: - virtual void on_offered_deadline_missed ( - DDSDataWriter* writer, - const DDS_OfferedDeadlineMissedStatus& status); - virtual void on_liveliness_lost( - DDSDataWriter* writer, - const DDS_LivelinessLostStatus& status); - virtual void on_offered_incompatible_qos( - DDSDataWriter* writer, - const DDS_OfferedIncompatibleQosStatus& status); - virtual void on_publication_matched( - DDSDataWriter* writer, - const DDS_PublicationMatchedStatus& status); - virtual void on_reliable_writer_cache_changed( - DDSDataWriter* writer, - const DDS_ReliableWriterCacheChangedStatus& status); - virtual void on_reliable_reader_activity_changed ( - DDSDataWriter* writer, - const DDS_ReliableReaderActivityChangedStatus& status); -}; - -void DummyPublisherListener::on_offered_deadline_missed ( - DDSDataWriter* /*writer*/, - const DDS_OfferedDeadlineMissedStatus& /*status*/) -{ - ACE_DEBUG ((LM_DEBUG, "on_offered_deadline_missed\n")); - ++unexpected_count_; -} - -void DummyPublisherListener::on_liveliness_lost( - DDSDataWriter* /*writer*/, - const DDS_LivelinessLostStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_offered_incompatible_qos( - DDSDataWriter* /*writer*/, - const DDS_OfferedIncompatibleQosStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_publication_matched( - DDSDataWriter* /*writer*/, - const DDS_PublicationMatchedStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_reliable_writer_cache_changed( - DDSDataWriter* /*writer*/, - const DDS_ReliableWriterCacheChangedStatus& /*status*/) -{ - ++unexpected_count_; -} - -void DummyPublisherListener::on_reliable_reader_activity_changed ( - DDSDataWriter* /*writer*/, - const DDS_ReliableReaderActivityChangedStatus& /*status*/) -{ - ++unexpected_count_; -} - -void -split_qos (const char * qos) -{ - char* buf = ACE_OS::strdup (qos); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!lib_name_) - { - lib_name_ = ACE_OS::strdup (p); - } - else if (!prof_name_) - { - prof_name_ = ACE_OS::strdup (p); - } - } - ACE_OS::free (buf); - ACE_DEBUG ((LM_DEBUG, "Sender : Found QoS profile %C %C\n", - lib_name_, - prof_name_)); -} - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:d:i:s:q:O")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'd': - domain_id_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'i': - iterations_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 's': - sleep_ = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'b': - both_read_write_ = true; - break; - case 'q': - { - const char * qos = get_opts.opt_arg (); - split_qos (qos); - } - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage:\n\n" - " -d \n" - " -i \n" - " -s \n" - " -q \n" - " -b " - "\n"), - -1); - } - } - // Indicates successful parsing of the command line - return 0; -} - -void -calculate_clock_overhead (void) -{ - int num_of_loops_clock = 320; - struct RTINtpTime begin_time = RTI_NTP_TIME_ZERO; - struct RTINtpTime clock_roundtrip_time = RTI_NTP_TIME_ZERO; - - timer->getTime(timer, &begin_time); - for (int i = 0; i < num_of_loops_clock; ++i) { - timer->getTime(timer, &clock_roundtrip_time); - } - RTINtpTime_decrement(clock_roundtrip_time, begin_time); - clock_overhead_ = (ACE_UINT64)(1E6 * RTINtpTime_toDouble(&clock_roundtrip_time) / - (double)num_of_loops_clock); -} - -void -init_values (void) -{ - delete [] duration_times_; - duration_times_ = new ACE_UINT64[iterations_]; - datalen_range_ = new CORBA::Short[nr_of_runs_]; - int start = 16; - for(int i = 0; i < nr_of_runs_; i++) - { - datalen_range_[i] = start; - start = 2 * start; - } - - datalen_ = datalen_range_[0]; - - // make instances of Topic - instance_->seq_num = 0; - instance_->data.length (datalen_); - calculate_clock_overhead (); -} - -void -record_time (struct RTINtpTime& receive_time) -{ - ++count_; - RTINtpTime roundtrip = {0,0}; - RTINtpTime_subtract(roundtrip, receive_time, start_time_); - ACE_UINT64 duration = - (ACE_UINT64)(1E6 * RTINtpTime_toDouble(&roundtrip));// - _clock_overhead; - - if (count_ > iterations_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Internal error while getting more " - "messages back as expected.\n")); - } - else - { - duration_times_[count_-1] = duration; - sigma_duration_squared_ += (double)duration * (double)duration; - tv_total_ += duration; - if (duration > tv_max_ || (tv_max_ == 0L)) - { - tv_max_ = duration; - } - if (duration < tv_min_ || (tv_min_ == 0L)) - { - tv_min_ = duration; - } - } -} - -void -reset_results (void) -{ - count_ = 0; - delete [] duration_times_; - duration_times_ = new ACE_UINT64[iterations_]; - tv_total_ = 0L; - tv_max_ = 0L; - tv_min_ = 0L; - number_of_msg_ = 0; - received_ = false; - seq_num_ = 0; - sigma_duration_squared_ = 0; -} - -static int compare_two_longs (const void * long1, const void * long2) -{ - return (int)((*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2)); -} - -void -calc_results() -{ - // Sort all duration times. - qsort(duration_times_, - count_, - sizeof(ACE_UINT64), - compare_two_longs); - - // Show latency_50_percentile, latency_90_percentile, - // latency_99_percentile and latency_99.99_percentile. - // For example duration_times[per50] is the median i.e. 50% of the - // samples have a latency time <= duration_times[per50] - int per50 = count_/2; - int per90 = (int)(count_ * 0.90); - int per99 = (int)(count_ * 0.990); - int per9999 = (int)(count_ * 0.9999); - - double avg = 0; - double roundtrip_time_std = 0; - if (count_ > 0) - { - avg = (double)(tv_total_ / count_); - // Calculate standard deviation. - roundtrip_time_std = sqrt( - (sigma_duration_squared_ / (double)count_) - - (avg * avg)); - } - - // Show values as float, in order to be comparable with RTI performance test. - if (count_ > 0) - { - if (datalen_idx_ == 0) - { - ACE_DEBUG ((LM_DEBUG, - "Collecting statistics on %d samples per message size.\n" - "This is the roundtrip time, *not* the one-way-latency\n" - "Clock overhead %d\n" - "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%," - " max us\n" - "------,-------,-------,-------,-------,-------,-------,-------," - "-------\n", count_, clock_overhead_)); - } - ACE_DEBUG ((LM_DEBUG, - "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n", - datalen_, - roundtrip_time_std, - avg, - (double)tv_min_, - (double)duration_times_[per50-1], - (double)duration_times_[per90-1], - (double)duration_times_[per99-1], - (double)duration_times_[per9999-1], - (double)tv_max_)); - } - else - { - ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " - "No samples reveived back.\n")); - } -} - - -bool -write_one (void) -{ - // First message sent always, next messages only as previous sent message - // is received back. - if ((number_of_msg_ == 0) || received_) - { - // All messages send, stop timer. - if ((iterations_ != 0) && - (number_of_msg_ >= iterations_ )) - { - if (datalen_idx_ >= (nr_of_runs_ - 1)) - { - calc_results(); - return true; - } - else - { - calc_results(); - reset_results(); - ++datalen_idx_; - datalen_ = datalen_range_[datalen_idx_]; - instance_->data.length (datalen_); - } - } - else - { - try - { - instance_->seq_num = number_of_msg_; - // Keep last sent seq_num, to control if message is sent back. - seq_num_ = number_of_msg_; - received_ = false; - RTINtpTime_setZero(&start_time_); - timer->getTime(timer, &start_time_); - test_data_writer_->write (*instance_, DDS_HANDLE_NIL); - } - catch (const CORBA::Exception& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing sample with sequence_number <%u>.\n"), - instance_->seq_num)); - } - ++number_of_msg_; - } - } - return false; -} - -void start (void) -{ - unsigned int sec = sleep_/1000; - unsigned int usec = (sleep_ % 1000) * 1000; - - while (!write_one()) - { - ACE_Time_Value sleeptime (sec, usec); - ACE_OS::sleep (sleeptime); - } -} - -void -read (LatencyTest & an_instance, struct RTINtpTime& receive_time) -{ - if (an_instance.seq_num == seq_num_) - { - record_time (receive_time); - received_ = true; - } -} - -int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) -{ - timer = RTIHighResolutionClock_new(); - DDS_ReturnCode_t retcode; - ::DDS::DataReader * data_reader = 0; - ::DDS::DataReader * dum_data_reader = 0; - - HelloListener listener; - DummyListener dum_listener; - const char * type_name = 0; - int main_result = 1; /* error by default */ - - ::DDS::Topic * receive_topic = 0; - ::DDS::Topic * send_topic = 0; - ::DDS::DataWriter * data_writer = 0; - ::DDS::DataWriter * dum_data_writer = 0; - DummyPublisherListener * pub_listener = 0; - ::DDS::Publisher * pub = 0; - - try - { - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); - domain_id_ = id; - - if (parse_args (argc, argv) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error arguments.\n"))); - return 1; - } - - /* Create the domain participant */ - DDSDomainParticipant * participant = - DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id_, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sender : Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Register type before creating topic */ - type_name = LatencyTestTypeSupport::get_type_name(); - retcode = LatencyTestTypeSupport::register_type (participant, - type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - - send_topic = participant->create_topic_with_profile ( - "send", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!send_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - receive_topic = participant->create_topic_with_profile ( - "receive", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!receive_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - pub_listener = new DummyPublisherListener (); - pub = participant->create_publisher_with_profile ( - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - - if (!pub) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); - goto clean_exit; - } - - /* Create the data writer using the publisher */ - data_writer = pub->create_datawriter_with_profile( - send_topic, - lib_name_, - prof_name_, - pub_listener, - DDS_OFFERED_DEADLINE_MISSED_STATUS | - DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | - DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | - DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | - DDS_LIVELINESS_LOST_STATUS | - DDS_PUBLICATION_MATCHED_STATUS); - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Create a data reader, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector. - */ - if (both_read_write_) - { - dum_data_reader = participant->create_datareader_with_profile( - send_topic, - lib_name_, - prof_name_, - &dum_listener, - DDS_DATA_AVAILABLE_STATUS); - - if (!dum_data_reader ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); - goto clean_exit; - } - } - - data_reader = participant->create_datareader_with_profile( - receive_topic, - lib_name_, - prof_name_, - &listener, - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* Create a data writer, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector - */ - if (both_read_write_) - { - dum_data_writer = participant->create_datawriter_with_profile( - receive_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!dum_data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); - goto clean_exit; - } - } - - /* Create data sample for writing */ - instance_ = LatencyTestTypeSupport::create_data (); - if (instance_ == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } - - init_values(); - - test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); - if (!test_data_writer_) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); - goto clean_exit; - } - - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (5); - - // handle writing of messages - start(); - - /* --- Clean Up --- */ - ACE_OS::sleep (5); - main_result = 0; - - clean_exit: - const char * read_write_str = 0; - if (both_read_write_) - { - read_write_str = "Used a extra dummy reader and writer per topic."; - } - else - { - read_write_str = "Used a reader for one topic and a writer for other topic."; - } - - if((nr_of_runs_ -1) != datalen_idx_) - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" - " Number of messages sent of last run (%u): %u\n" - "%C\n\n", - datalen_idx_, - nr_of_runs_, - datalen_idx_ + 1, - number_of_msg_, - read_write_str)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " - "%u messages.\n" - "%C\n\n", - nr_of_runs_, - number_of_msg_, - read_write_str)); - } - ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", - unexpected_count_)); - if (participant) - { - retcode = participant->delete_contained_entities (); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant (participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); - main_result = 1; - } - - delete [] datalen_range_; - delete [] duration_times_; - delete pub_listener; - - return main_result; -} - -void HelloListener::on_data_available(DDSDataReader *reader) -{ - LatencyTestDataReader * test_reader = - LatencyTestDataReader::narrow (reader); - if (!test_reader) - { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataReader::narrow failed.\n"))); - return; - } - - /* Loop until there are messages available in the queue */ - for(;;) - { - ::DDS::SampleInfoSeq info; - ::LatencyTestRTISeq sample_req; - ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); - if (retcode == DDS_RETCODE_NO_DATA) - { - /* No more samples */ - break; - } - else if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to take data from data reader," - " error %d.\n"), - retcode)); - return; - } - for (::DDS_Long i = 0; i < sample_req.length (); ++i) - { - if (info[i].valid_data) - { - struct RTINtpTime finish_time; - RTINtpTime_setZero(&finish_time); - timer->getTime(timer, &finish_time); - read(sample_req[i], finish_time); - } - } - (void) test_reader->return_loan (sample_req, info); - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index ed1ff76010e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - 8712 - - - - DDS_TRANSPORTBUILTIN_UDPv4 - - - - - - dds.transport.UDPv4.builtin.parent.message_size_max - 8712 - - dds.transport.UDPv4.builtin.recv_socket_buffer_size - 17424 - - dds.transport.UDPv4.builtin.send_socket_buffer_size - 8712 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - DDS_KEEP_LAST_HISTORY_QOS - 1 - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - 3 - 3 - 3 - - - - - 3 - - 0 - 0 - - - - 604800 - 1000000 - - - - 0 - 1000000 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - DDS_KEEP_LAST_HISTORY_QOS - 1 - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - true - - - - - 0 - 0 - - - - - - - - - - DDS_TRANSPORTBUILTIN_SHMEM - - - 8712 - - - - - dds.transport.shmem.builtin.parent.message_size_max - 8712 - - - dds.transport.shmem.builtin.receive_buffer_size - 17424 - - - - - - - RELIABLE_RELIABILITY_QOS - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - true - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl deleted file mode 100755 index 868093f722c..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl +++ /dev/null @@ -1,47 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -foreach $i (@ARGV) { - if ($i eq '-b') { - $rw_extra = '-b:'; - } -} - -$nr_runs = 2; -@profiles = ("Latency_Library#UDPv4QoS", "Latency_Library#SharedMemQos"); - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$DDS4CCM_ROOT = "$CIAO_ROOT/connectors/dds4ccm"; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - -$tg_sender->AddLibPath ('../lib'); -$tg_receiver->AddLibPath ('../lib'); - -sub run_tests { - for ($i = 0; $i < $nr_runs; ++$i) { - $qos = $profiles[$i]; - - print "Start receiver with QoS profile <$qos>\n"; - $R = $tg_receiver->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Receiver/DDS_receiver", "-q $qos $rw_extra"); - - $R->Spawn(); - - print "Start sender with QoS profile <$qos>\n"; - $S = $tg_sender->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Sender/DDS_Sender", "-q $qos $rw_extra"); - - $S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180); - $R->Kill (); - } -} - -run_tests (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl deleted file mode 100755 index bf0c681d5d3..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl +++ /dev/null @@ -1,47 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -foreach $i (@ARGV) { - if ($i eq '-b') { - $rw_extra = '-b:'; - } -} - -$nr_runs = 2; -@profiles = ("Latency_Library#UDPv4QoS", "Latency_Library#SharedMemQos"); - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$DDS4CCM_ROOT = "$CIAO_ROOT/connectors/dds4ccm"; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - -$tg_sender->AddLibPath ('../lib'); -$tg_receiver->AddLibPath ('../lib'); - -sub run_tests { - for ($i = 0; $i < $nr_runs; ++$i) { - $qos = $profiles[$i]; - - print "Start receiver with QoS profile <$qos>\n"; - $R = $tg_receiver->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Receiver/DDS_receiver", "-q $qos $rw_extra"); - - $R->Spawn(); - - print "Start sender with QoS profile <$qos>\n"; - $S = $tg_sender->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Sender/DDS_NDDS_Sender", "-q $qos $rw_extra"); - - $S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180); - $R->Kill (); - } -} - -run_tests (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore deleted file mode 100644 index 6ca7ba5295d..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/THROUGHPUT_Base_stub_export.h -/Throughput_Base.cxx -/Throughput_Base.h -/Throughput_BasePlugin.cxx -/Throughput_BasePlugin.h -/Throughput_BaseSupport.cxx -/Throughput_BaseSupport.h diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl deleted file mode 100644 index b28bd3a61bd..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file Throughput_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef THROUGHPUT_BASE_IDL -#define THROUGHPUT_BASE_IDL - -const short MAX_DATA_SEQUENCE_LENGTH = 8192; - -typedef enum ThroughputCommandKind -{ - THROUGHPUT_COMMAND_IDLE, - THROUGHPUT_COMMAND_START, - THROUGHPUT_COMMAND_COMPLETE -} CommandKind; - -typedef sequence OctetSeq; - -struct ThroughputTest { - long key; - unsigned long long seq_num; - OctetSeq data; - }; - -struct ThroughputCommand -{ - CommandKind command; - unsigned long data_length; - unsigned long long current_publisher_effort; - unsigned long long final_publisher_effort; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc deleted file mode 100644 index 95f1b33ca8c..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc +++ /dev/null @@ -1,26 +0,0 @@ -project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Throughput_Base_stub - dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL - libout = ../lib - - requires += dds4ccm_ndds - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=THROUGHPUT_BASE_STUB_Export \ - -Wb,stub_export_include=THROUGHPUT_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Throughput_Base.idl - } - - opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export - - DDSGenerator_Files { - Throughput_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore deleted file mode 100644 index a5f27931c30..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/DDS_receiver diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc deleted file mode 100644 index 9197cbfc596..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc +++ /dev/null @@ -1,15 +0,0 @@ -project(*receiver_plain) : nddslib, acelib, taolib, typecode { - after += DDS_Throughput_Base_stub_plain - exename = DDS_receiver - libpaths += ../lib - libout = ../lib - includes += ../Base - libs += DDS_Throughput_Base_stub - - requires += dds4ccm_ndds - - Source_Files { - Throughput_Receiver.cpp - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp deleted file mode 100644 index c9cd6162f2a..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp +++ /dev/null @@ -1,397 +0,0 @@ -#include "ace/Get_Opt.h" -#include "tao/ORB_Core.h" -#include "ace/Env_Value_T.h" -#include "ace/High_Res_Timer.h" -#include "Throughput_Base.h" -#include "Throughput_BaseSupport.h" -#include "Throughput_BasePlugin.h" - -#include - -bool shutdown_flag = false; - -CORBA::LongLong count_ = 0; // total count of all received messages -ACE_UINT64 interval_time_ = 0; -CORBA::LongLong interval_messages_received_ = 0; -CORBA::LongLong interval_bytes_received_ = 0; -CORBA::Long interval_data_length_ = 0; -CORBA::UShort run_ = 0; -ACE_UINT64 first_time_ = 0; -CORBA::LongLong messages_lost_ = 0; -CORBA::Boolean logres = false; -CORBA::ULongLong seq_num_ = 0; -CORBA::LongLong demand_ = 0; - -ThroughputTest *instance =0; -::DDS::Topic *topic = 0; -::DDS::Topic *cmd_topic = 0; - -const char *lib_name = "HelloTest_Library"; -const char *cmd_prof_name = "ThroughputCmdQoS"; -const char *prof_name = "ThroughputQoS"; -const char *part_name = "ThroughputPartQoS"; - -CORBA::UShort domain_id = 0; - - int - parse_args (int argc, ACE_TCHAR *argv[]) - { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:O")); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'd': - domain_id = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-d " - "\n", - argv [0]), - -1); - } - // Indicates successful parsing of the command line - return 0; - } - -/* The listener of events and data from the middleware */ -class HelloListener: public ::DDS::DataReaderListener { -public: - void on_data_available(::DDS::DataReader *reader); -}; - -/* The listener of events and command data from the middleware */ -class CmdListener: public ::DDS::DataReaderListener { -public: - void on_data_available(::DDS::DataReader *reader); -}; - - void - show_results() - { - if ((count_ > 0) && (interval_time_ > 0)) - { - double per_sec = (double)1000000/ interval_time_; - double mbps = (interval_bytes_received_* per_sec)* (8.0/1000.0/1000.0); - - if(run_ == 1) - { - ACE_DEBUG((LM_DEBUG, - " bytes, demand, samples,sample/s, Mbit/s,lost samples\n" - "------,-------,-------,--------,-------,------------\n" - "%6u,%7q,%7q,%7.1f,%7.1f,%7q\n", - interval_data_length_, - demand_, - interval_messages_received_, - interval_messages_received_* per_sec, - mbps, - messages_lost_)); - } - else - { - ACE_DEBUG((LM_DEBUG,"%6u,%7q,%7q,%7.1f,%7.1f,%7q\n", - interval_data_length_, - demand_, - interval_messages_received_, - interval_messages_received_* per_sec, - mbps, - messages_lost_)); - } - } - } - - void - reset_results() - { - interval_messages_received_ = 0; - interval_bytes_received_ = 0; - interval_time_=0; - seq_num_ = 0; - messages_lost_= 0; - } - - void - handle_run(ThroughputCommand & an_instance) - { - if( an_instance.command == THROUGHPUT_COMMAND_START) - { - logres = true; - reset_results(); - interval_data_length_ = an_instance.data_length; - demand_ = an_instance.current_publisher_effort; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (first_time_); - } - if( an_instance.command == THROUGHPUT_COMMAND_COMPLETE) - { - logres = false; - ACE_UINT64 last_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time); - interval_time_ = (last_time - first_time_); - ++run_; - show_results(); - if(an_instance.current_publisher_effort == - an_instance.final_publisher_effort) - { - shutdown_flag = true; - } - } - } - - void - record_data (ThroughputTest & an_instance) - { - ++count_; // total count of all received messages - if(logres == true) - { - ++interval_messages_received_; - interval_bytes_received_ += interval_data_length_; - if (an_instance.seq_num != seq_num_) - { - ++messages_lost_; - /* Reset sequence number */ - seq_num_ = an_instance.seq_num; - } - ++seq_num_; - } - } - - int ACE_TMAIN(int argc, ACE_TCHAR** argv) - { - ::DDS::ReturnCode_t retcode; - HelloListener listener; - CmdListener cmd_listener; - int main_result = 1; /* error by default */ - ::DDS::DataReader *data_reader = 0; - ::DDS::DataReader *cmd_data_reader = 0; - const char * type_name_cmd = 0; - const char * type_name = 0; - - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); - domain_id = id; - - if (parse_args (argc, argv) != 0) - return 1; - - /* Create the domain participant on domain ID 0 */ - ::DDS::DomainParticipant *participant = - ::DDS::DomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id, /* Domain ID */ - lib_name, - part_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to create domain participant.\n"))); - goto clean_exit; - } - /* Register type before creating topic */ - type_name = ThroughputTestTypeSupport::get_type_name(); - retcode = ThroughputTestTypeSupport::register_type(participant, type_name); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to register topic type.\n"))); - goto clean_exit; - } - topic = participant->create_topic( - "Test data", /* Topic name*/ - type_name, /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - /* Register type before creating command topic */ - type_name_cmd = ThroughputCommandTypeSupport::get_type_name(); - retcode = ThroughputCommandTypeSupport::register_type( - participant, type_name_cmd); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to register command topic type.\n"))); - goto clean_exit; - } - /* Create the topic "Hello, World" for the String type */ - cmd_topic = participant->create_topic( - "Command data", /* Topic name*/ - type_name_cmd, /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!cmd_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create cmd_topic.\n"))); - goto clean_exit; - } - /* Create the data reader using the default publisher */ - data_reader = participant->create_datareader_with_profile( - topic, - lib_name, - prof_name, /* QoS */ - &listener, /* Listener */ - DDS_DATA_AVAILABLE_STATUS); - /* Create the command data reader using the default publisher */ - cmd_data_reader = participant->create_datareader_with_profile( - cmd_topic, - lib_name, - cmd_prof_name, /* QoS */ - &cmd_listener, /* Listener */ - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader || !cmd_data_reader) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* --- Sleep During Asynchronous Reception ---------------------------- */ - - /* This thread sleeps forever. When a sample is received, RTI Data - * Distribution Service will call the on_data_available_callback function. - */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ready to read data.\n"))); - for (;;) - { - ACE_OS::sleep (1); - if(shutdown_flag) - { - break; - } - } - - /* --- Clean Up ------------------------------------------------------- */ - - main_result = 0; -clean_exit: - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - if (count_ > 0) - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "Number of samples received: %u \n", - count_)); - } - else - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "No samples received\n ")); - } - if (participant) - { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - - DDSDomainParticipantFactory::finalize_instance (); - - return main_result; - } - - /* This method gets called back by DDS when one or more data samples - * have been received. - */ - void HelloListener::on_data_available(::DDS::DataReader *reader) - { - /* Perform a safe type-cast from a generic data reader into a - * specific data reader for the type "ThroughputTestDataReader" - */ - ThroughputTestDataReader * test_reader = - ThroughputTestDataReader::narrow(reader); - if (!test_reader) - { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n"))); - return; - } - - ThroughputTest *instance = new ThroughputTest; - - /* Loop until there are messages available in the queue */ - for(;;) - { - ::DDS::SampleInfo info; - ::DDS::ReturnCode_t retcode = test_reader->take_next_sample(*instance, - info); - if (retcode == DDS_RETCODE_NO_DATA) - { - /* No more samples */ - break; - } - else if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to take data from data reader," - " error %d.\n"), - retcode)); - return; - } - if (info.valid_data) - { - record_data(*instance); - } - } - } - /* This method gets called back by DDS when one or more data samples - * have beenreceived. - */ - void CmdListener::on_data_available(::DDS::DataReader *reader) - { - ThroughputCommandDataReader * cmd_reader = - ThroughputCommandDataReader::narrow(reader); - - if (!cmd_reader) - { - /* In this specific case, this will never fail */ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("::DDS::StringDataReader::narrow failed.\n"))); - return; - } - - ThroughputCommand *instance = new ThroughputCommand; - - /* Loop until there are messages available in the queue */ - for(;;) - { - ::DDS::SampleInfo info; - ::DDS::ReturnCode_t retcode = cmd_reader->take_next_sample( - *instance, - info); - if (retcode == DDS_RETCODE_NO_DATA) - { - /* No more samples */ - break; - } - else if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to take data from data reader," - " error %d.\n"), retcode)); - return; - } - if (info.valid_data) - { - handle_run(*instance); - } - } - } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore deleted file mode 100644 index e44c12611b5..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/DDS_Sender diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc deleted file mode 100644 index 068cbc775d5..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc +++ /dev/null @@ -1,15 +0,0 @@ -project(*sender_plain) : nddslib, acelib, taolib, typecode { - after += DDS_Throughput_Base_stub_plain - exename = DDS_Sender - avoids += ace_for_tao - libpaths += ../lib - libout = ../lib - includes += ../Base - libs += DDS_Throughput_Base_stub - - requires += dds4ccm_ndds - - Source_Files { - Throughput_Sender.cpp - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp deleted file mode 100644 index 499241ce5d1..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ /dev/null @@ -1,326 +0,0 @@ -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Env_Value_T.h" -#include "tao/ORB_Core.h" -#include "Throughput_Base.h" -#include "Throughput_BaseSupport.h" -#include "Throughput_BasePlugin.h" - -#include - -CORBA::UShort datalen = 1024; -CORBA::UShort recover_time = 1; // in sec -CORBA::ULong start_load = 1000; -CORBA::ULong incr_load = 1000; -CORBA::ULongLong max_load = 9000; -CORBA::ULongLong number_of_msg = 0; -ACE_UINT64 duration_run_ = 10; // in sec - -CORBA::ULongLong load = 0; -ACE_UINT64 start_time = 0; - -ThroughputTest *instance = 0; -ThroughputCommand *instance_cmd = 0; -::DDS::Topic *topic = 0; -::DDS::Topic *cmd_topic = 0; -::DDS::DataWriter *data_writer = 0; -::DDS::DataWriter *cmd_writer = 0; -ThroughputTestDataWriter *test_data_writer = 0; -ThroughputCommandDataWriter *cmd_data_writer = 0; - -const char *lib_name = "HelloTest_Library"; -const char *cmd_prof_name = "ThroughputCmdQoS"; -const char *prof_name = "ThroughputQoS"; -const char *part_name = "ThroughputPartQoS"; - -CORBA::UShort domain_id = 0; - - int - parse_args (int argc, ACE_TCHAR *argv[]) - { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:l:r:s:m:i:O")); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'd': - domain_id = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'l': - datalen = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'r': - recover_time = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 's': - start_load = ACE_OS::atol (get_opts.opt_arg ()); - break; - case 'i': - incr_load = ACE_OS::atol (get_opts.opt_arg ()); - break; - case 'm': - max_load = ACE_OS::atol (get_opts.opt_arg ()); - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-d " - "-l " - "-r " - "-s " - "-i " - "-m " - "\n", - argv [0]), - -1); - } - // Indicates successful parsing of the command line - return 0; - } - - bool - write(void) - { - CORBA::Boolean test_complete = false; - load += incr_load; - if ( load > max_load) - { - return false; - } - else - { - instance_cmd->command = THROUGHPUT_COMMAND_START; - instance_cmd->data_length = datalen; - instance_cmd->current_publisher_effort = load; - instance_cmd->final_publisher_effort = max_load; - try - { - cmd_data_writer->write(*instance_cmd, DDS_HANDLE_NIL); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing command.\n"))); - } - test_complete = false; - // get start time - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time); - while (!test_complete) - { - for (CORBA::ULongLong current_load = 0; - current_load < load && !test_complete; - ++current_load, ++instance->seq_num) - { - try - { - test_data_writer->write(*instance, DDS_HANDLE_NIL); - ++number_of_msg; - } - catch (const ::CORBA::Exception&) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer " - "info for <%q>.\n"), - number_of_msg)); - test_complete= true; - } - } - ACE_UINT64 end_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time); - ACE_UINT64 interval = end_time - start_time; - if(interval > (duration_run_ * 1000 * 1000)) - { - test_complete = true; - instance_cmd->command = THROUGHPUT_COMMAND_COMPLETE; - cmd_data_writer->write ( *instance_cmd, DDS_HANDLE_NIL); - } - if (!test_complete) - { - ACE_OS::sleep (recover_time); - } - } - return true; - } - } - - int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) - { - ::DDS::ReturnCode_t retcode; - long overhead_size = 0; - const char * type_name_cmd = 0; - const char * type_name = 0; - - int main_result = 1; /* error by default */ - - try - { - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); - domain_id = id; - - if (parse_args (argc, argv) != 0) - return 1; - - /* Create the domain participant */ - ::DDS::DomainParticipant *participant = - ::DDS::DomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id, /* Domain ID */ - lib_name, - part_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Register type before creating topic */ - type_name = ThroughputTestTypeSupport::get_type_name(); - retcode = ThroughputTestTypeSupport::register_type( - participant, type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - topic = participant->create_topic( - "Test data", /* Topic name*/ - type_name, /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - - - if (!topic) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - /* Register type before creating topic */ - type_name_cmd = ThroughputCommandTypeSupport::get_type_name(); - retcode = ThroughputCommandTypeSupport::register_type( - participant, type_name_cmd); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - /* Create the topic "Command World" for the String type */ - cmd_topic = participant->create_topic("Command data", /* Topic name*/ - type_name_cmd , /* Type name */ - DDS_TOPIC_QOS_DEFAULT,/* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } - - /* Create the command writer using the default publisher */ - cmd_writer = participant->create_datawriter_with_profile( - cmd_topic, - lib_name, - cmd_prof_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!cmd_writer) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to create cmd data writer.\n"))); - goto clean_exit; - } - - /* Create the data writer using the default publisher */ - data_writer = participant->create_datawriter_with_profile( - topic, - lib_name, - prof_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Create data sample for writing */ - instance = ThroughputTestTypeSupport::create_data(); - if (instance == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } - overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULongLong); - instance->key = 1; - instance->seq_num = 0; - //instance->data.maximum (MAX_DATA_SEQUENCE_LENGTH); - instance->data.length(datalen - overhead_size); - - /* Create data sample for writing */ - instance_cmd = ThroughputCommandTypeSupport::create_data(); - if (instance_cmd == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create command sample.\n"))); - goto clean_exit; - } - - /* Perform a safe type-cast from a generic data writer into a - * specific data writer for the types "ThroughputTestDataWriter" - * and "ThroughputCommandDataWriter" - */ - test_data_writer = ThroughputTestDataWriter::narrow(data_writer); - cmd_data_writer = ThroughputCommandDataWriter::narrow(cmd_writer); - if (!test_data_writer || !cmd_data_writer) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n"))); - goto clean_exit; - } - - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (1); - - /* --- Write Data ----------------------------------------------------- */ - for(CORBA::ULong i = start_load; i < (max_load + incr_load); i+= incr_load) - { - write(); - ACE_OS::sleep (5); - } - - /* --- Clean Up ------------------------------------------------------- */ - ACE_OS::sleep (5); - - main_result = 0; -clean_exit: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %Q\n", - (number_of_msg))); - if (participant) - { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); - main_result = 1; - } - DDSDomainParticipantFactory::finalize_instance (); - return main_result; -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 3377092c378..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - 92160 - - - - - dds.transport.builtin.mask - DDS_TRANSPORTBUILTIN_UDPv4 - dds.transport.UDPv4.builtin.parent.message_size_max - 9216 - dds.transport.UDPv4.builtin.recv_socket_buffer_size - 92160 - dds.transport.UDPv4.builtin.send_socket_buffer_size - 92160 - - - - - - - - - - - 92160 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - - - - 92160 - - - - - - RELIABLE_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - RELIABLE_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl deleted file mode 100755 index b9f171d62fa..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/run_test_dds.pl +++ /dev/null @@ -1,26 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - -$tg_sender->AddLibPath ('../lib'); -$tg_receiver->AddLibPath ('../lib'); - -print "Start receiver\n"; -$R = $tg_receiver->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_receiver", ""); -$R->Spawn(); -print "Start sender\n"; -$S = $tg_sender->CreateProcess ("$CIAO_ROOT/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender", ""); -$S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180); -$R->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl deleted file mode 100644 index d36869f3ed4..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file Perf_Keyed_Test_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef PERF_KEYED_TEST_BASE_IDL -#define PERF_KEYED_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Perf_Keyed_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Perf_Keyed_Test_BaseTypeSupportImpl.h" - -/// Flag used to indicate message is used for initialization only -const unsigned long INITIALIZE_SIZE = 1234; - -/// Flag used to indicate end of test -const unsigned long FINISHED_SIZE = 1235; -const unsigned long OVERHEAD_BYTES = 31; - -#pragma DCPS_DATA_TYPE "PerfKeyedTest" -#pragma DCPS_DATA_KEY "PerfKeyedTest key" - -struct PerfKeyedTest { - string key; //@key - long entity_id; //id of subscriber/publisher - unsigned long seq_num; - long latency_ping; - string bin_data; - unsigned long data_len; - unsigned long long nanotime; -}; - - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence PerfKeyedTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc deleted file mode 100644 index e23011f227a..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Perf_Keyed_Test_Base_stub - dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PERF_KEYED_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Perf_Keyed_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Perf_Keyed_Test_Base.idl - } - - opendds_ts_flags += --export=PERF_KEYED_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Perf_Keyed_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl deleted file mode 100644 index 9fe2a19a315..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file Perf_Keyed_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - * - * by-hand translation of the idl3p. - */ - -#ifndef PERF_KEYED_TEST_CONNECTOR_IDL_ -#define PERF_KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Perf_Keyed_Test_Base.idl" - -#pragma ciao lem "Connector/Perf_Keyed_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Perf_Keyed_Test_BaseTypeSupport.idl" -#endif - -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::PerfKeyedTest, ::PerfKeyedTestSeq> PerfKeyedTest; -}; - -#endif /* Perf_Keyed_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc deleted file mode 100644 index 73257fa5473..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector" - -project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Perf_Keyed_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Perf_Keyed_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Perf_Keyed_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Perf_Keyed_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=PERF_KEYED_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Perf_Keyed_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Perf_Keyed_Test_Connector.idl - } -} - -project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Perf_Keyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Perf_Keyed_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Perf_Keyed_Test_ConnectorE.idl - } -} - -project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub - libs += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_PK_Test_Connector_lem_stub - dynamicflags += PERF_KEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ConnectorEC.cpp - } - - Header_Files { - Perf_Keyed_Test_ConnectorEC.h - Perf_Keyed_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_ConnectorEC.inl - } -} - -project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Perf_Keyed_Test_Base_stub - libs += DDS_Perf_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Perf_Keyed_Test_Connector_stub - dynamicflags += PERF_KEYED_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ConnectorC.cpp - } - - Header_Files { - Perf_Keyed_Test_ConnectorC.h - Perf_Keyed_Test_Connector_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_ConnectorC.inl - } -} - -project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub - sharedname = DDS_Perf_Keyed_Test_Connector_exec - libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PERF_KEYED_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_Connector_conn.cpp - } - - Header_Files { - Perf_Keyed_Test_Connector_conn.h - Perf_Keyed_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { - after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub - sharedname = DDS_Perf_Keyed_Test_Connector_svnt - libs += DDS_Perf_Keyed_Test_Connector_stub \ - DDS_PK_Test_Connector_lem_stub \ - DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PERF_KEYED_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ConnectorS.cpp - Perf_Keyed_Test_Connector_svnt.cpp - } - - Header_Files { - Perf_Keyed_Test_ConnectorS.h - Perf_Keyed_Test_Connector_svnt.h - Perf_Keyed_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore deleted file mode 100644 index b837dbf72b4..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Perf_Keyed_Test_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl deleted file mode 100644 index 0033ddaad8a..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Perf_Keyed_Test_Connector.idl" - -module Perf_Keyed_Test -{ - component Receiver - { - port CCM_DDS::PerfKeyedTest::DDS_Listen info_listen; - port CCM_DDS::PerfKeyedTest::DDS_Write write_ping; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc deleted file mode 100644 index 18df7980bdd..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Perf_Keyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Perf_Keyed_Test_Receiver.idl - } -} - -project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Perf_Keyed_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Perf_Keyed_Test_ReceiverE.idl - } -} - -project(DDS_Perf_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Receiver_lem_gen DDS_Perf_Keyed_Test_Receiver_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub - libs += Receiver_stub DDS_Perf_Keyed_Test_Connector_stub \ - DDS_Perf_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ReceiverEC.cpp - } - - Header_Files { - Perf_Keyed_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_ReceiverEC.inl - } -} - -project(DDS_Perf_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Receiver_idl_gen DDS_Perf_Keyed_Test_Connector_stub \ - DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_lem_gen - libs += DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ReceiverC.cpp - } - - Header_Files { - Perf_Keyed_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_ReceiverC.inl - } -} - -project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Receiver_stub \ - DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub \ - DDS_PK_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_Receiver_exec.cpp - } - - Header_Files { - Perf_Keyed_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { - after += DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ - DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ - Receiver_exec DDS_PK_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_ReceiverS.cpp - Perf_Keyed_Test_Receiver_svnt.cpp - } - - Header_Files { - Perf_Keyed_Test_ReceiverS.h - Perf_Keyed_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp deleted file mode 100644 index 3b8fa86c7e6..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp +++ /dev/null @@ -1,245 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Perf_Keyed_Test_Receiver_exec.h" -#include "ace/High_Res_Timer.h" - -namespace CIAO_Perf_Keyed_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::Perf_Keyed_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::Perf_Keyed_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PerfKeyedTest::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::PerfKeyedTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - // Record time, not for ping messages , already pinged back. - if (datum.latency_ping != -1L) - { - this->callback_.record_time (datum.data_len); - } - - // Send back a packet if this is a ping - if (datum.latency_ping == 1L) - { - this->callback_.write_one (const_cast (datum)); - } - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::PerfKeyedTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : count_ (0L) - , interval_time_(0L) - , interval_messages_received_(0L) - , messages_received_(0L) - , interval_bytes_received_(0L) - , bytes_received_(0L) - , interval_data_length_(0L) - , first_time_ (0L) - , finished_(false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::write_one (PerfKeyedTest & an_instance) - { - an_instance.latency_ping = -1L; - this->writer_->write_one (an_instance, ::DDS::HANDLE_NIL); - } - - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::record_time (unsigned long datalen) - { - ++this->count_; - if( datalen == INITIALIZE_SIZE) - { - // store the info for this interval - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->first_time_); - this->messages_received_=1; - } - else if ( datalen == FINISHED_SIZE) - { // store the info for this interval - ACE_UINT64 last_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time); - this->interval_time_ = (last_time - this->first_time_); - this->interval_messages_received_ = ++this->messages_received_; - this->interval_bytes_received_ = this->bytes_received_; - this->finished_ = true; - } - else - { - ++this->messages_received_; - this->interval_data_length_ = datalen + OVERHEAD_BYTES; - this->bytes_received_ += datalen + OVERHEAD_BYTES; - } - } - // Component attributes and port operations. - - ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_DDS::PerfKeyedTest::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::CCM_DDS::PerfKeyedTest::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Perf_Keyed_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - (void) ACE_High_Res_Timer::global_scale_factor (); - // enable the datalistener - this->start(); - } - - void - Receiver_exec_i::ccm_activate (void) - { - this->writer_ = this->ciao_context_->get_connection_write_ping_data (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (!this->finished_.value ()) // proces ended before received last message - { - ACE_UINT64 last_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time); - this->interval_time_ = (last_time - this->first_time_); - this->interval_messages_received_ = ++this->messages_received_; - this->interval_bytes_received_ = this->bytes_received_; - } - if ((this->count_.value () > 0) && (this->interval_time_ > 0)) - { - double per_sec = (double)1000000/ this->interval_time_; - double mbps = - (this->interval_bytes_received_.value()* per_sec)* (8.0/1000.0/1000.0); - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "Data Length: %u Messages: %u Messages/s(ave): " - "%6.01f, Mbps(ave): %7.01f \n", - this->interval_data_length_.value(), - this->interval_messages_received_.value(), - this->interval_messages_received_.value()* per_sec, - mbps)); - } - else - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "No samples received\n ")); - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Perf_Keyed_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h deleted file mode 100644 index 1f4403622d9..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h +++ /dev/null @@ -1,157 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PERF_KEYED_TEST_RECEIVER_EXEC_RQNPFL_H_ -#define CIAO_PERF_KEYED_TEST_RECEIVER_EXEC_RQNPFL_H_ - -#include /**/ "ace/pre.h" - -#include "Perf_Keyed_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Perf_Keyed_Test_Receiver_Impl -{ - class Receiver_exec_i; - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Bool; - typedef ACE_Atomic_Op Atomic_Long; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::Perf_Keyed_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ - - virtual - void on_one_data (const ::PerfKeyedTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::PerfKeyedTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Perf_Keyed_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void record_time (unsigned long datalen); - void write_one (PerfKeyedTest & an_instance); - - //@} - - private: - ::Perf_Keyed_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::PerfKeyedTest::CCM_Listener_var ciao_info_listen_data_listener_; - //@} - - //@{ - /** User defined members. */ - ::CCM_DDS::PerfKeyedTest::Writer_var writer_; - - Atomic_ULong count_; - ACE_UINT64 interval_time_; - Atomic_Long interval_messages_received_; - Atomic_Long messages_received_; - Atomic_Long interval_bytes_received_; - Atomic_Long bytes_received_; - Atomic_Long interval_data_length_; - ACE_UINT64 first_time_; - Atomic_Bool finished_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Perf_Keyed_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore deleted file mode 100644 index 3c777e43724..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Perf_Keyed_Test_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl deleted file mode 100644 index 5752f96bbaf..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_PERF_KEYED_TEST_SENDER_IDL -#define DDS_PERF_KEYED_TEST_SENDER_IDL - -#include "Connector/Perf_Keyed_Test_Connector.idl" - - -module Perf_Keyed_Test -{ - component Sender - { - port CCM_DDS::PerfKeyedTest::DDS_Write info_write; - attribute unsigned short keys; - attribute unsigned long iterations; - attribute unsigned short latency_count; //number of samples sent before a latency ping packet is sent. default 100000, < sample_count - attribute unsigned short sleep; //time in ms to sleep between each send - attribute unsigned short spin; - attribute unsigned short datalen; //minimal 32 - attribute unsigned short number_of_sub; //number of subscribers - provides CCM_DDS::ConnectorStatusListener connector_status; - port CCM_DDS::PerfKeyedTest::DDS_Listen ping_listen; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc deleted file mode 100644 index 262bce294f5..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Perf_Keyed_Test_Sender.idl - } -} - -project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Perf_Keyed_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Perf_Keyed_Test_SenderE.idl - } -} - -project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Sender_lem_gen DDS_Perf_Keyed_Test_Sender_stub \ - DDS_Perf_Keyed_Test_Base_stub - libs += DDS_Perf_Keyed_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_SenderEC.cpp - } - - Header_Files { - Perf_Keyed_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_SenderEC.inl - } -} - -project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Sender_idl_gen DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub - libs += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_SenderC.cpp - } - - Header_Files { - Perf_Keyed_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_SenderC.inl - } -} - -project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Perf_Keyed_Test_Sender_lem_stub DDS_Perf_Keyed_Test_Sender_stub \ - DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_Sender_exec.cpp - } - - Header_Files { - Perf_Keyed_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Sender_lem_stub \ - DDS_Perf_Keyed_Test_Connector_stub \ - DDS_Perf_Keyed_Test_Connector_svnt DDS_PK_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ - DDS_PK_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_SenderS.cpp - Perf_Keyed_Test_Sender_svnt.cpp - } - - Header_Files { - Perf_Keyed_Test_SenderS.h - Perf_Keyed_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp deleted file mode 100644 index 7c15ba28542..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp +++ /dev/null @@ -1,671 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Perf_Keyed_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "ace/Timer_Queue.h" -#include "ace/High_Res_Timer.h" - -namespace CIAO_Perf_Keyed_Test_Sender_Impl -{ - /** - * Facet Executor Implementation Class: connector_status_exec_i - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - this->callback_.write_one (); - return 0; - } - - /** - * Facet Executor Implementation Class: connector_status_exec_i - */ - - connector_status_exec_i::connector_status_exec_i ( - ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback, - Atomic_Boolean &matched, - int number_of_subscribers) - : ciao_context_ ( - ::Perf_Keyed_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - , matched_ (matched) - , number_of_subscribers_ (number_of_subscribers) - { - } - - connector_status_exec_i::~connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (!::CORBA::is_nil (the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - ::DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow (the_entity); - if (::CORBA::is_nil (wr.in ())) - { - throw ::CORBA::INTERNAL (); - } - ::DDS::PublicationMatchedStatus_var stat; - ::DDS::ReturnCode_t retval = wr->get_publication_matched_status (stat.out ()); - if (retval == DDS::RETCODE_OK) - { - ACE_DEBUG ((LM_DEBUG, "connector_status_exec_i::on_unexpected_status - " - "on_publication_matched status received. Starting application\n")); - - if ((stat.in ().current_count >= - (this->number_of_subscribers_ + 1)) && - !this->matched_.value()) - { - this->matched_ = true; - this->callback_.start (); - } - } - } - } - - /** - * Facet Executor Implementation Class: ping_listen_data_listener_exec_i - */ - - ping_listen_data_listener_exec_i::ping_listen_data_listener_exec_i ( - ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::Perf_Keyed_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_(callback) - { - } - - ping_listen_data_listener_exec_i::~ping_listen_data_listener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PerfKeyedTest::Listener - - void - ping_listen_data_listener_exec_i::on_one_data (const ::PerfKeyedTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - //only interested in messages received with a latency_ping = -1 ('ping'messages) - if (datum.latency_ping == -1) - { - this->callback_.record_time (datum.nanotime); - } - } - - void - ping_listen_data_listener_exec_i::on_many_data (const ::PerfKeyedTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (1) - , iterations_ (1000) - , latency_count_ (100) - , sleep_ (10) - , spin_ (100) - , datalen_ (100) - , number_of_sub_ (1) - , matched_(false) - , tv_total_ (0L) - , tv_max_ (0L) - , tv_min_ (0L) - , count_ (0) // Number of returned pings - , number_of_msg_(0) // Number of sent messages - , timer_(false) - { - ACE_NEW_THROW_EX (this->ticker_, - WriteTicker (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write_one (void) - { - if (this->number_of_msg_ == 0) - { - //first message - this->last_key_->second->data_len = INITIALIZE_SIZE; - this->last_key_->second->bin_data = CORBA::string_alloc(0); - } - else if ((this->iterations_ != 0) && - (this->number_of_msg_ == ((this->iterations_ * this->keys_) -1))) - { - //last message - this->last_key_->second->data_len = FINISHED_SIZE; - this->last_key_->second->bin_data = CORBA::string_alloc(0); - } - else - { - this->last_key_->second->data_len = this->datalen_; - this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_); - } - - if ((this->iterations_ != 0) && (this->number_of_msg_ >= - (this->iterations_ * this->keys_))) - { - this->reactor ()->cancel_timer (this->ticker_); - this->timer_ = false; - } - else - { - try - { - this->last_key_->second->seq_num = this->number_of_msg_; - // Send some messages (latency_ping = 1L) with indicator that - // message has to be returned by the subscriber - // TO DO : use other selection if more then one key is used. - if (( this->number_of_msg_ % this->latency_count_) == 0) - { - this->last_key_->second->latency_ping = 1L; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( - this->last_key_->second->nanotime); - } - else - { - this->last_key_->second->latency_ping = 0L; - } - - this->writer_->write_one (this->last_key_->second, - ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing a sample.\n"))); - } - ++this->last_key_; - ++this->number_of_msg_; - - if (this->last_key_ == this->samples_.end ()) - { - // start over again. - this->last_key_ = this->samples_.begin (); - } - } - } - - void - Sender_exec_i::write_one_with_spin (void) - { - double ad, bd, cd; - volatile double * a, * b, * c; - - a = &ad; - b = &bd; - c = &cd; - - for (unsigned int loop = 0; - this->iterations_ == 0 || loop < this->iterations_; - ++loop) - { - if (this->spin_ > 0) - { - // spin, spin, spin - for (int m = 0; m < this->spin_; ++m) - { - *a = 1.1; - *b = 3.1415; - *c = *a/(*b)*m; - } - } - if (this->number_of_msg_ == 0) - { - // first message - this->last_key_->second->data_len = INITIALIZE_SIZE; - this->last_key_->second->bin_data = CORBA::string_alloc(0); - } - else if ((this->iterations_ != 0) && - (this->number_of_msg_ == - ((this->iterations_ * this->keys_) -1))) - { - // last message - this->last_key_->second->data_len = FINISHED_SIZE; - this->last_key_->second->bin_data = CORBA::string_alloc(0); - } - else - { - this->last_key_->second->data_len = this->datalen_; - this->last_key_->second->bin_data = - CORBA::string_alloc(this->datalen_); - } - try - { - this->last_key_->second->seq_num = loop; - this->last_key_->second->latency_ping = 0L; - - // if ping required - if (( this->number_of_msg_ % this->latency_count_) == 0) - { - // send some messages (latency_ping = 1L) with indicator that - // message has to be returned by the subscriber - this->last_key_->second->latency_ping = 1L; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( - this->last_key_->second->nanotime); - } - this->writer_->write_one (this->last_key_->second, - ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - if (this->last_key_ == this->samples_.end ()) - { // onto the next iteration - this->last_key_ = this->samples_.begin (); - } - ++this->number_of_msg_; - } - } - - void - Sender_exec_i::start (void) - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - PerfKeyedTest *new_key = new PerfKeyedTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->seq_num = 0; - ::CORBA::ULong length = this->datalen_; - new_key->data_len = length; - new_key->bin_data = CORBA::string_alloc(length); - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - // this->sleep_ is in ms - unsigned int sec = this->sleep_/1000; - unsigned int usec = (this->sleep_ % 1000) * 1000; - - // if sleep and spin both > 0, use sleep value and ignore spin value - if (this->sleep_ > 0) // use reactor timer to sleep - { - if (this->reactor ()->schedule_timer( - this->ticker_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - this->timer_ = true; - } - else //use spin i.o sleep - { - ACE_OS::sleep(5); - this->write_one_with_spin(); - } - } - - void - Sender_exec_i::record_time (unsigned long long nanotime) - { - ACE_UINT64 testend; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (testend); - ACE_UINT64 interval = (testend - nanotime); - - ++this->count_; - long duration = static_cast (interval); - this->tv_total_ += duration; - if (duration > this->tv_max_.value () || (this->tv_max_.value () == 0L)) - this->tv_max_ = duration; - if (duration < this->tv_min_.value () || (this->tv_min_.value () == 0L)) - this->tv_min_ = duration; - } - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::ULong - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::ULong iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::latency_count (void) - { - return this->latency_count_; - } - - void - Sender_exec_i::latency_count ( - const ::CORBA::UShort latency_count) - { - this->latency_count_ = latency_count; - } - - ::CORBA::UShort - Sender_exec_i::sleep (void) - { - return this->sleep_; - } - - void - Sender_exec_i::sleep ( - const ::CORBA::UShort sleep) - { - this->sleep_ = sleep; - } - - ::CORBA::UShort - Sender_exec_i::spin (void) - { - return this->spin_; - } - - void - Sender_exec_i::spin ( - const ::CORBA::UShort spin) - { - this->spin_ = spin; - } - - ::CORBA::UShort - Sender_exec_i::datalen (void) - { - return this->datalen_; - } - - void - Sender_exec_i::datalen ( - const ::CORBA::UShort datalen) - { - if (datalen <= OVERHEAD_BYTES) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: datalen has to be bigger as %u\n"), - OVERHEAD_BYTES)); - throw ::CORBA::BAD_PARAM (); - } - this->datalen_ = datalen - OVERHEAD_BYTES; - } - - ::CORBA::UShort - Sender_exec_i::number_of_sub (void) - { - return this->number_of_sub_; - } - - void - Sender_exec_i::number_of_sub ( - const ::CORBA::UShort number_of_sub) - { - if (number_of_sub > 0) - { - this->number_of_sub_ = number_of_sub; - } - else - { - this->number_of_sub_ = 1; - } - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_connector_status_.in ())) - { - connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - connector_status_exec_i ( - this->ciao_context_.in (), - *this, - this->matched_, - this->number_of_sub_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_connector_status_.in ()); - } - - ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr - Sender_exec_i::get_ping_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_ping_listen_data_listener_.in ())) - { - ping_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ping_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_DDS::PerfKeyedTest::CCM_Listener::_nil ()); - - this->ciao_ping_listen_data_listener_ = tmp; - } - - return - ::CCM_DDS::PerfKeyedTest::CCM_Listener::_duplicate ( - this->ciao_ping_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Sender_exec_i::get_ping_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Perf_Keyed_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - this->writer_ = this->ciao_context_->get_connection_info_write_data (); - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_ping_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate:" - " Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - if (this->timer_.value ()) - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Sender_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n", - (this->number_of_msg_ + 1))); - - if( this->count_.value () > 0) - { - double avg = this->tv_total_.value () / this->count_.value (); - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER latency time-one way, in usec :\n" - "\tTotal time <%u>,\n\tNumber of latency messages <%u>," - "\n\tAvg <%6.01f>,\n\tMin <%u>,\n\tMax <%u>.\n", - this->tv_total_.value ()/2, - this->count_.value (), - avg/2, - this->tv_min_.value ()/2, - this->tv_max_.value ()/2)); - } - else - { - ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " - "No samples reveived back.\n")); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Perf_Keyed_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h deleted file mode 100644 index 864ad161bdc..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h +++ /dev/null @@ -1,278 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PERF_KEYED_TEST_SENDER_EXEC_EXWYAH_H_ -#define CIAO_PERF_KEYED_TEST_SENDER_EXEC_EXWYAH_H_ - -#include /**/ "ace/pre.h" - -#include "Perf_Keyed_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Perf_Keyed_Test_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - /** - * WriteTicker - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: connector_status_exec_i - */ - - class connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - connector_status_exec_i ( - ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback, - Atomic_Boolean &matched, - int number_of_subscribers); - virtual ~connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - Atomic_Boolean &matched_; - int number_of_subscribers_; - }; - - /** - * Provider Executor Implementation Class: ping_listen_data_listener_exec_i - */ - - class ping_listen_data_listener_exec_i - : public virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ping_listen_data_listener_exec_i ( - ::Perf_Keyed_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback); - virtual ~ping_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ - - virtual - void on_one_data (const ::PerfKeyedTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::PerfKeyedTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::ULong iterations (void); - - virtual void iterations (::CORBA::ULong iterations); - - virtual ::CORBA::UShort latency_count (void); - - virtual void latency_count (::CORBA::UShort latency_count); - - virtual ::CORBA::UShort sleep (void); - - virtual void sleep (::CORBA::UShort sleep); - - virtual ::CORBA::UShort spin (void); - - virtual void spin (::CORBA::UShort spin); - - virtual ::CORBA::UShort datalen (void); - - virtual void datalen (::CORBA::UShort datalen); - - virtual ::CORBA::UShort number_of_sub (void); - - virtual void number_of_sub (::CORBA::UShort number_of_sub); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr - get_ping_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_ping_listen_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void write_one (void); - void write_one_with_spin (void); - void record_time (unsigned long long nanotime); - - //@} - - private: - ::Perf_Keyed_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::ULong iterations_; - - ::CORBA::UShort latency_count_; - - ::CORBA::UShort sleep_; - - ::CORBA::UShort spin_; - - ::CORBA::UShort datalen_; - - ::CORBA::UShort number_of_sub_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_; - ::CCM_DDS::PerfKeyedTest::CCM_Listener_var ciao_ping_listen_data_listener_; - //@} - - //@{ - /** User defined members. */ - ::CCM_DDS::PerfKeyedTest::Writer_var writer_; - WriteTicker *ticker_; - - Atomic_Boolean matched_; - Atomic_Long tv_total_; - Atomic_Long tv_max_; - Atomic_Long tv_min_; - Atomic_Long count_; - CORBA::UShort number_of_msg_; - Atomic_Boolean timer_; - - typedef std::map Writer_Table; - Writer_Table samples_; - - Writer_Table::iterator last_key_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Perf_Keyed_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml deleted file mode 100644 index 6e276c4f9b4..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/KeyedTest_Library.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp deleted file mode 100644 index fadb6eeb0cf..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp +++ /dev/null @@ -1,541 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Perf_Keyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#LatencyQoS - - - - - - Perf_Keyed_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#LatencyQoS - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ulong - - - 10000 - - - - - latency_count - - - tk_ushort - - - 100 - - - - - sleep - - - tk_ushort - - - 10 - - - - - spin - - - tk_ushort - - - 10 - - - - - datalen - - - tk_ushort - - - 999 - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - writer_connection_sub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_ping_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - - SameProcess - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp deleted file mode 100644 index 8c54d966c8e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp +++ /dev/null @@ -1,393 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Perf_Keyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#LatencyQoS - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ulong - - - 0 - - - - - latency_count - - - tk_ushort - - - 100 - - - - - sleep - - - tk_ushort - - - 2 - - - - - spin - - - tk_ushort - - - 1000 - - - - - number_of_sub - - - tk_ushort - - - 1 - - - - - datalen - - - tk_ushort - - - 999 - - - - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - - SameProcess - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp deleted file mode 100644 index 5eca7b9af73..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp +++ /dev/null @@ -1,393 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Perf_Keyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#LatencyQoS - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ulong - - - 0 - - - - - latency_count - - - tk_ushort - - - 100 - - - - - sleep - - - tk_ushort - - - 10 - - - - - spin - - - tk_ushort - - - 1000 - - - - - number_of_sub - - - tk_ushort - - - 3 - - - - - datalen - - - tk_ushort - - - 999 - - - - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - - SameProcess - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp deleted file mode 100644 index e0d380e4ce0..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp +++ /dev/null @@ -1,392 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Perf_Keyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#BestEffortQoS - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ulong - - - 10000 - - - - - latency_count - - - tk_ushort - - - 100 - - - - - sleep - - - tk_ushort - - - 2 - - - - - spin - - - tk_ushort - - - 1000 - - - - - number_of_sub - - - tk_ushort - - - 3 - - - - - datalen - - - tk_ushort - - - 999 - - - - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - - SameProcess - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp deleted file mode 100644 index 7f497be2038..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp +++ /dev/null @@ -1,247 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Perf_Keyed_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#LatencyQoS - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_sub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_ping_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp deleted file mode 100644 index 58527776abf..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp +++ /dev/null @@ -1,248 +0,0 @@ - - - - Perf_Keyed_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Perf_Keyed_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Perf_Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CCM_DDS_PerfKeyedTest_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Perf_Keyed_Test_Connector_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Perf_Keyed_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Perf_Keyed_Test - - - - - qos_profile - - - tk_string - - - KeyedTest_Library#BestEffortQoS - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_sub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_ping_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Perf_Keyed_Test_Connector_exec - - - DDS_Perf_Keyed_Test_Connector_exec - - - Perf_Keyed_Test_Connector_svnt - - - DDS_Perf_Keyed_Test_Connector_svnt - - - Perf_Keyed_Test_Connector_stub - - - DDS_Perf_Keyed_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README deleted file mode 100644 index 6775696acc2..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README +++ /dev/null @@ -1,25 +0,0 @@ - - -These tests test the performance with different options. - -- test one publisher and one subscriber in 1 process: - run_test.pl with resp. Plan.cdp - - -- default test (RELIABLE) , separate publisher and subscriber: - run_pub.pl and run_sub.pl with resp. Plan_pub.cdp and Plan_sub.cdp . - -- test with one publisher and three separate subscribers: - run_pub3.pl with Plan_pub3.cdp and run_sub.pl, run_sub2.pl, run_sub3.pl all with Plan_sub.cdp . - -- BEST_EFFORT test, separate publisher and subscriber: - run_pub_BE.pl and run_sub_BE.pl with resp. Plan_pub_BE.cdp and Plan_sub_BE.cdp . - - -To test changes in the next attributes, changes this values in the publisher cdp-files: -latency_count : indicates the number of messages minus 1 between two latency messages -iterations : the number of messages from one instance to send. 0 = INFINITY . -datalen: the datalen of a message (minimal 32). -sleep: time in ms to sleep before writing the next message -spin: number of times to do a code loop before writing the next message, sleep has to be 0 . -keys: number of instances. (default 1) MORE THEN 1 NOT IMPLEMENTED YET. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 2b998d90470..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - 10 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl deleted file mode 100755 index 106b5654d7c..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Sender.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# ior files other than daemon -# 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_pub.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60004 -o ns.ior\n"; - -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:60004/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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl deleted file mode 100755 index 3cba0b8122b..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Sender.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# ior files other than daemon -# 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_pub3.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60004 -o ns.ior\n"; - -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:60004/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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl deleted file mode 100755 index 3825e7ab803..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Sender.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# ior files other than daemon -# 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_pub_BE.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60004 -o ns.ior\n"; - -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:60004/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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl deleted file mode 100755 index 7c1ee38890b..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60002 ); -@iorbases = ( "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns1.ior"; -$ior_nsfile = 0; -$ior_embase = "EM1.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_sub.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl deleted file mode 100755 index fda74e578e5..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60005 ); -@iorbases = ( "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns1.ior"; -$ior_nsfile = 0; -$ior_embase = "EM2.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_sub.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60006 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60006 -o ns.ior\n"; - -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:60006/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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl deleted file mode 100755 index acc454f47e3..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60007 ); -@iorbases = ( "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns1.ior"; -$ior_nsfile = 0; -$ior_embase = "EM3.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_sub.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60008 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60008 -o ns.ior\n"; - -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:60008/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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl deleted file mode 100755 index 007cbba5e62..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl +++ /dev/null @@ -1,225 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60002 ); -@iorbases = ( "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns1.ior"; -$ior_nsfile = 0; -$ior_embase = "EM1.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_sub_BE.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 daemon $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); - } -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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->Spawn (); - -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"); -$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); - -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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl deleted file mode 100755 index 8768ad7f236..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl +++ /dev/null @@ -1,233 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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->Spawn (); - -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 (2*$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 120 seconds to allow task to complete\n"; -sleep (120); - -# 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\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/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore deleted file mode 100644 index 2a87f80288d..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LatencyTT_Test_Base.cxx -/LatencyTT_Test_Base.h -/LatencyTT_Test_BasePlugin.cxx -/LatencyTT_Test_BasePlugin.h -/LatencyTT_Test_BaseSupport.cxx -/LatencyTT_Test_BaseSupport.h -/LatencyTT_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl deleted file mode 100644 index 7de56b3076e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file LatencyTT_Test_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef LATENCYTT_TEST_BASE_IDL -#define LATENCYTT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/LatencyTT_Test_BaseSupport.h" -#pragma opendds typesupport "Base/LatencyTT_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "LatencyTTTest" - -const short MAX_DATA_SEQUENCE_LENGTH = 8192; - -typedef sequence BD_oct_seq; - -struct LatencyTTTest { - long seq_num; - BD_oct_seq data; - }; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence LatencyTTTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc deleted file mode 100644 index e797df7dbac..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_LatencyTT_Test_Base_stub - dynamicflags += LATENCYTT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=LATENCYTT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=LatencyTT_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - LatencyTT_Test_Base.idl - } - - opendds_ts_flags += --export=LATENCYTT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - LatencyTT_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore deleted file mode 100644 index 1160975ebe2..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LatencyTT_Test_ConnectorE.idl -/LatencyTT_Test_Connector_conn.cpp -/LatencyTT_Test_Connector_conn.h -/LatencyTT_Test_Connector_conn_export.h -/LatencyTT_Test_Connector_lem_stub_export.h -/LatencyTT_Test_Connector_stub_export.h -/LatencyTT_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl deleted file mode 100644 index bacb82fa723..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file LatencyTT_Test_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - * - * by-hand translation of the idl3p. - */ - -#ifndef LATENCYTT_TEST_CONNECTOR_IDL_ -#define LATENCYTT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/LatencyTT_Test_Base.idl" - -#pragma ciao lem "Connector/LatencyTT_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/LatencyTT_Test_BaseTypeSupport.idl" -#endif - -module LatencyTT_Test -{ - module ::CCM_DDS::Typed < ::LatencyTTTest, ::LatencyTTTestSeq> LatencyTTTestConn; -}; - -#endif /* LatencyTT_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc deleted file mode 100644 index 60307471e60..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l .. -o ../lib -u DDS LatencyTT_Test_Connector" - -project(DDS_LatencyTT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_LatencyTT_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LatencyTT_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=LATENCYTT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LatencyTT_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=LATENCYTT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LatencyTT_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=LATENCYTT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LatencyTT_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - LatencyTT_Test_Connector.idl - } -} - -project(DDS_LatencyTT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LatencyTT_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=LatencyTT_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - LatencyTT_Test_ConnectorE.idl - } -} - -project(DDS_LTT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub - libs += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LTT_Test_Connector_lem_stub - dynamicflags += LATENCYTT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ConnectorEC.cpp - } - - Header_Files { - LatencyTT_Test_ConnectorEC.h - LatencyTT_Test_Connector_lem_stub_export.h - } - - Inline_Files { - LatencyTT_Test_ConnectorEC.inl - } -} - -project(DDS_LatencyTT_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_LatencyTT_Test_Connector_idl_gen DDS_LatencyTT_Test_Base_stub - libs += DDS_LatencyTT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LatencyTT_Test_Connector_stub - dynamicflags += LATENCYTT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ConnectorC.cpp - } - - Header_Files { - LatencyTT_Test_ConnectorC.h - LatencyTT_Test_Connector_stub_export.h - } - - Inline_Files { - LatencyTT_Test_ConnectorC.inl - } -} - -project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub - sharedname = DDS_LatencyTT_Test_Connector_exec - libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LATENCYTT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_Connector_conn.cpp - } - - Header_Files { - LatencyTT_Test_Connector_conn.h - LatencyTT_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { - after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub - sharedname = DDS_LatencyTT_Test_Connector_svnt - libs += DDS_LatencyTT_Test_Connector_stub \ - DDS_LTT_Test_Connector_lem_stub \ - DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LATENCYTT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ConnectorS.cpp - LatencyTT_Test_Connector_svnt.cpp - } - - Header_Files { - LatencyTT_Test_ConnectorS.h - LatencyTT_Test_Connector_svnt.h - LatencyTT_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore deleted file mode 100644 index 14c8f0250ee..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LatencyTT_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl deleted file mode 100644 index d75c6a1a3fe..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/LatencyTT_Test_Connector.idl" - -module LatencyTT_Test -{ - component Receiver - { - port LatencyTTTestConn::DDS_Listen info_listen; - port LatencyTTTestConn::DDS_Write write_ping; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc deleted file mode 100644 index 8782e264bfe..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc +++ /dev/null @@ -1,148 +0,0 @@ -project(DDS_LatencyTT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LatencyTT_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - LatencyTT_Test_Receiver.idl - } -} - -project(DDS_LatencyTT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LatencyTT_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - LatencyTT_Test_ReceiverE.idl - } -} - -project(DDS_LatencyTT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LatencyTT_Test_Receiver_lem_gen DDS_LatencyTT_Test_Receiver_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub - libs += Receiver_stub DDS_LatencyTT_Test_Connector_stub \ - DDS_LatencyTT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ReceiverEC.cpp - } - - Header_Files { - LatencyTT_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - LatencyTT_Test_ReceiverEC.inl - } -} - -project(DDS_LatencyTT_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_LatencyTT_Test_Receiver_idl_gen DDS_LatencyTT_Test_Connector_stub \ - DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_lem_gen - libs += DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ReceiverC.cpp - } - - Header_Files { - LatencyTT_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - LatencyTT_Test_ReceiverC.inl - } -} - -project(DDS_LatencyTT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Receiver_stub \ - DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub \ - DDS_LTT_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_Receiver_exec.cpp - } - - Header_Files { - LatencyTT_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ - DDS_LatencyTT_Test_Receiver_exec DDS_LTT_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ - DDS_LatencyTT_Test_Connector_stub \ - Receiver_exec DDS_LTT_Test_Connector_lem_stub - - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_ReceiverS.cpp - LatencyTT_Test_Receiver_svnt.cpp - } - - Header_Files { - LatencyTT_Test_ReceiverS.h - LatencyTT_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp deleted file mode 100644 index 168bb9fc4ad..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.cpp +++ /dev/null @@ -1,183 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "LatencyTT_Test_Receiver_exec.h" - -namespace CIAO_LatencyTT_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::LatencyTT_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::LatencyTT_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::LatencyTT_Test::LatencyTTTestConn::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::LatencyTTTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - this->callback_.write_one (datum); - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::LatencyTTTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : count_ (0L) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::write_one (const LatencyTTTest & an_instance) - { - ++this->count_; - this->writer_->write_one(an_instance, ::DDS::HANDLE_NIL); - } - - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - // Component attributes and port operations. - - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LatencyTT_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - this->writer_ = this->ciao_context_->get_connection_write_ping_data (); - // Enable the datalistener. - this->start(); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->count_ == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR RECEIVER: No messages sent back.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY RECEIVER:\n " - "Total number of messages sent back: %u \n", - this->count_)); - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LatencyTT_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h deleted file mode 100644 index 7ccbf144b4e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h +++ /dev/null @@ -1,144 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_LATENCYTT_TEST_RECEIVER_EXEC_SYGLHE_H_ -#define CIAO_LATENCYTT_TEST_RECEIVER_EXEC_SYGLHE_H_ - -#include /**/ "ace/pre.h" - -#include "LatencyTT_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_LatencyTT_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::LatencyTT_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ - - virtual - void on_one_data (const ::LatencyTTTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::LatencyTTTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::LatencyTT_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void write_one (const LatencyTTTest & an_instance); - - //@} - - private: - ::LatencyTT_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_var ciao_info_listen_data_listener_; - //@} - - //@{ - /** User defined members. */ - CORBA::ULong count_; - ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LatencyTT_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore deleted file mode 100644 index 8a0cb781646..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LatencyTT_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl deleted file mode 100644 index 91e2ef8f7fe..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_LATENCYTT_TEST_SENDER_IDL -#define DDS_LATENCYTT_TEST_SENDER_IDL - -#include "Connector/LatencyTT_Test_Connector.idl" - -module LatencyTT_Test -{ - component Sender - { - port LatencyTTTestConn::DDS_Write info_write; - port LatencyTTTestConn::DDS_Listen ping_listen; - - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned long iterations; - attribute unsigned short sleep; - attribute unsigned short number_of_sub; //number of subscribers - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc deleted file mode 100644 index afb0b7a38af..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc +++ /dev/null @@ -1,144 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_LatencyTT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_LatencyTT_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - LatencyTT_Test_Sender.idl - } -} - -project(DDS_LatencyTT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LatencyTT_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - LatencyTT_Test_SenderE.idl - } -} - -project(DDS_LatencyTT_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LatencyTT_Test_Sender_lem_gen DDS_LatencyTT_Test_Sender_stub \ - DDS_LatencyTT_Test_Base_stub - libs += DDS_LatencyTT_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_SenderEC.cpp - } - - Header_Files { - LatencyTT_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - LatencyTT_Test_SenderEC.inl - } -} - -project(DDS_LatencyTT_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_LatencyTT_Test_Sender_idl_gen DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub - libs += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_SenderC.cpp - } - - Header_Files { - LatencyTT_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - LatencyTT_Test_SenderC.inl - } -} - -project(DDS_LatencyTT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LatencyTT_Test_Sender_lem_stub DDS_LatencyTT_Test_Sender_stub \ - DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_Sender_exec.cpp - } - - Header_Files { - LatencyTT_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - -project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Sender_lem_stub \ - DDS_LatencyTT_Test_Connector_stub \ - DDS_LatencyTT_Test_Connector_svnt DDS_LTT_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ - DDS_LTT_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LatencyTT_Test_SenderS.cpp - LatencyTT_Test_Sender_svnt.cpp - } - - Header_Files { - LatencyTT_Test_SenderS.h - LatencyTT_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp deleted file mode 100644 index 41c9267aef7..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp +++ /dev/null @@ -1,691 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "LatencyTT_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_math.h" - -#include "ace/Timer_Queue.h" -#include "ace/High_Res_Timer.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_LatencyTT_Test_Sender_Impl -{ - static int compare_two_longs (const void *long1, const void *long2) - { - return (int)(*(ACE_UINT64*)long1 - *(ACE_UINT64*)long2); - } - - /** - * WriteTicker - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - /** - * Facet Executor Implementation Class: ping_listen_data_listener_exec_i - */ - - ping_listen_data_listener_exec_i::ping_listen_data_listener_exec_i ( - ::LatencyTT_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::LatencyTT_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - ping_listen_data_listener_exec_i::~ping_listen_data_listener_exec_i (void) - { - } - - // Operations from ::LatencyTT_Test::LatencyTTTestConn::Listener - - void - ping_listen_data_listener_exec_i::on_one_data (const ::LatencyTTTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_UINT64 receive_time = 0; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (receive_time); - this->callback_.read(const_cast (datum), receive_time); - } - - void - ping_listen_data_listener_exec_i::on_many_data (const ::LatencyTTTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: connector_status_exec_i - */ - - connector_status_exec_i::connector_status_exec_i ( - ::LatencyTT_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback, - Atomic_Boolean &matched, - int number_of_subscribers, - Atomic_Long &unexpected_count) - : ciao_context_ ( - ::LatencyTT_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - , matched_ (matched) - , number_of_subscribers_ (number_of_subscribers) - , unexpected_count_(unexpected_count) - { - } - - connector_status_exec_i::~connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - ++this->unexpected_count_; - if (! ::CORBA::is_nil (the_entity) && - status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - ::DDS::PublicationMatchedStatus_var stat; - ::DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity); - if(::CORBA::is_nil(wr)) - { - throw ::CORBA::INTERNAL (); - } - ::DDS::ReturnCode_t retval = wr->get_publication_matched_status (stat.out ()); - if (retval == DDS::RETCODE_OK) - { - if (stat.in ().current_count >= this->number_of_subscribers_ && - !this->matched_.value()) - { - this->matched_ = true; - this->callback_.start(); - } - } - } - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (1000) - , sleep_ (10) - , number_of_sub_ (1) - - , datalen_ (100) - , datalen_idx_ (0) - , nr_of_runs_ (10) - , matched_ (false) - , tv_total_ (0L) - , tv_max_ (0L) - , tv_min_ (0L) - , count_ (0) - , number_of_msg_ (0) // Number of sent messages - , timer_ (false) - , received_ (false) - , seq_num_ (0) - , sigma_duration_squared_ (0) - , start_time_ (0) - , start_time_test_ (0) - , end_time_test_ (0) - , duration_times_ (0) - , datalen_range_ (0) - , _clock_overhead_ (0) - , unexpected_count_ (0) - { - ACE_NEW_THROW_EX (this->ticker_, - WriteTicker (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->datalen_range_, - ::CORBA::Short[this->nr_of_runs_], - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - delete [] this->duration_times_; - delete [] datalen_range_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write_one (void) - { - if (this->number_of_msg_ == 0 && this->datalen_idx_ == 0) - { - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_test_); - } - // First message sent always, next messages only as previous sent message - // is received back. - if (this->number_of_msg_ == 0 || this->received_.value ()) - { - // All messages send, stop timer. - if (this->iterations_ != 0 && - this->number_of_msg_ >= this->iterations_) - { - if( this->datalen_idx_ >= (this->nr_of_runs_ - 1)) - { - this->stop (); - this->timer_ = false; - this->calc_results (); - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->end_time_test_); - - } - else - { - this->calc_results (); - this->reset_results (); - ++this->datalen_idx_; - this->datalen_ = this->datalen_range_[this->datalen_idx_]; - this->test_topic_.data.length (this->datalen_); - } - } - else - { - try - { - this->test_topic_.seq_num = this->number_of_msg_; - - // Keep last sent seq_num, to control if message is sent back. - this->seq_num_ = this->number_of_msg_; - this->received_ = false; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_); - this->writer_->write_one (this->test_topic_, ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while wrinting sample with sequence_number <%u>.\n"), - this->test_topic_.seq_num)); - } - ++this->number_of_msg_; - } - } - } - - void - Sender_exec_i::read (LatencyTTTest & an_instance, ACE_UINT64 receive_time) - { - if (an_instance.seq_num == this->seq_num_) - { - this->record_time (receive_time); - this->received_ = true; - } - } - - void - Sender_exec_i::reset_results() - { - delete [] this->duration_times_; - this->count_ = 0; - - ACE_NEW_THROW_EX (this->duration_times_, - ACE_UINT64[this->iterations_], - ::CORBA::NO_MEMORY ()); - - this->tv_total_ = 0L; - this->tv_max_ = 0L; - this->tv_min_ = 0L; - this->number_of_msg_ = 0; - this->received_ = false; - this->seq_num_ = 0; - this->sigma_duration_squared_ = 0; - } - - void - Sender_exec_i::calc_results (void) - { - // Sort all duration times. - qsort(this->duration_times_, - this->count_, - sizeof(ACE_UINT64), - compare_two_longs); - - // Show latency_50_percentile, latency_90_percentile, - // latency_99_percentile and latency_99.99_percentile. - // For example duration_times[per50] is the median i.e. 50% of the - // samples have a latency time <= duration_times[per50] - int const per50 = this->count_ / 2; - int const per90 = (int)(this->count_ * 0.90); - int const per99 = (int)(this->count_ * 0.990); - int const per9999 = (int)(this->count_ * 0.9999); - - double const avg = (double)(this->tv_total_ / this->count_); - // Calculate standard deviation. - double const roundtrip_time_std = sqrt( - (this->sigma_duration_squared_ / (double)this->count_) - - (avg * avg)); - - // Show values as float, in order to be comparable with RTI performance test. - if (this->count_ > 0) - { - if (this->datalen_idx_ == 0) - { - #if (CIAO_DDS4CCM_CONTEXT_SWITCH==1) - ACE_DEBUG ((LM_DEBUG, "\n\nYES, we're using a threadswitch between " - "DDS and CCM\n\n")); - #else - ACE_DEBUG ((LM_DEBUG, "\n\nNO, we're not using a threadswitch between " - "DDS and CCM\n\n")); - #endif - ACE_DEBUG ((LM_DEBUG, - "Collecting statistics on %d samples per message size.\n" - "This is the roundtrip time, *not* the one-way-latency\n" - "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%," - " max us\n" - "------,-------,-------,-------,-------,-------,-------,-------," - "-------\n" - "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n", - this->count_, - this->datalen_, - roundtrip_time_std, - avg, - (double)this->tv_min_, - (double)this->duration_times_[per50-1], - (double)this->duration_times_[per90-1], - (double)this->duration_times_[per99-1], - (double)this->duration_times_[per9999-1], - (double)this->tv_max_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "%6d,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f,%7.1f\n", - this->datalen_, - roundtrip_time_std, - avg, - (double)this->tv_min_, - (double)this->duration_times_[per50-1], - (double)this->duration_times_[per90-1], - (double)this->duration_times_[per99-1], - (double)this->duration_times_[per9999-1], - (double)this->tv_max_)); - } - } - else - { - ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " - "No samples received back.\n")); - } - } - - void - Sender_exec_i::start (void) - { - // This->sleep_ is in ms - unsigned int sec = this->sleep_ / 1000; - unsigned int usec = (this->sleep_ % 1000) * 1000; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start - " - "Start test with interval <%u.%u>\n", - sec, usec)); - if (this->reactor ()->schedule_timer( - this->ticker_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - this->timer_ = true; - } - - void - Sender_exec_i::stop (void) - { - if (this->timer_.value ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - - void - Sender_exec_i::record_time (ACE_UINT64 receive_time) - { - ACE_UINT64 interval = receive_time - this->start_time_; - ACE_UINT64 duration = interval - this->_clock_overhead_; - int i = ++this->count_; - this->duration_times_[i-1] = duration; - this->sigma_duration_squared_ += (double)duration * (double)duration; - this->tv_total_ += duration; - if (duration > this->tv_max_ || this->tv_max_ == 0L) - { - this->tv_max_ = duration; - } - if (duration < this->tv_min_ || this->tv_min_ == 0L) - { - this->tv_min_ = duration; - } - } - - void - Sender_exec_i::calculate_clock_overhead (void) - { - int num_of_loops_clock = 320; - ACE_UINT64 begin_time = 0; - ACE_UINT64 clock_roundtrip_time = 0; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (begin_time); - for (int i = 0; i < num_of_loops_clock; ++i) - { - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (clock_roundtrip_time); - } - ACE_UINT64 total_time = clock_roundtrip_time - begin_time; - this->_clock_overhead_ = (long)(total_time / num_of_loops_clock); - } - - void - Sender_exec_i::init_values (void) - { - delete [] this->duration_times_; - ACE_NEW_THROW_EX (this->duration_times_, - ACE_UINT64[this->iterations_], - ::CORBA::NO_MEMORY ()); - int start = 16; - for (int i = 0; i < this->nr_of_runs_; i++) - { - this->datalen_range_[i] = start; - start = 2 * start; - } - - this->datalen_ = this->datalen_range_[0]; - - // make instances of Topic - this->test_topic_.seq_num = 0; - this->test_topic_.data.length (this->datalen_); - calculate_clock_overhead (); - } - - // Component attributes and port operations. - - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr - Sender_exec_i::get_ping_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_ping_listen_data_listener_.in ())) - { - ping_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ping_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_nil ()); - - this->ciao_ping_listen_data_listener_ = tmp; - } - - return - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener::_duplicate ( - this->ciao_ping_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Sender_exec_i::get_ping_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_connector_status_.in ())) - { - connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - connector_status_exec_i ( - this->ciao_context_.in (), - *this, - this->matched_, - this->number_of_sub_, - this->unexpected_count_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_connector_status_.in ()); - } - - ::CORBA::ULong - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::ULong iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::sleep (void) - { - return this->sleep_; - } - - void - Sender_exec_i::sleep ( - const ::CORBA::UShort sleep) - { - this->sleep_ = sleep; - } - - ::CORBA::UShort - Sender_exec_i::number_of_sub (void) - { - return this->number_of_sub_; - } - - void - Sender_exec_i::number_of_sub ( - const ::CORBA::UShort number_of_sub) - { - if (number_of_sub > 0) - { - this->number_of_sub_ = number_of_sub; - } - else - { - this->number_of_sub_ = 1; - } - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LatencyTT_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - this->writer_ = this->ciao_context_->get_connection_info_write_data (); - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_ping_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); - } - this->init_values(); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->nr_of_runs_ -1 != this->datalen_idx_) - { - if (this->datalen_idx_ == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR SENDER: No run has taken place.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" - " Number of messages sent of last run (%u): %u\n", - this->datalen_idx_, - this->nr_of_runs_, - this->datalen_idx_ + 1, - this->number_of_msg_)); - } - } - else - { - ACE_UINT64 test_time_usec = this->end_time_test_ - - this->start_time_test_; - - double sec = (double)test_time_usec / (1000 * 1000); - ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " - "%u messages in %3.3f seconds.\n", - this->nr_of_runs_, - this->number_of_msg_, sec)); - } - ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", - this->unexpected_count_.value ())); - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LatencyTT_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h deleted file mode 100644 index 66333f35cd8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h +++ /dev/null @@ -1,269 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_LATENCYTT_TEST_SENDER_EXEC_CAXIAK_H_ -#define CIAO_LATENCYTT_TEST_SENDER_EXEC_CAXIAK_H_ - -#include /**/ "ace/pre.h" - -#include "LatencyTT_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_LatencyTT_Test_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - /** - * Write action generator - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: ping_listen_data_listener_exec_i - */ - - class ping_listen_data_listener_exec_i - : public virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ping_listen_data_listener_exec_i ( - ::LatencyTT_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback); - virtual ~ping_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ - - virtual - void on_one_data (const ::LatencyTTTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::LatencyTTTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: connector_status_exec_i - */ - - class connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - connector_status_exec_i ( - ::LatencyTT_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback, - Atomic_Boolean &matched, - int number_of_subscribers, - Atomic_Long &unexpected_count); - virtual ~connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - Atomic_Boolean &matched_; - int number_of_subscribers_; - Atomic_Long &unexpected_count_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_ptr - get_ping_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_ping_listen_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::ULong iterations (void); - - virtual void iterations (::CORBA::ULong iterations); - - virtual ::CORBA::UShort sleep (void); - - virtual void sleep (::CORBA::UShort sleep); - - virtual ::CORBA::UShort number_of_sub (void); - - virtual void number_of_sub (::CORBA::UShort number_of_sub); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void write_one (void); - void read (LatencyTTTest & instance, ACE_UINT64 receive_time); - void start (void); - - //@} - - private: - ::LatencyTT_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::LatencyTT_Test::LatencyTTTestConn::CCM_Listener_var ciao_ping_listen_data_listener_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_; - - ::CORBA::ULong iterations_; - - ::CORBA::UShort sleep_; - - ::CORBA::UShort number_of_sub_; - //@} - - //@{ - /** User defined members. */ - ::LatencyTT_Test::LatencyTTTestConn::Writer_var writer_; - WriteTicker *ticker_; - - ::CORBA::UShort datalen_; - ::CORBA::UShort datalen_idx_; - ::CORBA::UShort nr_of_runs_; - Atomic_Boolean matched_; - ACE_UINT64 tv_total_; - ACE_UINT64 tv_max_; - ACE_UINT64 tv_min_; - ::CORBA::UShort count_; - ::CORBA::UShort number_of_msg_; - Atomic_Boolean timer_; - Atomic_Boolean received_; - ::CORBA::Long seq_num_; - ::CORBA::Double sigma_duration_squared_; - ACE_UINT64 start_time_; - ACE_UINT64 start_time_test_; - ACE_UINT64 end_time_test_; - - LatencyTTTest test_topic_; - ACE_UINT64* duration_times_; - ::CORBA::Short* datalen_range_; - ::CORBA::Long _clock_overhead_; - Atomic_Long unexpected_count_; - - //@} - - //@{ - /** User defined private operations. */ - void stop (void); - void calc_results (void); - void reset_results (void); - void init_values (void); - void calculate_clock_overhead (void); - void record_time (ACE_UINT64 receive_time); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LatencyTT_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml deleted file mode 100644 index 713d330f43f..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Latency_Library.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 1 - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - 3 - 3 - 3 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 1 - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp deleted file mode 100644 index 009c8748060..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp +++ /dev/null @@ -1,579 +0,0 @@ - - - - LatencyTT_Test_Depl - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LatencyTT_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - LatencyTT_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - LatencyTT_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - LatencyTT_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LTT_Test - - - - - qos_profile - - - tk_string - - - Latency_Library#SharedMemQos - - - - - - - LatencyTT_TestSec_ConnectorComponentb2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LTT_TestSec - - - - - qos_profile - - - tk_string - - - Latency_Library#SharedMemQos - - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - - SenderComponent - SenderNode - - - - - iterations - - - tk_ulong - - - 10000 - - - - - sleep - - - tk_ushort - - - 2 - - - - - number_of_sub - - - tk_ushort - - - 1 - - - - - - - LatencyTT_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - LTT_Test - - - - - qos_profile - - - tk_string - - - Latency_Library#SharedMemQos - - - - - - - LatencyTT_TestSec_ConnectorComponentb - SenderNode - - - - - topic_name - - - tk_string - - - LTT_TestSec - - - - - qos_profile - - - tk_string - - - Latency_Library#SharedMemQos - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_ping_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - LatencyTT_Test_Connector_exec - - - DDS_LatencyTT_Test_Connector_exec - - - LatencyTT_Test_Connector_svnt - - - DDS_LatencyTT_Test_Connector_svnt - - - LatencyTT_Test_Connector_stub - - - DDS_LatencyTT_Test_Connector_stub - - - - SameProcess - - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp deleted file mode 100644 index ee24ffc15f2..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp +++ /dev/null @@ -1,579 +0,0 @@ - - - - LatencyTT_Test_Depl - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LatencyTT_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_LatencyTTTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - LatencyTT_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - LatencyTT_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_LatencyTT_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LatencyTT_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - LatencyTT_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LTT_Test - - - - - qos_profile - - - tk_string - - - Latency_Library#UDPv4QoS - - - - - - - LatencyTT_TestSec_ConnectorComponentb2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LTT_TestSec - - - - - qos_profile - - - tk_string - - - Latency_Library#UDPv4QoS - - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - - SenderComponent - SenderNode - - - - - iterations - - - tk_ulong - - - 10000 - - - - - sleep - - - tk_ushort - - - 2 - - - - - number_of_sub - - - tk_ushort - - - 1 - - - - - - - LatencyTT_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - LTT_Test - - - - - qos_profile - - - tk_string - - - Latency_Library#UDPv4QoS - - - - - - - LatencyTT_TestSec_ConnectorComponentb - SenderNode - - - - - topic_name - - - tk_string - - - LTT_TestSec - - - - - qos_profile - - - tk_string - - - Latency_Library#UDPv4QoS - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_ping_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - info_listen_data_pub - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - ping_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - ping_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - LatencyTT_Test_Connector_exec - - - DDS_LatencyTT_Test_Connector_exec - - - LatencyTT_Test_Connector_svnt - - - DDS_LatencyTT_Test_Connector_svnt - - - LatencyTT_Test_Connector_stub - - - DDS_LatencyTT_Test_Connector_stub - - - - SameProcess - - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README deleted file mode 100644 index 595876e5e2e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README +++ /dev/null @@ -1,15 +0,0 @@ - - -This performace test (LatencyTT) shows the latency , round trip time, with two topics. -One for sending from publisher to subscriber and one for sending back from subscriber to publicher. -The other Latency test (Latency) shows the latency, round trip time, with one topic. -The test can run with different options. - - -- run_test.pl : start one publisher and one subscriber in different processes - with resp. Plan_sub.cdp and Plan_pub.cdp - - -To test changes in the next attributes, changes this values in the publisher cdp-files: -iterations : the number of messages per run to send. Has to be greater as 0. -sleep: time in ms to sleep before writing the next message diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index ed1ff76010e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - 8712 - - - - DDS_TRANSPORTBUILTIN_UDPv4 - - - - - - dds.transport.UDPv4.builtin.parent.message_size_max - 8712 - - dds.transport.UDPv4.builtin.recv_socket_buffer_size - 17424 - - dds.transport.UDPv4.builtin.send_socket_buffer_size - 8712 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - DDS_KEEP_LAST_HISTORY_QOS - 1 - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - 3 - 3 - 3 - - - - - 3 - - 0 - 0 - - - - 604800 - 1000000 - - - - 0 - 1000000 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - DDS_KEEP_LAST_HISTORY_QOS - 1 - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - true - - - - - 0 - 0 - - - - - - - - - - DDS_TRANSPORTBUILTIN_SHMEM - - - 8712 - - - - - dds.transport.shmem.builtin.parent.message_size_max - 8712 - - - dds.transport.shmem.builtin.receive_buffer_size - 17424 - - - - - - - RELIABLE_RELIABILITY_QOS - - - VOLATILE_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - VOLATILE_DURABILITY_QOS - true - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl deleted file mode 100755 index c461f1a0c92..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl +++ /dev/null @@ -1,223 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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; - -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 daemon $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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "Starting test for deployment $file\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - - if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; - } - - - print "Sleeping 300 seconds to allow task to complete\n"; - sleep (300); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Executor finished.\n"; - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore b/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl deleted file mode 100644 index 45a19c666d6..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @file Throughput_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef THROUGHPUT_BASE_IDL -#define THROUGHPUT_BASE_IDL - -#pragma ndds typesupport "Base/Throughput_BaseSupport.h" -#pragma opendds typesupport "Base/Throughput_BaseTypeSupportImpl.h" - -const short MAX_DATA_SEQUENCE_LENGTH = 8192; - -typedef enum ThroughputCommandKind -{ - THROUGHPUT_COMMAND_IDLE, - THROUGHPUT_COMMAND_START, - THROUGHPUT_COMMAND_COMPLETE -} CommandKind; - -typedef sequence OctetSeq; - -#pragma DCPS_DATA_TYPE "ThroughputTest" - -struct ThroughputTest { - long key; - unsigned long long seq_num; - OctetSeq data; - }; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ThroughputTestSeq; -#endif - -#pragma DCPS_DATA_TYPE "ThroughputCommand" - -struct ThroughputCommand -{ - CommandKind command; - unsigned long data_length; - unsigned long long current_publisher_effort; - unsigned long long final_publisher_effort; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ThroughputCommandSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc deleted file mode 100644 index 8d7b06dafcd..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Throughput_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Throughput_Base_stub - dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=THROUGHPUT_BASE_STUB_Export \ - -Wb,stub_export_include=THROUGHPUT_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Throughput_Base.idl - } - - opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export - - DDSGenerator_Files { - Throughput_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl deleted file mode 100644 index 1d540e04466..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file Throughput_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - * - * by-hand translation of the idl3p. - */ - -#ifndef THROUGHPUT_CONNECTOR_IDL_ -#define THROUGHPUT_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Throughput_Base.idl" - -#pragma ciao lem "Connector/Throughput_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Throughput_BaseTypeSupport.idl" -#endif - -module Throughput -{ - module ::CCM_DDS::Typed < ::ThroughputTest, ::ThroughputTestSeq> ThroughputTestConn; -}; - -#endif /* Throughput_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc deleted file mode 100644 index 46ac62d42c6..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Connector" - -project(DDS_Throughput_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Throughput_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=THROUGHPUT_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Throughput_Connector_stub_export.h \ - -Wb,skel_export_macro=THROUGHPUT_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Throughput_Connector_svnt_export.h \ - -Wb,svnt_export_macro=THROUGHPUT_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Throughput_Connector_svnt_export.h \ - -Wb,conn_export_macro=THROUGHPUT_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Throughput_Connector_conn_export.h \ - -I .. - - IDL_Files { - Throughput_Connector.idl - } -} - -project(DDS_Throughput_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Throughput_Connector_idl_gen - idlflags += -Wb,stub_export_macro=THROUGHPUT_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Throughput_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - Throughput_ConnectorE.idl - } -} - -project(DDS_TP_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub - libs += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_TP_Test_Connector_lem_stub - dynamicflags += THROUGHPUT_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ConnectorEC.cpp - } - - Header_Files { - Throughput_ConnectorEC.h - Throughput_Connector_lem_stub_export.h - } - - Inline_Files { - Throughput_ConnectorEC.inl - } -} - -project(DDS_Throughput_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Base_stub - libs += DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Throughput_Connector_stub - dynamicflags += THROUGHPUT_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ConnectorC.cpp - } - - Header_Files { - Throughput_ConnectorC.h - Throughput_Connector_stub_export.h - } - - Inline_Files { - Throughput_ConnectorC.inl - } -} - -project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub - sharedname = DDS_Throughput_Connector_exec - libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += THROUGHPUT_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Connector_conn.cpp - } - - Header_Files { - Throughput_Connector_conn.h - Throughput_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { - after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub - sharedname = DDS_Throughput_Connector_svnt - libs += DDS_Throughput_Connector_stub \ - DDS_TP_Test_Connector_lem_stub \ - DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += THROUGHPUT_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ConnectorS.cpp - Throughput_Connector_svnt.cpp - } - - Header_Files { - Throughput_ConnectorS.h - Throughput_Connector_svnt.h - Throughput_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl deleted file mode 100644 index f09b8938611..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Throughput_Connector.idl" -#include "SecConnector/Throughput_Sec_Connector.idl" - -module Throughput -{ - component Receiver - { - port ThroughputTestConn::DDS_Listen info_listen; - port ThroughputCommandConn::DDS_Listen command_listen; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc deleted file mode 100644 index 70b7c003a1b..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc +++ /dev/null @@ -1,150 +0,0 @@ -project(DDS_Throughput_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Sec_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Throughput_Receiver.idl - } -} - -project(DDS_Throughput_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Throughput_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Throughput_ReceiverE.idl - } -} - -project(DDS_Throughput_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Throughput_Receiver_lem_gen DDS_Throughput_Receiver_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub - libs += Receiver_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ - DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ReceiverEC.cpp - } - - Header_Files { - Throughput_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Throughput_ReceiverEC.inl - } -} - -project(DDS_Throughput_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Throughput_Receiver_idl_gen DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ - DDS_Throughput_Base_stub DDS_Throughput_Connector_lem_gen DDS_TP_Sec_Connector_lem_gen - libs += DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ReceiverC.cpp - } - - Header_Files { - Throughput_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Throughput_ReceiverC.inl - } -} - -project(DDS_Throughput_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Throughput_Receiver_lem_stub DDS_Throughput_Receiver_stub \ - DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ - DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub \ - DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Receiver_exec.cpp - } - - Header_Files { - Throughput_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Throughput_Receiver_lem_stub DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ - DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ - DDS_Throughput_Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ - DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ - Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub - - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_ReceiverS.cpp - Throughput_Receiver_svnt.cpp - } - - Header_Files { - Throughput_ReceiverS.h - Throughput_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp deleted file mode 100644 index 48d041abcef..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.cpp +++ /dev/null @@ -1,332 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Throughput_Receiver_exec.h" - -#include "ace/High_Res_Timer.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Throughput_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::Throughput::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::Throughput::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::Throughput::ThroughputTestConn::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::ThroughputTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - this->callback_.record_data (datum); - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::ThroughputTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: command_listen_data_listener_exec_i - */ - - command_listen_data_listener_exec_i::command_listen_data_listener_exec_i ( - ::Throughput::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::Throughput::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - command_listen_data_listener_exec_i::~command_listen_data_listener_exec_i (void) - { - } - - // Operations from ::Throughput::ThroughputCommandConn::Listener - - void - command_listen_data_listener_exec_i::on_one_data (const ::ThroughputCommand & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - this->callback_.handle_run (datum); - } - - void - command_listen_data_listener_exec_i::on_many_data (const ::ThroughputCommandSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : count_ (0L), // total count of all received messages - interval_messages_received_(0L), - interval_bytes_received_(0L), - interval_data_length_(0L), - run_(0), - first_time_ (0L), - demand_ (0L), - seq_num_ (0L), - messages_lost_(0), - log_(false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::start (void) - { - ::CCM_DDS::DataListenerControl_var dlccmd = - this->ciao_context_->get_connection_command_listen_data_control (); - dlccmd->mode (::CCM_DDS::ONE_BY_ONE); - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::reset_results (void) - { - this->interval_messages_received_ = 0; - this->interval_bytes_received_ = 0; - this->seq_num_ = 0; - this->messages_lost_= 0; - } - - void - Receiver_exec_i::handle_run (const ThroughputCommand & an_instance) - { - if (an_instance.command == THROUGHPUT_COMMAND_START) - { - this->reset_results(); - this->interval_data_length_ = an_instance.data_length; - this->demand_ = an_instance.current_publisher_effort; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->first_time_); - this->log_ = true; - } - else if (an_instance.command == THROUGHPUT_COMMAND_COMPLETE) - { - this->log_ = false; - ++this->run_; - ACE_UINT64 last_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time); - ACE_UINT64 interval_time = (last_time - this->first_time_); - this->show_results (interval_time); - } - } - - void - Receiver_exec_i::record_data (const ThroughputTest & an_instance) - { - ++this->count_; // total count of all received messages - - if (this->log_.value ()) - { - ++this->interval_messages_received_; - this->interval_bytes_received_ += this->interval_data_length_; - if (an_instance.seq_num != this->seq_num_) - { - ++this->messages_lost_; - this->seq_num_ = an_instance.seq_num; - } - ++this->seq_num_; - } - } - - void - Receiver_exec_i::show_results (const ACE_UINT64& interval_time) - { - if (this->count_ > 0 && interval_time > 0) - { - double per_sec = (double)1000000/ interval_time; - double mbps = (this->interval_bytes_received_* per_sec)* (8.0/1000.0/1000.0); - - if(this->run_ == 1) - { - #if (CIAO_DDS4CCM_CONTEXT_SWITCH==1) - ACE_DEBUG ((LM_DEBUG, "\n\nYES, we're using a threadswitch between " - "DDS and CCM\n\n")); - #else - ACE_DEBUG ((LM_DEBUG, "\n\nNO, we're not using a threadswitch between " - "DDS and CCM\n\n")); - #endif - ACE_DEBUG ((LM_DEBUG, - " bytes, demand, samples,sample/s, Mbit/s,lost samples\n")); - ACE_DEBUG ((LM_DEBUG, - "------,-------,--------,--------,-------,------------\n")); - } - ACE_DEBUG ((LM_DEBUG, "%6u,%7q,%8q,%8.1f,%7.1f,%7q\n", - this->interval_data_length_, - this->demand_, - this->interval_messages_received_, - this->interval_messages_received_ * per_sec, - mbps, - this->messages_lost_)); - } - } - - // Component attributes and port operations. - - ::Throughput::ThroughputTestConn::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::Throughput::ThroughputTestConn::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::Throughput::ThroughputTestConn::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::Throughput::ThroughputCommandConn::CCM_Listener_ptr - Receiver_exec_i::get_command_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_command_listen_data_listener_.in ())) - { - command_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - command_listen_data_listener_exec_i ( - this->ciao_context_.in (), - *this), - ::Throughput::ThroughputCommandConn::CCM_Listener::_nil ()); - - this->ciao_command_listen_data_listener_ = tmp; - } - - return - ::Throughput::ThroughputCommandConn::CCM_Listener::_duplicate ( - this->ciao_command_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_command_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Throughput::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - this->start(); - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->count_ > 0) - { - ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " - "Number of samples received: %u \n", - this->count_)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR RECEIVER: " - "No samples received\n")); - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Throughput_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h deleted file mode 100644 index 8ce0b44cc33..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h +++ /dev/null @@ -1,197 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_THROUGHPUT_RECEIVER_EXEC_3P5DJU_H_ -#define CIAO_THROUGHPUT_RECEIVER_EXEC_3P5DJU_H_ - -#include /**/ "ace/pre.h" - -#include "Throughput_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Throughput_Receiver_Impl -{ - class Receiver_exec_i; - typedef ACE_Atomic_Op Atomic_Bool; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::Throughput::ThroughputTestConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::Throughput::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Throughput::ThroughputTestConn::Listener. */ - - virtual - void on_one_data (const ::ThroughputTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ThroughputTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Throughput::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: command_listen_data_listener_exec_i - */ - - class command_listen_data_listener_exec_i - : public virtual ::Throughput::ThroughputCommandConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - command_listen_data_listener_exec_i ( - ::Throughput::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~command_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Throughput::ThroughputCommandConn::Listener. */ - - virtual - void on_one_data (const ::ThroughputCommand & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ThroughputCommandSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Throughput::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Throughput::ThroughputTestConn::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::Throughput::ThroughputCommandConn::CCM_Listener_ptr - get_command_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_command_listen_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void record_data (const ThroughputTest & an_instance); - void handle_run (const ThroughputCommand & an_instance); - - //@} - - private: - ::Throughput::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Throughput::ThroughputTestConn::CCM_Listener_var ciao_info_listen_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_; - ::Throughput::ThroughputCommandConn::CCM_Listener_var ciao_command_listen_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_command_listen_status_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - CORBA::ULongLong count_; - CORBA::ULongLong interval_messages_received_; - CORBA::ULongLong interval_bytes_received_; - CORBA::ULong interval_data_length_; - CORBA::ULong run_; - ACE_UINT64 first_time_; - CORBA::ULongLong demand_; - CORBA::ULongLong seq_num_; - CORBA::ULongLong messages_lost_; - Atomic_Bool log_; - - void start (); - void reset_results (void); - void show_results (const ACE_UINT64& interval_time); - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Throughput_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl deleted file mode 100644 index 2ee2cc683d0..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file Throughput_Sec_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - * - * by-hand translation of the idl3p. - */ - -#ifndef THROUGHPUT_SEC_CONNECTOR_IDL_ -#define THROUGHPUT_SEC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Throughput_Base.idl" - -#pragma ciao lem "SecConnector/Throughput_Sec_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Throughput_BaseTypeSupport.idl" -#endif - -module Throughput -{ - module ::CCM_DDS::Typed < ::ThroughputCommand, ::ThroughputCommandSeq> ThroughputCommandConn; -}; - -#endif /* Throughput_Sec_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc deleted file mode 100644 index 1b893eb477e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Sec_Connector" - -project(DDS_TP_Sec_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Throughput_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=THROUGHPUT_SEC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Throughput_Sec_Connector_stub_export.h \ - -Wb,skel_export_macro=THROUGHPUT_SEC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Throughput_Sec_Connector_svnt_export.h \ - -Wb,svnt_export_macro=THROUGHPUT_SEC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Throughput_Sec_Connector_svnt_export.h \ - -Wb,conn_export_macro=THROUGHPUT_SEC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Throughput_Sec_Connector_conn_export.h \ - -I .. - - IDL_Files { - Throughput_Sec_Connector.idl - } -} - -project(DDS_TP_Sec_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_TP_Sec_Connector_idl_gen - idlflags += -Wb,stub_export_macro=THROUGHPUT_SEC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Throughput_Sec_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - Throughput_Sec_ConnectorE.idl - } -} - -project(DDS_TP_Sec_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub - libs += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_TP_Sec_Connector_lem_stub - dynamicflags += THROUGHPUT_SEC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Sec_ConnectorEC.cpp - } - - Header_Files { - Throughput_Sec_ConnectorEC.h - Throughput_Sec_Connector_lem_stub_export.h - } - - Inline_Files { - Throughput_Sec_ConnectorEC.inl - } -} - -project(DDS_Throughput_Sec_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_TP_Sec_Connector_idl_gen DDS_Throughput_Base_stub - libs += DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Throughput_Sec_Connector_stub - dynamicflags += THROUGHPUT_SEC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Sec_ConnectorC.cpp - } - - Header_Files { - Throughput_Sec_ConnectorC.h - Throughput_Sec_Connector_stub_export.h - } - - Inline_Files { - Throughput_Sec_ConnectorC.inl - } -} - -project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub - sharedname = DDS_Throughput_Sec_Connector_exec - libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += THROUGHPUT_SEC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Sec_Connector_conn.cpp - } - - Header_Files { - Throughput_Sec_Connector_conn.h - Throughput_Sec_Connector_conn_export.h - } - - Inline_Files { - } -} - -project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { - after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub - sharedname = DDS_Throughput_Sec_Connector_svnt - libs += DDS_Throughput_Sec_Connector_stub \ - DDS_TP_Sec_Connector_lem_stub \ - DDS_Throughput_Base_stub \ - DDS_Throughput_Sec_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += THROUGHPUT_SEC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Sec_ConnectorS.cpp - Throughput_Sec_Connector_svnt.cpp - } - - Header_Files { - Throughput_Sec_ConnectorS.h - Throughput_Sec_Connector_svnt.h - Throughput_Sec_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl deleted file mode 100644 index 9cb773135d9..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_THROUGHPUT_SENDER_IDL -#define DDS_THROUGHPUT_SENDER_IDL - -#include "Connector/Throughput_Connector.idl" -#include "SecConnector/Throughput_Sec_Connector.idl" - -module Throughput -{ - component Sender - { - port ThroughputTestConn::DDS_Write info_write; - port ThroughputCommandConn::DDS_Write command_write; - - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned long start_load; - attribute unsigned long incr_load; - attribute unsigned long long max_load; - attribute unsigned short recover_time; - attribute unsigned short datalen; //minimal 24 - attribute unsigned short number_of_sub; //number of subscribers - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc deleted file mode 100644 index 9b6d0c52b09..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc +++ /dev/null @@ -1,148 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Throughput_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Throughput_Connector_idl_gen DDS_Throughput_Sec_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Throughput_Sender.idl - } -} - -project(DDS_Throughput_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Throughput_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Throughput_SenderE.idl - } -} - -project(DDS_Throughput_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Throughput_Sender_lem_gen DDS_Throughput_Sender_stub \ - DDS_Throughput_Base_stub - libs += DDS_Throughput_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_SenderEC.cpp - } - - Header_Files { - Throughput_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Throughput_SenderEC.inl - } -} - -project(DDS_Throughput_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Throughput_Sender_idl_gen DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub - libs += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_SenderC.cpp - } - - Header_Files { - Throughput_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Throughput_SenderC.inl - } -} - -project(DDS_Throughput_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Throughput_Sender_lem_stub DDS_Throughput_Sender_stub \ - DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \ - DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \ - DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \ - DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_Sender_exec.cpp - } - - Header_Files { - Throughput_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - -project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_Throughput_Base_stub DDS_Throughput_Sender_lem_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ - DDS_Throughput_Connector_svnt DDS_TP_Test_Connector_lem_stub \ - DDS_Throughput_Sec_Connector_svnt DDS_TP_Sec_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ - DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ - DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Throughput_SenderS.cpp - Throughput_Sender_svnt.cpp - } - - Header_Files { - Throughput_SenderS.h - Throughput_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp deleted file mode 100644 index 3071bf55951..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp +++ /dev/null @@ -1,536 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Throughput_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "ace/High_Res_Timer.h" -#include "ace/Timer_Queue.h" - -namespace CIAO_Throughput_Sender_Impl -{ - - /** - * WriteTicker - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback, - Atomic_Boolean &running) - : callback_ (callback), - running_ (running) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - if (!this->running_.value ()) - { - this->callback_.write (); - } - return 0; - } - - /** - * Facet Executor Implementation Class: connector_status_exec_i - */ - - connector_status_exec_i::connector_status_exec_i ( - ::Throughput::CCM_Sender_Context_ptr ctx, - int number_of_subscribers, - Sender_exec_i &callback) - : ciao_context_ ( - ::Throughput::CCM_Sender_Context::_duplicate (ctx)) - , number_of_subscribers_ (number_of_subscribers) - , callback_ (callback) - { - } - - connector_status_exec_i::~connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (!CORBA::is_nil (the_entity) && - status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - ::DDS::PublicationMatchedStatus_var stat; - DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow (the_entity); - if(::CORBA::is_nil (wr.in ())) - { - throw ::CORBA::INTERNAL (); - } - ::DDS::ReturnCode_t retval = - wr->get_publication_matched_status (stat.out ()); - if (retval == ::DDS::RETCODE_OK) - { - if (stat.in ().current_count >= this->number_of_subscribers_ && - !this->started_.value ()) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "on_publication_matched status received. Starting application\n")); - this->started_ = true; - this->callback_.start (); - } - } - } - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : start_load_ (100) - , incr_load_ (100) - , max_load_ (1000) - , recover_time_ (1) // Specifies how long (in s) to sleep after writing a - // specific effort specified by start_load , incr_load - , datalen_ (1024) - , number_of_sub_ (1) - , ticker_ (0) - , duration_run_ (10) - , number_of_msg_ (0) - , load_ (0) - , overhead_size_ (0) - , running_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - WriteTicker (*this, this->running_), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write (void) - { - this->running_ = true; - CORBA::Boolean test_complete = false; - this->load_ += this->incr_load_; - if (this->load_ >= this->max_load_) - { - this->stop (); - } - else - { - this->test_topic_cmd_.command = THROUGHPUT_COMMAND_START; - this->test_topic_cmd_.data_length = this->datalen_; - this->test_topic_cmd_.current_publisher_effort = this->load_; - this->test_topic_cmd_.final_publisher_effort = this->max_load_; - try - { - this->cmd_writer_->write_one (this->test_topic_cmd_, - ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while writing command.\n"))); - } - test_complete = false; - // get start time - ACE_UINT64 start_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time); - while (!test_complete) - { - for (CORBA::ULongLong current_load = 0; - current_load < this->load_ && !test_complete; - ++current_load, ++this->test_topic_.seq_num) - { - try - { - this->writer_->write_one (this->test_topic_, - ::DDS::HANDLE_NIL); - ++this->number_of_msg_; - } - catch (const CCM_DDS::InternalError& err) - { - if (err.error_code == ::DDS::RETCODE_TIMEOUT) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("Write Timeout please increase " - "-maxBlockingTime parameter for " - "test\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer ") - ACE_TEXT ("info for <%u>.\n"), - this->test_topic_.seq_num)); - test_complete= true; - } - } - } - ACE_UINT64 end_time; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (end_time); - ACE_UINT64 interval = end_time - start_time; - if(interval > (this->duration_run_ * 1000 * 1000)) - { - test_complete = true; - this->test_topic_cmd_.command = THROUGHPUT_COMMAND_COMPLETE; - this->cmd_writer_->write_one (this->test_topic_cmd_, - ::DDS::HANDLE_NIL); - } - if (!test_complete) - { - ACE_OS::sleep (this->recover_time_); - } - } - } - this->running_ = false; - } - - void - Sender_exec_i::start (void) - { - ACE_UINT64 const sec = this->duration_run_ + 5; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (sec, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - } - delete this->ticker_; - this->ticker_ = 0; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_connector_status_.in ())) - { - connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - connector_status_exec_i ( - this->ciao_context_.in (), - this->number_of_sub_, - *this), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_connector_status_.in ()); - } - - ::CORBA::ULong - Sender_exec_i::start_load (void) - { - return this->start_load_; - } - - void - Sender_exec_i::start_load ( - const ::CORBA::ULong start_load) - { - if (start_load < 100) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: start_load must be greater as '100' " - "and smaller as max_load\n"))); - throw ::CORBA::BAD_PARAM (); - } - else - { - this->start_load_ = start_load; - } - } - - ::CORBA::ULong - Sender_exec_i::incr_load (void) - { - return this->incr_load_; - } - - void - Sender_exec_i::incr_load ( - const ::CORBA::ULong incr_load) - { - if (incr_load < 100) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR:incr_load must be greater as '99'\n"))); - throw ::CORBA::BAD_PARAM (); - } - else - { - this->incr_load_ = incr_load; - } - } - - ::CORBA::ULongLong - Sender_exec_i::max_load (void) - { - return this->max_load_; - } - - void - Sender_exec_i::max_load ( - const ::CORBA::ULongLong max_load) - { - if (max_load <= 100 || max_load > 90000) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: max_load must be greater as '100' " - "and smaller as '90001'\n"))); - throw ::CORBA::BAD_PARAM (); - } - else - { - this->max_load_ = max_load; - } - } - - ::CORBA::UShort - Sender_exec_i::recover_time (void) - { - return this->recover_time_; - } - - void - Sender_exec_i::recover_time ( - const ::CORBA::UShort recover_time) - { - this->recover_time_ = recover_time; - } - - ::CORBA::UShort - Sender_exec_i::datalen (void) - { - return this->datalen_; - } - - void - Sender_exec_i::datalen ( - const ::CORBA::UShort datalen) - { - this->overhead_size_ = sizeof (CORBA::ULong) + sizeof (CORBA::ULongLong); - if (datalen <= this->overhead_size_ || - datalen > MAX_DATA_SEQUENCE_LENGTH) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: datalen has to be bigger" - " as %u and smaller as %u\n"), - this->overhead_size_, - MAX_DATA_SEQUENCE_LENGTH)); - throw ::CORBA::BAD_PARAM (); - } - this->datalen_ = datalen; - } - - ::CORBA::UShort - Sender_exec_i::number_of_sub (void) - { - return this->number_of_sub_; - } - - void - Sender_exec_i::number_of_sub ( - const ::CORBA::UShort number_of_sub) - { - if (number_of_sub > 0) - { - this->number_of_sub_ = number_of_sub; - } - else - { - this->number_of_sub_ = 1; - } - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Throughput::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - try - { - this->writer_ = this->ciao_context_->get_connection_info_write_data (); - this->cmd_writer_ = - this->ciao_context_->get_connection_command_write_data (); - if(CORBA::is_nil (this->writer_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::configuration_complete: " - "Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::configuration_complete:" - " Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_activate (void) - { - // Make instances of Topic - this->test_topic_.key = 1; - this->test_topic_.seq_num = 0; - this->test_topic_.data.length (this->datalen_ - this->overhead_size_); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->number_of_msg_ == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR SENDER: No messages " - "sent during test.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n", - this->number_of_msg_)); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Throughput_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h deleted file mode 100644 index dd5d2ece208..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h +++ /dev/null @@ -1,231 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_THROUGHPUT_SENDER_EXEC_1FSOUB_H_ -#define CIAO_THROUGHPUT_SENDER_EXEC_1FSOUB_H_ - -#include /**/ "ace/pre.h" - -#include "Throughput_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Throughput_Sender_Impl -{ - class Sender_exec_i; - - typedef ACE_Atomic_Op Atomic_Boolean; - - /** - * WriteTicker - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback, - Atomic_Boolean &running); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - Sender_exec_i &callback_; - Atomic_Boolean running_; - }; - - /** - * Provider Executor Implementation Class: connector_status_exec_i - */ - - class connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - connector_status_exec_i ( - ::Throughput::CCM_Sender_Context_ptr ctx, - int number_of_subscribers, - Sender_exec_i &callback); - virtual ~connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Throughput::CCM_Sender_Context_var ciao_context_; - int number_of_subscribers_; - Sender_exec_i &callback_; - Atomic_Boolean started_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::ULong start_load (void); - - virtual void start_load (::CORBA::ULong start_load); - - virtual ::CORBA::ULong incr_load (void); - - virtual void incr_load (::CORBA::ULong incr_load); - - virtual ::CORBA::ULongLong max_load (void); - - virtual void max_load (::CORBA::ULongLong max_load); - - virtual ::CORBA::UShort recover_time (void); - - virtual void recover_time (::CORBA::UShort recover_time); - - virtual ::CORBA::UShort datalen (void); - - virtual void datalen (::CORBA::UShort datalen); - - virtual ::CORBA::UShort number_of_sub (void); - - virtual void number_of_sub (::CORBA::UShort number_of_sub); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void write (void); - void start (void); - - //@} - - private: - ::Throughput::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_; - - ::CORBA::ULong start_load_; - - ::CORBA::ULong incr_load_; - - ::CORBA::ULongLong max_load_; - - ::CORBA::UShort recover_time_; - - ::CORBA::UShort datalen_; - - ::CORBA::UShort number_of_sub_; - //@} - - //@{ - /** User defined members. */ - ::Throughput::ThroughputTestConn::Writer_var writer_; - ::Throughput::ThroughputCommandConn::Writer_var cmd_writer_; - - WriteTicker *ticker_; - - ACE_UINT64 duration_run_; - ::CORBA::ULongLong number_of_msg_; - ::CORBA::ULongLong load_; - ::CORBA::UShort overhead_size_; - - ThroughputTest test_topic_; - ThroughputCommand test_topic_cmd_; - ::CORBA::Octet* buffer_; - - Atomic_Boolean running_; - - //@} - - //@{ - /** User defined private operations. */ - void stop (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Throughput_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp deleted file mode 100644 index 4d33f196105..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp +++ /dev/null @@ -1,463 +0,0 @@ - - - - Throughput_Depl_2 - - - CompSvr - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.DAnCE.LocalityManager - - - - - - - Throughput_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_ThroughputTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_ThroughputTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Throughput_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Throughput_Connector_exec - - - - - - - Throughput_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_ThroughputCommandConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_ThroughputCommandConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Throughput_Sec_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Throughput_Sec_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Throughput_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TP_Test - - - - - qos_profile - - - tk_string - - - Throughput_Library#ThroughputQoS - - - - - - - Throughput_Sec_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TP_Command - - - - - qos_profile - - - tk_string - - - Throughput_Library#ThroughputCmdQoS - - - - - - - ComponentServerInstance - SenderNode - - - - edu.vanderbilt.dre.DAnCE.LocalityArguments - - - tk_string - - - -ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'" - - - - - - SenderComponent - SenderNode - - - - - start_load - - - tk_ulong - - - 1000 - - - - - max_load - - - tk_ulonglong - - - 5000 - - - - - incr_load - - - tk_ulong - - - 1000 - - - - - - - recover_time - - - tk_ushort - - - 1 - - - - - number_of_sub - - - tk_ushort - - - 1 - - - - - datalen - - - tk_ushort - - - 1024 - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - writer_sec_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - command_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - CompoSvrArtifactName - - - dance_locality_manager - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Throughput_Connector_exec - - - DDS_Throughput_Connector_exec - - - Throughput_Connector_svnt - - - DDS_Throughput_Connector_svnt - - - Throughput_Connector_stub - - - DDS_Throughput_Connector_stub - - - Throughput_Sec_Connector_exec - - - DDS_Throughput_Sec_Connector_exec - - - Throughput_Sec_Connector_svnt - - - DDS_Throughput_Sec_Connector_svnt - - - Throughput_Sec_Connector_stub - - - DDS_Throughput_Sec_Connector_stub - - - - SameProcess - - - - - - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp deleted file mode 100644 index 48626f435e3..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp +++ /dev/null @@ -1,369 +0,0 @@ - - - - Throughput_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Throughput_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_ThroughputTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_ThroughputTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Throughput_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Throughput_Connector_exec - - - - - - - Throughput_Sec_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Throughput_ThroughputCommandConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Throughput_ThroughputCommandConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Throughput_Sec_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Throughput_Sec_Connector_exec - - - - - - - - ReceiverComponent - ReceiverNode - - - - - - Throughput_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TP_Test - - - - - qos_profile - - - tk_string - - - Throughput_Library#ThroughputQoS - - - - - - - Throughput_Sec_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TP_Command - - - - - qos_profile - - - tk_string - - - Throughput_Library#ThroughputCmdQoS - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - command_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - command_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - command_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - command_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - Throughput_Connector_exec - - - DDS_Throughput_Connector_exec - - - Throughput_Connector_svnt - - - DDS_Throughput_Connector_svnt - - - Throughput_Connector_stub - - - DDS_Throughput_Connector_stub - - - - Throughput_Sec_Connector_exec - - - DDS_Throughput_Sec_Connector_exec - - - Throughput_Sec_Connector_svnt - - - DDS_Throughput_Sec_Connector_svnt - - - Throughput_Sec_Connector_stub - - - DDS_Throughput_Sec_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml deleted file mode 100644 index 8c7811a3adc..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Throughput_Library.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - RELIABLE_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index db48a83b0b2..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - 92160 - - - - - dds.transport.builtin.mask - DDS_TRANSPORTBUILTIN_UDPv4 - dds.transport.UDPv4.builtin.parent.message_size_max - UDP_SIZE_MAX - dds.transport.UDPv4.builtin.recv_socket_buffer_size - UDP_SOCKET_RECV_BUFFER_SIZE - dds.transport.UDPv4.builtin.send_socket_buffer_size - UDP_SOCKET_SEND_BUFFER_SIZE - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - - - - - 92160 - - - - - dds.transport.builtin.mask - DDS_TRANSPORTBUILTIN_UDPv4 - dds.transport.UDPv4.builtin.parent.message_size_max - UDP_SIZE_MAX - dds.transport.UDPv4.builtin.recv_socket_buffer_size - UDP_SOCKET_RECV_BUFFER_SIZE - dds.transport.UDPv4.builtin.send_socket_buffer_size - UDP_SOCKET_SEND_BUFFER_SIZE - - - - - - - RELIABLE_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - - - RELIABLE_RELIABILITY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - TRANSIENT_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl deleted file mode 100755 index 47c701ce25e..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl +++ /dev/null @@ -1,257 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode","SenderNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns.ior"; -$ior_nsfile = 0; -$ior_embase = "EM.ior"; -$ior_emfile = 0; - -# Processes -$E = 0; -$E2 = 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_sub.cdp"; -$cdp_file_two = "Plan_pub.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (5 * $tg_executor->ProcessStartWaitInterval ()); - -if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; -} - -print "Start dance_plan_launcher.exe with -x $cdp_file_two -k file://$ior_emfile\n"; -$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file_two -k file://$ior_emfile"); -$pl_status = $E2->SpawnWaitKill (5 * $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 180 seconds to allow task to complete\n"; -sleep (180); - -# 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 -s\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ()); - -print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file_two -s\n"; - -$E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file_two -s"); -$E2->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ()); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/.gitignore b/CIAO/connectors/dds4ccm/tests/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl deleted file mode 100644 index 5bd3aa34352..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CSL_DeadlineTest_Base.idl - * @author Marijke Hengstmengel - */ - -#ifndef CSL_DEADLINETEST_BASE_IDL -#define CSL_DEADLINETEST_BASE_IDL - -#pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h" -#pragma opendds typesupport "Base/CSL_DeadlineTest_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif /* CSL_DEADLINETEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc deleted file mode 100644 index c3219fd1a33..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CSL_DeadlineTest_Base_stub - dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \ - -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CSL_DeadlineTest_Base.idl - } - - opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export - - DDSGenerator_Files { - CSL_DeadlineTest_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore deleted file mode 100644 index 079b83fa08f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/CSL_DeadlineTest_ConnectorE.idl -/CSL_DeadlineTest_Connector_conn.cpp -/CSL_DeadlineTest_Connector_conn.h -/CSL_DeadlineTest_Connector_conn_export.h -/CSL_DeadlineTest_Connector_lem_stub_export.h -/CSL_DeadlineTest_Connector_stub_export.h -/CSL_DeadlineTest_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl deleted file mode 100644 index 72770442ace..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CSL_DeadlineTest_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_DeadlineTest_CONNECTOR_IDL_ -#define CSL_DeadlineTest_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CSL_DeadlineTest_Base.idl" - -#pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CSL_DeadlineTest_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLDeadlineConnector; - -#endif /* CSL_DeadlineTest_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc deleted file mode 100644 index 6b5cd55c228..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector" - -project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CSL_DeadlineTest_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CSL_DeadlineTest_Connector_stub_export.h \ - -Wb,skel_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CSL_DeadlineTest_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CSL_DeadlineTest_Connector_svnt_export.h \ - -Wb,conn_export_macro=CSL_DEADLINETEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CSL_DeadlineTest_Connector_conn_export.h \ - -I .. - - IDL_Files { - CSL_DeadlineTest_Connector.idl - } -} - -project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_DT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CSL_DeadlineTest_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CSL_DeadlineTest_ConnectorE.idl - } -} - -project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub - libs += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_DT_Connector_lem_stub - dynamicflags += CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ConnectorEC.cpp - } - - Header_Files { - CSL_DeadlineTest_ConnectorEC.h - CSL_DeadlineTest_Connector_lem_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_ConnectorEC.inl - } -} - -project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_DT_Connector_idl_gen DDS_CSL_DeadlineTest_Base_stub - libs += DDS_CSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_DeadlineTest_Connector_stub - dynamicflags += CSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ConnectorC.cpp - } - - Header_Files { - CSL_DeadlineTest_ConnectorC.h - CSL_DeadlineTest_Connector_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_ConnectorC.inl - } -} - -project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub - sharedname = DDS_CSL_DeadlineTest_Connector_exec - libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_Connector_conn.cpp - } - - Header_Files { - CSL_DeadlineTest_Connector_conn.h - CSL_DeadlineTest_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub - sharedname = DDS_CSL_DeadlineTest_Connector_svnt - libs += DDS_CSL_DeadlineTest_Connector_stub \ - DDS_CSL_DT_Connector_lem_stub \ - DDS_CSL_DeadlineTest_Base_stub \ - DDS_CSL_DeadlineTest_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ConnectorS.cpp - CSL_DeadlineTest_Connector_svnt.cpp - } - - Header_Files { - CSL_DeadlineTest_ConnectorS.h - CSL_DeadlineTest_Connector_svnt.h - CSL_DeadlineTest_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl deleted file mode 100644 index afff6a7ef12..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CSL_DeadlineTest_Connector.idl" - -module CSL_DeadlineTest -{ - component Receiver - { - port CSLDeadlineConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc deleted file mode 100644 index 96ca8bf00cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc +++ /dev/null @@ -1,135 +0,0 @@ -project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_DT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - CSL_DeadlineTest_Receiver.idl - } -} - -project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_DeadlineTest_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CSL_DeadlineTest_ReceiverE.idl - } -} - -project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Receiver_lem_gen DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub - libs += Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ReceiverEC.cpp - } - - Header_Files { - CSL_DeadlineTest_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_ReceiverEC.inl - } -} - -project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Receiver_idl_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_gen - libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ReceiverC.cpp - } - - Header_Files { - CSL_DeadlineTest_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_ReceiverC.inl - } -} - -project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_Receiver_exec.cpp - } - - Header_Files { - CSL_DeadlineTest_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_ReceiverS.cpp - CSL_DeadlineTest_Receiver_svnt.cpp - } - - Header_Files { - CSL_DeadlineTest_ReceiverS.h - CSL_DeadlineTest_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp deleted file mode 100644 index f8e2f553741..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp +++ /dev/null @@ -1,191 +0,0 @@ -// -*- C++ -*- -#include "CSL_DeadlineTest_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" - -namespace CIAO_CSL_DeadlineTest_Receiver_Impl -{ - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed) - : deadline_missed_ (deadline_missed) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - this->deadline_missed_ = true; - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind /*status_kind*/) - { - } - - //============================================================ - // TestTopic_RawListener_exec_i - //============================================================ - TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received) - : received_ (received) - { - } - - TestTopic_RawListener_exec_i::~TestTopic_RawListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::TestTopic_RawListener - - void - TestTopic_RawListener_exec_i::on_one_data ( - const TestTopic & an_instance , - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->received_; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_RawListener: ") - ACE_TEXT ("received test_topic_info for <%C> at %u\n"), - an_instance.key.in (), - an_instance.x)); - } - - void - TestTopic_RawListener_exec_i::on_many_data ( - const TestTopicSeq & /*an_instance */, - const ::CCM_DDS::ReadInfoSeq & /* info */) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : deadline_missed_ (false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - // Component attributes. - // Port operations. - ::CSLDeadlineConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); - return new TestTopic_RawListener_exec_i (this->received_); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->deadline_missed_); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CSL_DeadlineTest::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) - { - ::CCM_DDS::DataListenerControl_var lc = - this->context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (!this->deadline_missed_.value ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Didn't receive ") - ACE_TEXT ("'on_offered_deadline_missed'\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Received the unexpected ") - ACE_TEXT ("'on_offered_deadline_missed'\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_DeadlineTest_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h deleted file mode 100644 index 09383f289ca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h +++ /dev/null @@ -1,128 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "CSL_DeadlineTest_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/OS_NS_Thread.h" - - - -namespace CIAO_CSL_DeadlineTest_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - //============================================================ - // TestTopic_RawListener_exec_i - //============================================================ - class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i - : public virtual ::CSLDeadlineConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - TestTopic_RawListener_exec_i (Atomic_ULong &); - virtual ~TestTopic_RawListener_exec_i (void); - - virtual void - on_one_data ( - const TestTopic & an_instance, - const ::CCM_DDS::ReadInfo & info); - - virtual void - on_many_data ( - const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & info); - - private: - Atomic_ULong &received_; - }; - - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &); - - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &deadline_missed_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - virtual ::CSLDeadlineConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - 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); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::CSL_DeadlineTest::CCM_Receiver_Context_var context_; - Atomic_ULong received_; - Atomic_Boolean deadline_missed_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_DeadlineTest_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore deleted file mode 100644 index 97f2c4f5077..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/CSL_DeadlineTest_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl deleted file mode 100644 index 95ddfb14c9f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel - */ - -#ifndef DDS_CSL_DEADLINETEST_SENDER_IDL -#define DDS_CSL_DEADLINETEST_SENDER_IDL - -#include "Connector/CSL_DeadlineTest_Connector.idl" - -module CSL_DeadlineTest -{ - component Sender - { - port CSLDeadlineConnector::DDS_Write test_topic_write; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc deleted file mode 100644 index 45f26e72e69..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CSL_DT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CSL_DeadlineTest_Sender.idl - } -} - -project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_DeadlineTest_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CSL_DeadlineTest_SenderE.idl - } -} - -project(DDS_CSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Sender_lem_gen DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DeadlineTest_Base_stub - libs += DDS_CSL_DeadlineTest_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_SenderEC.cpp - } - - Header_Files { - CSL_DeadlineTest_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_SenderEC.inl - } -} - -project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Sender_idl_gen DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub - libs += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_SenderC.cpp - } - - Header_Files { - CSL_DeadlineTest_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_SenderC.inl - } -} - -project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_Sender_exec.cpp - } - - Header_Files { - CSL_DeadlineTest_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_SenderS.cpp - CSL_DeadlineTest_Sender_svnt.cpp - } - - Header_Files { - CSL_DeadlineTest_SenderS.h - CSL_DeadlineTest_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp deleted file mode 100644 index a005474788c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// -*- C++ -*- -// Test for OFFERED_DEADLINE_MISSED status : Writer failed to write data within -// the deadline time period set in the profile. - -#include "CSL_DeadlineTest_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_unistd.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_DeadlineTest_Sender_Impl -{ - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &deadline_missed, - ACE_Thread_ID &thread_id, - Sender_exec_i &callback) - : deadline_missed_ (deadline_missed), - thread_id_ (thread_id), - callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - - if(status.last_instance_handle != ::DDS::HANDLE_NIL && ! ::CORBA::is_nil (the_writer)) - { - this->deadline_missed_ = true; - } - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - // Add 2 different instances of topic - this->callback_.add_instance_of_topic ("ONE",1); - this->callback_.add_instance_of_topic ("TWO",2); - - // When we have a publication matched start write the data once - this->callback_.write (); - } - } - - //============================================================ - // Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : deadline_missed_ (false), - thread_id_listener_ (0, 0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->deadline_missed_, - this->thread_id_listener_, - *this); - } - - // Supported operations and attributes. - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = ::CSL_DeadlineTest::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::write (void) - { - ::CSLDeadlineConnector::Writer_var writer = - this->context_->get_connection_test_topic_write_data (); - - if (! ::CORBA::is_nil (writer.in ()) ) - { - // to force an 'offered_deadline_missed' write the topics with a pause - // of 2 sec in between and in the profile the deadline is set to 1 sec. - for (CSL_QoSTest_Table::iterator i = this->_ktests_.begin (); - i != this->_ktests_.end (); - ++i) - { - try - { - ACE_OS::sleep (2); - ::DDS::InstanceHandle_t const hnd = - writer->register_instance (i->second); - writer->write_one(i->second,hnd); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while writing topic for <%C>.\n"), - i->first.c_str ())); - } - } - } - } - - void - Sender_exec_i::add_instance_of_topic (const char * key, int x) - { - TestTopic *new_key = new TestTopic; - new_key->key = CORBA::string_dup(key); - new_key->x = x; - this->_ktests_[key] = new_key; - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->deadline_missed_.value ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'on_offered_deadline_missed'\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_offered_deadline_missed'\n"))); - } - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string(list_buf); - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_DeadlineTest_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h deleted file mode 100644 index 678cc3c7e5e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h +++ /dev/null @@ -1,104 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - - -#include "CSL_DeadlineTest_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -#include - -namespace CIAO_CSL_DeadlineTest_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed, - ACE_Thread_ID &thread_id, - Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &deadline_missed_; - ACE_Thread_ID &thread_id_; - Sender_exec_i &callback_; - }; - - //============================================================ - // Sender_exec_i - //============================================================ - 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); - - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status(void); - - void write (void); - void add_instance_of_topic (const char *, int x ); - - private: - ::CSL_DeadlineTest::CCM_Sender_Context_var context_; - - Atomic_Boolean deadline_missed_; - ACE_Thread_ID thread_id_listener_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map CSL_QoSTest_Table; - CSL_QoSTest_Table _ktests_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_DeadlineTest_Sender_Impl (void); - - - -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml deleted file mode 100644 index a14318cb94c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 1 - 0 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - 1 - 0 - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp deleted file mode 100644 index 01c2adc328e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp +++ /dev/null @@ -1,412 +0,0 @@ - - - - CSL_DeadlineTest_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_DeadlineTest_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_DeadlineTest_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CSL_DeadlineTest_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSLDeadlineConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSLDeadlineConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CSL_DeadlineTest_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CSL_DeadlineTest_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_DeadlineTest_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_DeadlineTest_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - CSL_DeadlineTest_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - CSL_DeadlineTest_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CSL_DeadlineTest_Connector_exec - - - DDS_CSL_DeadlineTest_Connector_exec - - - CSL_DeadlineTest_Connector_svnt - - - DDS_CSL_DeadlineTest_Connector_svnt - - - CSL_DeadlineTest_Connector_stub - - - DDS_CSL_DeadlineTest_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 954241ce864..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - 1 - 0 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - 1 - 0 - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl deleted file mode 100755 index f41a32df43a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl +++ /dev/null @@ -1,242 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl deleted file mode 100644 index d2b1a6260fd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CSL_QoSTest_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_QOSTEST_BASE_IDL -#define CSL_QOSTEST_BASE_IDL - -#pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h" -#pragma opendds typesupport "Base/CSL_QoSTest_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc deleted file mode 100644 index 3782d26a74d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CSL_QoSTest_Base_stub - dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \ - -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CSL_QoSTest_Base.idl - } - - opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export - - DDSGenerator_Files { - CSL_QoSTest_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl deleted file mode 100644 index 20c524cc3a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CSL_QoSTest_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_QOSTEST_CONNECTOR_IDL_ -#define CSL_QOSTEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CSL_QoSTest_Base.idl" - -#pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CSL_QoSTest_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLQoSConnector; - -#endif /* CSL_QoSTest_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc deleted file mode 100644 index 06be4dfd932..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector" - -project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CSL_QoSTest_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CSL_QoSTest_Connector_stub_export.h \ - -Wb,skel_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CSL_QoSTest_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CSL_QoSTest_Connector_svnt_export.h \ - -Wb,conn_export_macro=CSL_QOSTEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CSL_QoSTest_Connector_conn_export.h \ - -I .. - - IDL_Files { - CSL_QoSTest_Connector.idl - } -} - -project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_QoSTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CSL_QoSTest_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CSL_QoSTest_ConnectorE.idl - } -} - -project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub - libs += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_QoSTest_Connector_lem_stub - dynamicflags += CSL_QOSTEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ConnectorEC.cpp - } - - Header_Files { - CSL_QoSTest_ConnectorEC.h - CSL_QoSTest_Connector_lem_stub_export.h - } - - Inline_Files { - CSL_QoSTest_ConnectorEC.inl - } -} - -project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_QoSTest_Connector_idl_gen DDS_CSL_QoSTest_Base_stub - libs += DDS_CSL_QoSTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_QoSTest_Connector_stub - dynamicflags += CSL_QOSTEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ConnectorC.cpp - } - - Header_Files { - CSL_QoSTest_ConnectorC.h - CSL_QoSTest_Connector_stub_export.h - } - - Inline_Files { - CSL_QoSTest_ConnectorC.inl - } -} - -project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub - sharedname = DDS_CSL_QoSTest_Connector_exec - libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_QOSTEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_Connector_conn.cpp - } - - Header_Files { - CSL_QoSTest_Connector_conn.h - CSL_QoSTest_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub - sharedname = DDS_CSL_QoSTest_Connector_svnt - libs += DDS_CSL_QoSTest_Connector_stub \ - DDS_CSL_QoSTest_Connector_lem_stub \ - DDS_CSL_QoSTest_Base_stub \ - DDS_CSL_QoSTest_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_QOSTEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ConnectorS.cpp - CSL_QoSTest_Connector_svnt.cpp - } - - Header_Files { - CSL_QoSTest_ConnectorS.h - CSL_QoSTest_Connector_svnt.h - CSL_QoSTest_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl deleted file mode 100644 index 4a0d73b4e00..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CSL_QoSTest_Connector.idl" - -module CSL_QoSTest -{ - component Receiver - { - port CSLQoSConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc deleted file mode 100644 index 1aa1e5f0e88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc +++ /dev/null @@ -1,135 +0,0 @@ -project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_QoSTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - CSL_QoSTest_Receiver.idl - } -} - -project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_QoSTest_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CSL_QoSTest_ReceiverE.idl - } -} - -project(DDS_CSL_QoSTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_QoSTest_Receiver_lem_gen DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub - libs += Receiver_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ReceiverEC.cpp - } - - Header_Files { - CSL_QoSTest_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CSL_QoSTest_ReceiverEC.inl - } -} - -project(DDS_CSL_QoSTest_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_QoSTest_Receiver_idl_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_gen - libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ReceiverC.cpp - } - - Header_Files { - CSL_QoSTest_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CSL_QoSTest_ReceiverC.inl - } -} - -project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_Receiver_exec.cpp - } - - Header_Files { - CSL_QoSTest_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_ReceiverS.cpp - CSL_QoSTest_Receiver_svnt.cpp - } - - Header_Files { - CSL_QoSTest_ReceiverS.h - CSL_QoSTest_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp deleted file mode 100644 index 64750dbb8d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp +++ /dev/null @@ -1,211 +0,0 @@ -// -*- C++ -*- -//Test for ConnectorStatusListener: on_requested_incompatible_qos - -#include "CSL_QoSTest_Receiver_exec.h" -#include "ace/Log_Msg.h" - - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_QoSTest_Receiver_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &incompatible, - ACE_Thread_ID &thread_id) - : incompatible_ (incompatible), - thread_id_ (thread_id) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr the_reader, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - - if(! ::CORBA::is_nil(the_reader)) - { - this->incompatible_ = true; - } - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind /*status_kind */) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : incompatible_ (false), - thread_id_listener_ (0, 0) - - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - ::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 ::CSLQoSConnector::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->incompatible_, - this->thread_id_listener_); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CSL_QoSTest::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) - { - if (!this->incompatible_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_requested_incompatible_qos' in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'on_requested_incompatible_qos' in Receiver\n") - )); - } - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_QoSTest_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h deleted file mode 100644 index 7f38ec76fb3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h +++ /dev/null @@ -1,98 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "CSL_QoSTest_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/OS_NS_Thread.h" - - - -namespace CIAO_CSL_QoSTest_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &, - ACE_Thread_ID &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &incompatible_; - ACE_Thread_ID &thread_id_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - virtual ::CSLQoSConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - 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); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::CSL_QoSTest::CCM_Receiver_Context_var context_; - Atomic_Boolean incompatible_; - ACE_Thread_ID thread_id_listener_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_QoSTest_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl deleted file mode 100644 index 4e43a8ad491..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_CSL_QOSTEST_SENDER_IDL -#define DDS_CSL_QOSTEST_SENDER_IDL - -#include "Connector/CSL_QoSTest_Connector.idl" - -module CSL_QoSTest -{ - component Sender - { - port CSLQoSConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc deleted file mode 100644 index 77b4674e421..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CSL_QoSTest_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CSL_QoSTest_Sender.idl - } -} - -project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_QoSTest_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CSL_QoSTest_SenderE.idl - } -} - -project(DDS_CSL_QoSTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_QoSTest_Sender_lem_gen DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Base_stub - libs += DDS_CSL_QoSTest_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_SenderEC.cpp - } - - Header_Files { - CSL_QoSTest_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CSL_QoSTest_SenderEC.inl - } -} - -project(DDS_CSL_QoSTest_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_QoSTest_Sender_idl_gen DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub - libs += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_SenderC.cpp - } - - Header_Files { - CSL_QoSTest_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CSL_QoSTest_SenderC.inl - } -} - -project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_Sender_exec.cpp - } - - Header_Files { - CSL_QoSTest_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_SenderS.cpp - CSL_QoSTest_Sender_svnt.cpp - } - - Header_Files { - CSL_QoSTest_SenderS.h - CSL_QoSTest_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp deleted file mode 100644 index bf832d1bcdf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp +++ /dev/null @@ -1,197 +0,0 @@ -// -*- C++ -*- -// Test for ConnectorStatusListener: on_offered_incompatible_qos - -#include "CSL_QoSTest_Sender_exec.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_QoSTest_Sender_Impl -{ - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &incompatible, - ACE_Thread_ID &thread_id) - : incompatible_ (incompatible), - thread_id_ (thread_id) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - - if(! ::CORBA::is_nil(the_writer)) - { - this->incompatible_ = true; - } - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind /*status_kind*/) - { - } - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : incompatible_ (false), - thread_id_listener_ (0, 0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->incompatible_, - this->thread_id_listener_); - } - - // Supported operations and attributes. - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CSL_QoSTest::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) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->incompatible_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_offered_incompatible_qos'\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'on_offered_incompatible_qos'\n") - )); - } - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_QoSTest_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h deleted file mode 100644 index 75c7bcfe932..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h +++ /dev/null @@ -1,87 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - -#include "CSL_QoSTest_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_CSL_QoSTest_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &, - ACE_Thread_ID &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &incompatible_; - ACE_Thread_ID &thread_id_; - }; - - //============================================================ - // Sender_exec_i - //============================================================ - 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); - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status(void); - - private: - ::CSL_QoSTest::CCM_Sender_Context_var context_; - - Atomic_Boolean incompatible_; - ACE_Thread_ID thread_id_listener_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_QoSTest_Sender_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp deleted file mode 100644 index f95cfc5d6bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp +++ /dev/null @@ -1,373 +0,0 @@ - - - - CSL_QoSTest_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_QoSTest_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_QoSTest_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CSL_QoSTest_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSLQoSConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSLQoSConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CSL_QoSTest_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CSL_QoSTest_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_QoSTest_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_QoSTest_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - CSL_QoSTest_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - QoSTest_Library#SenderProfile - - - - - - CSL_QoSTest_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - QoSTest_Library#ReceiverProfile - - - - - - SenderComponent - SenderNode - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - test_topic_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CSL_QoSTest_Connector_exec - - - DDS_CSL_QoSTest_Connector_exec - - - CSL_QoSTest_Connector_svnt - - - DDS_CSL_QoSTest_Connector_svnt - - - CSL_QoSTest_Connector_stub - - - DDS_CSL_QoSTest_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml deleted file mode 100644 index 9440aa13658..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - RELIABLE_RELIABILITY_QOS - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index c7b66a2685c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - DDS_MANUAL_BY_PARTICIPANT_LIVELINESS_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl deleted file mode 100755 index c6321471979..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl deleted file mode 100644 index 2435b1d1108..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file CSL_SRTest_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_SRTEST_BASE_IDL -#define CSL_SRTEST_BASE_IDL - -#pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h" -#pragma opendds typesupport "Base/CSL_SRTest_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif /* CSL_SRTEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc deleted file mode 100644 index d1471149105..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CSL_SRTest_Base_stub - dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \ - -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CSL_SRTest_Base.idl - } - - opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export - - DDSGenerator_Files { - CSL_SRTest_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl deleted file mode 100644 index 3e064833a91..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CSL_SRTest_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_SRTEST_CONNECTOR_IDL_ -#define CSL_SRTEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CSL_SRTest_Base.idl" - -#pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CSL_SRTest_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_SR_Connector; - -#endif /* CSL_SRTEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc deleted file mode 100644 index 2eaedc3edab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector" - -project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CSL_SRTest_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CSL_SRTest_Connector_stub_export.h \ - -Wb,skel_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CSL_SRTest_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CSL_SRTest_Connector_svnt_export.h \ - -Wb,conn_export_macro=CSL_SRTEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CSL_SRTest_Connector_conn_export.h \ - -I .. - - IDL_Files { - CSL_SRTest_Connector.idl - } -} - -project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_SRTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CSL_SRTest_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CSL_SRTest_ConnectorE.idl - } -} - -project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub - libs += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_SRTest_Connector_lem_stub - dynamicflags += CSL_SRTEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ConnectorEC.cpp - } - - Header_Files { - CSL_SRTest_ConnectorEC.h - CSL_SRTest_Connector_lem_stub_export.h - } - - Inline_Files { - CSL_SRTest_ConnectorEC.inl - } -} - -project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_SRTest_Connector_idl_gen DDS_CSL_SRTest_Base_stub - libs += DDS_CSL_SRTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_SRTest_Connector_stub - dynamicflags += CSL_SRTEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ConnectorC.cpp - } - - Header_Files { - CSL_SRTest_ConnectorC.h - CSL_SRTest_Connector_stub_export.h - } - - Inline_Files { - CSL_SRTest_ConnectorC.inl - } -} - -project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub - sharedname = DDS_CSL_SRTest_Connector_exec - libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_SRTEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_Connector_conn.cpp - } - - Header_Files { - CSL_SRTest_Connector_conn.h - CSL_SRTest_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub - sharedname = DDS_CSL_SRTest_Connector_svnt - libs += DDS_CSL_SRTest_Connector_stub \ - DDS_CSL_SRTest_Connector_lem_stub \ - DDS_CSL_SRTest_Base_stub \ - DDS_CSL_SRTest_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_SRTEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ConnectorS.cpp - CSL_SRTest_Connector_svnt.cpp - } - - Header_Files { - CSL_SRTest_ConnectorS.h - CSL_SRTest_Connector_svnt.h - CSL_SRTest_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl deleted file mode 100644 index 796d032255b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CSL_SRTest_Connector.idl" - -module CSL_SRTest -{ - component Receiver - { - 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. - attribute boolean raw_listen; //if true, raw listen port is enabled. - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc deleted file mode 100644 index fbf27cbf327..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_SRTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - CSL_SRTest_Receiver.idl - } -} - -project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_SRTest_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CSL_SRTest_ReceiverE.idl - } -} - -project(DDS_CSL_SRTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_SRTest_Receiver_lem_gen DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub - libs += Receiver_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ReceiverEC.cpp - } - - Header_Files { - CSL_SRTest_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CSL_SRTest_ReceiverEC.inl - } -} - -project(DDS_CSL_SRTest_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_SRTest_Receiver_idl_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_gen - libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ReceiverC.cpp - } - - Header_Files { - CSL_SRTest_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CSL_SRTest_ReceiverC.inl - } -} - -project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_Receiver_exec.cpp - } - - Header_Files { - CSL_SRTest_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_ReceiverS.cpp - CSL_SRTest_Receiver_svnt.cpp - } - - Header_Files { - CSL_SRTest_ReceiverS.h - CSL_SRTest_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp deleted file mode 100644 index 95cf1a9f244..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp +++ /dev/null @@ -1,516 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -/** - * Test for ConnectorStatusListener:REJECTED_SAMPLE status through too much instances - * in Sender 2, in Receiver 1 - **/ - -#include "CSL_SRTest_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/TimeUtilities.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_SRTest_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received) - : ciao_context_ ( - ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx)) - , received_ (received) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::CSL_SR_Connector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->received_; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_Listener: ") - ACE_TEXT ("received testtopic_info for <%C> at %dl\n"), - datum.key.in (), - datum.x)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &rejected, - ACE_Thread_ID &thread_id) - : ciao_context_ ( - ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx)) - , rejected_ (rejected) - , thread_id_ (thread_id) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleRejectedStatus & status) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT && - ! ::CORBA::is_nil(the_reader)) - { - this->rejected_ = true; - } - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind /* status_kind */) - { - /* Your code here. */ - } - - /** - * read_action_Generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, - const void *) - { - try - { - if (pulse_callback_.read_data ()) - { - this->pulse_callback_.read_all(); - } - } - catch (...) - { - } - return 0; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (0) - , read_data_ (false) - , raw_listen_ (false) - , received_ (0) - , rejected_(false) - , thread_id_listener_ (0, 0) - { - this->ticker_ = new read_action_Generator (*this); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_all (void) - { - ::CSL_SR_Connector::Reader_var reader; - if (this->read_data ()) - { - reader = this->ciao_context_->get_connection_info_out_data(); - } - - if (::CORBA::is_nil (reader.in ())) - { - return; - } - TestTopicSeq TestTopic_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - reader->read_all(TestTopic_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) - { - ACE_Time_Value tv; - tv <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); - } - for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ") - ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"), - i, - TestTopic_infos[i].key.in (), - TestTopic_infos[i].x)); - } - } - - // Component attributes and port operations. - - ::CSL_SR_Connector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->received_), - ::CSL_SR_Connector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::CSL_SR_Connector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in (), - this->rejected_, - this->thread_id_listener_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CORBA::ULong - Receiver_exec_i::rate (void) - { - return this->rate_; - } - - void - Receiver_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::Boolean - Receiver_exec_i::read_data (void) - { - return this->read_data_; - } - - void - Receiver_exec_i::read_data ( - const ::CORBA::Boolean read_data) - { - this->read_data_ = read_data; - } - - ::CORBA::Boolean - Receiver_exec_i::raw_listen (void) - { - return this->raw_listen_; - } - - void - Receiver_exec_i::raw_listen ( - const ::CORBA::Boolean raw_listen) - { - this->raw_listen_ = raw_listen; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CSL_SRTest::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED); - - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(0, usec), - ACE_Time_Value(0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->rejected_.value ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Have received the expected ") - ACE_TEXT ("'on_sample_rejected'\n") - )); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ") - ACE_TEXT ("warning 'on_sample_rejected'\n") - )); - } - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_SRTest_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h deleted file mode 100644 index 6bec32bc73a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h +++ /dev/null @@ -1,269 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_ -#define CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_ - -#include /**/ "ace/pre.h" - -#include "CSL_SRTest_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -#include "ace/OS_NS_Thread.h" - -namespace CIAO_CSL_SRTest_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - /** - * read_action_Generator - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::CSL_SR_Connector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from CSL_SR_Connector::Listener. */ - - virtual - void on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_; - Atomic_ULong &received_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::CSL_SRTest::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &, - ACE_Thread_ID &); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &rejected_; - ACE_Thread_ID &thread_id_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CSL_SR_Connector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::Boolean read_data (void); - - virtual void read_data (::CORBA::Boolean read_data); - - virtual ::CORBA::Boolean raw_listen (void); - - virtual void raw_listen (::CORBA::Boolean raw_listen); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_all (void); - //@} - - private: - ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CSL_SR_Connector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - - ::CORBA::ULong rate_; - - ::CORBA::Boolean read_data_; - - ::CORBA::Boolean raw_listen_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - Atomic_ULong received_; - Atomic_Boolean rejected_; - ACE_Thread_ID thread_id_listener_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_SRTest_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl deleted file mode 100644 index 7675b067f8e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_CSL_SRTEST_SENDER_IDL -#define DDS_CSL_SRTEST_SENDER_IDL - -#include "Connector/CSL_SRTest_Connector.idl" - -module CSL_SRTest -{ - component Sender - { - port CSL_SR_Connector::DDS_Write test_topic_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc deleted file mode 100644 index 5bef33fd457..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CSL_SRTest_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CSL_SRTest_Sender.idl - } -} - -project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_SRTest_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CSL_SRTest_SenderE.idl - } -} - -project(DDS_CSL_SRTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_SRTest_Sender_lem_gen DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Base_stub - libs += DDS_CSL_SRTest_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_SenderEC.cpp - } - - Header_Files { - CSL_SRTest_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CSL_SRTest_SenderEC.inl - } -} - -project(DDS_CSL_SRTest_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_SRTest_Sender_idl_gen DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub - libs += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_SenderC.cpp - } - - Header_Files { - CSL_SRTest_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CSL_SRTest_SenderC.inl - } -} - -project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_Sender_exec.cpp - } - - Header_Files { - CSL_SRTest_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_SenderS.cpp - CSL_SRTest_Sender_svnt.cpp - } - - Header_Files { - CSL_SRTest_SenderS.h - CSL_SRTest_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp deleted file mode 100644 index 4a3e7028231..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp +++ /dev/null @@ -1,203 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CSL_SRTest_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_CSL_SRTest_Sender_Impl -{ - /** - * Pulse Generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (100) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - ::CSL_SR_Connector::Writer_var writer = - this->ciao_context_->get_connection_test_topic_write_data (); - - for (CSL_SRTest_Table::iterator i = this->_ktests_.begin (); - i != this->_ktests_.end (); - ++i) - { - try - { - if (! ::CORBA::is_nil (writer.in ())) - { - writer->write_one(i->second,::DDS::HANDLE_NIL); - i->second->x++; - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"), - i->first.c_str ())); - } - } - } - - void - Sender_exec_i::start (void) - { - // calculate the interval time - long const usec = 10000000 / this->rate_; - - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - void - Sender_exec_i::add_instance_of_topic (const char * key, int x) - { - TestTopic *new_key = new TestTopic; - new_key->key = CORBA::string_dup(key); - new_key->x = x; - this->_ktests_[key] = new_key; - } - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CSL_SRTest::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - //add 2 different instances of topic - this->add_instance_of_topic ("ONE", 1); - this->add_instance_of_topic ("TWO", 2); - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_SRTest_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h deleted file mode 100644 index a62c8408d18..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h +++ /dev/null @@ -1,129 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_ -#define CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_ - -#include /**/ "ace/pre.h" - -#include "CSL_SRTest_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_CSL_SRTest_Sender_Impl -{ - class Sender_exec_i; - - /** - * Pulse Generator - */ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - //@} - - private: - ::CSL_SRTest::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - CORBA::ULong rate_; - - typedef std::map CSL_SRTest_Table; - CSL_SRTest_Table _ktests_; - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - - void add_instance_of_topic (const char *, int x); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_SRTest_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml deleted file mode 100644 index f19727f38a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 0 - 100000000 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - 10 - 2 - 10 - - - - - VOLATILE_DURABILITY_QOS - - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - - 0 - 0 - - - - AUTOMATIC_LIVELINESS_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - BEST_EFFORT_RELIABILITY_QOS - - 0 - 100000000 - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - - - 1 - 1 - 10 - 1 - 10 - - - SHARED_OWNERSHIP_QOS - - - - 0 - 0 - - - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp deleted file mode 100644 index e2a0b7bef7d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp +++ /dev/null @@ -1,458 +0,0 @@ - - - - CSL_SRTest_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_SRTest_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_SRTest_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CSL_SRTest_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_SR_Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_SR_Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CSL_SRTest_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CSL_SRTest_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_SRTest_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_SRTest_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - - - - read_data - - - tk_boolean - - - true - - - - - raw_listen - - - tk_boolean - - - false - - - - - - - CSL_SRTest_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - CSL_SRTest_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CSL_SRTest_Connector_exec - - - DDS_CSL_SRTest_Connector_exec - - - CSL_SRTest_Connector_svnt - - - DDS_CSL_SRTest_Connector_svnt - - - CSL_SRTest_Connector_stub - - - DDS_CSL_SRTest_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 6af0ea977f5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 0 - 100000000 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - 10 - 10 - 2 - - - - 10 - - - - - - - VOLATILE_DURABILITY_QOS - - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - - 0 - 0 - - - - AUTOMATIC_LIVELINESS_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - BEST_EFFORT_RELIABILITY_QOS - - 0 - 100000000 - - - - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - - - 1 - 1 - 10 - 1 - 10 - - - - - - SHARED_OWNERSHIP_QOS - - - - 0 - 0 - - - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl deleted file mode 100755 index 174721086cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl deleted file mode 100644 index 29c0dd70442..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file CSL_USTest_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_USTEST_BASE_IDL -#define CSL_USTEST_BASE_IDL - -#pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h" -#pragma opendds typesupport "Base/CSL_USTest_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif /* CSL_USTEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc deleted file mode 100644 index 9f5f5e9e8c5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CSL_USTest_Base_stub - dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \ - -Wb,stub_export_include=CSL_USTest_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CSL_USTest_Base.idl - } - - opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export - - DDSGenerator_Files { - CSL_USTest_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl deleted file mode 100644 index 32ad7cf13ce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CSL_USTest_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef CSL_USTEST_CONNECTOR_IDL_ -#define CSL_USTEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CSL_USTest_Base.idl" - -#pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CSL_USTest_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector; - -#endif /* CSL_USTest_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc deleted file mode 100644 index 2372945f778..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector" - -project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CSL_USTest_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CSL_USTest_Connector_stub_export.h \ - -Wb,skel_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CSL_USTest_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CSL_USTest_Connector_svnt_export.h \ - -Wb,conn_export_macro=CSL_USTEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CSL_USTest_Connector_conn_export.h \ - -I .. - - IDL_Files { - CSL_USTest_Connector.idl - } -} - -project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_USTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CSL_USTest_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CSL_USTest_ConnectorE.idl - } -} - -project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub - libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_USTest_Connector_lem_stub - dynamicflags += CSL_USTEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ConnectorEC.cpp - } - - Header_Files { - CSL_USTest_ConnectorEC.h - CSL_USTest_Connector_lem_stub_export.h - } - - Inline_Files { - CSL_USTest_ConnectorEC.inl - } -} - -project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_USTest_Connector_idl_gen DDS_CSL_USTest_Base_stub - libs += DDS_CSL_USTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CSL_USTest_Connector_stub - dynamicflags += CSL_USTEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ConnectorC.cpp - } - - Header_Files { - CSL_USTest_ConnectorC.h - CSL_USTest_Connector_stub_export.h - } - - Inline_Files { - CSL_USTest_ConnectorC.inl - } -} - -project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub - sharedname = DDS_CSL_USTest_Connector_exec - libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_USTEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_Connector_conn.cpp - } - - Header_Files { - CSL_USTest_Connector_conn.h - CSL_USTest_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub - sharedname = DDS_CSL_USTest_Connector_svnt - libs += DDS_CSL_USTest_Connector_stub \ - DDS_CSL_USTest_Connector_lem_stub \ - DDS_CSL_USTest_Base_stub \ - DDS_CSL_USTest_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CSL_USTEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ConnectorS.cpp - CSL_USTest_Connector_svnt.cpp - } - - Header_Files { - CSL_USTest_ConnectorS.h - CSL_USTest_Connector_svnt.h - CSL_USTest_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl deleted file mode 100644 index aedb58ebd5f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CSL_USTest_Connector.idl" - -module CSL_USTest -{ - component Receiver - { - port CSL_US_Connector::DDS_Listen info_out; - port CSL_US_Connector::DDS_Read info_read; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc deleted file mode 100644 index 79dda1f9d80..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CSL_USTest_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - CSL_USTest_Receiver.idl - } -} - -project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_USTest_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CSL_USTest_ReceiverE.idl - } -} - -project(DDS_CSL_USTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_USTest_Receiver_lem_gen DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub - libs += Receiver_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ReceiverEC.cpp - } - - Header_Files { - CSL_USTest_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CSL_USTest_ReceiverEC.inl - } -} - -project(DDS_CSL_USTest_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_USTest_Receiver_idl_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_gen - libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ReceiverC.cpp - } - - Header_Files { - CSL_USTest_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CSL_USTest_ReceiverC.inl - } -} - -project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_Receiver_exec.cpp - } - - Header_Files { - CSL_USTest_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_ReceiverS.cpp - CSL_USTest_Receiver_svnt.cpp - } - - Header_Files { - CSL_USTest_ReceiverS.h - CSL_USTest_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp deleted file mode 100644 index 5d0e0ba817e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ /dev/null @@ -1,573 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CSL_USTest_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/Utils.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_USTest_Receiver_Impl -{ - /** - * Pulser - */ - - Pulser::Pulser (Receiver_exec_i &callback) - : callback_ (callback) - { - } - - int - Pulser::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.read_all (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::CSL_US_Connector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::TestTopic & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - } - - void - info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_read_status_exec_i - */ - - info_read_status_exec_i::info_read_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_read_status_exec_i::~info_read_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &subscription_matched_received, - Atomic_Boolean &liveliness_changed_received, - ACE_Thread_ID &thread_id_subcription_matched, - ACE_Thread_ID &thread_id_liveliness_changed) - : ciao_context_ ( - ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx)) - , subscription_matched_received_ (subscription_matched_received) - , liveliness_changed_received_ (liveliness_changed_received) - , thread_id_subcription_matched_ (thread_id_subcription_matched) - , thread_id_liveliness_changed_ (thread_id_liveliness_changed) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER\tConnectorStatusListener_exec_i::on_unexpected_status: " - "received <%C>\n", - CIAO::DDS4CCM::translate_statuskind (status_kind))); - ACE_Thread_ID t_id; - - if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) - { - this->subscription_matched_received_ = true; - this->thread_id_subcription_matched_ = t_id; - } - else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS) - { - this->liveliness_changed_received_ = true; - this->thread_id_liveliness_changed_ = t_id; - } - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : subscription_matched_received_ (false) - , liveliness_changed_received_ (false) - , thread_id_listener_subscription_matched_ (0, 0) - , thread_id_listener_liveliness_changed_ (0, 0) - , received_(0) - { - ACE_NEW_THROW_EX (this->pulser_, - Pulser (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->pulser_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_all () - { - ::CSL_US_Connector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - - try - { - TestTopicSeq readertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - if (this->received_ < 30) - { - reader->read_all (readertest_info_seq, readinfo_seq); - ACE_DEBUG ((LM_DEBUG, "Read %u samples\n", - readinfo_seq.length ())); - this->received_ += readinfo_seq.length (); - } - else - { - this->reactor ()->cancel_timer (this->pulser_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::read_all :Stop reading.\n"))); - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n"))); - } - } - // Component attributes and port operations. - - ::CSL_US_Connector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::CSL_US_Connector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::CSL_US_Connector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_read_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ())) - { - info_read_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_read_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_read_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_read_status_.in ()); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in (), - this->subscription_matched_received_, - this->liveliness_changed_received_, - this->thread_id_listener_subscription_matched_, - this->thread_id_listener_liveliness_changed_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CSL_USTest::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - if (this->reactor ()->schedule_timer ( - this->pulser_, - 0, - ACE_Time_Value (6, 0), - ACE_Time_Value (3, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (!this->subscription_matched_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n"))); - } - if (!this->liveliness_changed_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ") - ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n"))); - } - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_subscription_matched_.to_string(list_buf); - - //test thread switch for SUBSCRIPTION_MATCHED_STATUS - if (this->thread_id_listener_subscription_matched_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " - "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'SUBSCRIPTION_MATCHED_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - - //test thread switch for LIVELINESS_CHANGED_STATUS - char list_buf_lc [65]; - this->thread_id_listener_liveliness_changed_.to_string(list_buf_lc); - - if (this->thread_id_listener_liveliness_changed_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " - "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_lc, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread switch for 'LIVELINESS_CHANGED_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_lc, - ccm_buf)); - } - #else - else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_lc, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_lc, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_USTest_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h deleted file mode 100644 index 88ebdc7a273..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h +++ /dev/null @@ -1,288 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_ -#define CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_ - -#include /**/ "ace/pre.h" - -#include "CSL_USTest_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CSL_USTest_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - /** - * Pulser - */ - - class Pulser : - public ACE_Event_Handler - { - public: - Pulser (Receiver_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::CSL_US_Connector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from CSL_US_Connector::Listener. */ - - virtual - void on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::CSL_USTest::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CSL_USTest::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_read_status_exec_i - */ - - class info_read_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_read_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx); - virtual ~info_read_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CSL_USTest::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::CSL_USTest::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &subscription_matched_received, - Atomic_Boolean &liveliness_changed_received, - ACE_Thread_ID &thread_id_subcription_matched, - ACE_Thread_ID &thread_id_liveliness_changed); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::CSL_USTest::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &subscription_matched_received_; - Atomic_Boolean &liveliness_changed_received_; - ACE_Thread_ID &thread_id_subcription_matched_; - ACE_Thread_ID &thread_id_liveliness_changed_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CSL_US_Connector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_read_status (void); - - 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); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_all (void); - - //@} - - private: - ::CSL_USTest::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CSL_US_Connector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - //@} - - //@{ - /** User defined members. */ - Pulser *pulser_; - - Atomic_Boolean subscription_matched_received_; - Atomic_Boolean liveliness_changed_received_; - ACE_Thread_ID thread_id_listener_subscription_matched_; - ACE_Thread_ID thread_id_listener_liveliness_changed_; - Atomic_ULong received_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_USTest_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl deleted file mode 100644 index 4cdc3107c58..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_CSL_USTEST_SENDER_IDL -#define DDS_CSL_USTEST_SENDER_IDL - -#include "Connector/CSL_USTest_Connector.idl" - -module CSL_USTest -{ - component Sender - { - port CSL_US_Connector::DDS_Write test_topic_write; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc deleted file mode 100644 index ec9ebf7f815..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CSL_USTest_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - CSL_USTest_Sender.idl - } -} - -project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CSL_USTest_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CSL_USTest_SenderE.idl - } -} - -project(DDS_CSL_USTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_USTest_Sender_lem_gen DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Base_stub - libs += DDS_CSL_USTest_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_SenderEC.cpp - } - - Header_Files { - CSL_USTest_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CSL_USTest_SenderEC.inl - } -} - -project(DDS_CSL_USTest_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CSL_USTest_Sender_idl_gen DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub - libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_SenderC.cpp - } - - Header_Files { - CSL_USTest_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CSL_USTest_SenderC.inl - } -} - -project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_Sender_exec.cpp - } - - Header_Files { - CSL_USTest_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_SenderS.cpp - CSL_USTest_Sender_svnt.cpp - } - - Header_Files { - CSL_USTest_SenderS.h - CSL_USTest_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp deleted file mode 100644 index ba268353c2e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp +++ /dev/null @@ -1,580 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CSL_USTest_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_CSL_USTest_Sender_Impl -{ - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Facet Executor Implementation Class: test_topic_connector_status_exec_i - */ - - test_topic_connector_status_exec_i::test_topic_connector_status_exec_i ( - ::CSL_USTest::CCM_Sender_Context_ptr ctx, - Atomic_Boolean &publication_matched_received, - Atomic_Boolean &liveliness_lost_received, - Atomic_Boolean &reliable_dr_activity_changed_received, - Atomic_Boolean &reliable_writer_cache_changed_received, - ACE_Thread_ID &thread_id_publication_matched, - ACE_Thread_ID &thread_id_liveliness_lost, - ACE_Thread_ID &thread_id_reliable_dr_activity_changed, - ACE_Thread_ID &thread_id_reliable_writer_cache_changed) - : ciao_context_ ( - ::CSL_USTest::CCM_Sender_Context::_duplicate (ctx)) - , publication_matched_received_ (publication_matched_received) - , liveliness_lost_received_ (liveliness_lost_received) - , reliable_dr_activity_changed_received_ (reliable_dr_activity_changed_received) - , reliable_writer_cache_changed_received_ (reliable_writer_cache_changed_received) - , thread_id_publication_matched_ (thread_id_publication_matched) - , thread_id_liveliness_lost_ (thread_id_liveliness_lost) - , thread_id_reliable_dr_activity_changed_ (thread_id_reliable_dr_activity_changed) - , thread_id_reliable_writer_cache_changed_ (thread_id_reliable_writer_cache_changed) - { - } - - test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - ACE_Thread_ID t_id; - ACE_DEBUG ((LM_DEBUG, "SENDER\t\tConnectorStatusListener_exec_i::on_unexpected_status: " - "received <%C>\n", - CIAO::DDS4CCM::translate_statuskind (status_kind))); - - if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS) - { - this->liveliness_lost_received_ = true; - this->thread_id_liveliness_lost_ = t_id; - } - else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - this->publication_matched_received_ = true; - this->thread_id_publication_matched_ = t_id; - - } -#if (CIAO_DDS4CCM_NDDS==1) - else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS) - { - this->reliable_dr_activity_changed_received_ = true; - this->thread_id_reliable_dr_activity_changed_ = t_id; - } - else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS) - { - this->reliable_writer_cache_changed_received_ = true; - this->thread_id_reliable_writer_cache_changed_ = t_id; - } -#endif - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : publication_matched_received_ (false) - , liveliness_lost_received_ (false) - , reliable_dr_activity_changed_received_ (false) - , reliable_writer_cache_changed_received_ (false) - , thread_id_listener_publication_matched_ (0, 0) - , thread_id_listener_liveliness_lost_ (0, 0) - , thread_id_reliable_dr_activity_changed_ (0, 0) - , thread_id_reliable_writer_cache_changed_ (0, 0) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - ::CSL_US_Connector::Writer_var writer = - this->ciao_context_->get_connection_test_topic_write_data (); - - for (CSL_SRTest_Table::iterator i = this->_ktests_.begin (); - i != this->_ktests_.end (); - ++i) - { - try - { - if (! ::CORBA::is_nil (writer.in ())) - { - writer->write_one(i->second,::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n", - i->first.c_str (), - i->second->x)); - i->second->x++; - } - else ACE_ERROR ((LM_ERROR, "Unable to write sample: <%C> - <%d>\n", - i->first.c_str (), - i->second->x)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"), - i->first.c_str ())); - } - } - } - - void - Sender_exec_i::add_instance_of_topic (const char * key, int x) - { - TestTopic *new_key = new TestTopic; - new_key->key = CORBA::string_dup(key); - new_key->x = x; - this->_ktests_[key] = new_key; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ())) - { - test_topic_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - test_topic_connector_status_exec_i ( - this->ciao_context_.in (), - this->publication_matched_received_, - this->liveliness_lost_received_, - this->reliable_dr_activity_changed_received_, - this->reliable_writer_cache_changed_received_, - this->thread_id_listener_publication_matched_, - this->thread_id_listener_liveliness_lost_, - this->thread_id_reliable_dr_activity_changed_, - this->thread_id_reliable_writer_cache_changed_), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_test_topic_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_test_topic_connector_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CSL_USTest::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - // Add 2 different instances of topic - this->add_instance_of_topic ("ONE", 1); - this->add_instance_of_topic ("TWO", 2); - // calculate the interval time - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (3, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->publication_matched_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ") - ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n") - )); - } - if (!this->liveliness_lost_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ") - ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n") - )); - } -#if (CIAO_DDS4CCM_NDDS==1) - if (!this->reliable_dr_activity_changed_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ") - ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n") - )); - } - if (!this->reliable_writer_cache_changed_received_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ") - ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n") - )); - } -#endif - - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - //test thread switch for PUBLICATION_MATCHED_STATUS - - char list_buf_pm [65]; - this->thread_id_listener_publication_matched_.to_string(list_buf_pm); - if (this->thread_id_listener_publication_matched_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_publication_matched_== ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_pm, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for 'PUBLICATION_MATCHED_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_pm, - ccm_buf)); - } - #else - else if (this->thread_id_listener_publication_matched_== ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'PUBLICATION_MATCHED_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_pm, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'PUBLICATION_MATCHED_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_pm, - ccm_buf)); - } - #endif - - // Test thread switch for LIVELINESS_LOST_STATUS - char list_buf_ll [65]; - this->thread_id_listener_liveliness_lost_.to_string(list_buf_ll); - if (this->thread_id_listener_liveliness_lost_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for 'LIVELINESS_LOST_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for 'LIVELINESS_LOST_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_ll, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for 'LIVELINESS_LOST_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_ll, - ccm_buf)); - } - #else - else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_LOST_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_ll, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_LOST_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_ll, - ccm_buf)); - } - #endif - -#if (CIAO_DDS4CCM_NDDS==1) - //test thread switch for RELIABLE_READER_ACTIVITY_CHANGED_STATUS - char list_buf_ra [65]; - this->thread_id_reliable_dr_activity_changed_.to_string(list_buf_ra); - - if (this->thread_id_reliable_dr_activity_changed_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_ra, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_ra, - ccm_buf)); - } - #else - else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_ra, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_ra, - ccm_buf)); - } - #endif -#endif - -#if (CIAO_DDS4CCM_NDDS==1) - //test thread switch for RELIABLE_WRITER_CACHE_CHANGED_STATUS - char list_buf_rw [65]; - this->thread_id_reliable_writer_cache_changed_.to_string (list_buf_rw); - - if (this->thread_id_reliable_writer_cache_changed_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_rw, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_rw, - ccm_buf)); - } - #else - else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_rw, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_rw, - ccm_buf)); - } - #endif -#endif - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_USTest_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h deleted file mode 100644 index 74ae7db32ff..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h +++ /dev/null @@ -1,205 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_ -#define CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_ - -#include /**/ "ace/pre.h" - -#include "CSL_USTest_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_CSL_USTest_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - /** - * Write action generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: test_topic_connector_status_exec_i - */ - - class test_topic_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - test_topic_connector_status_exec_i ( - ::CSL_USTest::CCM_Sender_Context_ptr ctx, - Atomic_Boolean &publication_matched_received, - Atomic_Boolean &liveliness_lost_received, - Atomic_Boolean &reliable_dr_activity_changed_received, - Atomic_Boolean &reliable_writer_cache_changed_received, - ACE_Thread_ID &thread_id_publication_matched, - ACE_Thread_ID &thread_id_liveliness_lost, - ACE_Thread_ID &thread_id_reliable_dr_activity_changed, - ACE_Thread_ID &thread_id_reliable_writer_cache_changed); - virtual ~test_topic_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::CSL_USTest::CCM_Sender_Context_var ciao_context_; - Atomic_Boolean &publication_matched_received_; - Atomic_Boolean &liveliness_lost_received_; - Atomic_Boolean &reliable_dr_activity_changed_received_; - Atomic_Boolean &reliable_writer_cache_changed_received_; - ACE_Thread_ID &thread_id_publication_matched_; - ACE_Thread_ID &thread_id_liveliness_lost_; - ACE_Thread_ID &thread_id_reliable_dr_activity_changed_; - ACE_Thread_ID &thread_id_reliable_writer_cache_changed_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - - //@} - - private: - ::CSL_USTest::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_; - //@} - - //@{ - /** User defined members. */ - Atomic_Boolean publication_matched_received_; - Atomic_Boolean liveliness_lost_received_; - Atomic_Boolean reliable_dr_activity_changed_received_; - Atomic_Boolean reliable_writer_cache_changed_received_; - ACE_Thread_ID thread_id_listener_publication_matched_; - ACE_Thread_ID thread_id_listener_liveliness_lost_; - ACE_Thread_ID thread_id_reliable_dr_activity_changed_; - ACE_Thread_ID thread_id_reliable_writer_cache_changed_; - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map CSL_SRTest_Table; - CSL_SRTest_Table _ktests_; - - //@} - - //@{ - /** User defined private operations. */ - void add_instance_of_topic (const char *, int x); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CSL_USTest_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml deleted file mode 100644 index eac65f2581f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - RELIABLE_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 200 - - - MANUAL_BY_TOPIC_LIVELINESS_QOS - - 1 - 0 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp deleted file mode 100644 index 0a4fd735998..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp +++ /dev/null @@ -1,432 +0,0 @@ - - - - CSL_USTest_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_USTest_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_USTest_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CSL_USTest_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_US_Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_US_Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CSL_USTest_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CSL_USTest_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CSL_USTest_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CSL_USTest_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - CSL_USTest_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - CSL_Library#CSLProfile - - - - - topic_name - - - tk_string - - - TestUS - - - - - - CSL_USTest_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - CSL_Library#CSLProfile - - - - - topic_name - - - tk_string - - - TestUS - - - - - - SenderComponent - SenderNode - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - info_read_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CSL_USTest_Connector_exec - - - DDS_CSL_USTest_Connector_exec - - - CSL_USTest_Connector_svnt - - - DDS_CSL_USTest_Connector_svnt - - - CSL_USTest_Connector_stub - - - DDS_CSL_USTest_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 63f96806879..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 200 - - - - 1 - - - - DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS - - 1 - 0 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl deleted file mode 100755 index 2b535b3e697..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl deleted file mode 100644 index 8855d45864d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CoherentUpdate_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_UPDATE_TEST_BASE_IDL -#define COHERENT_UPDATE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CoherentUpdate_Test_BaseSupport.h" -#pragma opendds typesupport "Base/CoherentUpdate_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "CoherentUpdateTest" -#pragma DCPS_DATA_KEY "CoherentUpdateTest symbol" - -struct CoherentUpdateTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence CoherentUpdateTestSeq; -#endif - -#endif /* COHERENT_UPDATE_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc deleted file mode 100644 index 37658d27e27..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = CoherentUpdate_Test_Base_stub - dynamicflags += COHERENT_UPDATE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=COHERENT_UPDATE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CoherentUpdate_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CoherentUpdate_Test_Base.idl - } - - opendds_ts_flags += --export=COHERENT_UPDATE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CoherentUpdate_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl deleted file mode 100644 index 7bd2be52b1b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_WRITE_STARTER_IDL -#define COHERENT_WRITE_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface CoherentUpdateStarter -{ - void set_reader_properties (in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface CoherentUpdateRestarter -{ - void restart_update (); -}; - -#endif /* COHERENT_WRITE_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc deleted file mode 100644 index be474990c28..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(DDS_Coh_Update_ReaderStarter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(DDS_Coh_Update_ReaderStarter_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Coh_Update_ReaderStarter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(DDS_Coh_Update_ReaderStarter_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Coh_Update_ReaderStarter_lem_gen DDS_Coh_Update_ReaderStarter_stub - libs += Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(DDS_Coh_Update_ReaderStarter_stub) : ccm_stub, dds4ccm_base { - after += DDS_Coh_Update_ReaderStarter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub - sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore deleted file mode 100644 index cd0af09aae3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/CoherentUpdate_Connector_conn_export.h -/CoherentUpdate_Connector_lem_stub_export.h -/CoherentUpdate_Connector_stub_export.h -/CoherentUpdate_Connector_svnt_export.h -/CoherentUpdate_Test_ConnectorE.idl -/CoherentUpdate_Test_Connector_conn.cpp -/CoherentUpdate_Test_Connector_conn.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl deleted file mode 100644 index 22e01fc79fb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CoherentUpdate_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_UPDATE_TEST_CONNECTOR_IDL_ -#define COHERENT_UPDATE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CoherentUpdate_Test_Base.idl" - -#pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CoherentUpdate_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdate_Test; - -#endif /* COHERENT_UPDATE_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc deleted file mode 100644 index 3b33c29bfcc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l .. -o ../lib -u DDS CoherentUpdate_Test_Connector" - -project(CoherentUpdate_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen CoherentUpdate_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CoherentUpdate_Connector_stub_export.h \ - -Wb,skel_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CoherentUpdate_Connector_svnt_export.h \ - -Wb,svnt_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CoherentUpdate_Connector_svnt_export.h \ - -Wb,conn_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CoherentUpdate_Connector_conn_export.h \ - -I .. - - IDL_Files { - CoherentUpdate_Test_Connector.idl - } -} - -project(CoherentUpdate_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CoherentUpdate_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CoherentUpdate_Connector_lem_stub_export.h \ - -SS -Gxhst -Sci \ - -I .. - - IDL_Files { - CoherentUpdate_Test_ConnectorE.idl - } -} - -project(CoherentUpdate_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += CoherentUpdate_Connector_lem_gen CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub - libs += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentUpdate_Connector_lem_stub - dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ConnectorEC.cpp - } - - Header_Files { - CoherentUpdate_Test_ConnectorEC.h - CoherentUpdate_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_ConnectorEC.inl - } -} - -project(CoherentUpdate_Connector_stub) : ccm_stub, dds4ccm_base { - after += CoherentUpdate_Connector_idl_gen CoherentUpdate_Test_Base_stub - libs += CoherentUpdate_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentUpdate_Connector_stub - dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ConnectorC.cpp - } - - Header_Files { - CoherentUpdate_Test_ConnectorC.h - CoherentUpdate_Test_Connector_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_ConnectorC.inl - } -} - -project(CoherentUpdate_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - CoherentUpdate_Test_Base_stub - sharedname = CoherentUpdate_Connector_exec - libs += CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \ - CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_Connector_conn.cpp - } - - Header_Files { - CoherentUpdate_Test_Connector_conn.h - CoherentUpdate_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CoherentUpdate_Connector_lem_stub \ - CoherentUpdate_Connector_exec \ - CoherentUpdate_Connector_stub - sharedname = CoherentUpdate_Connector_svnt - libs += CoherentUpdate_Connector_stub \ - CoherentUpdate_Connector_lem_stub \ - CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ConnectorS.cpp - CoherentUpdate_Test_Connector_svnt.cpp - } - - Header_Files { - CoherentUpdate_Test_ConnectorS.h - CoherentUpdate_Test_Connector_svnt.h - CoherentUpdate_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore deleted file mode 100644 index d07e6648dc0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/CoherentUpdate_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl deleted file mode 100644 index ab41ad8e412..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CoherentUpdate_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentUpdate_Test -{ - component Receiver - { - port CoherentUpdate_Test::DDS_Read info_out; - - provides CoherentUpdateStarter reader_start; - uses CoherentUpdateRestarter updater_restart; - - attribute unsigned short nr_runs; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc deleted file mode 100644 index 5c0974fb005..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc +++ /dev/null @@ -1,154 +0,0 @@ -project(CoherentUpdate_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CoherentUpdate_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - CoherentUpdate_Test_Receiver.idl - } -} - -project(CoherentUpdate_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentUpdate_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CoherentUpdate_Test_ReceiverE.idl - } -} - -project(CoherentUpdate_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentUpdate_Test_Receiver_lem_gen CoherentUpdate_Test_Receiver_stub \ - CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \ - DDS_Coh_Update_ReaderStarter_stub - libs += Receiver_stub CoherentUpdate_Connector_stub \ - CoherentUpdate_Test_Base_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ReceiverEC.cpp - } - - Header_Files { - CoherentUpdate_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_ReceiverEC.inl - } -} - -project(CoherentUpdate_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += CoherentUpdate_Test_Receiver_idl_gen CoherentUpdate_Connector_stub \ - CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_lem_gen \ - DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_lem_stub - libs += CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ReceiverC.cpp - } - - Header_Files { - CoherentUpdate_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_ReceiverC.inl - } -} - -project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Receiver_stub \ - CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \ - CoherentUpdate_Connector_lem_stub \ - DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \ - Reader_Starter_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_Receiver_exec.cpp - } - - Header_Files { - CoherentUpdate_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ - CoherentUpdate_Test_Receiver_exec CoherentUpdate_Connector_lem_stub \ - DDS_Coh_Update_ReaderStarter_stub \ - DDS_Coh_Update_ReaderStarter_svnt DDS_Coh_Update_ReaderStarter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ - Receiver_exec CoherentUpdate_Connector_lem_stub \ - Reader_Starter_stub Reader_Starter_svnt \ - Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_ReceiverS.cpp - CoherentUpdate_Test_Receiver_svnt.cpp - } - - Header_Files { - CoherentUpdate_Test_ReceiverS.h - CoherentUpdate_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp deleted file mode 100644 index a6d4750a855..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp +++ /dev/null @@ -1,376 +0,0 @@ -// -*- C++ -*- -#include "CoherentUpdate_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Reactor.h" -#include "ace/Log_Msg.h" - -namespace CIAO_CoherentUpdate_Test_Receiver_Impl -{ - //============================================================ - // read_action_Generator - //============================================================ - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, - int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - this->callback_.run (this->run_); - return 0; - } - - //============================================================ - // Facet Executor Implementation Class: reader_start_exec_i - //============================================================ - - reader_start_exec_i::reader_start_exec_i ( - ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::CoherentUpdate_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::CoherentUpdateStarter - - void - reader_start_exec_i::set_reader_properties ( - ::CORBA::UShort nr_iterations) - { - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read ( - ::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - //============================================================ - // Component Executor Implementation Class: Receiver_exec_i - //============================================================ - - Receiver_exec_i::Receiver_exec_i (void) - : nr_runs_ (5), - iterations_ (10), - run_ (0), - last_iter_ (0), - ticker_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - bool - Receiver_exec_i::check_last () - { - try - { - ::CoherentUpdate_Test::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_last - " - "Unable to retrieve reader from context.\n")); - return false; - } - CoherentUpdateTest coherentwrite_info; - ::CCM_DDS::ReadInfo readinfo; - coherentwrite_info.symbol = CORBA::string_dup ("KEY_1"); - reader->read_one_last ( - coherentwrite_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%d> - <%d>\n", - coherentwrite_info.iteration, - (this->run_ + 1) * this->iterations_ - 1)); - return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - void - Receiver_exec_i::read_all (::CoherentUpdate_Test::Reader_ptr reader) - { - try - { - CoherentUpdateTestSeq coherentwrite_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (coherentwrite_info_seq, readinfo_seq); - - for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it) - { - if (coherentwrite_info_seq[it].iteration > this->last_iter_) - { - if (coherentwrite_info_seq[it].iteration == ++this->last_iter_) - { - ACE_DEBUG ((LM_DEBUG, "OK: ")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: ")); - } - ACE_DEBUG ((LM_DEBUG, "expected: <%u> - " - "received <%d>\n", - this->last_iter_, - coherentwrite_info_seq[it].iteration)); - } - } - if (this->run_ < this->nr_runs () + 1) - { - CoherentUpdateRestarter_var restarter = - this->ciao_context_->get_connection_updater_restart (); - if (! ::CORBA::is_nil (restarter)) - { - restarter->restart_update (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all -" - "Unable to restart.\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n")); - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::start_read (CORBA::UShort run) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this, run), - ::CORBA::INTERNAL ()); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - this->run_ = run; - ::CoherentUpdate_Test::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (! ::CORBA::is_nil (reader.in ())) - { - this->read_all (reader); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - " - "Unable to start: reader is nil.\n")); - } - } - - // Supported operations and attributes. - - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_CoherentUpdateStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_CoherentUpdateStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_CoherentUpdateStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::nr_runs (void) - { - return - this->nr_runs_; - } - - void - Receiver_exec_i::nr_runs ( - const ::CORBA::UShort nr_runs) - { - this->nr_runs_ = - nr_runs; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoherentUpdate_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_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) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - if (this->run_ == 1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("Test did not run") - ACE_TEXT ("events.\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent update test.\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentUpdate_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h deleted file mode 100644 index 92349ce6df1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h +++ /dev/null @@ -1,141 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_ -#define CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_ - -#include /**/ "ace/pre.h" - -#include "CoherentUpdate_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoherentUpdate_Test_Receiver_Impl -{ - class Receiver_exec_i; - - //============================================================ - // read_action_Generator - //============================================================ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - }; - - class RECEIVER_EXEC_Export reader_start_exec_i - : public virtual ::CCM_CoherentUpdateStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~reader_start_exec_i (void); - - // Operations and attributes from CoherentUpdateStarter - - virtual - void set_reader_properties ( - ::CORBA::UShort nr_iterations); - - virtual - void start_read ( - ::CORBA::UShort run); - - private: - ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_CoherentUpdateStarter_ptr - get_reader_start (void); - - virtual ::CORBA::UShort - nr_runs (void); - - virtual void - nr_runs ( - ::CORBA::UShort nr_runs); - - ::CORBA::UShort iterations (void); - void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - bool check_last (); - - void start_read (CORBA::UShort run); - void run (CORBA::UShort run); - - private: - ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_; - ::CCM_CoherentUpdateStarter_var ciao_reader_start_; - - ::CORBA::UShort nr_runs_; - - ::CORBA::UShort iterations_; - ::CORBA::UShort run_; - ::CORBA::Long last_iter_; - - read_action_Generator *ticker_; - - void read_all ( - ::CoherentUpdate_Test::Reader_ptr reader); - - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentUpdate_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore deleted file mode 100644 index 86849fed249..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/CoherentUpdate_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl deleted file mode 100644 index b9c3e548001..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_COHERENT_UPDATE_TEST_SENDER_IDL -#define DDS_COHERENT_UPDATE_TEST_SENDER_IDL - -#include "Connector/CoherentUpdate_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentUpdate_Test -{ - component Sender - { - port CoherentUpdate_Test::DDS_Update info_update; - - uses CoherentUpdateStarter start_reader; - provides CoherentUpdateRestarter restart_updater; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc deleted file mode 100644 index 56c819695ef..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project(CoherentUpdate_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += CoherentUpdate_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CoherentUpdate_Test_Sender.idl - } -} - -project(CoherentUpdate_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentUpdate_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CoherentUpdate_Test_SenderE.idl - } -} - -project(CoherentUpdate_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentUpdate_Test_Sender_lem_gen CoherentUpdate_Test_Sender_stub \ - CoherentUpdate_Test_Base_stub DDS_Coh_Update_ReaderStarter_stub - libs += CoherentUpdate_Test_Base_stub Sender_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_SenderEC.cpp - } - - Header_Files { - CoherentUpdate_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_SenderEC.inl - } -} - -project(CoherentUpdate_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += CoherentUpdate_Test_Sender_idl_gen CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_stub DDS_Coh_Update_ReaderStarter_stub \ - DDS_Coh_Update_ReaderStarter_lem_stub - libs += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \ - Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_SenderC.cpp - } - - Header_Files { - CoherentUpdate_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CoherentUpdate_Test_SenderC.inl - } -} - -project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += CoherentUpdate_Test_Sender_lem_stub CoherentUpdate_Test_Sender_stub \ - CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - DDS_Coh_Update_ReaderStarter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - Reader_Starter_stub Reader_Starter_lem_stub \ - Reader_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_Sender_exec.cpp - } - - Header_Files { - CoherentUpdate_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Sender_lem_stub \ - CoherentUpdate_Connector_stub \ - CoherentUpdate_Connector_svnt CoherentUpdate_Connector_lem_stub \ - DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_svnt \ - DDS_Coh_Update_ReaderStarter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ - CoherentUpdate_Connector_lem_stub Reader_Starter_stub \ - Reader_Starter_svnt Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentUpdate_Test_SenderS.cpp - CoherentUpdate_Test_Sender_svnt.cpp - } - - Header_Files { - CoherentUpdate_Test_SenderS.h - CoherentUpdate_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp deleted file mode 100644 index b60ed95945a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp +++ /dev/null @@ -1,250 +0,0 @@ -// -*- C++ -*- -#include "CoherentUpdate_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/Log_Msg.h" - -#define SAMPLE_KEY_NAME "KEY_1" - -namespace CIAO_CoherentUpdate_Test_Sender_Impl -{ - //============================================================ - // WriteHandler - //============================================================ - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - //============================================================ - // Facet Executor Implementation Class: restart_updater_exec_i - //============================================================ - - restart_updater_exec_i::restart_updater_exec_i ( - ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback) - : ciao_context_ ( - ::CoherentUpdate_Test::CCM_Sender_Context::_duplicate (ctx)), - callback_ (callback) - { - } - - restart_updater_exec_i::~restart_updater_exec_i (void) - { - } - - // Operations from ::CoherentUpdateRestarter - - void - restart_updater_exec_i::restart_update (void) - { - this->callback_.restart (); - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (3), - run_ (1), - total_iter (0), - wh_ (0) - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->wh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - - ::CCM_CoherentUpdateRestarter_ptr - Sender_exec_i::get_restart_updater (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_updater_.in ())) - { - restart_updater_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_updater_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_CoherentUpdateRestarter::_nil ()); - - this->ciao_restart_updater_ = tmp; - } - - return - ::CCM_CoherentUpdateRestarter::_duplicate ( - this->ciao_restart_updater_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoherentUpdate_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - ::CoherentUpdate_Test::Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - updater->is_coherent_write (true); - - // First create an instance for consecutive updating. - CoherentUpdateTest new_key; - new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME); - new_key.iteration = 0; - updater->create_one (new_key); - - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - delete this->wh_; - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - CORBA::INTERNAL ()); - this->reactor ()->notify (this->wh_); - } - - void - Sender_exec_i::start (void) - { - ::CoherentUpdateStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - } - - ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n", - this->run_, - this->iterations ())); - - CoherentUpdateTestSeq update_many_seq; - update_many_seq.length (this->iterations_); - for (int i = 1; i < this->iterations_ + 1; ++i) - { - CoherentUpdateTest new_key; - new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME); - new_key.iteration = ++total_iter; - update_many_seq[i-1] = new_key; - } - - ::CoherentUpdate_Test::Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - updater->update_many (update_many_seq); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"), - total_iter)); - ACE_OS::sleep (2); - starter->start_read (this->run_); - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentUpdate_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h deleted file mode 100644 index bb6be68fcd7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h +++ /dev/null @@ -1,135 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_ -#define CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_ - -#include /**/ "ace/pre.h" - -#include "CoherentUpdate_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoherentUpdate_Test_Sender_Impl -{ - class Sender_exec_i; - - //============================================================ - // WriteHandler - //============================================================ - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - - //============================================================ - // Provider Executor Implementation Class: restart_updater_exec_i - //============================================================ - - class restart_updater_exec_i - : public virtual ::CCM_CoherentUpdateRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_updater_exec_i ( - ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_updater_exec_i (void); - - //@{ - /** Operations and attributes from CoherentUpdateRestarter. */ - - virtual - void restart_update (void); - //@} - - private: - ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_CoherentUpdateRestarter_ptr - get_restart_updater (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void restart (void); - //@} - - private: - ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes and port operations. */ - ::CCM_CoherentUpdateRestarter_var ciao_restart_updater_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort run_; - CORBA::ULong total_iter; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentUpdate_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp deleted file mode 100644 index 8ac3c21fef5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp +++ /dev/null @@ -1,385 +0,0 @@ - - - - CoherentUpdate_TestDepl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentUpdate_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentUpdate_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CoherentUpdate_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentUpdate_Test_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentUpdate_Test_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CoherentUpdate_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CoherentUpdate_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentUpdate_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentUpdate_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - nr_runs - - - tk_ushort - - - 5 - - - - - - CoherentUpdate_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - CoherentUpdater_Library#CoherentUpdaterProfile - - - - - topic_name - - - tk_string - - - CoherentUpdate_Test - - - - - - CoherentUpdate_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - CoherentUpdater_Library#CoherentUpdaterProfile - - - - - topic_name - - - tk_string - - - CoherentUpdate_Test - - - - - - SenderComponent - SenderNode - - - - - iterations - - - tk_ushort - - - 4 - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_updater - - updater_restart - false - SimplexReceptacle - - - - restart_updater - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CoherentUpdate_Connector_exec - - - CoherentUpdate_Connector_exec - - - CoherentUpdate_Connector_svnt - - - CoherentUpdate_Connector_svnt - - - CoherentUpdate_Connector_stub - - - CoherentUpdate_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index c9a46586ffb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl deleted file mode 100755 index c5b1964e047..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore deleted file mode 100644 index ffebb99f763..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/CoherentWrite_Test_Base.cxx -/CoherentWrite_Test_Base.h -/CoherentWrite_Test_BasePlugin.cxx -/CoherentWrite_Test_BasePlugin.h -/CoherentWrite_Test_BaseSupport.cxx -/CoherentWrite_Test_BaseSupport.h -/CoherentWrite_Test_Base_stub_export.h -/Reader_StarterE.idl -/Reader_Starter_exec_export.h -/Reader_Starter_lem_stub_export.h -/Reader_Starter_stub_export.h -/Reader_Starter_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl deleted file mode 100644 index 58d4b9d347e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CoherentWrite_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_WRITE_TEST_BASE_IDL -#define COHERENT_WRITE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CoherentWrite_Test_BaseSupport.h" -#pragma opendds typesupport "Base/CoherentWrite_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "CoherentWriteTest" -#pragma DCPS_DATA_KEY "CoherentWriteTest symbol" - -struct CoherentWriteTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence CoherentWriteTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc deleted file mode 100644 index 1fc2c2b7903..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = CoherentWrite_Test_Base_stub - dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CoherentWrite_Test_Base.idl - } - - opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CoherentWrite_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl deleted file mode 100644 index fc0847932dc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_WRITE_STARTER_IDL -#define COHERENT_WRITE_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface CoherentWriteStarter -{ - void set_reader_properties (in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface CoherentWriteRestarter -{ - void restart_write (); -}; - -#endif /* COHERENT_WRITE_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc deleted file mode 100644 index 2b15e9e7c45..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(DDS_Coherent_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(DDS_Coherent_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Coherent_Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_lem_gen DDS_Coherent_Reader_Starter_stub - libs += Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(DDS_Coherent_Reader_Starter_stub) : ccm_stub, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub - sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore deleted file mode 100644 index 3f22aee3083..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/CoherentWrite_Test_ConnectorE.idl -/CoherentWrite_Test_Connector_conn.cpp -/CoherentWrite_Test_Connector_conn.h -/CoherentWrite_Test_Connector_conn_export.h -/CoherentWrite_Test_Connector_lem_stub_export.h -/CoherentWrite_Test_Connector_stub_export.h -/CoherentWrite_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl deleted file mode 100644 index 270b1189a74..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CoherentWrite_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_ -#define COHERENT_WRITE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CoherentWrite_Test_Base.idl" - -#pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CoherentWrite_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTestConnector; - -#endif /* CoherentWrite_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc deleted file mode 100644 index cc2fac6fbf8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector" - -project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen CoherentWrite_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CoherentWrite_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CoherentWrite_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CoherentWrite_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - CoherentWrite_Test_Connector.idl - } -} - -project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CoherentWrite_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CoherentWrite_Test_ConnectorE.idl - } -} - -project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub - libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentWrite_Test_Connector_lem_stub - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorEC.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorEC.h - CoherentWrite_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ConnectorEC.inl - } -} - -project(CoherentWrite_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Connector_idl_gen CoherentWrite_Test_Base_stub - libs += CoherentWrite_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentWrite_Test_Connector_stub - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorC.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorC.h - CoherentWrite_Test_Connector_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ConnectorC.inl - } -} - -project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub - sharedname = CoherentWrite_Test_Connector_exec - libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub CoherentWrite_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Connector_conn.cpp - } - - Header_Files { - CoherentWrite_Test_Connector_conn.h - CoherentWrite_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub - sharedname = CoherentWrite_Test_Connector_svnt - libs += CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_lem_stub \ - CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorS.cpp - CoherentWrite_Test_Connector_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorS.h - CoherentWrite_Test_Connector_svnt.h - CoherentWrite_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore deleted file mode 100644 index 15ee47edcab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/CoherentWrite_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl deleted file mode 100644 index 8591550a8ea..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CoherentWrite_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentWrite_Test -{ - component Receiver - { - port CoherentWriteTestConnector::DDS_Get info_out; - - provides CoherentWriteStarter reader_start; - uses CoherentWriteRestarter writer_restart; - - attribute unsigned short nr_runs; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc deleted file mode 100644 index e66cc09b7ae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(CoherentWrite_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CoherentWrite_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - CoherentWrite_Test_Receiver.idl - } -} - -project(CoherentWrite_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentWrite_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CoherentWrite_Test_ReceiverE.idl - } -} - -project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Receiver_lem_gen CoherentWrite_Test_Receiver_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \ - DDS_Coherent_Reader_Starter_stub - libs += Receiver_stub CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Base_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverEC.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ReceiverEC.inl - } -} - -project(CoherentWrite_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Receiver_idl_gen CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_lem_gen \ - DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_lem_stub - libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverC.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ReceiverC.inl - } -} - -project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Receiver_stub \ - CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_lem_stub \ - DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub \ - Reader_Starter_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Receiver_exec.cpp - } - - Header_Files { - CoherentWrite_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - CoherentWrite_Test_Receiver_exec CoherentWrite_Test_Connector_lem_stub \ - DDS_Coherent_Reader_Starter_stub \ - DDS_Coherent_Reader_Starter_svnt DDS_Coherent_Reader_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - Receiver_exec CoherentWrite_Test_Connector_lem_stub \ - Reader_Starter_stub Reader_Starter_svnt \ - Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverS.cpp - CoherentWrite_Test_Receiver_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverS.h - CoherentWrite_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp deleted file mode 100644 index 061c5f5cd15..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp +++ /dev/null @@ -1,498 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CoherentWrite_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_CoherentWrite_Test_Receiver_Impl -{ - /** - * Read action Generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, - int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - // Use get_many for every even number. In that case, don't check whether - // the last sample has arrived since the samples are read by then (the - // getter only reads unread samples). - if (this->run_ % 2 == 1) - { - // Odd number so check if the last sample is available in DDS. - if (this->callback_.check_last ()) - this->callback_.run (this->run_); - } - else - this->callback_.run (this->run_); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::CoherentWriteStarter - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_iterations) - { - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read (::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : nr_runs_ (0) - , iterations_ (10) - , run_ (0) - , last_iter_ (0) - , ticker_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last (void) - { - try - { - ::CoherentWriteTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - CoherentWriteTest coherentwrite_info; - ::CCM_DDS::ReadInfo readinfo; - coherentwrite_info.symbol = CORBA::string_dup ("KEY_1"); - reader->read_one_last ( - coherentwrite_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%d> - <%d>\n", - coherentwrite_info.iteration, - (this->run_ + 1) * this->iterations_ - 1)); - return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - void - Receiver_exec_i::check_iters (const char * test, - const CoherentWriteTestSeq& coherentwrite_info_seq) - { - for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it) - { - if (coherentwrite_info_seq[it].iteration > this->last_iter_) - { - if (coherentwrite_info_seq[it].iteration == ++this->last_iter_) - { - ACE_DEBUG ((LM_DEBUG, "%C ALL OK: ", test)); - } - else - { - ACE_ERROR ((LM_ERROR, "%C ALL ERROR: ", test)); - } - ACE_DEBUG ((LM_DEBUG, "expected: <%u> - " - "received <%d>\n", - this->last_iter_, - coherentwrite_info_seq[it].iteration)); - } - } - if (this->run_ < this->nr_runs () + 1) - { - ::CoherentWriteRestarter_var restarter = - this->ciao_context_->get_connection_writer_restart (); - if (!::CORBA::is_nil (restarter.in ())) - restarter->restart_write (); - else - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "Unable to restart the writer " - "since the restarter is nil.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n")); - } - } - - void - Receiver_exec_i::get_all (void) - { - try - { - ::CoherentWriteTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_out_fresh_data (); - - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "Unable to get samples since " - "getter is nil.\n")); - return; - } - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - getter->time_out (to); - - CoherentWriteTestSeq coherentwrite_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - getter->get_many (coherentwrite_info_seq, readinfo_seq); - - this->check_iters ("GET", coherentwrite_info_seq); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ") - ACE_TEXT ("caught NonExistent exception\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: GET ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::get_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::read_all (void) - { - try - { - ::CoherentWriteTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "Unable to read since reader or " - "restarter is nil.\n")); - return; - } - - CoherentWriteTestSeq coherentwrite_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (coherentwrite_info_seq, readinfo_seq); - - this->check_iters ("READ", coherentwrite_info_seq); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::start_read (CORBA::UShort run) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this, run), - ::CORBA::INTERNAL ()); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - this->run_ = run; - if (this->run_ % 2 == 1) - this->read_all (); - else - this->get_all (); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_CoherentWriteStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_CoherentWriteStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_CoherentWriteStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::nr_runs (void) - { - return this->nr_runs_; - } - - void - Receiver_exec_i::nr_runs ( - const ::CORBA::UShort nr_runs) - { - this->nr_runs_ = nr_runs; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoherentWrite_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - if (this->run_ == 1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("Test did not run") - ACE_TEXT ("events.\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent write test.\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h deleted file mode 100644 index ae74291ae77..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h +++ /dev/null @@ -1,214 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_ -#define CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_ - -#include /**/ "ace/pre.h" - -#include "CoherentWrite_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoherentWrite_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Read action Generator - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - }; - - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_CoherentWriteStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from CoherentWriteStarter. */ - - virtual - void set_reader_properties (::CORBA::UShort nr_iterations); - - virtual - void start_read (::CORBA::UShort run); - //@} - - private: - ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_CoherentWriteStarter_ptr - get_reader_start (void); - - virtual ::CORBA::UShort nr_runs (void); - - virtual void nr_runs (::CORBA::UShort nr_runs); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - bool check_last (void); - void start_read (CORBA::UShort run); - void run (CORBA::UShort run); - - ::CORBA::UShort iterations (void); - void iterations (::CORBA::UShort iterations); - //@} - - private: - ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_CoherentWriteStarter_var ciao_reader_start_; - - ::CORBA::UShort nr_runs_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort run_; - CORBA::Long last_iter_; - - read_action_Generator *ticker_; - - void check_iters (const char * test, - const CoherentWriteTestSeq& coherentwrite_info_seq); - - void get_all (void); - void read_all (void); - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore deleted file mode 100644 index ddc0ac818d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/CoherentWrite_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl deleted file mode 100644 index 0e9cfb46df9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_COHERENT_WRITE_TEST_SENDER_IDL -#define DDS_COHERENT_WRITE_TEST_SENDER_IDL - -#include "Connector/CoherentWrite_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentWrite_Test -{ - component Sender - { - port CoherentWriteTestConnector::DDS_Write info_write; - - uses CoherentWriteStarter start_reader; - provides CoherentWriteRestarter restart_writer; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc deleted file mode 100644 index bc87dee5517..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(CoherentWrite_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += CoherentWrite_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - CoherentWrite_Test_Sender.idl - } -} - -project(CoherentWrite_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentWrite_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CoherentWrite_Test_SenderE.idl - } -} - -project(CoherentWrite_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Sender_lem_gen CoherentWrite_Test_Sender_stub \ - CoherentWrite_Test_Base_stub DDS_Coherent_Reader_Starter_stub - libs += CoherentWrite_Test_Base_stub Sender_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderEC.cpp - } - - Header_Files { - CoherentWrite_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_SenderEC.inl - } -} - -project(CoherentWrite_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Sender_idl_gen CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub DDS_Coherent_Reader_Starter_stub \ - DDS_Coherent_Reader_Starter_lem_stub - libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \ - Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderC.cpp - } - - Header_Files { - CoherentWrite_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_SenderC.inl - } -} - -project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += CoherentWrite_Test_Sender_lem_stub CoherentWrite_Test_Sender_stub \ - CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - DDS_Coherent_Reader_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - Reader_Starter_stub Reader_Starter_lem_stub \ - Reader_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Sender_exec.cpp - } - - Header_Files { - CoherentWrite_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CoherentWrite_Test_Base_stub CoherentWrite_Test_Sender_lem_stub \ - CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_svnt CoherentWrite_Test_Connector_lem_stub \ - DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_svnt \ - DDS_Coherent_Reader_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - CoherentWrite_Test_Connector_lem_stub Reader_Starter_stub \ - Reader_Starter_svnt Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderS.cpp - CoherentWrite_Test_Sender_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_SenderS.h - CoherentWrite_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp deleted file mode 100644 index 0c7f99cf703..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CoherentWrite_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_CoherentWrite_Test_Sender_Impl -{ - /** - * WriteHandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::CoherentWrite_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::CoherentWriteRestarter - - void - restart_writer_exec_i::restart_write (void) - { - this->callback_.restart (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , run_ (1) - , total_iter (0) - , wh_ (0) - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->wh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - delete this->wh_; - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::INTERNAL ()); - this->reactor ()->notify (this->wh_); - } - - void - Sender_exec_i::start (void) - { - ::CoherentWriteTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - CoherentWriteStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - if (::CORBA::is_nil (starter.in ()) || - ::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - return; - } - - writer->is_coherent_write (true); - starter->set_reader_properties (this->iterations_); - - ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n", - this->run_, - this->iterations ())); - - CoherentWriteTestSeq write_many_seq (this->iterations_); - write_many_seq.length (this->iterations_); - for (int i = 1; i < this->iterations_ + 1; ++i) - { - CoherentWriteTest new_key; - new_key.symbol = CORBA::string_dup("KEY_1"); - new_key.iteration = ++total_iter; - write_many_seq[i-1] = new_key; - } - writer->write_many (write_many_seq); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"), - total_iter)); - ACE_OS::sleep (2); - starter->start_read (this->run_); - } - - // Component attributes and port operations. - - ::CCM_CoherentWriteRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_CoherentWriteRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_CoherentWriteRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoherentWrite_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h deleted file mode 100644 index cca68b9c6f8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_ -#define CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_ - -#include /**/ "ace/pre.h" - -#include "CoherentWrite_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoherentWrite_Test_Sender_Impl -{ - - class Sender_exec_i; - - /** - * WriteHandler - */ - - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_CoherentWriteRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from CoherentWriteRestarter. */ - - virtual - void restart_write (void); - //@} - - private: - ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_CoherentWriteRestarter_ptr - get_restart_writer (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void restart (void); - - //@} - - private: - ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_CoherentWriteRestarter_var ciao_restart_writer_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort run_; - CORBA::ULong total_iter; - - WriteHandler *wh_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml deleted file mode 100644 index 20d72e051a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - INSTANCE_PRESENTATION_QOS - true - false - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp deleted file mode 100644 index f6e3a9e655d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp +++ /dev/null @@ -1,462 +0,0 @@ - - - - CoherentWrite_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWrite_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWrite_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CoherentWrite_Test_StateConnectorImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWriteTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWriteTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CoherentWrite_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CoherentWrite_Test_Connector_exec - - - - - - - CoherentWrite_Test_EventConnectorImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWriteTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWriteTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CoherentWrite_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CoherentWrite_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWrite_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWrite_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - nr_runs - - - tk_ushort - - - 5 - - - - - - - CoherentWrite_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - CoherentWriter_Library#CoherentWriterProfile - - - - - topic_name - - - tk_string - - - CoherentWrite_Test - - - - - - - CoherentWrite_Test_ReceiverConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - CoherentWriter_Library#CoherentWriterProfile - - - - - topic_name - - - tk_string - - - CoherentWrite_Test - - - - - - - SenderComponent - SenderNode - - - - - iterations - - - tk_ushort - - - 4 - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - info_out_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CoherentWrite_Test_Connector_exec - - - CoherentWrite_Test_Connector_exec - - - CoherentWrite_Test_Connector_svnt - - - CoherentWrite_Test_Connector_svnt - - - CoherentWrite_Test_Connector_stub - - - CoherentWrite_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 7caa8986861..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 -s\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/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl deleted file mode 100644 index 9fe01e52f7f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef COLLACATED_BASE_ -#define COLLACATED_BASE_ - -#pragma ndds typesupport "Base/Collocated_BaseSupport.h" -#pragma opendds typesupport "Base/Collocated_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "CoPubSub::Test_msg" - -module CoPubSub { - struct Test_msg { - string hello; - long msgId; - }; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Test_msgSeq; -#endif -}; - - -#endif // COLLACATED_BASE_ - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc deleted file mode 100644 index d939fdc6348..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (Collocated_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = Collocated_Base_stub - dynamicflags += COLLACATED_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=COLLACATED_BASE_STUB_Export \ - -Wb,stub_export_include=Collocated_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Collocated_Base.idl - } - - opendds_ts_flags += --export=COLLACATED_BASE_STUB_Export - - DDSGenerator_Files { - Collocated_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl deleted file mode 100644 index 28225040991..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef COLLACATED_CONNECTOR_ -#define COLLACATED_CONNECTOR_ - -#include -#include - -#include "Base/Collocated_Base.idl" - -#pragma ciao lem "Connector/Collocated_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Collocated_BaseTypeSupport.idl" -#endif - -module CoPubSub { - module CCM_DDS::Typed Test_conn; -}; - -#endif // COLLACATED_CONNECTOR_ - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc deleted file mode 100644 index 8555202b1e6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc +++ /dev/null @@ -1,144 +0,0 @@ -project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Collocated_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Collocated_Connector_stub_export.h \ - -Wb,skel_export_macro=COLLACATED_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Collocated_Connector_svnt_export.h \ - -Wb,svnt_export_macro=COLLACATED_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Collocated_Connector_svnt_export.h \ - -Wb,conn_export_macro=COLLACATED_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Collocated_Connector_conn_export.h \ - -I .. - - IDL_Files { - Collocated_Connector.idl - } -} - -project(Collocated_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += Collocated_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Collocated_Connector_lem_stub_export.h \ - -SS -Gxhst -Sci \ - -I .. - - IDL_Files { - Collocated_ConnectorE.idl - } -} - -project(Collocated_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Collocated_Connector_lem_gen Collocated_Connector_stub Collocated_Base_stub - libs += Collocated_Base_stub Collocated_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Collocated_Connector_lem_stub - dynamicflags += COLLACATED_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Collocated_ConnectorEC.cpp - } - - Header_Files { - Collocated_ConnectorEC.h - Collocated_Connector_lem_stub_export.h - } - - Inline_Files { - Collocated_ConnectorEC.inl - } -} - -project(Collocated_Connector_stub) : ccm_stub, dds4ccm_base { - after += Collocated_Connector_idl_gen Collocated_Base_stub - libs += Collocated_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Collocated_Connector_stub - dynamicflags += COLLACATED_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Collocated_ConnectorC.cpp - } - - Header_Files { - Collocated_ConnectorC.h - Collocated_Connector_stub_export.h - } - - Inline_Files { - Collocated_ConnectorC.inl - } -} - -project(Collocated_Connector_exec) : ciao_executor, dds4ccm_impl { - after += Collocated_Connector_lem_stub Collocated_Connector_stub \ - Collocated_Base_stub - sharedname = Collocated_Connector_exec - libs += Collocated_Connector_stub Collocated_Connector_lem_stub \ - Collocated_Base_stub Collocated_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COLLACATED_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Collocated_Connector_conn.cpp - } - - Header_Files { - Collocated_Connector_conn.h - Collocated_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Collocated_Connector_lem_stub \ - Collocated_Connector_exec \ - Collocated_Connector_stub - sharedname = Collocated_Connector_svnt - libs += Collocated_Connector_stub \ - Collocated_Connector_lem_stub \ - Collocated_Base_stub \ - Collocated_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COLLACATED_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Collocated_ConnectorS.cpp - Collocated_Connector_svnt.cpp - } - - Header_Files { - Collocated_ConnectorS.h - Collocated_Connector_svnt.h - Collocated_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl deleted file mode 100644 index 4471ce44144..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef PUBSUB_COMPONENT_ -#define PUBSUB_COMPONENT_ - -#include -#include "Connector/Collocated_Connector.idl" - -module CoPubSub { - component PubSub_comp { - port Test_conn::DDS_Write TestPub; - port Test_conn::DDS_Listen TestSub; - }; -}; - -#endif // PUBSUB_COMPONENT_ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc deleted file mode 100644 index 1aa98495166..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc +++ /dev/null @@ -1,143 +0,0 @@ -project(PubSubComponent_idl_gen) : componentidldefaults, dds4ccm { - after += Collocated_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \ - -Wb,stub_export_include=PubSub_Component_stub_export.h \ - -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=PubSub_Component_svnt_export.h \ - -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=PubSub_Component_svnt_export.h \ - -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \ - -Wb,exec_export_include=PubSub_Component_exec_export.h \ - -I .. - - IDL_Files { - PubSub_Component.idl - } -} - -project(PubSubComponent_lem_gen) : ciaoidldefaults, dds4ccm { - after += PubSubComponent_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=PubSubComponent_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - PubSub_ComponentE.idl - } -} - -project(PubSubComponent_lem_stub) : ccm_svnt, dds4ccm_base { - after += PubSubComponent_lem_gen PubSubComponent_stub \ - Collocated_Base_stub - libs += Collocated_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = PubSub_Component_lem_stub - dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PubSub_ComponentEC.cpp - } - - Header_Files { - PubSub_ComponentEC.h - PubSub_Component_lem_stub_export.h - } - - Inline_Files { - PubSub_ComponentEC.inl - } -} - -project(PubSubComponent_stub) : ccm_stub, dds4ccm_base { - after += PubSubComponent_idl_gen Collocated_Base_stub \ - Collocated_Connector_stub - libs += Collocated_Base_stub Collocated_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = PubSub_Component_stub - dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PubSub_ComponentC.cpp - } - - Header_Files { - PubSub_ComponentC.h - PubSub_Component_stub_export.h - } - - Inline_Files { - PubSub_ComponentC.inl - } -} - -project(PubSubComponent_exec) : ciao_executor, dds4ccm_lem_stub { - after += PubSubComponent_lem_stub PubSubComponent_stub \ - Collocated_Connector_lem_stub Collocated_Connector_stub - sharedname = PubSub_Component_exec - libs += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \ - Collocated_Connector_lem_stub Collocated_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PubSub_Component_exec.cpp - } - - Header_Files { - PubSub_Component_exec.h - PubSub_Component_exec_export.h - } - - Inline_Files { - } -} - - -project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Collocated_Base_stub PubSubComponent_lem_stub \ - Collocated_Connector_stub \ - Collocated_Connector_svnt Collocated_Connector_lem_stub - sharedname = PubSub_Component_svnt - libs += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \ - Collocated_Connector_stub Collocated_Connector_svnt \ - Collocated_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PubSub_ComponentS.cpp - PubSub_Component_svnt.cpp - } - - Header_Files { - PubSub_ComponentS.h - PubSub_Component_svnt.h - PubSub_Component_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp deleted file mode 100644 index 462f0ebbdf4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp +++ /dev/null @@ -1,301 +0,0 @@ -// -*- C++ -*- -#include "PubSub_Component_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_CoPubSub_PubSub_comp_Impl -{ - - - /** - * WriteHandler - */ - WriteHandler::WriteHandler (PubSub_comp_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_timeout (const ACE_Time_Value &, const void *) - { - return this->callback_.tick (); - } - - /** - * Facet Executor Implementation Class: TestSub_data_listener_exec_i - */ - - TestSub_data_listener_exec_i::TestSub_data_listener_exec_i ( - ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx) - : ciao_context_ ( - ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx)) - { - } - - TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void) - { - } - - // Operations from ::CoPubSub::Test_conn::Listener - - void - TestSub_data_listener_exec_i::on_one_data ( - const ::CoPubSub::Test_msg & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - " - "New data received: <%C> - <%d>\n", - datum.hello.in (), datum.msgId)); - } - - void - TestSub_data_listener_exec_i::on_many_data ( - const ::CoPubSub::Test_msgSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: TestSub_status_exec_i - */ - - TestSub_status_exec_i::TestSub_status_exec_i ( - ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx) - : ciao_context_ ( - ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx)) - { - } - - TestSub_status_exec_i::~TestSub_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - TestSub_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - TestSub_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: PubSub_comp_exec_i - */ - - PubSub_comp_exec_i::PubSub_comp_exec_i (void) - : count_(-3) - { - ticker_ = new WriteHandler (*this); - } - - PubSub_comp_exec_i::~PubSub_comp_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - PubSub_comp_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - int - PubSub_comp_exec_i::tick (void) - { - CoPubSub::Test_msg sample; - sample.hello = CORBA::string_dup("CoPubSub Test Message"); - sample.msgId = ++this->count_; - - // Reference to the writer interface for the DDS4CCM connector for msg type - ::CoPubSub::Test_conn::Writer_var writer; - - writer = ciao_context_->get_connection_TestPub_data(); - - if (CORBA::is_nil(writer.in())) - { - ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - Writer seems nil.\n")); - return -1; // Don't reschedule timer - } - - try - { - writer->write_one(sample, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::tick - " - "Sample has been written: <%C> - <%d>\n", - sample.hello.in (), sample.msgId)); - } - catch (const CCM_DDS::InternalError &) // catch "normal" exception - { - ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - " - "ERROR: caught InternalError.\n")); - - return -1; // Don't reschedule timer - } - catch (const CORBA::Exception & ex) - { - ex._tao_print_exception("PubSub_comp_exec_i::tick - ERROR: "); - return -1; // Don't reschedule timer - } - catch (...) // catch everything else. If this is called something is wrong - { - ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - " - "ERROR: caught unknown exception.\n")); - return -1; // Don't reschedule timer - } - return 0; - } - - // Component attributes and port operations. - - ::CoPubSub::Test_conn::CCM_Listener_ptr - PubSub_comp_exec_i::get_TestSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ())) - { - TestSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - TestSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::CoPubSub::Test_conn::CCM_Listener::_nil ()); - - this->ciao_TestSub_data_listener_ = tmp; - } - - return - ::CoPubSub::Test_conn::CCM_Listener::_duplicate ( - this->ciao_TestSub_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - PubSub_comp_exec_i::get_TestSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ())) - { - TestSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - TestSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_TestSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_TestSub_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - PubSub_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoPubSub::CCM_PubSub_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - PubSub_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - PubSub_comp_exec_i::ccm_activate (void) - { - CCM_DDS::DataListenerControl_var control = - ciao_context_->get_connection_TestSub_data_control(); - - if (! CORBA::is_nil(control.in())) - { - try - { - control->mode(CCM_DDS::ONE_BY_ONE); - } - catch (const CORBA::Exception & ex) - { - ex._tao_print_exception("PubSub_comp_exec_i::ccm_activate - ERROR: "); - } - } - else - { - ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - " - "ERROR: Data listener control seems nil.\n")); - } - - ACE_Time_Value delay(3, 0); // timer = 3 seconds + 0 usec = 3 sec - ACE_Time_Value repeat(3, 0); // timer = 3 seconds + 0 usec = 3 sec - - if (this->reactor()->schedule_timer(this->ticker_, - 0, - delay, - repeat) == -1) - { - ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - " - "ERROR: Unable to schedule timer.\n")); - } - else - ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::ccm_activate - " - "Timer is up and running.\n")); - } - - void - PubSub_comp_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->ticker_); - } - - void - PubSub_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoPubSub_PubSub_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - PubSub_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h deleted file mode 100644 index 7391ebf1357..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h +++ /dev/null @@ -1,169 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_ -#define CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_ - -#include /**/ "ace/pre.h" - -#include "PubSub_ComponentEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "PubSub_Component_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoPubSub_PubSub_comp_Impl -{ - class PubSub_comp_exec_i; - - /** - * WriteHandler - */ - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (PubSub_comp_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &, const void *); - private: - PubSub_comp_exec_i &callback_; - }; - - - /** - * Provider Executor Implementation Class: TestSub_data_listener_exec_i - */ - - class TestSub_data_listener_exec_i - : public virtual ::CoPubSub::Test_conn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - TestSub_data_listener_exec_i ( - ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx); - virtual ~TestSub_data_listener_exec_i (void); - - /** @name Operations and attributes from CoPubSub::Test_conn::Listener */ - //@{ - - virtual - void on_one_data ( - const ::CoPubSub::Test_msg & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::CoPubSub::Test_msgSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: TestSub_status_exec_i - */ - - class TestSub_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - TestSub_status_exec_i ( - ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx); - virtual ~TestSub_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: PubSub_comp_exec_i - */ - - class PubSub_comp_exec_i - : public virtual PubSub_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - PubSub_comp_exec_i (void); - virtual ~PubSub_comp_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::CoPubSub::Test_conn::CCM_Listener_ptr - get_TestSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_TestSub_status (void); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - int tick (void); - - //@} - - private: - ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_; - //@} - - /** @name User defined members. */ - //@{ - WriteHandler *ticker_; - - ::CORBA::Long count_; - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoPubSub_PubSub_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl deleted file mode 100644 index 791e62294f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef SUB_COMPONENT_ -#define SUB_COMPONENT_ - -#include -#include "Connector/Collocated_Connector.idl" - -module CoPubSub { - component Sub_comp { - port Test_conn::DDS_Listen TestSub; - }; -}; - -#endif // SUB_COMPONENT_ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc deleted file mode 100644 index 371880ecee3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc +++ /dev/null @@ -1,143 +0,0 @@ -project(SubComponent_idl_gen) : componentidldefaults, dds4ccm { - after += Collocated_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \ - -Wb,stub_export_include=Sub_Component_stub_export.h \ - -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Sub_Component_svnt_export.h \ - -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Sub_Component_svnt_export.h \ - -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Sub_Component_exec_export.h \ - -I .. - - IDL_Files { - Sub_Component.idl - } -} - -project(SubComponent_lem_gen) : ciaoidldefaults, dds4ccm { - after += SubComponent_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=SubComponent_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Sub_ComponentE.idl - } -} - -project(SubComponent_lem_stub) : ccm_svnt, dds4ccm_base { - after += SubComponent_lem_gen SubComponent_stub \ - Collocated_Base_stub - libs += Collocated_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sub_Component_lem_stub - dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Sub_ComponentEC.cpp - } - - Header_Files { - Sub_ComponentEC.h - Sub_Component_lem_stub_export.h - } - - Inline_Files { - Sub_ComponentEC.inl - } -} - -project(SubComponent_stub) : ccm_stub, dds4ccm_base { - after += SubComponent_idl_gen Collocated_Base_stub \ - Collocated_Connector_stub - libs += Collocated_Base_stub Collocated_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sub_Component_stub - dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Sub_ComponentC.cpp - } - - Header_Files { - Sub_ComponentC.h - Sub_Component_stub_export.h - } - - Inline_Files { - Sub_ComponentC.inl - } -} - -project(SubComponent_exec) : ciao_executor, dds4ccm_lem_stub { - after += SubComponent_lem_stub SubComponent_stub \ - Collocated_Connector_lem_stub Collocated_Connector_stub - sharedname = Sub_Component_exec - libs += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \ - Collocated_Connector_lem_stub Collocated_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Sub_Component_exec.cpp - } - - Header_Files { - Sub_Component_exec.h - Sub_Component_exec_export.h - } - - Inline_Files { - } -} - - -project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Collocated_Base_stub SubComponent_lem_stub \ - Collocated_Connector_stub \ - Collocated_Connector_svnt Collocated_Connector_lem_stub - sharedname = Sub_Component_svnt - libs += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \ - Collocated_Connector_stub Collocated_Connector_svnt \ - Collocated_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Sub_ComponentS.cpp - Sub_Component_svnt.cpp - } - - Header_Files { - Sub_ComponentS.h - Sub_Component_svnt.h - Sub_Component_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp deleted file mode 100644 index a644b08d8cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// -*- C++ -*- -#include "Sub_Component_exec.h" - -namespace CIAO_CoPubSub_Sub_comp_Impl -{ - - /** - * Facet Executor Implementation Class: TestSub_data_listener_exec_i - */ - - TestSub_data_listener_exec_i::TestSub_data_listener_exec_i ( - ::CoPubSub::CCM_Sub_comp_Context_ptr ctx) - : ciao_context_ ( - ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx)) - { - } - - TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void) - { - } - - // Operations from ::CoPubSub::Test_conn::Listener - - void - TestSub_data_listener_exec_i::on_one_data ( - const ::CoPubSub::Test_msg & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - " - "New data received: <%C> - <%d>\n", - datum.hello.in (), datum.msgId)); - } - - void - TestSub_data_listener_exec_i::on_many_data ( - const ::CoPubSub::Test_msgSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: TestSub_status_exec_i - */ - - TestSub_status_exec_i::TestSub_status_exec_i ( - ::CoPubSub::CCM_Sub_comp_Context_ptr ctx) - : ciao_context_ ( - ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx)) - { - } - - TestSub_status_exec_i::~TestSub_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - TestSub_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - TestSub_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Sub_comp_exec_i - */ - - Sub_comp_exec_i::Sub_comp_exec_i (void){ - } - - Sub_comp_exec_i::~Sub_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CoPubSub::Test_conn::CCM_Listener_ptr - Sub_comp_exec_i::get_TestSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ())) - { - TestSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - TestSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::CoPubSub::Test_conn::CCM_Listener::_nil ()); - - this->ciao_TestSub_data_listener_ = tmp; - } - - return - ::CoPubSub::Test_conn::CCM_Listener::_duplicate ( - this->ciao_TestSub_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Sub_comp_exec_i::get_TestSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ())) - { - TestSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - TestSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_TestSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_TestSub_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Sub_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CoPubSub::CCM_Sub_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sub_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sub_comp_exec_i::ccm_activate (void) - { - CCM_DDS::DataListenerControl_var control = - ciao_context_->get_connection_TestSub_data_control(); - - if (! CORBA::is_nil(control.in())) - { - try - { - control->mode(CCM_DDS::ONE_BY_ONE); - } - catch (const CORBA::Exception & ex) - { - ex._tao_print_exception("Sub_comp_exec_i::ccm_activate - ERROR: "); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Sub_comp_exec_i::ccm_activate - " - "ERROR: Listener control is nil.\n")); - } - } - - void - Sub_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sub_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoPubSub_Sub_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sub_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h deleted file mode 100644 index 4b6c45083f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h +++ /dev/null @@ -1,148 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_ -#define CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_ - -#include /**/ "ace/pre.h" - -#include "Sub_ComponentEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sub_Component_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CoPubSub_Sub_comp_Impl -{ - - /** - * Provider Executor Implementation Class: TestSub_data_listener_exec_i - */ - - class TestSub_data_listener_exec_i - : public virtual ::CoPubSub::Test_conn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - TestSub_data_listener_exec_i ( - ::CoPubSub::CCM_Sub_comp_Context_ptr ctx); - virtual ~TestSub_data_listener_exec_i (void); - - /** @name Operations and attributes from CoPubSub::Test_conn::Listener */ - //@{ - - virtual - void on_one_data ( - const ::CoPubSub::Test_msg & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::CoPubSub::Test_msgSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: TestSub_status_exec_i - */ - - class TestSub_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - TestSub_status_exec_i ( - ::CoPubSub::CCM_Sub_comp_Context_ptr ctx); - virtual ~TestSub_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Sub_comp_exec_i - */ - - class Sub_comp_exec_i - : public virtual Sub_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sub_comp_exec_i (void); - virtual ~Sub_comp_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::CoPubSub::Test_conn::CCM_Listener_ptr - get_TestSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_TestSub_status (void); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - - //@} - - private: - ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_; - //@} - - /** @name User defined members. */ - //@{ - - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - }; - - extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoPubSub_Sub_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp deleted file mode 100644 index c8b624d3b41..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp +++ /dev/null @@ -1,654 +0,0 @@ - - - - CollocatedDepl_1 - - - SubComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoPubSub_Sub_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoPubSub_Sub_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sub_Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sub_Component_exec - - - - - - - PubSubComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoPubSub_PubSub_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoPubSub_PubSub_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PubSub_Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PubSub_Component_exec - - - - - - - CollocatedConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoPubSub_Test_conn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoPubSub_Test_conn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Collocated_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Collocated_Connector_exec - - - - - - - - SubComponent1 - Node - - - - - - SubComponent1Connector - Node - - - - topic_name - - - tk_string - - - CollocatedTopic - - - - - push_consumer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - msgId < %0 - - - - parameters - - - 1 - - - - - - - - - - - SubComponent2 - Node - - - - - - SubComponent2Connector - Node - - - - topic_name - - - tk_string - - - CollocatedTopic - - - - - push_consumer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - msgId < %0 - - - - parameters - - - 1 - - - - - - - - - - - PubSubComponent - Node - - - - - - PubSubComponentConnector - Node - - - - topic_name - - - tk_string - - - CollocatedTopic - - - - - push_consumer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - msgId < %0 - - - - parameters - - - 1 - - - - - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestPub_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - pubsub_listener_filter - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_filter_config - false - SimplexReceptacle - - - - push_consumer_filter_config - true - Facet - - - - - - pubsub_data_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - pubsub_listener_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - sub1_listener_filter - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_filter_config - false - SimplexReceptacle - - - - push_consumer_filter_config - true - Facet - - - - - - sub1_data_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - sub1_listener_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - - sub2_listener_filter - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_filter_config - false - SimplexReceptacle - - - - push_consumer_filter_config - true - Facet - - - - - - sub2_data_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - sub2_listener_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - TestSub_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - Collocated_Connector_exec - - - Collocated_Connector_exec - - - Collocated_Connector_svnt - - - Collocated_Connector_svnt - - - Collocated_Connector_stub - - - Collocated_Connector_stub - - - - Sub_Component_exec - - - Sub_Component_exec - - - Sub_Component_svnt - - - Sub_Component_svnt - - - Sub_Component_stub - - - Sub_Component_stub - - - - PubSub_Component_exec - - - PubSub_Component_exec - - - PubSub_Component_svnt - - - PubSub_Component_svnt - - - PubSub_Component_stub - - - PubSub_Component_stub - - - - SameProcess - - - - - - SameProcess - - - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl deleted file mode 100755 index 255dca278d1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp.ior" ); -@iorfiles = 0; -@nodenames = ( "Node" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore deleted file mode 100644 index e600c6c5059..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Connector -/DiffDir.cxx -/DiffDir.h -/DiffDirPlugin.cxx -/DiffDirPlugin.h -/DiffDirSupport.cxx -/DiffDirSupport.h -/DiffDir_Common_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl deleted file mode 100644 index c860f65027c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef DIFFDIR_IDL -#define DIFFDIR_IDL - -#pragma ndds typesupport "DiffDirSupport.h" -#pragma opendds typesupport "DiffDirTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "DiffDirType" -#pragma DCPS_DATA_KEY "DiffDirType value" - -struct DiffDirType { - string value; //@key -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence DiffDirTypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb deleted file mode 100644 index 0d50c8147b0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb +++ /dev/null @@ -1,7 +0,0 @@ -feature (dds4ccm_ndds) { - dds_ts_flags += -d Connector -} - -feature (dds4ccm_opendds) { - dds_ts_flags += -o Connector -} diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc deleted file mode 100644 index 615ff24a7d2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc +++ /dev/null @@ -1,26 +0,0 @@ -project (DiffDir_stub) : taoidldefaults, \ - dds4ccm_ts_default, DiffDir { - 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 \ - -o Connector - - IDL_Files { - idlflags += -Gxhst - DiffDir.idl - gendir = Connector - } - - opendds_ts_flags += --export=DIFFDIR_COMMON_STUB_Export - - DDSGenerator_Files { - DiffDir.idl - gendir = Connector - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl deleted file mode 100644 index f4a400ab732..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DIFFDIR_CONNECTOR_IDL -#define DIFFDIR_CONNECTOR_IDL - -#include -#include - -#include "DiffDir.idl" - -#pragma ciao lem "DiffDir_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Connector/DiffDirTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::DiffDirType, ::DiffDirTypeSeq> DiffDirConnector; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc deleted file mode 100644 index e3cefe05fad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc +++ /dev/null @@ -1,135 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector" - -project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DiffDir_stub - 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 - gendir = Connector - } -} - -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 - gendir = Connector - } -} - -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 { - 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 { - 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 { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl deleted file mode 100644 index db1caed274a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file CFT_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_TEST_BASE_IDL -#define CONTENTFILTEREDTOPIC_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CFT_Test_BaseSupport.h" -#pragma opendds typesupport "Base/CFT_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "CFTTwoDimensionalTest" -#pragma DCPS_DATA_KEY "CFTTwoDimensionalTest symbol" - -struct CFTTwoDimensionalTest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence CFTTwoDimensionalTestSeq; -#endif - -#pragma DCPS_DATA_TYPE "CFTThreeDimensionalTest" -#pragma DCPS_DATA_KEY "CFTThreeDimensionalTest symbol" - -struct CFTThreeDimensionalTest { - string symbol; //@key - long x; - long y; - long z; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence CFTThreeDimensionalTestSeq; -#endif - -#endif /* CONTENTFILTEREDTOPIC_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc deleted file mode 100644 index 072bebbed80..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = CFT_Test_Base_stub - dynamicflags += CONTENTFILTEREDTOPIC_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CFT_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CFT_Test_Base.idl - } - - opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CFT_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl deleted file mode 100644 index 332b0c5eb7c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/CFT_Test_Connector.idl" - -module CFT_Test -{ - component CFTTestComponent - { - port CFTTwoDimensionalTestConn::DDS_Get two_dim_get; - port CFTThreeDimensionalTestConn::DDS_Get three_dim_get; - port CFTThreeDimensionalTestConn::DDS_Read three_dim_read; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc deleted file mode 100644 index c932730b398..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(CFT_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CFT_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - CFT_Test_Component.idl - } -} - -project(CFT_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += CFT_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CFT_Test_ComponentE.idl - } -} - -project(CFT_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_Test_Component_lem_gen CFT_Test_Component_stub \ - CFT_Test_Connector_stub CFT_Test_Base_stub - libs += Component_stub CFT_Test_Connector_stub \ - CFT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ComponentEC.cpp - } - - Header_Files { - CFT_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - CFT_Test_ComponentEC.inl - } -} - -project(CFT_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += CFT_Test_Component_idl_gen CFT_Test_Connector_stub \ - CFT_Test_Base_stub CFT_Test_Connector_lem_gen - libs += CFT_Test_Connector_stub CFT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ComponentC.cpp - } - - Header_Files { - CFT_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - CFT_Test_ComponentC.inl - } -} - -project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += CFT_Test_Component_lem_stub CFT_Test_Component_stub \ - CFT_Test_Base_stub CFT_Test_Connector_stub \ - CFT_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub CFT_Test_Base_stub \ - CFT_Test_Connector_stub CFT_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_Component_exec.cpp - } - - Header_Files { - CFT_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CFT_Test_Component_lem_stub CFT_Test_Base_stub \ - CFT_Test_Connector_stub CFT_Test_Connector_svnt \ - CFT_Test_Component_exec CFT_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub CFT_Test_Base_stub \ - CFT_Test_Connector_stub CFT_Test_Connector_svnt \ - Component_exec CFT_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ComponentS.cpp - CFT_Test_Component_svnt.cpp - } - - Header_Files { - CFT_Test_ComponentS.h - CFT_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp deleted file mode 100644 index 223ca8b96b3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- -#include "CFT_Test_Component_exec.h" - -namespace CIAO_CFT_Test_CFTTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = ::CFT_Test::CCM_CFTTestComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_two_dim_get_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_three_dim_get_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_three_dim_read_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - // if deployment succeeds, this test succeeds - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - " - "OK : Test succeeded. Two " - "ContentfilteredTopics can " - "be created.\n")); - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTTest_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h deleted file mode 100644 index b6349f7f40a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "CFT_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_CFT_Test_CFTTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual CFTTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_two_dim_get_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_three_dim_get_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_three_dim_read_status (void); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::CFT_Test::CCM_CFTTestComponent_Context_var context_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTTest_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl deleted file mode 100644 index df556d08cab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file CFT_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ -#define CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CFT_Test_Base.idl" - -#pragma ciao lem "Connector/CFT_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CFT_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn; -module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn; -#endif /* CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc deleted file mode 100644 index 0d248c5b0be..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CFT_Test_Base -l .. -o ../lib -u DDS CFT_Test_Connector" - -project(CFT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen CFT_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CFT_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CFT_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CFT_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CFT_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - CFT_Test_Connector.idl - } -} - -project(CFT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CFT_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CFT_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CFT_Test_ConnectorE.idl - } -} - -project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub - libs += CFT_Test_Base_stub CFT_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_Test_Connector_lem_stub - dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ConnectorEC.cpp - } - - Header_Files { - CFT_Test_ConnectorEC.h - CFT_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CFT_Test_ConnectorEC.inl - } -} - -project(CFT_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += CFT_Test_Connector_idl_gen CFT_Test_Base_stub - libs += CFT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_Test_Connector_stub - dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ConnectorC.cpp - } - - Header_Files { - CFT_Test_ConnectorC.h - CFT_Test_Connector_stub_export.h - } - - Inline_Files { - CFT_Test_ConnectorC.inl - } -} - -project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CFT_Test_Connector_lem_stub CFT_Test_Connector_stub CFT_Test_Base_stub - sharedname = CFT_Test_Connector_exec - libs += CFT_Test_Connector_stub CFT_Test_Connector_lem_stub CFT_Test_Base_stub CFT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_Connector_conn.cpp - } - - Header_Files { - CFT_Test_Connector_conn.h - CFT_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub - sharedname = CFT_Test_Connector_svnt - libs += CFT_Test_Connector_stub \ - CFT_Test_Connector_lem_stub \ - CFT_Test_Base_stub \ - CFT_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFT_Test_ConnectorS.cpp - CFT_Test_Connector_svnt.cpp - } - - Header_Files { - CFT_Test_ConnectorS.h - CFT_Test_Connector_svnt.h - CFT_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp deleted file mode 100644 index 74d797ad7dc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp +++ /dev/null @@ -1,419 +0,0 @@ - - - - CFTTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTTest_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFT_Test_CFTTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - TwoDim_CFT_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_CFTTwoDimensionalTestConn_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTTwoDimensionalTestConn_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_Test_Connector_exec - - - - - - - ThreeDim_CFT_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_CFTThreeDimensionalTestConn_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTThreeDimensionalTestConn_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_Test_Connector_exec - - - - - - - Component - ComponentNode - - - - - - - TwoDim_CFT_Test_Connector - ComponentNode - - - - - topic_name - - - tk_string - - - TwoDimensionalTopic - - - - - - - ThreeDim_CFT_Test_Connector - ComponentNode - - - - - topic_name - - - tk_string - - - ThreeDimensionalTopic - - - - - pull_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (x > %0) AND (x < %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - passive_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (x < %0) OR (x > %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - - - two_dim_get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - two_dim_get_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - three_dim_get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - three_dim_get_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - three_dim_read_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - three_dim_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - three_dim_get_filter_confit - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - three_dim_get_filter_config - false - SimplexReceptacle - - - - pull_observer_filter_config - true - Facet - - - - - - CFT_Test_Connector_exec - - - CFT_Test_Connector_exec - - - CFT_Test_Connector_svnt - - - CFT_Test_Connector_svnt - - - CFT_Test_Connector_stub - - - CFT_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl deleted file mode 100755 index 415d3a8df9d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Component.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp deleted file mode 100644 index bc767abfca1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp +++ /dev/null @@ -1,255 +0,0 @@ - - - - ReadGet_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ReadGet_Test_ReceiverConnectorImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - report_errors - - - tk_boolean - - - false - - - - - - - ReadGet_Test_ReceiverConnector - ReceiverNode - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - passive_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (x > %0) AND (x < %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - - - get_port_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_filter_config - false - SimplexReceptacle - - - - passive_observer_filter_config - true - Facet - - - - - - CFT_ReadGet_Test_Connector_exec - - - CFT_ReadGet_Test_Connector_exec - - - CFT_ReadGet_Test_Connector_svnt - - - CFT_ReadGet_Test_Connector_svnt - - - CFT_ReadGet_Test_Connector_stub - - - ReadGet_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl deleted file mode 100755 index 8a4460518c9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl +++ /dev/null @@ -1,214 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode" ); - -# 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; - -sub create_targets { - # naming service - $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; - $tg_naming->AddLibPath ('../ReadGet/lib'); - # daemon - for ($i = 0; $i < $nr_daemon; ++$i) { - $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; - $tg_daemons[$i]->AddLibPath ('../ReadGet/lib'); - } - # execution manager - $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - $tg_exe_man->AddLibPath ('../ReadGet/lib'); - # executor (plan_launcher) - $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - $tg_executor->AddLibPath ('../ReadGet/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 ('dance_locality_manager'); -} - - -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 = "$DANCE_ROOT/bin/dance_locality_manager"; - - $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 node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile -q"); - $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - if ($pl_status != 0) { - print "OK: dance_plan_launcher reported a problem <$pl_status>\n"; - kill_open_processes (); - } - else { - print STDERR "ERROR: dance_plan_launcher did not report an error\n"; - kill_open_processes (); - } - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl deleted file mode 100644 index f7d819efe29..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CFTLE_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL -#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CFTLE_Test_BaseSupport.h" -#pragma opendds typesupport "Base/CFTLE_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenEventTest" -#pragma DCPS_DATA_KEY "ContentFilteredTopicListenEventTest key" - -struct ContentFilteredTopicListenEventTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ContentFilteredTopicListenEventTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc deleted file mode 100644 index 59e839f1dc5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CFTLE_Test_Base_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CFTLE_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CFTLE_Test_Base.idl - } - - opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CFTLE_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl deleted file mode 100644 index 04395d584eb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file CFTLE_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_ -#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CFTLE_Test_Base.idl" - -#pragma ciao lem "Connector/CFTLE_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CFTLE_Test_BaseTypeSupport.idl" -#endif - -module CFTLE_Test -{ - module ::CCM_DDS::Typed < ::ContentFilteredTopicListenEventTest, ::ContentFilteredTopicListenEventTestSeq> ContentFilteredTopicListenEventTestConnector; -}; - -#endif /* CFTLE_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc deleted file mode 100644 index 3a5a0b192f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l .. -o ../lib -u DDS CFTLE_Test_Connector" - -project(DDS_CFTLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CFTLE_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CFTLE_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CFTLE_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CFTLE_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CFTLE_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - CFTLE_Test_Connector.idl - } -} - -project(DDS_CFTLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CFTLE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CFTLE_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CFTLE_Test_ConnectorE.idl - } -} - -project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub - libs += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CFTLE_Test_Connector_lem_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ConnectorEC.cpp - } - - Header_Files { - CFTLE_Test_ConnectorEC.h - CFTLE_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CFTLE_Test_ConnectorEC.inl - } -} - -project(DDS_CFTLE_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLE_Test_Connector_idl_gen DDS_CFTLE_Test_Base_stub - libs += DDS_CFTLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CFTLE_Test_Connector_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ConnectorC.cpp - } - - Header_Files { - CFTLE_Test_ConnectorC.h - CFTLE_Test_Connector_stub_export.h - } - - Inline_Files { - CFTLE_Test_ConnectorC.inl - } -} - -project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub - sharedname = DDS_CFTLE_Test_Connector_exec - libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_Connector_conn.cpp - } - - Header_Files { - CFTLE_Test_Connector_conn.h - CFTLE_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub - sharedname = DDS_CFTLE_Test_Connector_svnt - libs += DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Connector_lem_stub \ - DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ConnectorS.cpp - CFTLE_Test_Connector_svnt.cpp - } - - Header_Files { - CFTLE_Test_ConnectorS.h - CFTLE_Test_Connector_svnt.h - CFTLE_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl deleted file mode 100644 index ef595aa217d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CFTLE_Test_Connector.idl" - -module CFTLE_Test -{ - component Receiver - { - port ContentFilteredTopicListenEventTestConnector::DDS_Listen info_listen; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc deleted file mode 100644 index 5c52a76f4f3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_CFTLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CFTLE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - CFTLE_Test_Receiver.idl - } -} - -project(DDS_CFTLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CFTLE_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CFTLE_Test_ReceiverE.idl - } -} - -project(DDS_CFTLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLE_Test_Receiver_lem_gen DDS_CFTLE_Test_Receiver_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub - libs += Receiver_stub DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ReceiverEC.cpp - } - - Header_Files { - CFTLE_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CFTLE_Test_ReceiverEC.inl - } -} - -project(DDS_CFTLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLE_Test_Receiver_idl_gen DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_lem_gen - libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ReceiverC.cpp - } - - Header_Files { - CFTLE_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CFTLE_Test_ReceiverC.inl - } -} - -project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Receiver_stub \ - DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_Receiver_exec.cpp - } - - Header_Files { - CFTLE_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ - DDS_CFTLE_Test_Receiver_exec DDS_CFTLE_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ - Receiver_exec DDS_CFTLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_ReceiverS.cpp - CFTLE_Test_Receiver_svnt.cpp - } - - Header_Files { - CFTLE_Test_ReceiverS.h - CFTLE_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp deleted file mode 100644 index 44b10bf7e3d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp +++ /dev/null @@ -1,355 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CFTLE_Test_Receiver_exec.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define MIN_ITERATION 2 -#define MAX_ITERATION 5 - -#define SAMPLES_PER_KEY 2 - -namespace CIAO_CFTLE_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::CFTLE_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : ciao_context_ ( - ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_ (thread_id) - , samples_received_ (samples_received) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::ContentFilteredTopicListenEventTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - ++this->samples_received_; - ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenEventTest_Listener::on_one_data: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (info.instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (datum.iteration <= MIN_ITERATION || - datum.iteration > MAX_ITERATION ) - { - ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenEventTest_Listener::on_one_data: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::ContentFilteredTopicListenEventTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_listen_status_exec_i - */ - - info_listen_status_exec_i::info_listen_status_exec_i ( - ::CFTLE_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_listen_status_exec_i::~info_listen_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : keys_ (5) - , iterations_ (10) - , thread_id_listener_ (0, 0) - , samples_expected_ (keys_ * SAMPLES_PER_KEY) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::start (void) - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - // Component attributes and port operations. - - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_, - this->samples_received_), - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ())) - { - info_listen_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_listen_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_listen_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - - this->samples_expected_ = SAMPLES_PER_KEY * this->keys_; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CFTLE_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_listen_data (); - if (CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - " - "Error get reader connection.\n")); - } - } - - void - Receiver_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Start listening.\n")); - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLE_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h deleted file mode 100644 index a5d193bd04e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h +++ /dev/null @@ -1,189 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_ -#define CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_ - -#include /**/ "ace/pre.h" - -#include "CFTLE_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CFTLE_Test_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::CFTLE_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */ - - virtual - void on_one_data (const ::ContentFilteredTopicListenEventTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ContentFilteredTopicListenEventTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_; - Atomic_Long &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_listen_status_exec_i - */ - - class info_listen_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_status_exec_i ( - ::CFTLE_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_listen_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - - //@} - - private: - ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - ACE_Thread_ID thread_id_listener_; - - CORBA::Long samples_expected_; - Atomic_Long samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLE_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl deleted file mode 100644 index a7f807f0e64..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL -#define DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL - -#include "Connector/CFTLE_Test_Connector.idl" - -module CFTLE_Test -{ - component Sender - { - port ContentFilteredTopicListenEventTestConnector::DDS_Write info_write; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc deleted file mode 100644 index 6715e986b2d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CFTLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CFTLE_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CFTLE_Test_Sender.idl - } -} - -project(DDS_CFTLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CFTLE_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CFTLE_Test_SenderE.idl - } -} - -project(DDS_CFTLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLE_Test_Sender_lem_gen DDS_CFTLE_Test_Sender_stub \ - DDS_CFTLE_Test_Base_stub - libs += DDS_CFTLE_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_SenderEC.cpp - } - - Header_Files { - CFTLE_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CFTLE_Test_SenderEC.inl - } -} - -project(DDS_CFTLE_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLE_Test_Sender_idl_gen DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub - libs += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_SenderC.cpp - } - - Header_Files { - CFTLE_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CFTLE_Test_SenderC.inl - } -} - -project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CFTLE_Test_Sender_lem_stub DDS_CFTLE_Test_Sender_stub \ - DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_Sender_exec.cpp - } - - Header_Files { - CFTLE_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Sender_lem_stub \ - DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Connector_svnt DDS_CFTLE_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ - DDS_CFTLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLE_Test_SenderS.cpp - CFTLE_Test_Sender_svnt.cpp - } - - Header_Files { - CFTLE_Test_SenderS.h - CFTLE_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp deleted file mode 100644 index 0352ef020de..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp +++ /dev/null @@ -1,257 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "CFTLE_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_CFTLE_Test_Sender_Impl -{ - /** - * WriteTicker - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - ACE_NEW_THROW_EX (this->ticker_, - WriteTicker (*this), - CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write_one (void) - { - if (this->last_key_ != this->samples_.end ()) - { - try - { - ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ++this->last_key_->second->iteration; - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n", - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - //onto the next iteration - this->last_key_ = this->samples_.begin (); - while (this->last_key_ != this->samples_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - //next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->samples_.end ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - } - - - void - Sender_exec_i::start (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - ContentFilteredTopicListenEventTest *new_key = new ContentFilteredTopicListenEventTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CFTLE_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLE_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h deleted file mode 100644 index 23ebae100fa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h +++ /dev/null @@ -1,142 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_ -#define CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_ - -#include /**/ "ace/pre.h" - -#include "CFTLE_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_CFTLE_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * WriteTicker - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void write_one (void); - - //@} - - private: - ::CFTLE_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - WriteTicker *ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table samples_; - - Writer_Table::iterator last_key_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLE_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp deleted file mode 100644 index 521e7fb5cef..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp +++ /dev/null @@ -1,441 +0,0 @@ - - - - CFTLE_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLE_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLE_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CFTLE_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFTLE_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFTLE_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLE_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLE_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - CFTLE_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - CFTLE_Test - - - - - - CFTLE_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - CFTLE_Test - - - - - push_consumer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (iteration > %0) AND (iteration < %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_reader_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CFTLE_Test_Connector_exec - - - DDS_CFTLE_Test_Connector_exec - - - CFTLE_Test_Connector_svnt - - - DDS_CFTLE_Test_Connector_svnt - - - CFTLE_Test_Connector_stub - - - DDS_CFTLE_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl deleted file mode 100644 index 40911e517e4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Exception_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CFT_EXCEPTION_TEST_BASE_IDL -#define CFT_EXCEPTION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Exception_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Exception_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "CFTExceptionTest" -#pragma DCPS_DATA_KEY "CFTExceptionTest symbol" - -struct CFTExceptionTest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence CFTExceptionTestSeq; -#endif - -#endif /* CFT_EXCEPTION_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc deleted file mode 100644 index 11b3f8805fa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = CFT_Exception_Test_Base_stub - dynamicflags += CFT_EXCEPTION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CFT_EXCEPTION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CFT_Exception_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Exception_Test_Base.idl - } - - opendds_ts_flags += --export=CFT_EXCEPTION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Exception_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore deleted file mode 100644 index 6dc72fd9a88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Component_exec_export.h -/Component_lem_stub_export.h -/Component_stub_export.h -/Component_svnt_export.h -/Exception_Test_ComponentE.idl diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl deleted file mode 100644 index 232907f01c6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/Exception_Test_Connector.idl" - -module CFT_Exception_Test -{ - component CFTTestComponent - { - port CFTExceptionTestConn::DDS_Get getter; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc deleted file mode 100644 index 2abef71a064..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(CFT_Exception_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CFT_Exception_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - Exception_Test_Component.idl - } -} - -project(CFT_Exception_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += CFT_Exception_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Exception_Test_ComponentE.idl - } -} - -project(CFT_Exception_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_Exception_Test_Component_lem_gen CFT_Exception_Test_Component_stub \ - CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub - libs += Component_stub CFT_Exception_Test_Connector_stub \ - CFT_Exception_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ComponentEC.cpp - } - - Header_Files { - Exception_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - Exception_Test_ComponentEC.inl - } -} - -project(CFT_Exception_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += CFT_Exception_Test_Component_idl_gen CFT_Exception_Test_Connector_stub \ - CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_lem_gen - libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ComponentC.cpp - } - - Header_Files { - Exception_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - Exception_Test_ComponentC.inl - } -} - -project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Component_stub \ - CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub \ - CFT_Exception_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_Component_exec.cpp - } - - Header_Files { - Exception_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \ - CFT_Exception_Test_Component_exec CFT_Exception_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \ - Component_exec CFT_Exception_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ComponentS.cpp - Exception_Test_Component_svnt.cpp - } - - Header_Files { - Exception_Test_ComponentS.h - Exception_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp deleted file mode 100644 index beaf2f4956a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp +++ /dev/null @@ -1,109 +0,0 @@ -// -*- C++ -*- -#include "Exception_Test_Component_exec.h" - -namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CFT_Exception_Test::CCM_CFTTestComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_getter_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::test_set_query_parameters () - { - bool exception_caught = false; - try - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters: Test exception\n")); - ::DDS::StringSeq parameters; - parameters.length (2); - parameters[0] = CORBA::string_dup ("2"); - parameters[1] = CORBA::string_dup ("43"); - - this->filter_config_->set_filter_parameters (parameters); - } - catch (const ::CCM_DDS::InternalError&) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - " - "caught expected InternalErr exception.\n")); - exception_caught = true; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " - "Exception caught\n")); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " - "caught unknown exception\n")); - } - if (!exception_caught) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " - "Didn't catch the exprected exception\n")); - } - } - - void - Component_exec_i::ccm_activate (void) - { - this->filter_config_ = - this->context_->get_connection_getter_filter_config (); - this->test_set_query_parameters (); - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTTest_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h deleted file mode 100644 index f8367688ab0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "Exception_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual CFTTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_getter_status(void); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::CFT_Exception_Test::CCM_CFTTestComponent_Context_var context_; - ::CCM_DDS::ContentFilterSetting_var filter_config_; - - void - test_set_query_parameters (); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTTest_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl deleted file mode 100644 index dc039960236..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file Exception_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CFT_EXCEPTION_TEST_CONNECTOR_IDL_ -#define CFT_EXCEPTION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Exception_Test_Base.idl" - -#pragma ciao lem "Connector/Exception_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Exception_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::CFTExceptionTest, ::CFTExceptionTestSeq> CFTExceptionTestConn; -#endif /* CFT_EXCEPTION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc deleted file mode 100644 index 3f1aa68a9dd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p CFT_Exception_Test_Base -l .. -o ../lib -u DDS CFT_Exception_Test_Connector" - -project(CFT_Exception_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen CFT_Exception_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CFT_Exception_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CFT_Exception_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CFT_Exception_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CFT_Exception_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Exception_Test_Connector.idl - } -} - -project(CFT_Exception_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CFT_Exception_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CFT_Exception_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Exception_Test_ConnectorE.idl - } -} - -project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub - libs += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_Exception_Test_Connector_lem_stub - dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ConnectorEC.cpp - } - - Header_Files { - Exception_Test_ConnectorEC.h - Exception_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Exception_Test_ConnectorEC.inl - } -} - -project(CFT_Exception_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += CFT_Exception_Test_Connector_idl_gen CFT_Exception_Test_Base_stub - libs += CFT_Exception_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_Exception_Test_Connector_stub - dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ConnectorC.cpp - } - - Header_Files { - Exception_Test_ConnectorC.h - Exception_Test_Connector_stub_export.h - } - - Inline_Files { - Exception_Test_ConnectorC.inl - } -} - -project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub - sharedname = CFT_Exception_Test_Connector_exec - libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Base_stub CFT_Exception_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_Connector_conn.cpp - } - - Header_Files { - Exception_Test_Connector_conn.h - Exception_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub - sharedname = CFT_Exception_Test_Connector_svnt - libs += CFT_Exception_Test_Connector_stub \ - CFT_Exception_Test_Connector_lem_stub \ - CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Exception_Test_ConnectorS.cpp - Exception_Test_Connector_svnt.cpp - } - - Header_Files { - Exception_Test_ConnectorS.h - Exception_Test_Connector_svnt.h - Exception_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp deleted file mode 100644 index 66b371dbb3b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp +++ /dev/null @@ -1,193 +0,0 @@ - - - - CFTTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTTest_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFT_Exception_Test_CFTTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - CFT_Exception_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_CFTExceptionTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTExceptionTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_Exception_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_Exception_Test_Connector_exec - - - - - - - - Component - ComponentNode - - - - - - - CFT_Exception_Test_Connector - ComponentNode - - - - - topic_name - - - tk_string - - - ExceptionTopic - - - - - - - getter_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - getter_filter_config - false - SimplexReceptacle - - - - pull_consumer_filter_config - true - Facet - - - - - - CFT_Exception_Test_Connector_exec - - - CFT_Exception_Test_Connector_exec - - - CFT_Exception_Test_Connector_svnt - - - CFT_Exception_Test_Connector_svnt - - - CFT_Exception_Test_Connector_stub - - - CFT_Exception_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl deleted file mode 100755 index 4b792aab84f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Component.ior", "Sender.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode", "SenderNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore deleted file mode 100644 index ff64ba3a619..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/ReadGet_StarterE.idl -/ReadGet_Starter_exec_export.h -/ReadGet_Starter_lem_stub_export.h -/ReadGet_Starter_stub_export.h -/ReadGet_Starter_svnt_export.h -/ReadGet_Test_Base.cxx -/ReadGet_Test_Base.h -/ReadGet_Test_BasePlugin.cxx -/ReadGet_Test_BasePlugin.h -/ReadGet_Test_BaseSupport.cxx -/ReadGet_Test_BaseSupport.h -/ReadGet_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl deleted file mode 100644 index b61d30c7687..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file ReadGet_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERYCONDITION_STARTER_IDL -#define QUERYCONDITION_STARTER_IDL - -#pragma ciao lem "Base/ReadGet_StarterE.idl" - -interface ReadGetStarter -{ - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface ReadGetRestarter -{ - void restart_write (); -}; - -#endif /* QUERYCONDITION_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc deleted file mode 100644 index 806cd6640ad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(CFT_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=ReadGet_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I.. - - IDL_Files { - ReadGet_Starter.idl - } -} - -project(CFT_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += CFT_ReadGet_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ReadGet_StarterE.idl - } -} - -project(CFT_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_ReadGet_Starter_lem_gen CFT_ReadGet_Starter_stub - libs += CFT_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_ReadGet_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterEC.cpp - } - - Header_Files { - ReadGet_StarterEC.h - ReadGet_Starter_lem_stub_export.h - } - - Inline_Files { - ReadGet_StarterEC.inl - } -} - -project(CFT_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base { - after += CFT_ReadGet_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_ReadGet_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterC.cpp - } - - Header_Files { - ReadGet_StarterC.h - ReadGet_Starter_stub_export.h - } - - Inline_Files { - ReadGet_StarterC.inl - } -} - - -project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub - sharedname = CFT_ReadGet_Starter_svnt - libs += CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterS.cpp - ReadGet_Starter_svnt.cpp - } - - Header_Files { - ReadGet_StarterS.h - ReadGet_Starter_svnt.h - ReadGet_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl deleted file mode 100644 index 7fadf380e9f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file ReadGet_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_BASE_IDL -#define QUERY_CONDITION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h" -#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTest" -#pragma DCPS_DATA_KEY "QueryConditionTest symbol" - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc deleted file mode 100644 index 9feeba0ab26..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = CFT_ReadGet_Test_Base_stub - dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - ReadGet_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - ReadGet_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore deleted file mode 100644 index 652f3acd8d5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/ReadGet_Test_ConnectorE.idl -/ReadGet_Test_Connector_conn.cpp -/ReadGet_Test_Connector_conn.h -/ReadGet_Test_Connector_conn_export.h -/ReadGet_Test_Connector_lem_stub_export.h -/ReadGet_Test_Connector_stub_export.h -/ReadGet_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl deleted file mode 100644 index 7a280e41771..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file ReadGet_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/ReadGet_Test_Base.idl" - -#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/ReadGet_Test_BaseTypeSupport.idl" -#endif - -module ReadGet_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; -}; - -#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc deleted file mode 100644 index 1b1e27f6218..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector" - -project(CFT_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen CFT_ReadGet_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - ReadGet_Test_Connector.idl - } -} - -project(CFT_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CFT_ReadGet_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - ReadGet_Test_ConnectorE.idl - } -} - -project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += CFT_ReadGet_Test_Connector_lem_gen CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Base_stub - libs += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_ReadGet_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorEC.cpp - } - - Header_Files { - ReadGet_Test_ConnectorEC.h - ReadGet_Test_Connector_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_ConnectorEC.inl - } -} - -project(CFT_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_Test_Base_stub - libs += CFT_ReadGet_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CFT_ReadGet_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorC.cpp - } - - Header_Files { - ReadGet_Test_ConnectorC.h - ReadGet_Test_Connector_stub_export.h - } - - Inline_Files { - ReadGet_Test_ConnectorC.inl - } -} - -project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Base_stub - sharedname = CFT_ReadGet_Test_Connector_exec - libs += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Connector_conn.cpp - } - - Header_Files { - ReadGet_Test_Connector_conn.h - ReadGet_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_exec \ - CFT_ReadGet_Test_Connector_stub - sharedname = CFT_ReadGet_Test_Connector_svnt - libs += CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorS.cpp - ReadGet_Test_Connector_svnt.cpp - } - - Header_Files { - ReadGet_Test_ConnectorS.h - ReadGet_Test_Connector_svnt.h - ReadGet_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README deleted file mode 100644 index 3f742b997d4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README +++ /dev/null @@ -1,77 +0,0 @@ - - -This test will test whether the ContentFilteredTopic -on the DDS_Get and DDS_Read port works and that these ContentFilteredTopics are -not shared among the ports. - -The sender writes a number of samples to DDS and informs the receiver the amount -of samples written. The samples will stay in DDS (KEEP_ALL). -The receiver than starts reading the samples. - -This test will also test whether the parameters can be changed and if so, whether -they were changed correctly. - -The Sender writes a number of keys (adjustable by deployment plan) each with -20 iterations (fixed) to DDS. - -#The test consists of three runs: -1. No samples are written. Just test whether the correct exception is thrown and - that the filters are set correctly. -2. The sender writes no. keys * 20 iterations to DDS and informs the Receiver - that these samples were written. Once read, the Receiver will set a new set of - query parameters. After that it'll inform the Sender that the next bunch of - samples can be written to DDS. -3. Once written, the sender again will inform the Receiver that the samples were - written upon which the Receiver will start reading. - -#The following actions are taken by the Receiver component: -1. Each run, it'll poll whether the last sample is received. -2. If received, it performs the following tasks: - a. Invoke get_one on the getter of the Getter and get sample by sample. - b. Invoke the read_all on the reader of the Getter port. - c. Invoke the read_all on the reader of the Reader port. -3. Everytime a unexpected sample is received an error message is written. -4. Afterwards a status message is shown whether the correct number of samples - were read. - -#Queries: -The queries are set by the deployment plan. -The query expression for the getter (pull_observer_filter) looks like this: - ( (iteration > %0) AND (iteration < %1) ) -The query expression for the reader (passive_observer_filter) looks like this: - ( (iteration < %0) OR (iteration > %1) ) - -The parameters during the second run are 2 and 5 -The parameters during the third run are 22 and 34 - -#Regarding the received number of samples: - -- Get actions -The Getter port should receive 2 samples during the second run and 11 during the -third run but since all samples of the last key are read when polling for the -latest sample in DDS and the Getter will only get unread samples, the getter -should get (#keys - 1) * (2 + 11). - -- Read actions -* On the reader port -The amount of data read on the reader port depends on the number of iterations -written. - -Filtered out during the second run : 2, 3, 4 and 5 (4 samples) -Filtered out during the third run : 22-34 (13 samples) - -Since the reader also reads read samples, the samples read during the second run -will also be read during the third run. So the total number of samples on the -Reader port will be : - ((this->iterations_ - 4) * this->keys_ * 2) + - ((this->iterations_ - 13) * this->keys_) - -There'll be also a read action on the Getter port. This'll result in the same amount -of samples as on the Getter port but the samples of the second run will be read -twice and we don't need to decrement the number of keys with one since the Reader -reads also read samples. The following formule determines the number of samples on -the Getter port: - Filtered in during the second run : 3 and 4 (2 samples) - Filtered in during the third run : 22-34 (11 samples) - - ((2 + 2 + 11) * this->keys_); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore deleted file mode 100644 index 0adde6366f3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/ReadGet_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl deleted file mode 100644 index b9e00adc9fa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/ReadGet_Test_Connector.idl" -#include "Base/ReadGet_Starter.idl" - -module ReadGet_Test -{ - component Receiver - { - port QueryConditionTestConnector::DDS_Get get_port; - - port QueryConditionTestConnector::DDS_Read read_port; - - provides ReadGetStarter reader_start; - uses ReadGetRestarter writer_restart; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc deleted file mode 100644 index 6f8f07619f3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(CFT_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CFT_ReadGet_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - ReadGet_Test_Receiver.idl - } -} - -project(CFT_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += CFT_ReadGet_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ReadGet_Test_ReceiverE.idl - } -} - -project(CFT_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_ReadGet_Test_Receiver_lem_gen CFT_ReadGet_Test_Receiver_stub \ - CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Starter_stub - libs += Receiver_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverEC.cpp - } - - Header_Files { - ReadGet_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_ReceiverEC.inl - } -} - -project(CFT_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += CFT_ReadGet_Test_Receiver_idl_gen CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_lem_gen \ - CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub - libs += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverC.cpp - } - - Header_Files { - ReadGet_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - ReadGet_Test_ReceiverC.inl - } -} - -project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Receiver_stub \ - CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Receiver_exec.cpp - } - - Header_Files { - ReadGet_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ - CFT_ReadGet_Test_Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Starter_stub \ - CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ - Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \ - CFT_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverS.cpp - ReadGet_Test_Receiver_svnt.cpp - } - - Header_Files { - ReadGet_Test_ReceiverS.h - ReadGet_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp deleted file mode 100644 index 600cece9081..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ /dev/null @@ -1,1004 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ReadGet_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY_GETTER_PORT "( (iteration > %0) AND (iteration < %1) )" -#define QUERY_READER_PORT "( (iteration < %0) OR (iteration > %1) )" - -// initial values set in deploymentplan as well. -// Need to be the same -#define ITER1_VALUE1 "2" -#define ITER1_VALUE2 "5" - -#define ITER2_VALUE1 "22" -#define ITER2_VALUE2 "34" - -// Samples received on the getter port: -// 2 during the first run. -// 12 during the second run -// Beware that the last key (key no 5) is -// not read by the getter since this one is -// already read during check_last -// (see constructor Receiver_exec_i). -#define SAMPLES_PER_KEY_GETTER (2 + 11) - -// Samples received on the Reader port depend on the -// number of iterations send. The sender informs the -// Receiver about this number by invoking set_reader_properties. -// The number of expected samples on the receiver port are set -// when the iterations are set (see Receiver_exec_i::iterations). -// Besides this, this test also reads on the reader port. This'll -// result in the same amount of samples of the read on the getter -// port. - -namespace CIAO_ReadGet_Test_Receiver_Impl -{ - /** - * read_action_Generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, - int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Checking if last sample ") - ACE_TEXT ("is available in DDS...\n"))); - if (this->run_ == 1 || this->callback_.check_last ()) - { - this->callback_.run (this->run_); - } - return 0; - } - - /** - * Facet Executor Implementation Class: get_port_status_exec_i - */ - - get_port_status_exec_i::get_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - get_port_status_exec_i::~get_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: read_port_status_exec_i - */ - - read_port_status_exec_i::read_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - read_port_status_exec_i::~read_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::ReadGetStarter - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read (::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (20), - keys_ (5), - has_run_ (false), - current_iter_value1_ (ACE_OS::atoi (ITER1_VALUE1)), - current_iter_value2_ (ACE_OS::atoi (ITER1_VALUE2)), - ticker_ (0), - samples_expected_reader_ (0), - samples_received_reader_ (0), - samples_expected_getter_ (0), - samples_received_getter_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last () - { - bool retvalue = false; - try - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader = - this->ciao_context_->get_connection_get_port_data (); - if (::CORBA::is_nil (get_reader.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_last - ") - ACE_TEXT ("Reader of DDS_Get is nil.\n"))); - return false; - } - QueryConditionTest queryfiltertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - queryfiltertest_info.symbol = CORBA::string_dup (key); - get_reader->read_one_last ( - queryfiltertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_last - ") - ACE_TEXT ("last iteration <%d> - <%d>\n"), - queryfiltertest_info.iteration, - this->current_iter_value2_ - 1)); - retvalue = queryfiltertest_info.iteration >= this->current_iter_value2_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - retvalue = false; - } - catch (const ::CCM_DDS::NonExistent &) - { - retvalue = false; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - retvalue = false; - } - return retvalue; - } - - // Supported operations and attributes. - void - Receiver_exec_i::check_iter_on_reader_port (const QueryConditionTest & sample) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL ON READER PORT : ") - ACE_TEXT ("sample received for <%C>: iteration <%u>\n"), - sample.symbol.in (), - sample.iteration)); - if (sample.iteration > this->current_iter_value1_ && - sample.iteration < this->current_iter_value2_ && - sample.iteration > 20) //don't count the first run... - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL ON READER PORT : ") - ACE_TEXT ("Didn't expect samples between ") - ACE_TEXT ("%d and %d\n"), - this->current_iter_value1_, - this->current_iter_value2_)); - } - } - - void - Receiver_exec_i::check_iter_on_getter_port (const QueryConditionTest & sample, - const char * test) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL ON GETTER PORT : ") - ACE_TEXT ("sample received for <%C>: iteration <%u>\n"), - test, - sample.symbol.in (), - sample.iteration)); - if (sample.iteration <= ACE_OS::atoi (ITER1_VALUE1)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ") - ACE_TEXT ("Didn't expect samples with iterations ") - ACE_TEXT ("<= %d\n"), - test, - this->current_iter_value1_)); - } - if (sample.iteration > this->current_iter_value2_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ") - ACE_TEXT ("Didn't expect samples with iterations ") - ACE_TEXT ("> %d\n"), - test, - this->current_iter_value2_)); - } - } - - void - Receiver_exec_i::read_all_on_reader_port (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var read_reader = - this->ciao_context_->get_connection_read_port_data (); - - if (::CORBA::is_nil (read_reader)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver_exec_i::read_all_on_reader_port - ") - ACE_TEXT ("ERROR: No Reader on Reader port\n"))); - return; - } - QueryConditionTestSeq queryfiltertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - read_reader->read_all (queryfiltertest_info_seq, readinfo_seq); - if (queryfiltertest_info_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_reader_port : ") - ACE_TEXT ("No samples available in Reader!\n"))); - } - for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) - { - this->check_iter_on_reader_port (queryfiltertest_info_seq[it]); - } - this->samples_received_reader_ += queryfiltertest_info_seq.length (); - } - - void - Receiver_exec_i::read_all_on_getter_port (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader = - this->ciao_context_->get_connection_get_port_data (); - - if (::CORBA::is_nil (get_reader)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::read_all_on_getter_port - ") - ACE_TEXT ("No Reader on Getter port\n"))); - return; - } - QueryConditionTestSeq queryfiltertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - get_reader->read_all (queryfiltertest_info_seq, readinfo_seq); - if (queryfiltertest_info_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_getter_port : ") - ACE_TEXT ("No samples available in Reader!\n"))); - } - for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) - { - this->check_iter_on_getter_port (queryfiltertest_info_seq[it], "READ"); - } - this->samples_received_reader_ += queryfiltertest_info_seq.length (); - } - - void - Receiver_exec_i::get_all_on_getter_port (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - - if (::CORBA::is_nil (get_getter)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") - ACE_TEXT ("No Getter on Getter port\n"))); - return; - } - // Set time_out on getter - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - get_getter->time_out (to); - - QueryConditionTest_var qf_info; - ::CCM_DDS::ReadInfo readinfo; - CORBA::Boolean result = get_getter->get_one (qf_info.out (), readinfo); - if (result) - { - if (ACE_OS::strlen (qf_info->symbol.in ()) == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") - ACE_TEXT ("Name of key seems to be empty-> bailing out\n"))); - return; - } - this->check_iter_on_getter_port (*qf_info, "GET"); - ++this->samples_received_getter_; - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") - ACE_TEXT ("time out when retrieving ") - ACE_TEXT ("first sample.\n"))); - } - while (result) - { - result = get_getter->get_one (qf_info.out (), readinfo); - if (result) - { - this->check_iter_on_getter_port (*qf_info, "GET"); - ++this->samples_received_getter_; - } - } - } - - void - Receiver_exec_i::test_all () - { - const char * test = "GET ALL"; - try - { - get_all_on_getter_port (); - ACE_DEBUG ((LM_DEBUG, "==================================" - "==================================\n")); - - test = "READ ALL GETTER"; - read_all_on_getter_port (); - ACE_DEBUG ((LM_DEBUG, "==================================" - "==================================\n")); - - test = "READ ALL READER"; - read_all_on_reader_port (); - ACE_DEBUG ((LM_DEBUG, "==================================" - "==================================\n")); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - test, - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - test, - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception (test); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::check_filter () - { - this->check_filter_getter (); - this->check_filter_reader (); - } - - void - Receiver_exec_i::check_filter_getter (void) - { - ::CCM_DDS::QueryFilter_var filter; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter - ") - ACE_TEXT ("checking filter\n"))); - - try - { - ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - if (::CORBA::is_nil (get_getter.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to get getter interface\n"))); - throw ::CCM_DDS::InternalError (); - } - CORBA::Object_var cmp = get_getter->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to get component interface\n"))); - throw ::CCM_DDS::InternalError (); - } - ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn = - ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to narrow connector interface\n"))); - throw ::CCM_DDS::InternalError (); - } - - filter = conn->pull_observer_filter (); - if (!filter) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Filter is nil\n"))); - return; - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Exception caught\n"))); - return; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("caught unknown exception\n"))); - return; - } - - //check query - bool error = false; - ::CORBA::String_var expression = filter->expression.in (); - if (ACE_OS::strcmp (expression.in (), QUERY_GETTER_PORT) != 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected query when retrieving filter: ") - ACE_TEXT ("expected <%C> - received <%C>\n"), - QUERY_GETTER_PORT, expression.in ())); - error = true; - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected number of parameters: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ()); - if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected param value: ") - ACE_TEXT ("expected <%d> - received <%C>\n"), - this->current_iter_value1_, - param.in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ()); - if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected param value: ") - ACE_TEXT ("expected <%d> - received <%C>\n"), - this->current_iter_value2_, - param.in ())); - error = true; - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter - ") - ACE_TEXT ("Passed check_filter test.\n"))); - } - } - - void - Receiver_exec_i::check_filter_reader (void) - { - ::CCM_DDS::QueryFilter_var filter; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter - ") - ACE_TEXT ("checking filter\n"))); - - try - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_read_port_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to get getter interface\n"))); - throw ::CCM_DDS::InternalError (); - } - CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to get component interface\n"))); - throw ::CCM_DDS::InternalError (); - } - ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn = - ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unable to narrow connector interface\n"))); - throw ::CCM_DDS::InternalError (); - } - - filter = conn->passive_observer_filter (); - if (!filter) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Filter is nil\n"))); - return; - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Exception caught\n"))); - return; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("caught unknown exception\n"))); - return; - } - - //check query - bool error = false; - ::CORBA::String_var expression = ::CORBA::string_dup (filter->expression.in ()); - if (ACE_OS::strcmp (expression.in (), QUERY_READER_PORT) != 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected query when retrieving filter: ") - ACE_TEXT ("expected <%C> - received <%C>\n"), - QUERY_READER_PORT, expression.in ())); - error = true; - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected number of parameters: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ()); - if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected param value: ") - ACE_TEXT ("expected <%d> - received <%C>\n"), - this->current_iter_value1_, - param.in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ()); - if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter - ") - ACE_TEXT ("Unexpected param value: ") - ACE_TEXT ("expected <%d> - received <%C>\n"), - this->current_iter_value2_, - param.in ())); - error = true; - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter - ") - ACE_TEXT ("Passed check_filter test.\n"))); - } - } - - void - Receiver_exec_i::test_set_query_parameters () - { - try - { - ::CCM_DDS::ContentFilterSetting_var get_filter_setting = - this->ciao_context_->get_connection_get_port_filter_config (); - if (::CORBA::is_nil (get_filter_setting.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") - ACE_TEXT ("Filter config interface for Getter port is nil.\n"))); - throw ::CCM_DDS::InternalError (); - } - ::CCM_DDS::ContentFilterSetting_var read_filter_setting = - this->ciao_context_->get_connection_read_port_filter_config (); - if (::CORBA::is_nil (read_filter_setting.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") - ACE_TEXT ("Filter config interface for Reader port is nil.\n"))); - throw ::CCM_DDS::InternalError (); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_set_query_parameters: Set parameters\n"))); - ::DDS::StringSeq parameters; - parameters.length (2); - parameters[0] = ::CORBA::string_dup (ITER2_VALUE1); - parameters[1] = ::CORBA::string_dup (ITER2_VALUE2); - get_filter_setting->set_filter_parameters (parameters); - read_filter_setting->set_filter_parameters (parameters); - - this->current_iter_value1_ = ACE_OS::atoi (ITER2_VALUE1); - this->current_iter_value2_ = ACE_OS::atoi (ITER2_VALUE2); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("DONE Receiver_exec_i::test_set_query_parameters\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") - ACE_TEXT ("Exception caught\n"))); - return; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") - ACE_TEXT ("caught unknown exception\n"))); - return; - } - } - - void - Receiver_exec_i::start_read (CORBA::UShort run) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this, run), - ::CORBA::INTERNAL ()); - - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to schedule Timer\n"))); - } - } - - void - Receiver_exec_i::run (CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - - ReadGetRestarter_var restarter = this->ciao_context_->get_connection_writer_restart (); - if (::CORBA::is_nil (restarter.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::run - ") - ACE_TEXT ("Unable to start run since restarter ") - ACE_TEXT ("is nil.\n"))); - return; - } - - this->has_run_ = true; - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::run - ") - ACE_TEXT ("Starting run number <%d>\n"), - run)); - switch (run) - { - case 1: - { - check_filter (); - restarter->restart_write (); - } - break; - case 2: - { - test_all (); - check_filter (); - test_set_query_parameters (); - restarter->restart_write (); - } - break; - case 3: - { - test_all (); - check_filter (); - } - break; - } - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - // during first iteration, 2,3,4 and 5 are filtered out - // during the second iteration 22-34 are fitered out but the - // iterations of the first run are also received during the - // second run - // The last addition is from the read action on the getter port. - // During the first run, two samples are received. The second run - // includes the two samples from the first run and 11 samples (22-34) - // from the second run. - this->samples_expected_reader_ = - ((this->iterations_ - 4) * this->keys_ * 2) + - ((this->iterations_ - 13) * this->keys_) + - ((2 + 2 + 11) * this->keys_); - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - this->samples_expected_getter_ = (keys_ - 1) * SAMPLES_PER_KEY_GETTER; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_get_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ())) - { - get_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - get_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_get_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_get_port_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_read_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ())) - { - read_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - read_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_read_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_read_port_status_.in ()); - } - - ::CCM_ReadGetStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReadGetStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_ReadGetStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_reader_ != this->samples_expected_reader_) - { - ACE_ERROR ((LM_ERROR, "ERROR: READGET READER: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_reader_, - this->samples_received_reader_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "READGET READER: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_reader_, - this->samples_received_reader_)); - } - if (this->samples_received_getter_ != this->samples_expected_getter_) - { - ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_getter_, - this->samples_received_getter_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "READGET GETTER: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_getter_, - this->samples_received_getter_)); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h deleted file mode 100644 index 424abbe32c5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ /dev/null @@ -1,256 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_ -#define CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_ - -#include /**/ "ace/pre.h" - -#include "ReadGet_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ReadGet_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * read_action_Generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - - }; - - /** - * Provider Executor Implementation Class: get_port_status_exec_i - */ - - class get_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - get_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx); - virtual ~get_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: read_port_status_exec_i - */ - - class read_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - read_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx); - virtual ~read_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_ReadGetStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from ReadGetStarter. */ - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - - virtual - void start_read (::CORBA::UShort run); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_read_port_status (void); - - virtual ::CCM_ReadGetStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void iterations (::CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - bool check_last (); - void start_read (CORBA::UShort run); - void run (CORBA::UShort run); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_; - ::CCM_ReadGetStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort keys_; - bool has_run_; - - int current_iter_value1_; - int current_iter_value2_; - - read_action_Generator *ticker_; - - CORBA::ULong samples_expected_reader_; - CORBA::ULong samples_received_reader_; - CORBA::ULong samples_expected_getter_; - CORBA::ULong samples_received_getter_; - - //@} - - //@{ - /** User defined private operations. */ - void test_all (void); - void read_all_on_getter_port (void); - void get_all_on_getter_port (void); - void read_all_on_reader_port (void); - void check_iter_on_getter_port (const QueryConditionTest & sample, - const char * test); - void check_iter_on_reader_port (const QueryConditionTest & sample); - - void check_filter (void); - void check_filter_reader (void); - void check_filter_getter (void); - void test_set_query_parameters (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl deleted file mode 100644 index 7c4c9a22ae9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TEST_SENDER_IDL - -#include "Connector/ReadGet_Test_Connector.idl" -#include "Base/ReadGet_Starter.idl" - -module ReadGet_Test -{ - component Sender - { - port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener sender_connector_status; - - uses ReadGetStarter start_reader; - provides ReadGetRestarter restart_writer; - - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc deleted file mode 100644 index f0cd858c212..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(CFT_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - ReadGet_Test_Sender.idl - } -} - -project(CFT_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += CFT_ReadGet_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - ReadGet_Test_SenderE.idl - } -} - -project(CFT_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_ReadGet_Test_Sender_lem_gen CFT_ReadGet_Test_Sender_stub \ - CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub - libs += CFT_ReadGet_Test_Base_stub Sender_stub CFT_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderEC.cpp - } - - Header_Files { - ReadGet_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_SenderEC.inl - } -} - -project(CFT_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += CFT_ReadGet_Test_Sender_idl_gen CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_stub CFT_CFT_ReadGet_Starter_stub \ - CFT_CFT_ReadGet_Starter_lem_stub - libs += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderC.cpp - } - - Header_Files { - ReadGet_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - ReadGet_Test_SenderC.inl - } -} - -project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += CFT_ReadGet_Test_Sender_lem_stub CFT_ReadGet_Test_Sender_stub \ - CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub \ - CFT_ReadGet_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Sender_exec.cpp - } - - Header_Files { - ReadGet_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Sender_lem_stub \ - CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Connector_svnt CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \ - CFT_ReadGet_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ - CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Starter_stub \ - CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderS.cpp - ReadGet_Test_Sender_svnt.cpp - } - - Header_Files { - ReadGet_Test_SenderS.h - ReadGet_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp deleted file mode 100644 index 15937591fce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ReadGet_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define ITERATIONS 20 - -namespace CIAO_ReadGet_Test_Sender_Impl -{ - /** - * WriteHandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::ReadGet_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback) - : ciao_context_ ( - ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::ReadGetRestarter - - void - restart_writer_exec_i::restart_write (void) - { - this->callback_.restart (); - } - - /** - * Component Executor Implementation Class: ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - , started_ (false) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->started_ = true; - this->callback_.get_started (); - } - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (ITERATIONS) - , run_ (1) - , wh_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Component attributes and port operations. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_ReadGetRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReadGetRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_ReadGetRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_sender_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - delete this->wh_; - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - CORBA::INTERNAL ()); - this->reactor ()->notify (this->wh_); - } - - void - Sender_exec_i::start (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ReadGetStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (::CORBA::is_nil (starter.in ()) || - ::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender_exec_i::start - ") - ACE_TEXT ("Unable to start the reader\n"))); - return; - } - starter->set_reader_properties (this->keys_, this->iterations_); - - if (this->run_ > 1) - { - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key.symbol = CORBA::string_dup(key); - CORBA::UShort iter = 1; - if (this->run_ == 3) - { - iter = this->iterations_ + 1; - } - while (iter < (this->run_ - 1) * this->iterations_ + 1) - { - new_key.iteration = iter; - writer->write_one (new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - key, iter)); - ++iter; - } - } - ACE_OS::sleep (1); - } - starter->start_read (this->run_); - } - - void - Sender_exec_i::get_started (void) - { - try - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - CORBA::INTERNAL ()); - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); - } - } - - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - delete this->wh_; - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h deleted file mode 100644 index 48723c18067..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ /dev/null @@ -1,195 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_ -#define CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_ - -#include /**/ "ace/pre.h" - -#include "ReadGet_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ReadGet_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * WriteHandler - */ - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_ReadGetRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::ReadGet_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from ReadGetRestarter. */ - - virtual - void restart_write (void); - //@} - - private: - ::ReadGet_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i & callback_; - }; - - /** - * Component Executor Implementation Class: ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - bool started_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_ReadGetRestarter_ptr - get_restart_writer (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_sender_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void start (void); - void restart (void); - //@} - - private: - ::ReadGet_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_ReadGetRestarter_var ciao_restart_writer_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort run_; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp deleted file mode 100644 index a972b294dd1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp +++ /dev/null @@ -1,622 +0,0 @@ - - - - ReadGet_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ReadGet_Test_ReceiverConnectorImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_exec - - - - - - ReadGet_Test_ReceiverConnectorImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFT_ReadGet_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - ReadGet_Test_SenderConnector - SenderNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - - ReadGet_Test_ReceiverConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - pull_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (iteration > %0) AND (iteration < %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - passive_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (iteration < %0) OR (iteration > %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 8 - - - - - - - read_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - get_port_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - - get_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - get_port_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_filter_config - false - SimplexReceptacle - - - - pull_observer_filter_config - true - Facet - - - - - - read_port_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_filter_config - false - SimplexReceptacle - - - - passive_observer_filter_config - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - sender_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - sender_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CFT_ReadGet_Test_Connector_exec - - - CFT_ReadGet_Test_Connector_exec - - - CFT_ReadGet_Test_Connector_svnt - - - CFT_ReadGet_Test_Connector_svnt - - - CFT_ReadGet_Test_Connector_stub - - - ReadGet_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml deleted file mode 100644 index b9cba6277a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 37e7ff8dec9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 -s\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/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl deleted file mode 100644 index da7e51836c0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CFTLS_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL -#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CFTLS_Test_BaseSupport.h" -#pragma opendds typesupport "Base/CFTLS_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenStateTest" -#pragma DCPS_DATA_KEY "ContentFilteredTopicListenStateTest key" - -struct ContentFilteredTopicListenStateTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ContentFilteredTopicListenStateTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc deleted file mode 100644 index 5b30e442ccf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CFTLS_Test_Base_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CFTLS_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CFTLS_Test_Base.idl - } - - opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CFTLS_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl deleted file mode 100644 index 84dbf35b5a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file CFTLS_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ -#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/CFTLS_Test_Base.idl" - -#pragma ciao lem "Connector/CFTLS_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/CFTLS_Test_BaseTypeSupport.idl" -#endif - -module CFTLS_Test -{ - module ::CCM_DDS::Typed < ::ContentFilteredTopicListenStateTest, ::ContentFilteredTopicListenStateTestSeq> ContentFilteredTopicListenStateTestConnector; -}; - -#endif /* CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc deleted file mode 100644 index 8ac8d9af7a9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l .. -o ../lib -u DDS CFTLS_Test_Connector" - -project(DDS_CFTLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CFTLS_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CFTLS_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CFTLS_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CFTLS_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CFTLS_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - CFTLS_Test_Connector.idl - } -} - -project(DDS_CFTLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CFTLS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CFTLS_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - CFTLS_Test_ConnectorE.idl - } -} - -project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub - libs += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CFTLS_Test_Connector_lem_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ConnectorEC.cpp - } - - Header_Files { - CFTLS_Test_ConnectorEC.h - CFTLS_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CFTLS_Test_ConnectorEC.inl - } -} - -project(DDS_CFTLS_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLS_Test_Connector_idl_gen DDS_CFTLS_Test_Base_stub - libs += DDS_CFTLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_CFTLS_Test_Connector_stub - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ConnectorC.cpp - } - - Header_Files { - CFTLS_Test_ConnectorC.h - CFTLS_Test_Connector_stub_export.h - } - - Inline_Files { - CFTLS_Test_ConnectorC.inl - } -} - -project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub - sharedname = DDS_CFTLS_Test_Connector_exec - libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_Connector_conn.cpp - } - - Header_Files { - CFTLS_Test_Connector_conn.h - CFTLS_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub - sharedname = DDS_CFTLS_Test_Connector_svnt - libs += DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Connector_lem_stub \ - DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ConnectorS.cpp - CFTLS_Test_Connector_svnt.cpp - } - - Header_Files { - CFTLS_Test_ConnectorS.h - CFTLS_Test_Connector_svnt.h - CFTLS_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl deleted file mode 100644 index c0a22c26b01..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CFTLS_Test_Connector.idl" - -module CFTLS_Test -{ - component Receiver - { - port ContentFilteredTopicListenStateTestConnector::DDS_StateListen info_state; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc deleted file mode 100644 index f881b671225..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(DDS_CFTLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_CFTLS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - CFTLS_Test_Receiver.idl - } -} - -project(DDS_CFTLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CFTLS_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CFTLS_Test_ReceiverE.idl - } -} - -project(DDS_CFTLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLS_Test_Receiver_lem_gen DDS_CFTLS_Test_Receiver_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub - libs += Receiver_stub DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ReceiverEC.cpp - } - - Header_Files { - CFTLS_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CFTLS_Test_ReceiverEC.inl - } -} - -project(DDS_CFTLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLS_Test_Receiver_idl_gen DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_lem_gen - libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ReceiverC.cpp - } - - Header_Files { - CFTLS_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CFTLS_Test_ReceiverC.inl - } -} - -project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Receiver_stub \ - DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_Receiver_exec.cpp - } - - Header_Files { - CFTLS_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ - DDS_CFTLS_Test_Receiver_exec DDS_CFTLS_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ - Receiver_exec DDS_CFTLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_ReceiverS.cpp - CFTLS_Test_Receiver_svnt.cpp - } - - Header_Files { - CFTLS_Test_ReceiverS.h - CFTLS_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp deleted file mode 100644 index 5aeaa515d78..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp +++ /dev/null @@ -1,271 +0,0 @@ -// -*- C++ -*- -#include "CFTLS_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" - -#define MIN_ITERATION "2" -#define MAX_ITERATION "5" - -#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in.... - -namespace CIAO_CFTLS_Test_Receiver_Impl -{ - //============================================================ - // ContentFilteredTopicListenStateTest_Listener_exec_i - //============================================================ - ContentFilteredTopicListenStateTest_Listener::ContentFilteredTopicListenStateTest_Listener ( - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : thread_id_ (thread_id), - samples_received_ (samples_received) - { - } - - ContentFilteredTopicListenStateTest_Listener::~ContentFilteredTopicListenStateTest_Listener (void) - { - } - - void - ContentFilteredTopicListenStateTest_Listener::on_creation ( - const ContentFilteredTopicListenStateTest& an_instance, - const CCM_DDS::ReadInfo& /*read_info*/) - { - ++this->samples_received_; - - ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_creation: " - "key <%C> - iteration <%d>\n", - an_instance.key.in (), - an_instance.iteration)); - if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) || - an_instance.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_creation: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - ContentFilteredTopicListenStateTest_Listener::on_one_update ( - const ContentFilteredTopicListenStateTest& an_instance, - const CCM_DDS::ReadInfo& /*read_info*/) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - ++this->samples_received_; - - ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_one_update: " - "key <%C> - iteration <%d>\n", - an_instance.key.in (), - an_instance.iteration)); - - if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) || - an_instance.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_one_update: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - ContentFilteredTopicListenStateTest_Listener::on_many_updates ( - const ContentFilteredTopicListenStateTestSeq& /*an_instance*/, - const CCM_DDS::ReadInfoSeq& /*read_info*/) - { - } - - void - ContentFilteredTopicListenStateTest_Listener::on_deletion ( - const ContentFilteredTopicListenStateTest& /*an_instance*/, - const CCM_DDS::ReadInfo& /*read_info*/) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : thread_id_listener_ (0, 0), - iterations_ (10), - keys_ (5), - samples_expected_ (keys_ * SAMPLES_PER_KEY), - samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->context_->get_connection_info_state_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_state_data_listener (void) - { - return new ContentFilteredTopicListenStateTest_Listener ( - this->thread_id_listener_, - this->samples_received_); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_state_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - - this->samples_expected_ = SAMPLES_PER_KEY * this->keys_; - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CFTLS_Test::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Reader_var reader = - this->context_->get_connection_info_state_data (); - if (CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - " - "Error get reader connection.\n")); - } - } - - void - Receiver_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Start listening.\n")); - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "CFT_STATE: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLS_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h deleted file mode 100644 index 656dbaa4846..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "CFTLS_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/OS_NS_Thread.h" - -#include "ace/Task.h" - -namespace CIAO_CFTLS_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_Long; - - //============================================================ - // ContentFilteredTopicListenStateTest_Listener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ContentFilteredTopicListenStateTest_Listener - : public virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - ContentFilteredTopicListenStateTest_Listener ( - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - virtual ~ContentFilteredTopicListenStateTest_Listener (void); - - virtual void - on_creation (const ContentFilteredTopicListenStateTest& an_instance, - const CCM_DDS::ReadInfo& read_info); - - virtual void - on_one_update (const ContentFilteredTopicListenStateTest& an_instance, - const CCM_DDS::ReadInfo& read_info); - - virtual void - on_many_updates (const ContentFilteredTopicListenStateTestSeq& an_instance, - const CCM_DDS::ReadInfoSeq& read_info); - - virtual void - on_deletion (const ContentFilteredTopicListenStateTest& an_instance, - const CCM_DDS::ReadInfo& read_info); - - private: - ACE_Thread_ID &thread_id_; - Atomic_Long &samples_received_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - void start (); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr - get_info_state_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_state_status (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: - ::CFTLS_Test::CCM_Receiver_Context_var context_; - - ACE_Thread_ID thread_id_listener_; - - CORBA::UShort iterations_; - CORBA::UShort keys_; - - CORBA::Long samples_expected_; - Atomic_Long samples_received_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLS_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl deleted file mode 100644 index 1d30d34f57a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL -#define DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL - -#include "Connector/CFTLS_Test_Connector.idl" - -module CFTLS_Test -{ - component Sender - { - port ContentFilteredTopicListenStateTestConnector::DDS_Update info_update; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc deleted file mode 100644 index 1fdabb4b0cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_CFTLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_CFTLS_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CFTLS_Test_Sender.idl - } -} - -project(DDS_CFTLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_CFTLS_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CFTLS_Test_SenderE.idl - } -} - -project(DDS_CFTLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLS_Test_Sender_lem_gen DDS_CFTLS_Test_Sender_stub \ - DDS_CFTLS_Test_Base_stub - libs += DDS_CFTLS_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_SenderEC.cpp - } - - Header_Files { - CFTLS_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CFTLS_Test_SenderEC.inl - } -} - -project(DDS_CFTLS_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_CFTLS_Test_Sender_idl_gen DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub - libs += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_SenderC.cpp - } - - Header_Files { - CFTLS_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CFTLS_Test_SenderC.inl - } -} - -project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CFTLS_Test_Sender_lem_stub DDS_CFTLS_Test_Sender_stub \ - DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_Sender_exec.cpp - } - - Header_Files { - CFTLS_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Sender_lem_stub \ - DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Connector_svnt DDS_CFTLS_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ - DDS_CFTLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CFTLS_Test_SenderS.cpp - CFTLS_Test_Sender_svnt.cpp - } - - Header_Files { - CFTLS_Test_SenderS.h - CFTLS_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp deleted file mode 100644 index ba27bdbbc04..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp +++ /dev/null @@ -1,241 +0,0 @@ -// -*- C++ -*- -#include "CFTLS_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/Log_Msg.h" -#include "ace/Date_Time.h" - -namespace CIAO_CFTLS_Test_Sender_Impl -{ - /** - * StartHandler - */ - StartHandler::StartHandler(Sender_exec_i &callback) - : callback_ (callback) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - int - StartHandler::handle_exception (ACE_HANDLE) - { - this->callback_.run (); - return 0; - } - - /** - * UpdateTicker - */ - UpdateTicker::UpdateTicker (Sender_exec_i &callback) - : callback_ (callback), - last_iter_ (0) - { - } - - int - UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.update_one (++this->last_iter_); - return 0; - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - ACE_NEW_THROW_EX (this->ticker_, - UpdateTicker (*this), - CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - void - Sender_exec_i::update_one (CORBA::UShort iter) - { - ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var - updater = this->ciao_context_->get_connection_info_update_data (); - if (iter <= this->iterations ()) - { - for (CORBA::UShort i = 1; i < this->keys () + 1; ++i) - { - char key[7]; - ACE_OS::sprintf (key, "KEY_%d", i); - ContentFilteredTopicListenStateTest update_key; - update_key.key = CORBA::string_dup (key); - update_key.iteration = iter; - updater->update_one (update_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n", - key, iter)); - - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - " - "Finished updating. Cancel Timer.\n")); - this->reactor ()->cancel_timer (this->ticker_); - } - } - - void - Sender_exec_i::run () - { - ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var - updater = this->ciao_context_->get_connection_info_update_data (); - - // First create the instances for consecutive updating. - for (CORBA::UShort i = 1; i < this->keys () + 1; ++i) - { - char key[7]; - ACE_OS::sprintf (key, "KEY_%d", i); - ContentFilteredTopicListenStateTest new_key; - new_key.key = CORBA::string_dup(key); - new_key.iteration = 0; - updater->create_one (new_key); - } - - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::run : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::start (void) - { - StartHandler* rh = 0; - ACE_NEW (rh, - StartHandler (*this)); - ACE_Event_Handler_var safe_handler (rh); - this->reactor ()->notify (rh); - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::CFTLS_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLS_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h deleted file mode 100644 index df81462c9e2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h +++ /dev/null @@ -1,123 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_ -#define CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_ - -#include /**/ "ace/pre.h" - -#include "CFTLS_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_CFTLS_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * StartHandler - */ - class StartHandler : public ACE_Event_Handler - { - public: - StartHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * UpdateTicker - */ - class UpdateTicker : public ACE_Event_Handler - { - public: - UpdateTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - CORBA::UShort last_iter_; - }; - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void run (void); - void update_one (CORBA::UShort iter); - //@} - - private: - ::CFTLS_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - UpdateTicker *ticker_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CFTLS_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp deleted file mode 100644 index e9c9826a614..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp +++ /dev/null @@ -1,441 +0,0 @@ - - - - CFTLS_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLS_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLS_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CFTLS_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CFTLS_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CFTLS_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CFTLS_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CFTLS_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - CFTLS_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - CFTLS_Test - - - - - - CFTLS_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - CFTLS_Test - - - - - push_state_observer_filter - - - tk_struct - - QueryFilter - IDL:CCM_DDS/QueryFilter:1.0 - - expression - - tk_string - - - - parameters - - tk_sequence - - - tk_string - - - - - - - - - expression - - ( (iteration > %0) AND (iteration < %1) ) - - - - parameters - - - 2 - - - 5 - - - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_state_rdr - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - - info_state_dl - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - - info_state_dc - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CFTLS_Test_Connector_exec - - - DDS_CFTLS_Test_Connector_exec - - - CFTLS_Test_Connector_svnt - - - DDS_CFTLS_Test_Connector_svnt - - - CFTLS_Test_Connector_stub - - - DDS_CFTLS_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl deleted file mode 100755 index 0fd038e4fe3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 40 seconds to allow task to complete\n"; -sleep (40); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore deleted file mode 100644 index e2af81adef2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Writer_Base.cxx -/Writer_Base.h -/Writer_BasePlugin.cxx -/Writer_BasePlugin.h -/Writer_BaseSupport.cxx -/Writer_BaseSupport.h -/Writer_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl deleted file mode 100644 index 525042673a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Writer_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_BASE_IDL -#define WRITER_BASE_IDL - -#pragma ndds typesupport "Base/Writer_BaseSupport.h" -#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "WriterTest" -#pragma DCPS_DATA_KEY "WriterTest key" - -struct WriterTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WriterTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc deleted file mode 100644 index ee28c32ab45..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_DDSWriterEntityBase_stub - dynamicflags += WRITER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ - -Wb,stub_export_include=Writer_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Writer_Base.idl - } - - opendds_ts_flags += --export=WRITER_BASE_STUB_Export - - DDSGenerator_Files { - Writer_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore deleted file mode 100644 index e8f96f6e9cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Writer_ConnectorE.idl -/Writer_Connector_conn.cpp -/Writer_Connector_conn.h -/Writer_Connector_conn_export.h -/Writer_Connector_lem_stub_export.h -/Writer_Connector_stub_export.h -/Writer_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl deleted file mode 100644 index 421f8585ccd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Writer_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_CONNECTOR_IDL_ -#define WRITER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Writer_Base.idl" - -#pragma ciao lem "Connector/Writer_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Writer_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; - -#endif /* Writer_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc deleted file mode 100644 index 9412a344dc9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector" - -project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_DDSWriterEntityBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_stub_export.h \ - -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Writer_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Writer_Connector_svnt_export.h \ - -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Writer_Connector_conn_export.h \ - -I .. - - IDL_Files { - Writer_Connector.idl - } -} - -project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_DDSWriterEntityConnector_idl_gen - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Writer_ConnectorE.idl - } -} - -project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub - libs += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_DDSWriterEntityConnector_lem_stub - dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorEC.cpp - } - - Header_Files { - Writer_ConnectorEC.h - Writer_Connector_lem_stub_export.h - } - - Inline_Files { - Writer_ConnectorEC.inl - } -} - -project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_DDSWriterEntityConnector_idl_gen DDS_DDSWriterEntityBase_stub - libs += DDS_DDSWriterEntityBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_DDSWriterEntityConnector_stub - dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorC.cpp - } - - Header_Files { - Writer_ConnectorC.h - Writer_Connector_stub_export.h - } - - Inline_Files { - Writer_ConnectorC.inl - } -} - -project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub - sharedname = DDS_DDSWriterEntityConnector_exec - libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Connector_conn.cpp - } - - Header_Files { - Writer_Connector_conn.h - Writer_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub - sharedname = DDS_DDSWriterEntityConnector_svnt - libs += DDS_DDSWriterEntityConnector_stub \ - DDS_DDSWriterEntityConnector_lem_stub \ - DDS_DDSWriterEntityBase_stub \ - DDS_DDSWriterEntityConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorS.cpp - Writer_Connector_svnt.cpp - } - - Header_Files { - Writer_ConnectorS.h - Writer_Connector_svnt.h - Writer_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/README b/CIAO/connectors/dds4ccm/tests/DDSEntity/README deleted file mode 100644 index b38dcbae1ca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/README +++ /dev/null @@ -1,7 +0,0 @@ - - -Test which shows how to use the DDSDataWriter and DDSDataReader -directly. - -We use the Datawriter and DataReader from the DDS4CCM library. -After typecasting it can be used to perform operations on DDS directly. diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore deleted file mode 100644 index f2f7d84b894..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/Writer_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl deleted file mode 100644 index 344e3826c91..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Receiver - { - port WriterTestConnector::DDS_Listen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc deleted file mode 100644 index 399ff061ff2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc +++ /dev/null @@ -1,138 +0,0 @@ -project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_DDSWriterEntityConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Writer_Receiver.idl - } -} - -project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_DDSWriterEntityReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Writer_ReceiverE.idl - } -} - -project(DDS_DDSWriterEntityReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_DDSWriterEntityReceiver_lem_gen DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub - libs += Receiver_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverEC.cpp - } - - Header_Files { - Writer_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Writer_ReceiverEC.inl - } -} - -project(DDS_DDSWriterEntityReceiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_DDSWriterEntityReceiver_idl_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_lem_gen - libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverC.cpp - } - - Header_Files { - Writer_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Writer_ReceiverC.inl - } -} - -project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - Writer_Receiver_exec.cpp - } - - Header_Files { - Writer_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - Writer_ReceiverS.cpp - Writer_Receiver_svnt.cpp - } - - Header_Files { - Writer_ReceiverS.h - Writer_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp deleted file mode 100644 index 616c6e25646..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp +++ /dev/null @@ -1,308 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "Connector/Writer_Connector_conn.h" -#include - -namespace CIAO_Writer_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::WriterTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ") - ACE_TEXT ("received writer info for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - for (CORBA::ULong i = 0; i < data.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ") - ACE_TEXT ("received writer info for <%C> at %u\n"), - data[i].key.in (), - data[i].iteration)); - } - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void){ - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::WriterTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::WriterTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::WriterTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - WriterTestDataReader * reader = 0; - - ::DDS::DataReader_var dds_dr = - this->ciao_context_->get_connection_info_out_dds_entity (); - - if (::CORBA::is_nil (dds_dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Datareader connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader * > (dds_dr.in ()); - - if (ccm_dr) - { - typedef ::CIAO::NDDS::DDS_DataReader_Base DataReader_type; - - ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - DataReader_type * typed_ccm_dr = - dynamic_cast (tmp.in ()); - if (typed_ccm_dr) - { - DDSDataReader* dds_reader = typed_ccm_dr->get_rti_entity (); - if (dds_reader) - { - reader = ::CIAO_WriterTestConnector_DDS_Event_Impl - ::WriterTest_DDS_Traits - ::datareader_type::narrow (dds_reader); - if (!reader) - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error narrowing to a typed " - "DDS DataReader.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS Datareader.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error casting DataReader to typed DataReader\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "::DDS::DataReader of CCM DataReader seems nil\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error casting DDS::DataReader to CCM_DataReader\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::dds_seq_type - data; - ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::sampleinfo_seq_type - sample_info_seq; - - ::DDS::ReturnCode_t const result = reader->take ( - data, - sample_info_seq, - 1, - 0); - - ACE_DEBUG ((LM_DEBUG, "Take returned %C with %d samples\n", - ::CIAO::DDS4CCM::translate_retcode (result), data.length ())); - - ::DDS::ReturnCode_t const result_loan = reader->return_loan (data, sample_info_seq); - - ACE_DEBUG ((LM_DEBUG, "Return loan returned %C\n", - ::CIAO::DDS4CCM::translate_retcode (result_loan))); - - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h deleted file mode 100644 index 82201909a1b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h +++ /dev/null @@ -1,169 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_ -#define CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -class WriterTestDataReader; - -namespace CIAO_Writer_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::WriterTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from WriterTestConnector::Listener. */ - - virtual - void on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::WriterTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::WriterTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore deleted file mode 100644 index 809d63704bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/Writer_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl deleted file mode 100644 index 13bdad07c59..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_WRITER_ENTITY_SENDER_IDL -#define DDS_WRITER_ENTITY_SENDER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Sender - { - port WriterTestConnector::DDS_Write info_write; - attribute unsigned short rate; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif /* DDS_WRITER_ENTITY_SENDER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc deleted file mode 100644 index 82039febd68..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc +++ /dev/null @@ -1,150 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_DDSWriterEntityConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Writer_Sender.idl - } -} - -project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_DDSWriterEntitySender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Writer_SenderE.idl - } -} - -project(DDS_DDSWriterEntitySender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_DDSWriterEntitySender_lem_gen DDS_DDSWriterEntitySender_stub \ - DDS_DDSWriterEntityBase_stub - libs += DDS_DDSWriterEntityBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderEC.cpp - } - - Header_Files { - Writer_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Writer_SenderEC.inl - } -} - -project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base { - after += DDS_DDSWriterEntitySender_idl_gen DDS_DDSWriterEntityBase_stub \ - DDS_DDSWriterEntityConnector_stub - libs += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderC.cpp - } - - Header_Files { - Writer_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Writer_SenderC.inl - } -} - -project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \ - DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \ - DDS_DDSWriterEntityConnector_exec - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \ - DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \ - DDS_DDSWriterEntityConnector_exec - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - Writer_Sender_exec.cpp - } - - Header_Files { - Writer_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \ - DDS_DDSWriterEntityConnector_stub \ - DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \ - DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt \ - DDS_DDSWriterEntityConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - requires += dds4ccm_ndds - - IDL_Files { - } - - Source_Files { - Writer_SenderS.cpp - Writer_Sender_svnt.cpp - } - - Header_Files { - Writer_SenderS.h - Writer_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp deleted file mode 100644 index c9301a67feb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp +++ /dev/null @@ -1,386 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "Base/Writer_BaseSupport.h" -#include "Connector/Writer_Connector_conn.h" - -namespace CIAO_Writer_Sender_Impl -{ - /** - * Pulse Generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (0) - , iterations_ (0) - , keys_ (0) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::unregister_handles () - { - for (Writer_Table::iterator i = this->ktests_.begin (); - i != this->ktests_.end (); - ++i) - { - try - { - DDS_InstanceHandle_t hnd = this->handles_[i->first.c_str ()]; - this->writer_->unregister_instance (i->second, hnd); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"), - i->first.c_str (), - i->second->iteration, - hnd)); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("unknown exception caught during unregister_instance.\n"))); - } - } - } - - void - Sender_exec_i::register_handles() - { - Writer_Table::iterator i = this->ktests_.begin (); - for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i) - { - DDS_InstanceHandle_t const hnd = this->writer_->register_instance (i->second); - if (DDS_InstanceHandle_is_nil (&hnd)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"), - i->first.c_str (), i->second->iteration)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"), - i->second->key.in ())); - this->handles_[i->first.c_str ()] = hnd; - } - } - } - - void - Sender_exec_i::write_keyed () - { - if (this->last_key != this->ktests_.end ()) - { - ++this->last_key->second->iteration; - DDS_InstanceHandle_t hnd = this->handles_[this->last_key->first.c_str ()]; - DDS_ReturnCode_t const retval = this->writer_->write (this->last_key->second, hnd); - if (retval == DDS_RETCODE_OK) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - valid handle <%d>\n"), - this->last_key->first.c_str (), - this->last_key->second->iteration, - hnd.isValid)); - } - else ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error writing key <%C> - retcode %C\n"), - CIAO::DDS4CCM::translate_retcode (retval))); - - ++this->last_key; - } - else - { - //onto the next iteration - this->last_key = this->ktests_.begin (); - while (this->last_key != this->ktests_.end ()) - { - if (this->last_key->second->iteration == this->iterations_) - { - // Next key - ++this->last_key; - } - else - { - break; - } - } - if (this->last_key == this->ktests_.end ()) - { - unregister_handles (); - this->stop (); - } - } - } - - void - Sender_exec_i::tick () - { - write_keyed (); - } - - void - Sender_exec_i::start (void) - { - long usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - delete this->ticker_; - this->ticker_ = 0; - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::UShort rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - ::DDS::DataWriter_var dds_dw = - this->ciao_context_->get_connection_info_write_dds_entity (); - - if (::CORBA::is_nil (dds_dw.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Datawriter connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ()); - - if (ccm_dw) - { - ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; - DataWriter_type * typed_ccm_dw = dynamic_cast (tmp.in ()); - if (typed_ccm_dw) - { - DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity (); - if (dds_datawriter) - { - this->writer_ = - ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter); - if (!this->writer_) - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error narrowing to a typed " - "DDS DataWriter.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error getting DDS DataWriter.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error casting DataWriter to typed DataWriter\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "::DDS::DataWriter of CCM DataWriter seems nil\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error casting DataWriter to CCM_DataWriter\n")); - throw ::CORBA::INTERNAL (); - } - - this->start (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - WriterTest *new_key = new WriterTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->ktests_[key] = new_key; - } - this->last_key = this->ktests_.begin (); - register_handles (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h deleted file mode 100644 index 8164d4b4f58..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_SENDER_EXEC_CPQPH1_H_ -#define CIAO_WRITER_SENDER_EXEC_CPQPH1_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include "dds4ccm/impl/ndds/DataWriter_T.h" - -#include - -class WriterTestDataWriter; -namespace CIAO_Writer_Sender_Impl -{ - class Sender_exec_i; - - /** - * Pulse Generator - */ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort rate (void); - - virtual void rate (::CORBA::UShort rate); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - //@} - - private: - ::Writer::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort rate_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - - WriterTestDataWriter * writer_; - - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table ktests_; - - typedef std::map Writer_Table_Handles; - Writer_Table_Handles handles_; - - Writer_Table::iterator last_key; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - - void register_handles (); - void unregister_handles (); - void write_keyed (); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp deleted file mode 100644 index 0565cc072ff..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp +++ /dev/null @@ -1,382 +0,0 @@ - - - - DDSWriterEntity_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Writer_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_WriterTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WriterTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Writer_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Writer_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Writer_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - DDSWriterEntity - - - - - - Writer_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - DDSWriterEntity - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ushort - - - 10 - - - - - iterations - - - tk_ushort - - - 5 - - - - - keys - - - tk_ushort - - - 5 - - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - _datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - reader_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_dds_entity - false - SimplexReceptacle - - - - push_consumer_dds_entity - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Writer_Connector_exec - - - DDS_DDSWriterEntityConnector_exec - - - Writer_Connector_svnt - - - DDS_DDSWriterEntityConnector_svnt - - - Writer_Connector_stub - - - DDS_DDSWriterEntityConnector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h deleted file mode 100644 index 392479178a2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h +++ /dev/null @@ -1,27 +0,0 @@ -#if !defined DERIVED_CONNECTOR_T -#define DERIVED_CONNECTOR_T - -#include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" -#include "connectors/dds4ccm/impl/DDS_State_Connector_T.h" - -template -class MyEvent_Connector_T - : public virtual DDS_Event_Connector_T -{ - virtual ::CCM_fooA_ptr get_my_foo (void) - { - return ::CCM_fooA::_nil (); - } -}; - -template -class MyState_Connector_T - : public virtual DDS_State_Connector_T -{ - virtual ::CCM_fooB_ptr get_my_foo (void) - { - return ::CCM_fooB::_nil (); - } -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl deleted file mode 100644 index c6b05f3fdfe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef DERIVED_IDL -#define DERIVED_IDL - -#pragma ndds typesupport "DerivedSupport.h" -#pragma opendds typesupport "DerivedTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "DerivedType" -#pragma DCPS_DATA_KEY "DerivedType value" - -struct DerivedType { - string value; //@key -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence DerivedTypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc deleted file mode 100644 index 8d33e93b753..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc +++ /dev/null @@ -1,22 +0,0 @@ -project (Derived_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = Derived_stub - dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \ - -Wb,stub_export_include=Derived_Common_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Derived.idl - } - - opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export - - DDSGenerator_Files { - Derived.idl - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl deleted file mode 100644 index ed4059534f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef DERIVED_CONNECTOR_IDL -#define DERIVED_CONNECTOR_IDL - -#include -#include - -#include "Derived.idl" - -#pragma ciao lem "Derived_ConnectorE.idl" - -#pragma dds4ccm impl "DDS_Derived_Connector_T.h" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "DerivedTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::DerivedType, ::DerivedTypeSeq> DerivedTypeConnector; - -interface fooA -{ - void send (in long value); -}; - -interface fooB -{ - void send (in long value); -}; - -// @todo, module here should go away again -module DerivedTypeConnector { - connector MyEvent : DerivedTypeConnector::DDS_Event - { - provides fooA my_foo; - }; - - connector MyState : DerivedTypeConnector::DDS_State - { - provides fooB my_foo; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc deleted file mode 100644 index ad959acfab8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc +++ /dev/null @@ -1,129 +0,0 @@ -project(Derived_Connector_idl_gen) : connectoridldefaults, dds4ccm { - custom_only = 1 - after += Derived_stub - idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Derived_Connector_stub_export.h \ - -Wb,skel_export_macro=DERIVED_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Derived_Connector_svnt_export.h \ - -Wb,conn_export_macro=DERIVED_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Derived_Connector_conn_export.h \ - -Gxhex -Gxhsk -Gxhst - IDL_Files { - Derived_Connector.idl - } -} - -project(Derived_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - after += Derived_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Derived_Connector_lem_stub_export.h \ - -SS -Gxhst - - IDL_Files { - Derived_ConnectorE.idl - } -} - -project(Derived_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Derived_Connector_lem_gen Derived_Connector_stub - libs += Derived_Connector_stub - - - sharedname = Derived_Connector_lem_stub - dynamicflags += DERIVED_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Derived_ConnectorEC.cpp - } - - Header_Files { - Derived_ConnectorEC.h - Derived_Connector_lem_stub_export.h - } - - Inline_Files { - Derived_ConnectorEC.inl - } -} - -project(Derived_Connector_stub) : ccm_stub, dds4ccm_base { - after += Derived_Connector_idl_gen Derived_stub - libs += Derived_stub - - - sharedname = Derived_Connector_stub - dynamicflags += DERIVED_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Derived_ConnectorC.cpp - } - - Header_Files { - Derived_ConnectorC.h - Derived_Connector_stub_export.h - } - - Inline_Files { - Derived_ConnectorC.inl - } -} - -project(Derived_Connector_exec) : ciao_executor, dds4ccm_impl { - after += Derived_Connector_lem_stub Derived_Connector_stub - sharedname = Derived_Connector_exec - libs += Derived_Connector_stub Derived_Connector_lem_stub Derived_stub - - dynamicflags += DERIVED_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Derived_Connector_conn.cpp - } - - Header_Files { - DDS_Derived_Connector_T.h - Derived_Connector_conn.h - Derived_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(Derived_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Derived_Connector_lem_stub - sharedname = Derived_Connector_svnt - libs += Derived_Connector_stub Derived_Connector_lem_stub Derived_stub - - - dynamicflags += DERIVED_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Derived_ConnectorS.cpp - Derived_Connector_svnt.cpp - } - - Header_Files { - Derived_ConnectorS.h - Derived_Connector_svnt.h - Derived_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore deleted file mode 100644 index e1cae80e694..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/DNM_Base.cxx -/DNM_Base.h -/DNM_BasePlugin.cxx -/DNM_BasePlugin.h -/DNM_BaseSupport.cxx -/DNM_BaseSupport.h -/DNM_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl deleted file mode 100644 index 69588857156..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @file DNM_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DOUBLE_NESTED_MODULE_BASE_IDL -#define DOUBLE_NESTED_MODULE_BASE_IDL - -#pragma ndds typesupport "Base/DNM_BaseSupport.h" -#pragma opendds typesupport "Base/DNM_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "X::Y::Z::DNM_Test_Struct" -#pragma DCPS_DATA_KEY "X::Y::Z::DNM_Test_Struct key" - -module X -{ - module Y - { - module Z - { - struct DNM_Test_Struct { - string key; //@key - long iter; - }; - #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence DNM_Test_StructSeq; -#endif - }; - }; -}; - - -#endif /* DOUBLE_NESTED_MODULE_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc deleted file mode 100644 index 8e0e78a1536..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_DNM_Base_stub - dynamicflags += DOUBLE_NESTED_MODULE_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_BASE_STUB_Export \ - -Wb,stub_export_include=DNM_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - DNM_Base.idl - } - - opendds_ts_flags += --export=DOUBLE_NESTED_MODULE_BASE_STUB_Export - - DDSGenerator_Files { - DNM_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore deleted file mode 100644 index c99c27aaf24..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/DNM_ConnectorE.idl -/DNM_Connector_conn.cpp -/DNM_Connector_conn.h -/DNM_Connector_conn_export.h -/DNM_Connector_lem_stub_export.h -/DNM_Connector_stub_export.h -/DNM_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl deleted file mode 100644 index 68ad2eec4e9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file DNM_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ -#define DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/DNM_Base.idl" - -#pragma ciao lem "Connector/DNM_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/DNM_BaseTypeSupport.idl" -#endif - -module DNM_Test_Connector -{ - module Nested_Connector - { - module ::CCM_DDS::Typed < X::Y::Z::DNM_Test_Struct, X::Y::Z::DNM_Test_StructSeq> DNM_TestConnector; - }; -}; - -#endif /* DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc deleted file mode 100644 index c9c973ddf85..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_DNM_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_DNM_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=DNM_Connector_stub_export.h \ - -Wb,skel_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=DNM_Connector_svnt_export.h \ - -Wb,svnt_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=DNM_Connector_svnt_export.h \ - -Wb,conn_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=DNM_Connector_conn_export.h \ - -I .. - - IDL_Files { - DNM_Connector.idl - } -} - -project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_DNM_Connector_idl_gen - idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=DNM_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - DNM_ConnectorE.idl - } -} - -project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub - libs += DDS_DNM_Base_stub DDS_DNM_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_DNM_Connector_lem_stub - dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_ConnectorEC.cpp - } - - Header_Files { - DNM_ConnectorEC.h - DNM_Connector_lem_stub_export.h - } - - Inline_Files { - DNM_ConnectorEC.inl - } -} - -project(DDS_DNM_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_DNM_Connector_idl_gen DDS_DNM_Base_stub - libs += DDS_DNM_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_DNM_Connector_stub - dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_ConnectorC.cpp - } - - Header_Files { - DNM_ConnectorC.h - DNM_Connector_stub_export.h - } - - Inline_Files { - DNM_ConnectorC.inl - } -} - -project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub - sharedname = DDS_DNM_Connector_exec - libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_Connector_conn.cpp - } - - Header_Files { - DNM_Connector_conn.h - DNM_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub - sharedname = DDS_DNM_Connector_svnt - libs += DDS_DNM_Connector_stub \ - DDS_DNM_Connector_lem_stub \ - DDS_DNM_Base_stub \ - DDS_DNM_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_ConnectorS.cpp - DNM_Connector_svnt.cpp - } - - Header_Files { - DNM_ConnectorS.h - DNM_Connector_svnt.h - DNM_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore deleted file mode 100644 index 102a5abb4c9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl deleted file mode 100644 index afa5b6ce2f2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file DNM_Sender.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DNM_SENDER_IDL -#define DNM_SENDER_IDL - -#include "Connector/DNM_Connector.idl" - -module DNM_Test_Sender -{ - module Nested_Sender - { - component Sender - { - port DNM_Test_Connector::Nested_Connector::DNM_TestConnector::DDS_Write info_write; - }; - }; -}; - -#endif /* DNM_SENDER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc deleted file mode 100644 index 1bd753bbdb3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc +++ /dev/null @@ -1,143 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_DNM_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DNM_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_DNM_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - DNM_Sender.idl - } -} - -project(DNM_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DNM_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - DNM_SenderE.idl - } -} - -project(DNM_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DNM_Sender_lem_gen DNM_Sender_stub DDS_DNM_Base_stub - libs += DDS_DNM_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_SenderEC.cpp - } - - Header_Files { - DNM_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - DNM_SenderEC.inl - } -} - -project(DNM_Sender_stub) : ccm_stub, dds4ccm_base { - after += DNM_Sender_idl_gen DDS_DNM_Base_stub DDS_DNM_Connector_stub - libs += DDS_DNM_Base_stub DDS_DNM_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_SenderC.cpp - } - - Header_Files { - DNM_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - DNM_SenderC.inl - } -} - -project(DNM_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DNM_Sender_lem_stub DNM_Sender_stub \ - DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \ - DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_Sender_exec.cpp - } - - Header_Files { - DNM_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_DNM_Base_stub DNM_Sender_lem_stub \ - DDS_DNM_Connector_stub \ - DDS_DNM_Connector_svnt DDS_DNM_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \ - DDS_DNM_Connector_stub DDS_DNM_Connector_svnt \ - DDS_DNM_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DNM_SenderS.cpp - DNM_Sender_svnt.cpp - } - - Header_Files { - DNM_SenderS.h - DNM_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp deleted file mode 100644 index 7e5830ccb3e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// -*- C++ -*- -#include "DNM_Sender_exec.h" -#include "Base/DNM_BaseC.h" - -namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl -{ - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::DNM_Test_Sender::Nested_Sender::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) - { - ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer = - this->context_->get_connection_info_write_data (); - - ::X::Y::Z::DNM_Test_Struct dnm; - dnm.key = CORBA::string_dup ("KEY_1"); - dnm.iter = 10; - writer->write_one (dnm, ::DDS::HANDLE_NIL); - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h deleted file mode 100644 index 9d9361ff4b5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h +++ /dev/null @@ -1,46 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - - -#include "DNM_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl -{ - //============================================================ - // Sender_exec_i - //============================================================ - 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: - ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context_var context_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore deleted file mode 100644 index c9d8f7c47b3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Event_Connection_Test_Base.cxx -/Event_Connection_Test_Base.h -/Event_Connection_Test_BasePlugin.cxx -/Event_Connection_Test_BasePlugin.h -/Event_Connection_Test_BaseSupport.cxx -/Event_Connection_Test_BaseSupport.h -/Event_Connection_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl deleted file mode 100644 index 5f4a523d5d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Event_Connection_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef EVENT_CONNECTION_TEST_BASE_IDL -#define EVENT_CONNECTION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Event_Connection_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "Event_ConnectionTest" -#pragma DCPS_DATA_KEY "Event_ConnectionTest key" - -struct Event_ConnectionTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Event_ConnectionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc deleted file mode 100644 index e953e70512c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_ECT_Base_stub - dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Event_Connection_Test_Base.idl - } - - opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Event_Connection_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore deleted file mode 100644 index 985cef62666..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Event_Connection_Test_ConnectorE.idl -/Event_Connection_Test_Connector_conn.cpp -/Event_Connection_Test_Connector_conn.h -/Event_Connection_Test_Connector_conn_export.h -/Event_Connection_Test_Connector_lem_stub_export.h -/Event_Connection_Test_Connector_stub_export.h -/Event_Connection_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl deleted file mode 100644 index 771620f19c7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Event_Connection_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_CONNECTOR_IDL_ -#define KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Event_Connection_Test_Base.idl" - -#pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Event_Connection_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionConnector; - -#endif /* Event_Connection_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc deleted file mode 100644 index 3a53d8ad1b7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector" - -project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_ECT_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Event_Connection_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Event_Connection_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Event_Connection_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=EVENT_CONNECTION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Event_Connection_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Event_Connection_Test_Connector.idl - } -} - -project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_ECT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Event_Connection_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Event_Connection_Test_ConnectorE.idl - } -} - -project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub - libs += DDS_ECT_Base_stub DDS_ECT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_ECT_Connector_lem_stub - dynamicflags += EVENT_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ConnectorEC.cpp - } - - Header_Files { - Event_Connection_Test_ConnectorEC.h - Event_Connection_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Event_Connection_Test_ConnectorEC.inl - } -} - -project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_ECT_Connector_idl_gen DDS_ECT_Base_stub - libs += DDS_ECT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_ECT_Connector_stub - dynamicflags += EVENT_CONNECTION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ConnectorC.cpp - } - - Header_Files { - Event_Connection_Test_ConnectorC.h - Event_Connection_Test_Connector_stub_export.h - } - - Inline_Files { - Event_Connection_Test_ConnectorC.inl - } -} - -project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub - sharedname = DDS_ECT_Connector_exec - libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_CONNECTION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_Connector_conn.cpp - } - - Header_Files { - Event_Connection_Test_Connector_conn.h - Event_Connection_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub - sharedname = DDS_ECT_Connector_svnt - libs += DDS_ECT_Connector_stub \ - DDS_ECT_Connector_lem_stub \ - DDS_ECT_Base_stub \ - DDS_ECT_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_CONNECTION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ConnectorS.cpp - Event_Connection_Test_Connector_svnt.cpp - } - - Header_Files { - Event_Connection_Test_ConnectorS.h - Event_Connection_Test_Connector_svnt.h - Event_Connection_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README deleted file mode 100644 index a0d80b6fb37..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README +++ /dev/null @@ -1,25 +0,0 @@ - - -This test tests all possible connections between -a Sender and a DDS Event connector and a Receiver and a -DDS Event connector. -The Sender requests the following connections: - * A writer - * A DDS writer - -The Receiver expects the following listeners to be created: - * A ConnectorStatusListener - * A PortStatusListener for the DDS_Listen port - * A PortStatusListener for the DDS_Get port - * A 'normal' listener - -The Receiver requests the following connections: - * A reader - * A getter - * A DDS reader - * A DataControlListener - -This test tests every single connection and reports an error when -a connections couldn't be esthablished. - -No actual read/write/listen operations are performed. diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore deleted file mode 100644 index 10c2d70efdc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Event_Connection_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl deleted file mode 100644 index 627c3e4909b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Event_Connection_Test_Connector.idl" - -module Event_Connection_Test -{ - component Receiver - { - port Event_ConnectionConnector::DDS_Listen info_listen; - port Event_ConnectionConnector::DDS_Get info_get; - provides CCM_DDS::ConnectorStatusListener status_listener; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc deleted file mode 100644 index dc9166a24d9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc +++ /dev/null @@ -1,135 +0,0 @@ -project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_ECT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - Event_Connection_Test_Receiver.idl - } -} - -project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_ECT_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Event_Connection_Test_ReceiverE.idl - } -} - -project(DDS_ECT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_ECT_Receiver_lem_gen DDS_ECT_Receiver_stub DDS_ECT_Connector_stub DDS_ECT_Base_stub - libs += Receiver_stub DDS_ECT_Connector_stub DDS_ECT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ReceiverEC.cpp - } - - Header_Files { - Event_Connection_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Event_Connection_Test_ReceiverEC.inl - } -} - -project(DDS_ECT_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_ECT_Receiver_idl_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_gen - libs += DDS_ECT_Connector_stub DDS_ECT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ReceiverC.cpp - } - - Header_Files { - Event_Connection_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Event_Connection_Test_ReceiverC.inl - } -} - -project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_ECT_Receiver_lem_stub DDS_ECT_Receiver_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_Receiver_exec.cpp - } - - Header_Files { - Event_Connection_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_ReceiverS.cpp - Event_Connection_Test_Receiver_svnt.cpp - } - - Header_Files { - Event_Connection_Test_ReceiverS.h - Event_Connection_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp deleted file mode 100644 index 4a1f6c95500..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp +++ /dev/null @@ -1,264 +0,0 @@ -// -*- C++ -*- -#include "Event_Connection_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" - -namespace CIAO_Event_Connection_Test_Receiver_Impl -{ - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : //DDS_Get - getter_ok_ (false), - getter_reader_ok_ (false), - getter_dds_data_reader_ok_ (false), - getter_filter_config_ok_ (false), - //DDS_Listen - listen_data_control_ok_ (false), - listen_reader_ok_ (false), - listen_dds_data_reader_ok_ (false), - listen_filter_config_ok_ (false), - //Provides - listen_port_status_created_ (false), - get_port_status_created_ (false), - get_status_listener_created_ (false), - raw_listener_created_ (false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Port operations. - ::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 ::Event_ConnectionConnector::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Listen\n"))); - this->listen_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - this->get_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_status_listener(void) - { - this->get_status_listener_created_ = true; - return ::CCM_DDS::CCM_ConnectorStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Event_Connection_Test::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - //DDS_Get - ::Event_ConnectionConnector::Getter_var getter_getter = - this->context_->get_connection_info_get_fresh_data (); - if (! ::CORBA::is_nil (getter_getter)) - { - this->getter_ok_ = true; - } - ::DDS::DataReader_var getter_dds_data_reader = - this->context_->get_connection_info_get_dds_entity (); - if (! ::CORBA::is_nil (getter_dds_data_reader)) - { - this->getter_dds_data_reader_ok_ = true; - } - - ::Event_ConnectionConnector::Reader_var getter_reader = - this->context_->get_connection_info_get_data (); - if (! ::CORBA::is_nil (getter_reader)) - { - this->getter_reader_ok_ = true; - } - - ::CCM_DDS::ContentFilterSetting_var getter_filter_config = - this->context_->get_connection_info_get_filter_config (); - if (! ::CORBA::is_nil (getter_filter_config)) - { - this->getter_filter_config_ok_ = true; - } - - //DDS_Listen - ::CCM_DDS::DataListenerControl_var listen_data_control = - this->context_->get_connection_info_listen_data_control (); - if (! ::CORBA::is_nil (listen_data_control)) - { - this->listen_data_control_ok_ = true; - } - - ::Event_ConnectionConnector::Reader_var listen_reader = - this->context_->get_connection_info_listen_data (); - if (! ::CORBA::is_nil (listen_reader)) - { - this->listen_reader_ok_ = true; - } - - ::DDS::DataReader_var listen_dds_data_reader = - this->context_->get_connection_info_listen_dds_entity (); - if (! ::CORBA::is_nil (listen_dds_data_reader)) - { - this->listen_dds_data_reader_ok_ = true; - } - - ::CCM_DDS::ContentFilterSetting_var listen_filter_config = - this->context_->get_connection_info_listen_filter_config (); - if (! ::CORBA::is_nil (listen_filter_config)) - { - this->listen_filter_config_ok_ = true; - } - } - - void - Receiver_exec_i::ccm_activate (void) - { - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - //DDS_Get - if (!this->getter_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter passed\n"))); - } - if (!this->getter_dds_data_reader_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n"))); - } - if (!this->getter_reader_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n"))); - } - if (!this->getter_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n"))); - } - //DDS_Listen - if (!this->listen_data_control_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data listen control of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data listen control of DDS_Listen passed\n"))); - } - if (!this->listen_reader_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n"))); - } - if (!this->listen_dds_data_reader_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get dds reader of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n"))); - } - if (!this->listen_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n"))); - } - //Provides - if (!this->raw_listener_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : listener not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Listener was created\n"))); - } - if (!this->listen_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n"))); - } - if (!this->get_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n"))); - } - if (!this->get_status_listener_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : ConnectorStatusListener was created\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Event_Connection_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h deleted file mode 100644 index 1818e387d4f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- -#ifndef EVENT_CONNECTION_RECEIVER_EXEC_H_ -#define EVENT_CONNECTION_RECEIVER_EXEC_H_ - -#include "Event_Connection_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Event_Connection_Test_Receiver_Impl -{ - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - virtual ::Event_ConnectionConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - //DDS_Get - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual CCM_DDS::CCM_ConnectorStatusListener_ptr - get_status_listener(void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::Event_Connection_Test::CCM_Receiver_Context_var context_; - - bool getter_ok_; - bool getter_reader_ok_; - bool getter_dds_data_reader_ok_; - bool getter_filter_config_ok_; - - //DDS_Listen - bool listen_data_control_ok_; - bool listen_reader_ok_; - bool listen_dds_data_reader_ok_; - bool listen_filter_config_ok_; - - //Provide checks - bool listen_port_status_created_; - bool get_port_status_created_; - bool get_status_listener_created_; - bool raw_listener_created_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Event_Connection_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore deleted file mode 100644 index 021736f2ef6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Event_Connection_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl deleted file mode 100644 index cd21c5158cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_EVENT_CONNECTION_TEST_SENDER_IDL -#define DDS_EVENT_CONNECTION_TEST_SENDER_IDL - -#include "Connector/Event_Connection_Test_Connector.idl" - -module Event_Connection_Test -{ - component Sender - { - port Event_ConnectionConnector::DDS_Write info_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc deleted file mode 100644 index 70da2a16c63..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_ECT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Event_Connection_Test_Sender.idl - } -} - -project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_ECT_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Event_Connection_Test_SenderE.idl - } -} - -project(DDS_ECT_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_ECT_Sender_lem_gen DDS_ECT_Sender_stub DDS_ECT_Base_stub - libs += DDS_ECT_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_SenderEC.cpp - } - - Header_Files { - Event_Connection_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Event_Connection_Test_SenderEC.inl - } -} - -project(DDS_ECT_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_ECT_Sender_idl_gen DDS_ECT_Base_stub DDS_ECT_Connector_stub - libs += DDS_ECT_Base_stub DDS_ECT_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_SenderC.cpp - } - - Header_Files { - Event_Connection_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Event_Connection_Test_SenderC.inl - } -} - -project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_ECT_Sender_lem_stub DDS_ECT_Sender_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_Sender_exec.cpp - } - - Header_Files { - Event_Connection_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_ECT_Base_stub DDS_ECT_Sender_lem_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_SenderS.cpp - Event_Connection_Test_Sender_svnt.cpp - } - - Header_Files { - Event_Connection_Test_SenderS.h - Event_Connection_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp deleted file mode 100644 index ab7d1aee693..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// -*- C++ -*- -#include "Event_Connection_Test_Sender_exec.h" - -namespace CIAO_Event_Connection_Test_Sender_Impl -{ - //============================================================ - // Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : writer_ok_ (false), - writer_dds_datawriter_ok_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Event_Connection_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - ::Event_ConnectionConnector::Writer_var writer = - this->context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer.in ())) - { - this->writer_ok_ = true; - } - ::DDS::DataWriter_var writer_dds_datawriter = - this->context_->get_connection_info_write_dds_entity (); - if (! ::CORBA::is_nil (writer_dds_datawriter.in ())) - { - this->writer_dds_datawriter_ok_ = true; - } - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->writer_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get writer failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get writer passed\n"))); - } - if (!this->writer_dds_datawriter_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds writer failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer passed\n"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Event_Connection_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h deleted file mode 100644 index 4509c06bf87..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- -#ifndef EVENT_CONNECTION_SENDER_EXEC_H_ -#define EVENT_CONNECTION_SENDER_EXEC_H_ - - -#include "Event_Connection_Test_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Event_Connection_Test_Sender_Impl -{ - //============================================================ - // Sender_exec_i - //============================================================ - 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: - ::Event_Connection_Test::CCM_Sender_Context_var context_; - - bool writer_ok_; - bool writer_dds_datawriter_ok_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Event_Connection_Test_Sender_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp deleted file mode 100644 index 98af0e2eddb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp +++ /dev/null @@ -1,549 +0,0 @@ - - - - Event_Connection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_Connection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_Connection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Event_Connection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_ConnectionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_ConnectionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Event_Connection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Event_Connection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_Connection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_Connection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Event_Connection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Event_Connection_Test - - - - - - Event_Connection_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Event_Connection_Test - - - - - - SenderComponent - SenderNode - - - - - - - listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - listen_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - listen_rawlistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - listen_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - listen_dds_reader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_dds_entity - false - SimplexReceptacle - - - - push_consumer_dds_entity - true - Facet - - - - - - listen_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_filter_config - false - SimplexReceptacle - - - - push_consumer_filter_config - true - Facet - - - - - - getter_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_consumer_status - false - SimplexReceptacle - - - - - - getter_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - getter_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - getter_dds_reader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_consumer_dds_entity - true - Facet - - - - - - getter_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_filter_config - false - SimplexReceptacle - - - - pull_consumer_filter_config - true - Facet - - - - - - connector_status_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - status_listener - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - writer_dds_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Event_Connection_Test_Connector_exec - - - DDS_ECT_Connector_exec - - - Event_Connection_Test_Connector_svnt - - - DDS_ECT_Connector_svnt - - - Event_Connection_Test_Connector_stub - - - DDS_ECT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl deleted file mode 100755 index c6321471979..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore deleted file mode 100644 index 77e8d9f2fe7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/FSS_Event_Base.cxx -/FSS_Event_Base.h -/FSS_Event_BasePlugin.cxx -/FSS_Event_BasePlugin.h -/FSS_Event_BaseSupport.cxx -/FSS_Event_BaseSupport.h -/FSS_Event_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl deleted file mode 100644 index 5f863dfc852..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file FSS_Event_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL -#define FIXED_SIZE_STRUCT_EVENT_BASE_IDL - -#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h" -#pragma opendds typesupport "Base/FSS_Event_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "FixedStructSizeTest" - -struct FixedStructSizeTest { - long one; - long two; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence FixedStructSizeTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc deleted file mode 100644 index d3e00ad4ba2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_FSS_Event_Base_stub - dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \ - -Wb,stub_export_include=FSS_Event_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - FSS_Event_Base.idl - } - - opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export - - DDSGenerator_Files { - FSS_Event_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore deleted file mode 100644 index 769eec5ea57..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/FSS_Event_ConnectorE.idl -/FSS_Event_Connector_conn.cpp -/FSS_Event_Connector_conn.h -/FSS_Event_Connector_conn_export.h -/FSS_Event_Connector_lem_stub_export.h -/FSS_Event_Connector_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl deleted file mode 100644 index 3f15d247191..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file FSS_Event_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_ -#define FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_ - -#include -#include - -#include "Base/FSS_Event_Base.idl" - -#pragma ciao lem "Connector/FSS_Event_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/FSS_Event_BaseTypeSupport.idl" -#endif - -module FSS_Event -{ - module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector; -}; - -#endif /* FSS_Event_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc deleted file mode 100644 index 5a30d625af0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_FSS_Event_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=FSS_Event_Connector_stub_export.h \ - -Wb,skel_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=FSS_Event_Connector_svnt_export.h \ - -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=FSS_Event_Connector_svnt_export.h \ - -Wb,conn_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=FSS_Event_Connector_conn_export.h \ - -I .. - - IDL_Files { - FSS_Event_Connector.idl - } -} - -project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_FSS_Event_Connector_idl_gen - idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=FSS_Event_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - FSS_Event_ConnectorE.idl - } -} - -project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub - libs += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_FSS_Event_Connector_lem_stub - dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_Event_ConnectorEC.cpp - } - - Header_Files { - FSS_Event_ConnectorEC.h - FSS_Event_Connector_lem_stub_export.h - } - - Inline_Files { - FSS_Event_ConnectorEC.inl - } -} - -project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_FSS_Event_Connector_idl_gen DDS_FSS_Event_Base_stub - libs += DDS_FSS_Event_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_FSS_Event_Connector_stub - dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_Event_ConnectorC.cpp - } - - Header_Files { - FSS_Event_ConnectorC.h - FSS_Event_Connector_stub_export.h - } - - Inline_Files { - FSS_Event_ConnectorC.inl - } -} - -project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub - sharedname = DDS_FSS_Event_Connector_exec - libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_Event_Connector_conn.cpp - } - - Header_Files { - FSS_Event_Connector_conn.h - FSS_Event_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub - sharedname = DDS_FSS_Event_Connector_svnt - libs += DDS_FSS_Event_Connector_stub \ - DDS_FSS_Event_Connector_lem_stub \ - DDS_FSS_Event_Base_stub \ - DDS_FSS_Event_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_Event_ConnectorS.cpp - FSS_Event_Connector_svnt.cpp - } - - Header_Files { - FSS_Event_ConnectorS.h - FSS_Event_Connector_svnt.h - FSS_Event_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore deleted file mode 100644 index 37d860c1fd1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/FSS_State_Base.cxx -/FSS_State_Base.h -/FSS_State_BasePlugin.cxx -/FSS_State_BasePlugin.h -/FSS_State_BaseSupport.cxx -/FSS_State_BaseSupport.h -/FSS_State_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl deleted file mode 100644 index d09fc6a6884..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file FSS_State_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL -#define FIXED_SIZE_STRUCT_STATE_BASE_IDL - -#pragma ndds typesupport "Base/FSS_State_BaseSupport.h" -#pragma opendds typesupport "Base/FSS_State_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "FixedStructSizeTest" - -struct FixedStructSizeTest { - long one; - long two; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence FixedStructSizeTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc deleted file mode 100644 index e5e929febc7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_FSS_State_Base_stub - dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \ - -Wb,stub_export_include=FSS_State_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - FSS_State_Base.idl - } - - opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export - - DDSGenerator_Files { - FSS_State_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore deleted file mode 100644 index 6b972d0ecd6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/FSS_State_ConnectorE.idl -/FSS_State_Connector_conn.cpp -/FSS_State_Connector_conn.h -/FSS_State_Connector_conn_export.h -/FSS_State_Connector_lem_stub_export.h -/FSS_State_Connector_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl deleted file mode 100644 index 0ee2f8d5638..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file FSS_State_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_ -#define FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/FSS_State_Base.idl" - -#pragma ciao lem "Connector/FSS_State_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/FSS_State_BaseTypeSupport.idl" -#endif - -module FSS_State -{ - module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector; -}; - -#endif /* FSS_State_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc deleted file mode 100644 index b92636ed14c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector" - -project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_FSS_State_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=FSS_State_Connector_stub_export.h \ - -Wb,skel_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=FSS_State_Connector_svnt_export.h \ - -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=FSS_State_Connector_svnt_export.h \ - -Wb,conn_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=FSS_State_Connector_conn_export.h \ - -I .. - - IDL_Files { - FSS_State_Connector.idl - } -} - -project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_FSS_State_Connector_idl_gen - idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=FSS_State_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - FSS_State_ConnectorE.idl - } -} - -project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub - libs += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_FSS_State_Connector_lem_stub - dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_State_ConnectorEC.cpp - } - - Header_Files { - FSS_State_ConnectorEC.h - FSS_State_Connector_lem_stub_export.h - } - - Inline_Files { - FSS_State_ConnectorEC.inl - } -} - -project(DDS_FSS_State_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_FSS_State_Connector_idl_gen DDS_FSS_State_Base_stub - libs += DDS_FSS_State_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_FSS_State_Connector_stub - dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_State_ConnectorC.cpp - } - - Header_Files { - FSS_State_ConnectorC.h - FSS_State_Connector_stub_export.h - } - - Inline_Files { - FSS_State_ConnectorC.inl - } -} - -project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub - sharedname = DDS_FSS_State_Connector_exec - libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS_FSS_State_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_State_Connector_conn.cpp - } - - Header_Files { - FSS_State_Connector_conn.h - FSS_State_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub - sharedname = DDS_FSS_State_Connector_svnt - libs += DDS_FSS_State_Connector_stub \ - DDS_FSS_State_Connector_lem_stub \ - DDS_FSS_State_Base_stub \ - DDS_FSS_State_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_State_ConnectorS.cpp - FSS_State_Connector_svnt.cpp - } - - Header_Files { - FSS_State_ConnectorS.h - FSS_State_Connector_svnt.h - FSS_State_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl deleted file mode 100644 index 9e56e98005b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file GCE_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GET_COMPONENT_EVENT_TEST_BASE_IDL -#define GET_COMPONENT_EVENT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/GCE_Test_BaseSupport.h" -#pragma opendds typesupport "Base/GCE_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "GCETest" -#pragma DCPS_DATA_KEY "GCETest symbol" - -struct GCETest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence GCETestSeq; -#endif - -#endif /* GET_COMPONENT_EVENT_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc deleted file mode 100644 index 7ac420f122b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = GCE_Test_Base_stub - dynamicflags += GET_COMPONENT_EVENT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=GCE_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - GCE_Test_Base.idl - } - - opendds_ts_flags += --export=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - GCE_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl deleted file mode 100644 index cbf76c3a7d6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/GCE_Test_Connector.idl" - -module GCE_Test -{ - component GetComponentEventTestComponent - { - port GCETestConnector::DDS_Listen info_listen; - port GCETestConnector::DDS_Get info_get; - provides CCM_DDS::ConnectorStatusListener status_listener; - - port GCETestConnector::DDS_Write info_write; - - attribute boolean act_as_sender; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc deleted file mode 100644 index ab3f20f1130..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(GCE_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += GCE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - GCE_Test_Component.idl - } -} - -project(GCE_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += GCE_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - GCE_Test_ComponentE.idl - } -} - -project(GCE_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += GCE_Test_Component_lem_gen GCE_Test_Component_stub \ - GCE_Test_Connector_stub GCE_Test_Base_stub - libs += Component_stub GCE_Test_Connector_stub \ - GCE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ComponentEC.cpp - } - - Header_Files { - GCE_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - GCE_Test_ComponentEC.inl - } -} - -project(GCE_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += GCE_Test_Component_idl_gen GCE_Test_Connector_stub \ - GCE_Test_Base_stub GCE_Test_Connector_lem_gen - libs += GCE_Test_Connector_stub GCE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ComponentC.cpp - } - - Header_Files { - GCE_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - GCE_Test_ComponentC.inl - } -} - -project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += GCE_Test_Component_lem_stub GCE_Test_Component_stub \ - GCE_Test_Base_stub GCE_Test_Connector_stub \ - GCE_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub GCE_Test_Base_stub \ - GCE_Test_Connector_stub GCE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_Component_exec.cpp - } - - Header_Files { - GCE_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += GCE_Test_Component_lem_stub GCE_Test_Base_stub \ - GCE_Test_Connector_stub GCE_Test_Connector_svnt \ - GCE_Test_Component_exec GCE_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub GCE_Test_Base_stub \ - GCE_Test_Connector_stub GCE_Test_Connector_svnt \ - Component_exec GCE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ComponentS.cpp - GCE_Test_Component_svnt.cpp - } - - Header_Files { - GCE_Test_ComponentS.h - GCE_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp deleted file mode 100644 index e51b418c453..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp +++ /dev/null @@ -1,420 +0,0 @@ -// -*- C++ -*- -#include "GCE_Test_Component_exec.h" - -namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - : act_as_sender_ (false) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - ::CORBA::Boolean - Component_exec_i::act_as_sender (void) - { - return this->act_as_sender_; - } - - void - Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender) - { - this->act_as_sender_ = act_as_sender; - } - - ::GCETestConnector::CCM_Listener_ptr - Component_exec_i::get_info_listen_data_listener (void) - { - return ::GCETestConnector::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_get_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Component_exec_i::get_status_listener (void) - { - return ::CCM_DDS::CCM_ConnectorStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::GCE_Test::CCM_GetComponentEventTestComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::test_writer () - { - //DDS_Update -> Writer - try - { - ::GCETestConnector::Writer_var writer_data = - this->context_->get_connection_info_write_data (); - if (! ::CORBA::is_nil (writer_data.in ())) - { - CORBA::Object_var cmp = writer_data->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("writer_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ") - ACE_TEXT ("Writer on DDS_Write port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - " - ACE_TEXT ("writer_data is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("writer_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("writer_data\n"))); - } - - try - { - ::DDS::DataWriter_var writer_dds_entity = - this->context_->get_connection_info_write_dds_entity (); - if (! ::CORBA::is_nil (writer_dds_entity.in ())) - { - CORBA::Object_var cmp = writer_dds_entity->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("writer_dds_entity\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ") - ACE_TEXT ("dds_entity on DDS_Write port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - " - ACE_TEXT ("writer_dds_entity is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("write_dds_entity\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("writer_data\n"))); - } - } - - void - Component_exec_i::test_getter () - { - //Reader on DDS_Get - try - { - ::GCETestConnector::Reader_var getter_data = - this->context_->get_connection_info_get_data (); - if (! ::CORBA::is_nil (getter_data.in ())) - { - CORBA::Object_var cmp = getter_data->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("Reader on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("getter_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("getter_data\n"))); - } - - //Getter on DDS_Get - try - { - ::GCETestConnector::Getter_var getter_fresh_data = - this->context_->get_connection_info_get_fresh_data (); - if (! ::CORBA::is_nil (getter_fresh_data.in ())) - { - CORBA::Object_var cmp = getter_fresh_data->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_fresh_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("Getter on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_fresh_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("getter_fresh_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("getter_fresh_data\n"))); - } - - //Getter on DDS_Get - try - { - ::DDS::DataReader_var getter_dds_entity = - this->context_->get_connection_info_get_dds_entity (); - if (! ::CORBA::is_nil (getter_dds_entity.in ())) - { - CORBA::Object_var cmp = getter_dds_entity->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_dds_entity\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("dds_entity on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_dds_entity is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("get_dds_entity\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("get_dds_entity\n"))); - } - } - - void - Component_exec_i::test_listener () - { - try - { - //DDS_Listen - ::GCETestConnector::Reader_var listen_data = - this->context_->get_connection_info_listen_data (); - if (! ::CORBA::is_nil (listen_data.in ())) - { - CORBA::Object_var cmp = listen_data->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("listen_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ") - ACE_TEXT ("Reader on DDS_Listen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("listen_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("listen_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("listen_data\n"))); - } - - try - { - ::CCM_DDS::DataListenerControl_var listen_data_control = - this->context_->get_connection_info_listen_data_control (); - if (! ::CORBA::is_nil (listen_data_control.in ())) - { - CORBA::Object_var cmp = listen_data_control->_get_component (); - ::GCETestConnector::CCM_DDS_Event_var conn = - ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("listen_data_control\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ") - ACE_TEXT ("DataControl on DDS_Listen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("listen_data_control is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("listen_data_control\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("listen_data_control\n"))); - } - } - - void - Component_exec_i::ccm_activate (void) - { - if (this->act_as_sender_) - { - this->test_writer (); - } - else - { - this->test_getter (); - this->test_listener (); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComponentEventTest_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h deleted file mode 100644 index 79db6fd36e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "GCE_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual GetComponentEventTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - ::CORBA::Boolean - act_as_sender (void); - - void - act_as_sender (::CORBA::Boolean act_as_sender); - - virtual ::GCETestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_status_listener (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::GCE_Test::CCM_GetComponentEventTestComponent_Context_var context_; - ::CORBA::Boolean act_as_sender_; - void test_writer (void); - void test_getter (void); - void test_listener (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComponentEventTest_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl deleted file mode 100644 index ae80f12bf6a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file GCE_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ -#define GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/GCE_Test_Base.idl" - -#pragma ciao lem "Connector/GCE_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/GCE_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::GCETest, ::GCETestSeq> GCETestConnector; - -#endif /* GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc deleted file mode 100644 index 802e33ce66d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p GCE_Test_Base -l .. -o ../lib -u DDS GCE_Test_Connector" - -project(GCE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen GCE_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=GCE_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=GCE_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=GCE_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=GCE_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - GCE_Test_Connector.idl - } -} - -project(GCE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += GCE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=GCE_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - GCE_Test_ConnectorE.idl - } -} - -project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub - libs += GCE_Test_Base_stub GCE_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = GCE_Test_Connector_lem_stub - dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ConnectorEC.cpp - } - - Header_Files { - GCE_Test_ConnectorEC.h - GCE_Test_Connector_lem_stub_export.h - } - - Inline_Files { - GCE_Test_ConnectorEC.inl - } -} - -project(GCE_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += GCE_Test_Connector_idl_gen GCE_Test_Base_stub - libs += GCE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = GCE_Test_Connector_stub - dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ConnectorC.cpp - } - - Header_Files { - GCE_Test_ConnectorC.h - GCE_Test_Connector_stub_export.h - } - - Inline_Files { - GCE_Test_ConnectorC.inl - } -} - -project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += GCE_Test_Connector_lem_stub GCE_Test_Connector_stub GCE_Test_Base_stub - sharedname = GCE_Test_Connector_exec - libs += GCE_Test_Connector_stub GCE_Test_Connector_lem_stub GCE_Test_Base_stub GCE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_Connector_conn.cpp - } - - Header_Files { - GCE_Test_Connector_conn.h - GCE_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub - sharedname = GCE_Test_Connector_svnt - libs += GCE_Test_Connector_stub \ - GCE_Test_Connector_lem_stub \ - GCE_Test_Base_stub \ - GCE_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCE_Test_ConnectorS.cpp - GCE_Test_Connector_svnt.cpp - } - - Header_Files { - GCE_Test_ConnectorS.h - GCE_Test_Connector_svnt.h - GCE_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp deleted file mode 100644 index de9f38b7dc6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp +++ /dev/null @@ -1,361 +0,0 @@ - - - - GetComponentEventTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_GetComponentEventTest_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GCE_Test_GetComponentEventTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - GCE_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_GCETestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GCETestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - GCE_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - GCE_Test_Connector_exec - - - - - - - - Sender - SenderNode - - - - act_as_sender - - - tk_boolean - - - true - - - - - - - GCE_Test_Connector1 - SenderNode - - - - topic_name - - - tk_string - - - GetComponentEventTopic - - - - - - - - Receiver - ReceiverNode - - - - - act_as_sender - - - tk_boolean - - - false - - - - - - - GCE_Test_Connector2 - ReceiverNode - - - - - topic_name - - - tk_string - - - GetComponentEventTopic - - - - - - - - write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - write_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - - - get_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - get_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_consumer_dds_entity - true - Facet - - - - - get_fresh_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - - listen_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - listen_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - GCE_Test_Connector_exec - - - GCE_Test_Connector_exec - - - GCE_Test_Connector_svnt - - - GCE_Test_Connector_svnt - - - GCE_Test_Connector_stub - - - GCE_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl deleted file mode 100755 index 955469ac4bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); - -# 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\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/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl deleted file mode 100644 index 28624e01777..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file GCS_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GET_COMPONENT_STATE_TEST_BASE_IDL -#define GET_COMPONENT_STATE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/GCS_Test_BaseSupport.h" -#pragma opendds typesupport "Base/GCS_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "GCSTest" -#pragma DCPS_DATA_KEY "GCSTest symbol" - -struct GCSTest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence GCSTestSeq; -#endif - -#endif /* GET_COMPONENT_STATE_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc deleted file mode 100644 index 7756e763040..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = GCS_Test_Base_stub - dynamicflags += GET_COMPONENT_STATE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=GCS_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - GCS_Test_Base.idl - } - - opendds_ts_flags += --export=GET_COMPONENT_STATE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - GCS_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl deleted file mode 100644 index ec5ce2468b9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/GCS_Test_Connector.idl" - -module GCS_Test -{ - component GetComponentStateTestComponent - { - port GCSTestConnector::DDS_Read info_read; - port GCSTestConnector::DDS_Get info_get; - port GCSTestConnector::DDS_Listen info_listen; - port GCSTestConnector::DDS_StateListen info_statelisten; - - port GCSTestConnector::DDS_Update info_update; - - attribute boolean act_as_sender; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc deleted file mode 100644 index 929c3edd9f3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(GCS_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += GCS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - GCS_Test_Component.idl - } -} - -project(GCS_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += GCS_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - GCS_Test_ComponentE.idl - } -} - -project(GCS_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += GCS_Test_Component_lem_gen GCS_Test_Component_stub \ - GCS_Test_Connector_stub GCS_Test_Base_stub - libs += Component_stub GCS_Test_Connector_stub \ - GCS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ComponentEC.cpp - } - - Header_Files { - GCS_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - GCS_Test_ComponentEC.inl - } -} - -project(GCS_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += GCS_Test_Component_idl_gen GCS_Test_Connector_stub \ - GCS_Test_Base_stub GCS_Test_Connector_lem_gen - libs += GCS_Test_Connector_stub GCS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ComponentC.cpp - } - - Header_Files { - GCS_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - GCS_Test_ComponentC.inl - } -} - -project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += GCS_Test_Component_lem_stub GCS_Test_Component_stub \ - GCS_Test_Base_stub GCS_Test_Connector_stub \ - GCS_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub GCS_Test_Base_stub \ - GCS_Test_Connector_stub GCS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_Component_exec.cpp - } - - Header_Files { - GCS_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += GCS_Test_Component_lem_stub GCS_Test_Base_stub \ - GCS_Test_Connector_stub GCS_Test_Connector_svnt \ - GCS_Test_Component_exec GCS_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub GCS_Test_Base_stub \ - GCS_Test_Connector_stub GCS_Test_Connector_svnt \ - Component_exec GCS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ComponentS.cpp - GCS_Test_Component_svnt.cpp - } - - Header_Files { - GCS_Test_ComponentS.h - GCS_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp deleted file mode 100644 index e4227a18f31..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp +++ /dev/null @@ -1,612 +0,0 @@ -// -*- C++ -*- -#include "GCS_Test_Component_exec.h" - -namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - : act_as_sender_ (false) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - ::CORBA::Boolean - Component_exec_i::act_as_sender (void) - { - return this->act_as_sender_; - } - - void - Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender) - { - this->act_as_sender_ = act_as_sender; - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_read_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_get_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::GCSTestConnector::CCM_Listener_ptr - Component_exec_i::get_info_listen_data_listener (void) - { - return ::GCSTestConnector::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::GCSTestConnector::CCM_StateListener_ptr - Component_exec_i::get_info_statelisten_data_listener (void) - { - return ::GCSTestConnector::CCM_StateListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_statelisten_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::GCS_Test::CCM_GetComponentStateTestComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::test_updater () - { - //DDS_Update -> Writer - try - { - ::GCSTestConnector::Updater_var updater_data = - this->context_->get_connection_info_update_data (); - if (! ::CORBA::is_nil (updater_data.in ())) - { - CORBA::Object_var cmp = updater_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("updater_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ") - ACE_TEXT ("Writer on DDS_Update port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - " - ACE_TEXT ("updater_data is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("updater_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("updater_data\n"))); - } - - try - { - ::DDS::DataWriter_var updater_dds_entity = - this->context_->get_connection_info_update_dds_entity (); - if (! ::CORBA::is_nil (updater_dds_entity.in ())) - { - CORBA::Object_var cmp = updater_dds_entity->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("updater_dds_entity\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ") - ACE_TEXT ("dds entity on DDS_Update port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - " - ACE_TEXT ("updater_dds_entity is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("update_dds_entity\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("update_dds_entity\n"))); - } - } - - void - Component_exec_i::test_reader () - { - //DDS_Read -> Reader - try - { - ::GCSTestConnector::Reader_var reader_data = - this->context_->get_connection_info_read_data (); - if (! ::CORBA::is_nil (reader_data.in ())) - { - CORBA::Object_var cmp = reader_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("data_reader\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ") - ACE_TEXT ("Reader on DDS_Read port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - " - ACE_TEXT ("reader_data is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("data_reader\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("data_reader\n"))); - } - - try - { - ::DDS::DataReader_var datareader = - this->context_->get_connection_info_read_dds_entity (); - if (! ::CORBA::is_nil (datareader.in ())) - { - CORBA::Object_var cmp = datareader->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("dds_entity\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ") - ACE_TEXT ("DDS Entity on DDS_Read port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - " - ACE_TEXT ("data entity is NIL.\n")))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("read_dds_entity\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("read_dds_entity\n"))); - } - } - - void - Component_exec_i::test_getter () - { - //Reader on DDS_Get - try - { - ::GCSTestConnector::Reader_var getter_data = - this->context_->get_connection_info_get_data (); - if (! ::CORBA::is_nil (getter_data.in ())) - { - CORBA::Object_var cmp = getter_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("Reader on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("getter_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("getter_data\n"))); - } - - try - { - ::DDS::DataReader_var getter_dds_entity = - this->context_->get_connection_info_get_dds_entity (); - if (! ::CORBA::is_nil (getter_dds_entity.in ())) - { - CORBA::Object_var cmp = getter_dds_entity->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_dds_entity\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("dds_entity on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_dds_entity is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("get_dds_entity\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("get_dds_entity\n"))); - } - - //Getter on DDS_Get - try - { - ::GCSTestConnector::Getter_var getter_fresh_data = - this->context_->get_connection_info_get_fresh_data (); - if (! ::CORBA::is_nil (getter_fresh_data.in ())) - { - CORBA::Object_var cmp = getter_fresh_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("getter_fresh_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ") - ACE_TEXT ("Getter on DDS_Get port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("getter_fresh_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("getter_fresh_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("getter_fresh_data\n"))); - } - } - - void - Component_exec_i::test_listener () - { - try - { - //DDS_Listen - ::GCSTestConnector::Reader_var listen_data = - this->context_->get_connection_info_listen_data (); - if (! ::CORBA::is_nil (listen_data.in ())) - { - CORBA::Object_var cmp = listen_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("listen_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ") - ACE_TEXT ("Reader on DDS_Listen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("listen_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("listen_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("listen_data\n"))); - } - - try - { - ::CCM_DDS::DataListenerControl_var listen_data_control = - this->context_->get_connection_info_listen_data_control (); - if (! ::CORBA::is_nil (listen_data_control.in ())) - { - CORBA::Object_var cmp = listen_data_control->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("listen_data_control\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ") - ACE_TEXT ("DataControl on DDS_Listen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("listen_data_control is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("listen_data_control\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("listen_data_control\n"))); - } - } - - void - Component_exec_i::test_statelistener () - { - //DDS_StateListen - try - { - ::GCSTestConnector::Reader_var statelisten_data = - this->context_->get_connection_info_statelisten_data (); - if (! ::CORBA::is_nil (statelisten_data.in ())) - { - CORBA::Object_var cmp = statelisten_data->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("statelisten_data\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ") - ACE_TEXT ("Reader on DDS_StateListen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("statelisten_data is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("statelisten_data\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("statelisten_data\n"))); - } - - try - { - ::CCM_DDS::StateListenerControl_var statelisten_data_control = - this->context_->get_connection_info_statelisten_data_control (); - if (! ::CORBA::is_nil (statelisten_data_control.in ())) - { - CORBA::Object_var cmp = statelisten_data_control->_get_component (); - ::GCSTestConnector::CCM_DDS_State_var conn = - ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("Unable to get component interface of ") - ACE_TEXT ("statelisten_data_control\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ") - ACE_TEXT ("DataControl on DDS_StateListen port returned a ") - ACE_TEXT ("reference on _get_component.\n"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("statelisten_data_control is NIL.\n"))); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: "); - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") - ACE_TEXT ("CORBA exception caught while testing ") - ACE_TEXT ("statelisten_data_control\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ") - ACE_TEXT ("Unknown exception caught while testing ") - ACE_TEXT ("statelisten_data_control\n"))); - } - } - - void - Component_exec_i::ccm_activate (void) - { - if (this->act_as_sender_) - { - this->test_updater (); - } - else - { - this->test_reader (); - this->test_getter (); - this->test_listener (); - this->test_statelistener (); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComponentStateTest_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h deleted file mode 100644 index 0d749d19194..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "GCS_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual GetComponentStateTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_read_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::GCSTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::GCSTestConnector::CCM_StateListener_ptr - get_info_statelisten_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_statelisten_status (void); - - ::CORBA::Boolean - act_as_sender (void); - - void - act_as_sender (::CORBA::Boolean act_as_sender); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::GCS_Test::CCM_GetComponentStateTestComponent_Context_var context_; - ::CORBA::Boolean act_as_sender_; - void test_updater (void); - void test_reader (void); - void test_getter (void); - void test_listener (void); - void test_statelistener (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_GetComponentStateTest_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl deleted file mode 100644 index c4c89e62b17..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file GCS_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ -#define GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/GCS_Test_Base.idl" - -#pragma ciao lem "Connector/GCS_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/GCS_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::GCSTest, ::GCSTestSeq> GCSTestConnector; - -#endif /* GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc deleted file mode 100644 index 033a3b36eda..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p GCS_Test_Base -l .. -o ../lib -u DDS GCS_Test_Connector" - -project(GCS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen GCS_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=GCS_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=GCS_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=GCS_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=GCS_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - GCS_Test_Connector.idl - } -} - -project(GCS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += GCS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=GCS_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - GCS_Test_ConnectorE.idl - } -} - -project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub - libs += GCS_Test_Base_stub GCS_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = GCS_Test_Connector_lem_stub - dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ConnectorEC.cpp - } - - Header_Files { - GCS_Test_ConnectorEC.h - GCS_Test_Connector_lem_stub_export.h - } - - Inline_Files { - GCS_Test_ConnectorEC.inl - } -} - -project(GCS_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += GCS_Test_Connector_idl_gen GCS_Test_Base_stub - libs += GCS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = GCS_Test_Connector_stub - dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ConnectorC.cpp - } - - Header_Files { - GCS_Test_ConnectorC.h - GCS_Test_Connector_stub_export.h - } - - Inline_Files { - GCS_Test_ConnectorC.inl - } -} - -project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += GCS_Test_Connector_lem_stub GCS_Test_Connector_stub GCS_Test_Base_stub - sharedname = GCS_Test_Connector_exec - libs += GCS_Test_Connector_stub GCS_Test_Connector_lem_stub GCS_Test_Base_stub GCS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_Connector_conn.cpp - } - - Header_Files { - GCS_Test_Connector_conn.h - GCS_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub - sharedname = GCS_Test_Connector_svnt - libs += GCS_Test_Connector_stub \ - GCS_Test_Connector_lem_stub \ - GCS_Test_Base_stub \ - GCS_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GCS_Test_ConnectorS.cpp - GCS_Test_Connector_svnt.cpp - } - - Header_Files { - GCS_Test_ConnectorS.h - GCS_Test_Connector_svnt.h - GCS_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp deleted file mode 100644 index fa4016877d9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp +++ /dev/null @@ -1,441 +0,0 @@ - - - - GetComponentStateTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_GetComponentStateTest_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GCS_Test_GetComponentStateTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - GCS_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_GCSTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_GCSTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - GCS_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - GCS_Test_Connector_exec - - - - - - - - Sender - SenderNode - - - - act_as_sender - - - tk_boolean - - - true - - - - - - - GCS_Test_Connector1 - SenderNode - - - - topic_name - - - tk_string - - - GetComponentStateTopic - - - - - - - - Receiver - ReceiverNode - - - - - act_as_sender - - - tk_boolean - - - false - - - - - - - GCS_Test_Connector2 - ReceiverNode - - - - - topic_name - - - tk_string - - - GetComponentStateTopic - - - - - - - - update_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - update_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_dds_entity - false - SimplexReceptacle - - - - observable_dds_entity - true - Facet - - - - - - - - get_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - get_fresh_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - get_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_observer_dds_entity - true - Facet - - - - - - - read_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - read_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_dds_entity - false - SimplexReceptacle - - - - passive_observer_dds_entity - true - Facet - - - - - - - listen_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - listen_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_observer_data_control - true - Facet - - - - - - - statelisten_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - statelisten_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - - GCS_Test_Connector_exec - - - GCS_Test_Connector_exec - - - GCS_Test_Connector_svnt - - - GCS_Test_Connector_svnt - - - GCS_Test_Connector_stub - - - GCS_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl deleted file mode 100755 index 955469ac4bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Sender.ior", "Receiver.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); - -# 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\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/CIAO/connectors/dds4ccm/tests/Getter/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore deleted file mode 100644 index f1884aa728c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/Get_InvokerE.idl -/Get_Invoker_exec_export.h -/Get_Invoker_lem_stub_export.h -/Get_Invoker_stub_export.h -/Get_Invoker_svnt_export.h -/Getter_Test_Base.cxx -/Getter_Test_Base.h -/Getter_Test_BasePlugin.cxx -/Getter_Test_BasePlugin.h -/Getter_Test_BaseSupport.cxx -/Getter_Test_BaseSupport.h -/Getter_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl deleted file mode 100644 index cc639fc2100..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file Get_Invoker.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GETTER_INVOKER_IDL -#define GETTER_INVOKER_IDL - -#pragma ciao lem "Base/Get_InvokerE.idl" - -interface GetInvoker -{ - void start_timeout_get_one (); - void start_timeout_get_many (); - void start_get_one (in string key, in long fixed_key, in long iteration); - void start_get_many (in short keys, in long iterations); -}; - -#endif /* SAMPLE_INFO_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc deleted file mode 100644 index 6db55753faf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc +++ /dev/null @@ -1,111 +0,0 @@ -project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += - idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \ - -Wb,stub_export_include=Get_Invoker_stub_export.h \ - -Wb,skel_export_macro=GET_INVOKER_SVNT_Export \ - -Wb,skel_export_include=Get_Invoker_svnt_export.h \ - -Wb,svnt_export_macro=GET_INVOKER_SVNT_Export \ - -Wb,svnt_export_include=Get_Invoker_svnt_export.h \ - -Wb,exec_export_macro=GET_INVOKER_EXEC_Export \ - -Wb,exec_export_include=Get_Invoker_exec_export.h -I.. - - IDL_Files { - Get_Invoker.idl - } -} - -project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Get_Invoker_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \ - -Wb,stub_export_include=Get_Invoker_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Get_InvokerE.idl - } -} - -project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Get_Invoker_lem_gen DDS_Get_Invoker_stub - libs += Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Get_Invoker_lem_stub - dynamicflags += GET_INVOKER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Get_InvokerEC.cpp - } - - Header_Files { - Get_InvokerEC.h - Get_Invoker_lem_stub_export.h - } - - Inline_Files { - Get_InvokerEC.inl - } -} - -project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base { - after += DDS_Get_Invoker_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Get_Invoker_stub - dynamicflags += GET_INVOKER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Get_InvokerC.cpp - } - - Header_Files { - Get_InvokerC.h - Get_Invoker_stub_export.h - } - - Inline_Files { - Get_InvokerC.inl - } -} - - -project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \ - DDS_Get_Invoker_idl_gen - sharedname = Get_Invoker_svnt - libs += Get_Invoker_stub Get_Invoker_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GET_INVOKER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Get_InvokerS.cpp - Get_Invoker_svnt.cpp - } - - Header_Files { - Get_InvokerS.h - Get_Invoker_svnt.h - Get_Invoker_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl deleted file mode 100644 index e36c901337a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file Getter_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GETTER_TEST_BASE_IDL -#define GETTER_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "GetterTest" - -struct GetterTest { - string key; - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence GetterTestSeq; -#endif - -#pragma DCPS_DATA_TYPE "GetterFixed" - -struct GetterFixed { - long key; - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence GetterFixedSeq; -#endif - -#endif /* GETTER_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc deleted file mode 100644 index e48e419a2a2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Getter_Test_Base_stub - dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Getter_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Getter_Test_Base.idl - } - - opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Getter_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore deleted file mode 100644 index 2f55a351484..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Getter_Test_ConnectorE.idl -/Getter_Test_Connector_conn.cpp -/Getter_Test_Connector_conn.h -/Getter_Test_Connector_conn_export.h -/Getter_Test_Connector_lem_stub_export.h -/Getter_Test_Connector_stub_export.h -/Getter_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl deleted file mode 100644 index ad8902eb561..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file Getter_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GETTER_TEST_CONNECTOR_IDL_ -#define GETTER_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Getter_Test_Base.idl" - -#pragma ciao lem "Connector/Getter_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Getter_Test_BaseTypeSupport.idl" -#endif - -module Getter_Test -{ - module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConnector; - module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixedSeq> GetterFixedConnector; -}; - -#endif /* GETTER_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc deleted file mode 100644 index 45c6a8b80ac..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector" - -project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Getter_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Getter_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Getter_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Getter_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=GETTER_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Getter_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Getter_Test_Connector.idl - } -} - -project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Getter_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Getter_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Getter_Test_ConnectorE.idl - } -} - -project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub - libs += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Getter_Test_Connector_lem_stub - dynamicflags += GETTER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ConnectorEC.cpp - } - - Header_Files { - Getter_Test_ConnectorEC.h - Getter_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Getter_Test_ConnectorEC.inl - } -} - -project(DDS_Getter_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Getter_Test_Connector_idl_gen DDS_Getter_Test_Base_stub - libs += DDS_Getter_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Getter_Test_Connector_stub - dynamicflags += GETTER_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ConnectorC.cpp - } - - Header_Files { - Getter_Test_ConnectorC.h - Getter_Test_Connector_stub_export.h - } - - Inline_Files { - Getter_Test_ConnectorC.inl - } -} - -project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub - sharedname = DDS_Getter_Test_Connector_exec - libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS_Getter_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GETTER_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_Connector_conn.cpp - } - - Header_Files { - Getter_Test_Connector_conn.h - Getter_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub - sharedname = DDS_Getter_Test_Connector_svnt - libs += DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Connector_lem_stub \ - DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += GETTER_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ConnectorS.cpp - Getter_Test_Connector_svnt.cpp - } - - Header_Files { - Getter_Test_ConnectorS.h - Getter_Test_Connector_svnt.h - Getter_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/README b/CIAO/connectors/dds4ccm/tests/Getter/README deleted file mode 100644 index b99c9300e05..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/README +++ /dev/null @@ -1,23 +0,0 @@ - - -This test tests the Getter. - -Before the Sender starts writing samples to DDS, he informs the -Receiver (via a 'normal' CCM interface) about how many keys and -iterations to get from DDS. The receiver starts waiting on those -samples by calling get_one or get_many, using a timeout. - -In the meantime the Sender will sleep for half a second before actual -writing the samples to DDS. -Once the DDS connector on the receiver side receives the written samples, -he should wake up and should return the samples to the user code. - -So the starting points for the Receiver to start 'working' are: -. start_timeout_get_one (); -. start_timeout_get_many (); -. start_get_one (in string key, in long fixed_key, in long iteration); -. start_get_many (in short keys, in long iterations); - -In order to prevent deadlocks an event handler on the reactor is created -for each sample to be received. This event handler is created during invocation -of the latter two methods. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore deleted file mode 100644 index 0093957d491..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Getter_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl deleted file mode 100644 index 431bc426ae0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Getter_Test_Connector.idl" -#include "Base/Get_Invoker.idl" - -module Getter_Test -{ - component Receiver - { - port GetterTestConnector::DDS_Get info_get; - port GetterFixedConnector::DDS_Get info_fixed; - - provides GetInvoker getter_invoke; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc deleted file mode 100644 index fadaa44b2a5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc +++ /dev/null @@ -1,154 +0,0 @@ -project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Getter_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - Getter_Test_Receiver.idl - } -} - -project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Getter_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Getter_Test_ReceiverE.idl - } -} - -project(DDS_Getter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Getter_Test_Receiver_lem_gen DDS_Getter_Test_Receiver_stub \ - DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \ - DDS_Get_Invoker_stub - libs += Receiver_stub DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Base_stub Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ReceiverEC.cpp - } - - Header_Files { - Getter_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Getter_Test_ReceiverEC.inl - } -} - -project(DDS_Getter_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Getter_Test_Receiver_idl_gen DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_lem_gen \ - DDS_Get_Invoker_stub DDS_Get_Invoker_lem_stub - libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \ - Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ReceiverC.cpp - } - - Header_Files { - Getter_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Getter_Test_ReceiverC.inl - } -} - -project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Receiver_stub \ - DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Connector_lem_stub \ - DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub \ - Get_Invoker_lem_stub Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_Receiver_exec.cpp - } - - Header_Files { - Getter_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ - DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \ - DDS_Get_Invoker_stub \ - DDS_Get_Invoker_svnt DDS_Get_Invoker_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ - Receiver_exec DDS_Getter_Test_Connector_lem_stub \ - Get_Invoker_stub Get_Invoker_svnt \ - Get_Invoker_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_ReceiverS.cpp - Getter_Test_Receiver_svnt.cpp - } - - Header_Files { - Getter_Test_ReceiverS.h - Getter_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp deleted file mode 100644 index bd20a56aec6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp +++ /dev/null @@ -1,868 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Getter_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_sys_time.h" -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/dds4ccm_utils.h" - -namespace CIAO_Getter_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_fixed_status_exec_i - */ - - info_fixed_status_exec_i::info_fixed_status_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_fixed_status_exec_i::~info_fixed_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_fixed_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_fixed_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: getter_invoke_exec_i - */ - - getter_invoke_exec_i::getter_invoke_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - getter_invoke_exec_i::~getter_invoke_exec_i (void) - { - } - - // Operations from ::GetInvoker - - void - getter_invoke_exec_i::start_timeout_get_one (void) - { - this->callback_.timeout_get_one (); - } - - void - getter_invoke_exec_i::start_timeout_get_many (void) - { - this->callback_.timeout_get_many (); - } - - void - getter_invoke_exec_i::start_get_one (const char * key, - ::CORBA::Long fixed_key, - ::CORBA::Long iteration) - { - this->callback_.start_get_one (key, fixed_key, iteration); - } - - void - getter_invoke_exec_i::start_get_many (::CORBA::Short keys, - ::CORBA::Long iterations) - { - this->callback_.start_get_many (keys, iterations); - } - - /** - * GetOneHandler - */ - GetOneHandler::GetOneHandler (Receiver_exec_i &callback, - const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration) - : callback_ (callback) - , key_ (CORBA::string_dup (key)) - , fixed_key_ (fixed_key) - , iteration_ (iteration) - { - this->reference_counting_policy ().value ( - ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - - } - - GetOneHandler::~GetOneHandler (void) - { - } - - int - GetOneHandler::handle_exception (ACE_HANDLE) - { - this->callback_.get_one (this->key_.in (), this->fixed_key_, this->iteration_); - return 0; - } - - /** - * GetManyHandler - */ - GetManyHandler::GetManyHandler (Receiver_exec_i &callback, - CORBA::UShort keys, - CORBA::Long iterations) - : callback_ (callback), - keys_ (keys), - iterations_ (iterations) - { - this->reference_counting_policy ().value ( - ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - GetManyHandler::~GetManyHandler (void) - { - } - - int - GetManyHandler::handle_exception (ACE_HANDLE) - { - this->callback_.get_many (this->keys_, this->iterations_); - return 0; - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) : - fixed_handle_ (DDS::HANDLE_NIL), - variable_handle_ (DDS::HANDLE_NIL) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::start_get_one (const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration) - { - GetOneHandler* rh = new GetOneHandler (*this, - key, - fixed_key, - iteration); - ACE_Event_Handler_var safe_event_handler (rh); - this->reactor ()->notify (rh); - } - - void - Receiver_exec_i::start_get_many (CORBA::Short keys, - CORBA::Long iterations) - { - GetManyHandler* rh = new GetManyHandler (*this, keys, iterations); - ACE_Event_Handler_var safe_event_handler (rh); - this->reactor ()->notify (rh); - } - - void - Receiver_exec_i::get_many (CORBA::Short keys , CORBA::Long iterations) - { - // this is very hard to test in a controlled environment. - // When data arrives in DDS, the waiting ends and the - // Getter starts to read the data. In this test we expected - // therefor more then one, and less then but not exactly max_delivered_data. - // On the other hand, when the user want to have all the - // samples in DDS, one shouldn't use the wait method. - // Since the spec is not clear about this, the test will - // pass when at least one sample is returned. - ::Getter_Test::GetterTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - - DDS::Duration_t to; - to.sec = 20; - to.nanosec = 0; - getter->time_out (to); - getter->max_delivered_data (40); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: " - "Start getting data from DDS: " - "#keys <%d> - #iterations <%d> with timeout: " - "sec <%d> - nanosec <%u>\n", - keys, iterations, - getter->time_out ().sec, - getter->time_out ().nanosec)); - - GetterTestSeq gettertest_seq; - ::CCM_DDS::ReadInfoSeq readinfo; - bool const result = getter->get_many (gettertest_seq, readinfo); - if (result) - { - if (gettertest_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: " - "No data returned. " - "number of samples: " - "expected at least one - received <0>\n")); - } - if (gettertest_seq.length () == 1) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: " - "Not enough data returned. " - "number of samples: " - "expected at least two - received <1>\n")); - } - if (gettertest_seq.length () > 40) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: " - "To much data returned. " - "number of samples: " - "expected not more then 40 - received <1>\n")); - } - for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: " - "Returned data : key <%C> - iteration <%d> - handle " - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - "\n", - gettertest_seq[i].key.in (), - gettertest_seq[i].iteration, - DDS_INSTANCE_HANDLE_LOG(readinfo[i].instance_handle))); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: " - "Time out occurred\n")); - } - // Wait a while before reading. - ACE_Time_Value tv (3, 0); - ACE_OS::sleep (tv); - this->read_many (keys, iterations, gettertest_seq); - } - - void - Receiver_exec_i::read_many (CORBA::Short keys , - CORBA::Long iterations, - const GetterTestSeq& gettertest_seq) - { - ::Getter_Test::GetterTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_get_data (); - - GetterTestSeq read_seq; - ::CCM_DDS::ReadInfoSeq readinfos; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_many - " - "Start checking samples in DDS\n")); - reader->read_all (read_seq, readinfos); - // we expect all samples written during the test for get one (KEY_1) - // AND all samples written during the test for get many (number of keys) - ::CORBA::ULong expected = - static_cast < ::CORBA::ULong > (iterations * (keys + 1)); - if (read_seq.length () != expected) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - " - "Unexpected number of samples received: " - "expected <%d> - received <%u>\n", - expected, read_seq.length ())); - } - for (::CORBA::ULong i = 0; i < read_seq.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_many - " - "Sample received: key <%C> - iteration <%d> - " - "sample_read_state <%C>\n", - read_seq[i].key.in (), - read_seq[i].iteration, - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status))); - } - - for (::CORBA::Short key = 0; key < keys; ++key) - { - ::CORBA::Long iter = 0; - char str_key[8]; - ACE_OS::sprintf (str_key, "KEY_%d", key + 1); - for (::CORBA::ULong i = 0; i < read_seq.length (); ++i) - { - if (ACE_OS::strcmp (read_seq[i].key.in (), str_key) == 0) - ++iter; - if (iter > iterations) - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - " - "Unexpected number of iterations received " - "for key <%C>: <%d>\n", - str_key, - iter)); - } - } - // check which sample states should be ALREADY_SEEN/FRESH_INFO - for (::CORBA::ULong readed = 0; readed < read_seq.length (); ++readed) - { - ::CCM_DDS::AccessStatus received_access_status = - readinfos[readed].access_status; - bool found = false; - - for (::CORBA::ULong got = 0; - got < gettertest_seq.length () && !found; - ++got) - { - if (ACE_OS::strcmp (read_seq[readed].key.in (), - gettertest_seq[got].key.in ()) == 0 && - read_seq[readed].iteration == gettertest_seq[got].iteration) - { - found = true; - if (received_access_status != ::CCM_DDS::ALREADY_SEEN) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - " - "Unexpected access state received: " - "expected <%C> - received <%C>\n", - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status))); - } - } - } - // Samples which are not read by get_many or get_one (the samples belonging to - // KEY_1), should have FRESH_INFO as access status. - if (!found && ACE_OS::strcmp (read_seq[readed].key.in (), "KEY_1") != 0) - { - if (received_access_status != ::CCM_DDS::FRESH_INFO) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - " - "Unexpected access state received for sample " - "<%C>:<%d> : " - "expected <%C> - received <%C>\n", - read_seq[readed].key.in (), - read_seq[readed].iteration, - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status))); - } - } - } - } - - - void - Receiver_exec_i::get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration) - { - ::Getter_Test::GetterFixedConnector::Getter_var fixed = - this->ciao_context_->get_connection_info_fixed_fresh_data (); - - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - fixed->time_out (to); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: " - "Start getting data from DDS: " - "key <%u> - iteration <%d> " - " with timeout: " - "sec <%u> - nanosec <%u>\n", - fixed_key, iteration, - fixed->time_out ().sec, - fixed->time_out ().nanosec)); - GetterFixed gettertest_info; - ::CCM_DDS::ReadInfo readinfo; - ACE_Time_Value const tv = ACE_OS::gettimeofday (); - CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo); - if (result) - { - if (this->fixed_handle_ == DDS::HANDLE_NIL) - { - this->fixed_handle_ = readinfo.instance_handle; - } - ACE_Time_Value dur = ACE_OS::gettimeofday () - tv; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: " - "get_one took <%#T>\n", - &dur)); - if (gettertest_info.key != fixed_key) - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: " - "Expected key does " - "not match received key: " - "expected <%u> - received <%C>\n", - fixed_key, - gettertest_info.key)); - } - if (gettertest_info.iteration != iteration) - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: " - "Expected iteration does " - "not match received iteration: " - "expected <%d> - received <%d>\n", - iteration, - gettertest_info.iteration)); - } - // check readinfo struct. - if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) && - (this->fixed_handle_ != readinfo.instance_handle)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ") - ACE_TEXT ("received instance handle should be nil or not change ") - ACE_TEXT ("for unkeyed data: ") - ACE_TEXT ("key <%u> - iteration <%u> handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - gettertest_info.key, - gettertest_info.iteration, - DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle))); - } - if (readinfo.source_timestamp.sec == 0 && - readinfo.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: READ ONE LAST: " - "source timestamp seems to be invalid (nil) " - "key <%u> - iteration <%d>\n", - gettertest_info.key, - gettertest_info.iteration)); - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: " - "Returned data : key <%u> - iteration <%d>\n", - gettertest_info.key, - gettertest_info.iteration)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: " - "Time out while waiting for " - "key <%u> - iteration <%d>\n", - fixed_key, - iteration)); - } - } - - void - Receiver_exec_i::get_one_variable (const char * key, CORBA::Long iteration) - { - ::Getter_Test::GetterTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - getter->time_out (to); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: " - "Start getting data from DDS: " - "key <%C> - iteration <%d> " - " with timeout: " - "sec <%d> - nanosec <%u>\n", - key, iteration, - getter->time_out ().sec, - getter->time_out ().nanosec)); - GetterTest_var gettertest_info; - ::CCM_DDS::ReadInfo readinfo; - ACE_Time_Value tv = ACE_OS::gettimeofday (); - CORBA::Boolean const result = getter->get_one (gettertest_info.out (), readinfo); - if (result) - { - if (this->variable_handle_ == DDS::HANDLE_NIL) - { - this->variable_handle_ = readinfo.instance_handle; - } - ACE_Time_Value dur = ACE_OS::gettimeofday () - tv; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: " - "get_one took <%#T>\n", - &dur)); - if (ACE_OS::strcmp (gettertest_info->key, key) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: " - "Expected key does " - "not match received key: " - "expected <%C> - received <%C>\n", - key, - gettertest_info->key.in ())); - } - if (gettertest_info->iteration != iteration) - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: " - "Expected iteration does " - "not match received iteration: " - "expected <%d> - received <%d>\n", - iteration, - gettertest_info->iteration)); - } - // check readinfo struct. - if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) && - (this->fixed_handle_ != readinfo.instance_handle)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ") - ACE_TEXT ("received instance handle should be nil or not change ") - ACE_TEXT ("for unkeyed data: ") - ACE_TEXT ("key <%C> - iteration <%u> - handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - gettertest_info->key.in (), - gettertest_info->iteration, - DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle))); - } - if (readinfo.source_timestamp.sec == 0 && - readinfo.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: READ ONE LAST: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - gettertest_info->key.in (), - gettertest_info->iteration)); - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: " - "Returned data : key <%C> - iteration <%d>\n", - gettertest_info->key.in (), - gettertest_info->iteration)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: " - "Time out while waiting for " - "key <%C> - iteration <%d>\n", - key, - iteration)); - } - } - - void - Receiver_exec_i::get_one (const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration) - { - this->get_one_variable (key, iteration); - this->get_one_fixed (fixed_key, iteration); - } - - void - Receiver_exec_i::timeout_get_one_fixed (void) - { - try - { - ::Getter_Test::GetterFixedConnector::Getter_var fixed = - this->ciao_context_->get_connection_info_fixed_fresh_data (); - - DDS::Duration_t to; - to.sec = 1; - to.nanosec = 0; - fixed->time_out (to); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: " - "Start getting data from DDS: timeout: " - "sec <%d> - nanosec <%u>\n", - fixed->time_out ().sec, - fixed->time_out ().nanosec)); - GetterFixed gettertest_info; - ::CCM_DDS::ReadInfo readinfo; - CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo); - if (result) - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: " - "Returning true when get no data.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: " - "Expected to return no data.\n")); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: " - "Caught unexcepted InternalError " - "exception\n")); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR FIXED: TIMEOUT GET ONE:"); - ACE_ERROR ((LM_ERROR, - "ERROR: Receiver_exec_i::timeout_get_one_fixed : Exception caught\n")); - } - } - - void - Receiver_exec_i::timeout_get_one_variable (void) - { - try - { - ::Getter_Test::GetterTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - - DDS::Duration_t to; - to.sec = 1; - to.nanosec = 0; - getter->time_out (to); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: " - "Start getting data from DDS: timeout: " - "sec <%d> - nanosec <%u>\n", - getter->time_out ().sec, - getter->time_out ().nanosec)); - GetterTest_var gettertest_info;; - ::CCM_DDS::ReadInfo readinfo; - CORBA::Boolean result = getter->get_one (gettertest_info.out (), readinfo); - if (result) - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: " - "Returning true when get no data.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: " - "Expected to return no data.\n")); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: " - "Caught unexcepted InternalError " - "exception\n")); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR VARIABLE: TIMEOUT GET ONE:"); - ACE_ERROR ((LM_ERROR, - "ERROR: Receiver_exec_i::timeout_get_one_variable : Exception caught\n")); - } - } - - void - Receiver_exec_i::timeout_get_one (void) - { - this->timeout_get_one_variable (); - this->timeout_get_one_fixed (); - } - - void - Receiver_exec_i::timeout_get_many (void) - { - try - { - ::Getter_Test::GetterTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - - DDS::Duration_t to; - to.sec = 3; - to.nanosec = 0; - getter->time_out (to); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: " - "Start getting data from DDS: timeout: " - "sec <%d> - nanosec <%u>\n", - getter->time_out ().sec, - getter->time_out ().nanosec)); - GetterTestSeq gettertest_seq; - ::CCM_DDS::ReadInfoSeq readinfo; - CORBA::Boolean const result = getter->get_many (gettertest_seq, readinfo); - if (result) - { - ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: " - "Returning true when get no data.\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: " - "Expected to return no data.\n")); - } - } - catch (const CCM_DDS::InternalError&) - { - ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: " - "Caught unexcepted InternalError " - "exception\n")); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: TIMEOUT GET MANY:"); - ACE_ERROR ((LM_ERROR, - "ERROR: Receiver_exec_i::timeout_get_many : Exception caught\n")); - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_fixed_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_fixed_status_.in ())) - { - info_fixed_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_fixed_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_fixed_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_fixed_status_.in ()); - } - - ::CCM_GetInvoker_ptr - Receiver_exec_i::get_getter_invoke (void) - { - if ( ::CORBA::is_nil (this->ciao_getter_invoke_.in ())) - { - getter_invoke_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - getter_invoke_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_GetInvoker::_nil ()); - - this->ciao_getter_invoke_ = tmp; - } - - return - ::CCM_GetInvoker::_duplicate ( - this->ciao_getter_invoke_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Getter_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Getter_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h deleted file mode 100644 index 4f9b4fd9ab5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h +++ /dev/null @@ -1,277 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_ -#define CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_ - -#include /**/ "ace/pre.h" - -#include "Getter_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Getter_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * GetOneHandler - */ - class GetOneHandler - : public ACE_Event_Handler - { - public: - GetOneHandler (Receiver_exec_i &, - const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration); - virtual ~GetOneHandler (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - - private: - Receiver_exec_i &callback_; - CORBA::String_var key_; - CORBA::Long fixed_key_; - CORBA::Long iteration_; - }; - - /** - * GetManyHandler - */ - class GetManyHandler - : public ACE_Event_Handler - { - public: - GetManyHandler (Receiver_exec_i &, - CORBA::UShort keys, - CORBA::Long iterations); - virtual ~GetManyHandler (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - - private: - Receiver_exec_i &callback_; - CORBA::UShort keys_; - CORBA::Long iterations_; - }; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Getter_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_fixed_status_exec_i - */ - - class info_fixed_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_fixed_status_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_fixed_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Getter_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: getter_invoke_exec_i - */ - - class getter_invoke_exec_i - : public virtual ::CCM_GetInvoker, - public virtual ::CORBA::LocalObject - { - public: - getter_invoke_exec_i ( - ::Getter_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~getter_invoke_exec_i (void); - - //@{ - /** Operations and attributes from GetInvoker. */ - - virtual - void start_timeout_get_one (void); - - virtual - void start_timeout_get_many (void); - - virtual - void start_get_one (const char * key, - ::CORBA::Long fixed_key, - ::CORBA::Long iteration); - - virtual - void start_get_many (::CORBA::Short keys, - ::CORBA::Long iterations); - //@} - - private: - ::Getter_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_fixed_status (void); - - virtual ::CCM_GetInvoker_ptr - get_getter_invoke (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start_get_one (const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration); - void timeout_get_one (void); - void timeout_get_many (void); - void get_one (const char * key, - CORBA::Long fixed_key, - CORBA::Long iteration); - - void start_get_many (CORBA::Short keys, CORBA::Long iterations); - - void get_many (CORBA::Short keys, CORBA::Long iterations); - - //@} - - private: - ::Getter_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_fixed_status_; - ::CCM_GetInvoker_var ciao_getter_invoke_; - //@} - - //@{ - /** User defined members. */ - DDS::InstanceHandle_t fixed_handle_; - DDS::InstanceHandle_t variable_handle_; - - //@} - - //@{ - /** User defined private operations. */ - void timeout_get_one_fixed (void); - void timeout_get_one_variable (void); - - void get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration); - void get_one_variable (const char * key, CORBA::Long iteration); - - void read_many (CORBA::Short keys , - CORBA::Long iterations, - const GetterTestSeq& gettertest_seq); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Getter_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore deleted file mode 100644 index d9099de70bf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Getter_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl deleted file mode 100644 index acc67383c3f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_GETTER_TEST_SENDER_IDL -#define DDS_GETTER_TEST_SENDER_IDL - -#include "Connector/Getter_Test_Connector.idl" -#include "Base/Get_Invoker.idl" - -module Getter_Test -{ - component Sender - { - port GetterTestConnector::DDS_Write info_write; - port GetterFixedConnector::DDS_Write info_fixed; - - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - - uses GetInvoker invoke_getter; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc deleted file mode 100644 index e08b4d402a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc +++ /dev/null @@ -1,149 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Getter_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Getter_Test_Sender.idl - } -} - -project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Getter_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Getter_Test_SenderE.idl - } -} - -project(DDS_Getter_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Getter_Test_Sender_lem_gen DDS_Getter_Test_Sender_stub \ - DDS_Getter_Test_Base_stub DDS_Get_Invoker_stub - libs += DDS_Getter_Test_Base_stub Sender_stub Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_SenderEC.cpp - } - - Header_Files { - Getter_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Getter_Test_SenderEC.inl - } -} - -project(DDS_Getter_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Getter_Test_Sender_idl_gen DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_stub DDS_Get_Invoker_stub \ - DDS_Get_Invoker_lem_stub - libs += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \ - Get_Invoker_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_SenderC.cpp - } - - Header_Files { - Getter_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Getter_Test_SenderC.inl - } -} - -project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Getter_Test_Sender_lem_stub DDS_Getter_Test_Sender_stub \ - DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub \ - Get_Invoker_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_Sender_exec.cpp - } - - Header_Files { - Getter_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Getter_Test_Base_stub DDS_Getter_Test_Sender_lem_stub \ - DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \ - DDS_Get_Invoker_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ - DDS_Getter_Test_Connector_lem_stub Get_Invoker_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_SenderS.cpp - Getter_Test_Sender_svnt.cpp - } - - Header_Files { - Getter_Test_SenderS.h - Getter_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp deleted file mode 100644 index 86cce2badfc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp +++ /dev/null @@ -1,378 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Getter_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Getter_Test_Sender_Impl -{ - /** - * Pulse generator - */ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Getter_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::Getter_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->callback_.start (); - } - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - , done_ (false) - , ccm_activated_ (false) - , last_iter_ (1) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - void - Sender_exec_i::start_timeout_tests (void) - { - GetInvoker_var invoker = - this->ciao_context_->get_connection_invoke_getter (); - - invoker->start_timeout_get_one (); - invoker->start_timeout_get_many (); - } - - void - Sender_exec_i::write_many (void) - { - ::Getter_Test::GetterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - GetInvoker_var invoker = - this->ciao_context_->get_connection_invoke_getter (); - - // Prepare the samples. - GetterTestSeq write_many (this->keys_ * this->iterations_); - write_many.length (this->keys_ * this->iterations_); - - // since the test for get_one already writes samples to DDS with - // key=KEY_1 we start with key = 2 when writing many samples. - for (CORBA::UShort key = 2; key < this->keys_ + 2; ++key) - { - GetterTest new_key; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - new_key.key = CORBA::string_dup(tmp); - for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - new_key.iteration = iter; - write_many[(iter - 1) + ((key - 2) * 10)] = new_key; - } - } - try - { - // Inform the receiver that the sender has written many - // samples to DDS. - invoker->start_get_many (this->keys_, this->iterations_); - // Wait a while before writing the samples. - ACE_Time_Value tv (2, 0); - ACE_OS::sleep (tv); - // Now start writing. - writer->write_many (write_many); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"), - write_many.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - - void - Sender_exec_i::start (void) - { - // Start can be called more than once... - if (!this->done_ && this->ccm_activated_) - { - this->done_ = true; - start_timeout_tests (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, 500000), - ACE_Time_Value (0, 500000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - } - - void - Sender_exec_i::tick (void) - { - ::Getter_Test::GetterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ::Getter_Test::GetterFixedConnector::Writer_var fixed = - this->ciao_context_->get_connection_info_fixed_data (); - ::GetInvoker_var invoker = - this->ciao_context_->get_connection_invoke_getter (); - - if (this->last_iter_ <= this->iterations_) - { - GetterFixed fixed_key; - GetterTest *new_key = new GetterTest; - new_key->key = CORBA::string_dup ("KEY_1"); - fixed_key.key = 1; - // Inform the receiver that this class (as the sender) is about to - // write samples to DDS. - invoker->start_get_one ("KEY_1", 1, last_iter_); - - new_key->iteration = last_iter_; - fixed_key.iteration = last_iter_; - - ACE_Time_Value tv (0, 50000); - ACE_OS::sleep (tv); - - writer->write_one (*new_key, ::DDS::HANDLE_NIL); - fixed->write_one (fixed_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written keys <%C> and <%u> with <%d>\n", - new_key->key.in (), fixed_key.key, last_iter_)); - - ++last_iter_; - delete new_key; - } - else - { - // Stop the timer at forehand. - this->reactor ()->cancel_timer (this->ticker_); - // Perform the last test. - this->write_many (); - } - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Getter_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->ccm_activated_ = true; - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->done_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::ccm_remove : ") - ACE_TEXT ("Never got start signal\n"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Getter_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h deleted file mode 100644 index cb017322f97..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h +++ /dev/null @@ -1,189 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_ -#define CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_ - -#include /**/ "ace/pre.h" - -#include "Getter_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Getter_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * Pulse generator. - */ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Getter_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Getter_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void tick (void); - //@} - - private: - ::Getter_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - bool done_; - bool ccm_activated_; - CORBA::ULong last_iter_; - pulse_Generator * ticker_; - //@} - - //@{ - /** User defined private operations. */ - void start_timeout_tests (void); - void write_many (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Getter_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml deleted file mode 100644 index 7f8f5e589e4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - TRANSIENT_DURABILITY_QOS - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - KEEP_ALL_HISTORY_QOS - 1 - - - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp deleted file mode 100644 index bc1ffd81232..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp +++ /dev/null @@ -1,542 +0,0 @@ - - - - Getter_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Getter_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Getter_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Getter_Fixed_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Getter_Test_GetterFixedConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Getter_Test_GetterFixedConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Getter_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Getter_Test_Connector_exec - - - - - - - Getter_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Getter_Test_GetterTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Getter_Test_GetterTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Getter_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Getter_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Getter_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Getter_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Getter_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - Getter_Library#GetterProfile - - - - - topic_name - - - tk_string - - - Getter_Test - - - - - - Getter_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - Getter_Library#GetterProfile - - - - - topic_name - - - tk_string - - - Getter_Test - - - - - - - - Getter_Fixed_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Getter_Fixed - - - - - - Getter_Fixed_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Getter_Fixed - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_get_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - info_get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - info_fixed_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_fixed_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - info_out_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - fixed_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_fixed_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - invoke_getter - false - SimplexReceptacle - - - - getter_invoke - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Getter_Test_Connector_exec - - - DDS_Getter_Test_Connector_exec - - - Getter_Test_Connector_svnt - - - DDS_Getter_Test_Connector_svnt - - - Getter_Test_Connector_stub - - - DDS_Getter_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 6c565b5b209..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl deleted file mode 100755 index 5f6eda59235..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl +++ /dev/null @@ -1,249 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $tg_executor->ProcessStartWaitInterval ()); - -if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; -} - -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 -s\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/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl deleted file mode 100644 index 262effa164f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Hello_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef HELLO_BASE_IDL -#define HELLO_BASE_IDL - -#pragma ndds typesupport "Base/Hello_BaseSupport.h" -#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "DDSHello" - -struct DDSHello { - string hello; - short iterator; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence DDSHelloSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc deleted file mode 100644 index ac400cd71d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (Home_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = Home_Hello_Base_stub - dynamicflags += HELLO_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ - -Wb,stub_export_include=Hello_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Hello_Base.idl - } - - opendds_ts_flags += --export=HELLO_BASE_STUB_Export - - DDSGenerator_Files { - Hello_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl deleted file mode 100644 index 4b20fa3c416..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Hello_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef HELLO_CONNECTOR_IDL_ -#define HELLO_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Hello_Base.idl" - -#pragma ciao lem "Connector1/Hello_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Hello_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Foo_conn; - -#endif /* HELLO_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc deleted file mode 100644 index 0071d626167..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc +++ /dev/null @@ -1,149 +0,0 @@ -project(Home_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Home_Hello_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Hello_Connector_stub_export.h \ - -Wb,skel_export_macro=HELLO_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Hello_Connector_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Hello_Connector_svnt_export.h \ - -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Hello_Connector_conn_export.h \ - -I .. - - IDL_Files { - Hello_Connector.idl - } -} - -project(Home_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += Home_Hello_Connector_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Hello_ConnectorE.idl - } -} - -project(Home_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Home_Hello_Connector_lem_gen \ - Home_Hello_Connector_stub \ - Home_Hello_Base_stub - libs += Home_Hello_Base_stub \ - Home_Hello_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Home_Hello_Connector_lem_stub - dynamicflags += HELLO_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorEC.cpp - } - - Header_Files { - Hello_ConnectorEC.h - Hello_Connector_lem_stub_export.h - } - - Inline_Files { - Hello_ConnectorEC.inl - } -} - -project(Home_Hello_Connector_stub) : ccm_stub, dds4ccm_base { - after += Home_Hello_Connector_idl_gen Home_Hello_Base_stub - libs += Home_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Home_Hello_Connector_stub - dynamicflags += HELLO_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorC.cpp - } - - Header_Files { - Hello_ConnectorC.h - Hello_Connector_stub_export.h - } - - Inline_Files { - Hello_ConnectorC.inl - } -} - -project(Home_Hello_Connector_exec) : ciao_executor, dds4ccm_impl { - after += Home_Hello_Connector_lem_stub \ - Home_Hello_Connector_stub \ - Home_Hello_Base_stub - sharedname = Home_Hello_Connector_exec - libs += Home_Hello_Connector_stub \ - Home_Hello_Connector_lem_stub \ - Home_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector_conn.cpp - } - - Header_Files { - Hello_Connector_conn.h - Hello_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(Home_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Home_Hello_Connector_lem_stub \ - Home_Hello_Connector_exec \ - Home_Hello_Connector_stub - sharedname = Home_Hello_Connector_svnt - libs += Home_Hello_Connector_stub \ - Home_Hello_Connector_lem_stub \ - Home_Hello_Base_stub \ - Home_Hello_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_ConnectorS.cpp - Hello_Connector_svnt.cpp - } - - Header_Files { - Hello_ConnectorS.h - Hello_Connector_svnt.h - Hello_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl deleted file mode 100644 index db9a415bf82..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Hello_Connector2.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef HELLO_CONNECTOR2_IDL_ -#define HELLO_CONNECTOR2_IDL_ - -#include -#include - -#include "Base/Hello_Base.idl" - -#pragma ciao lem "Connector2/Hello_Connector2E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Hello_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Bar_conn; - -#endif /* HELLO_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc deleted file mode 100644 index 34106691416..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc +++ /dev/null @@ -1,149 +0,0 @@ -project(Home_Hello_Connector2_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Home_Hello_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_STUB_Export \ - -Wb,stub_export_include=Hello_Connector2_stub_export.h \ - -Wb,skel_export_macro=HELLO_CONNECTOR2_SVNT_Export \ - -Wb,skel_export_include=Hello_Connector2_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_CONNECTOR2_SVNT_Export \ - -Wb,svnt_export_include=Hello_Connector2_svnt_export.h \ - -Wb,conn_export_macro=HELLO_CONNECTOR2_CONN_Export \ - -Wb,conn_export_include=Hello_Connector2_conn_export.h \ - -I .. - - IDL_Files { - Hello_Connector2.idl - } -} - -project(Home_Hello_Connector2_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += Home_Hello_Connector2_idl_gen - idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_LEM_STUB_Export \ - -Wb,stub_export_include=Hello_Connector2_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Hello_Connector2E.idl - } -} - -project(Home_Hello_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Home_Hello_Connector2_lem_gen \ - Home_Hello_Connector2_stub \ - Home_Hello_Base_stub - libs += Home_Hello_Base_stub \ - Home_Hello_Connector2_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Home_Hello_Connector2_lem_stub - dynamicflags += HELLO_CONNECTOR2_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector2EC.cpp - } - - Header_Files { - Hello_Connector2EC.h - Hello_Connector2_lem_stub_export.h - } - - Inline_Files { - Hello_Connector2EC.inl - } -} - -project(Home_Hello_Connector2_stub) : ccm_stub, dds4ccm_base { - after += Home_Hello_Connector2_idl_gen Home_Hello_Base_stub - libs += Home_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Home_Hello_Connector2_stub - dynamicflags += HELLO_CONNECTOR2_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector2C.cpp - } - - Header_Files { - Hello_Connector2C.h - Hello_Connector2_stub_export.h - } - - Inline_Files { - Hello_Connector2C.inl - } -} - -project(Home_Hello_Connector2_exec) : ciao_executor, dds4ccm_impl { - after += Home_Hello_Connector2_lem_stub \ - Home_Hello_Connector2_stub \ - Home_Hello_Base_stub - sharedname = Home_Hello_Connector2_exec - libs += Home_Hello_Connector2_stub \ - Home_Hello_Connector2_lem_stub \ - Home_Hello_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR2_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector2_conn.cpp - } - - Header_Files { - Hello_Connector2_conn.h - Hello_Connector2_conn_export.h - } - - Inline_Files { - } -} - - -project(Home_Hello_Connector2_svnt) : ciao_servant, dds4ccm_impl { - after += Home_Hello_Connector2_lem_stub \ - Home_Hello_Connector2_exec \ - Home_Hello_Connector2_stub - sharedname = Home_Hello_Connector2_svnt - libs += Home_Hello_Connector2_stub \ - Home_Hello_Connector2_lem_stub \ - Home_Hello_Base_stub \ - Home_Hello_Connector2_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_CONNECTOR2_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Connector2S.cpp - Hello_Connector2_svnt.cpp - } - - Header_Files { - Hello_Connector2S.h - Hello_Connector2_svnt.h - Hello_Connector2_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl deleted file mode 100644 index d1692eb1582..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_SENDER_IDL -#define DDS_SENDER_IDL - -#include "Connector1/Hello_Connector.idl" -#include "Connector2/Hello_Connector2.idl" - -module Hello -{ - interface Base_obj - { - }; - - interface Derived_obj : Base_obj - { - }; - - component Base_comp - { - provides Base_obj baseFacet; - uses Base_obj baseRecept; - port Foo_conn::DDS_Write fooPub; - port Foo_conn::DDS_Listen fooSub; - attribute short baseAttr; - }; - - home Base_compHome manages Base_comp { - }; - - component Derived_comp : Base_comp - { - provides Derived_obj derivedFacet; - uses Derived_obj derivedRecept; - attribute long long derivedAttr; - port Bar_conn::DDS_Write barPub; - port Bar_conn::DDS_Listen barSub; - - }; - - home Derived_compHome : Base_compHome manages Derived_comp { - }; - - component DerivedEmpty_comp : Base_comp { - }; - - - - -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc deleted file mode 100644 index accf17584fb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(Home_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm { - avoids += ace_for_tao - after += Home_Hello_Connector_idl_gen Home_Hello_Connector2_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=HELLO_SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Hello_Sender.idl - } -} - -project(Home_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - avoids += ace_for_tao - after += Home_Hello_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Hello_SenderE.idl - } -} - -project(Home_Hello_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - avoids += ace_for_tao - after += Home_Hello_Sender_lem_gen Home_Hello_Sender_stub Home_Hello_Base_stub - libs += Home_Hello_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderEC.cpp - } - - Header_Files { - Hello_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Hello_SenderEC.inl - } -} - -project(Home_Hello_Sender_stub) : ccm_stub, dds4ccm_base { - avoids += ace_for_tao - after += Home_Hello_Sender_idl_gen Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub - libs += Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += HELLO_SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderC.cpp - } - - Header_Files { - Hello_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Hello_SenderC.inl - } -} - -project(Home_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += Home_Hello_Sender_lem_stub Home_Hello_Sender_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \ - Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub Home_Hello_Base_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \ - Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_Sender_exec.cpp - } - - Header_Files { - Hello_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(Home_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - avoids += ace_for_tao - after += Home_Hello_Base_stub Home_Hello_Sender_lem_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt Home_Hello_Connector_lem_stub \ - Home_Hello_Connector2_stub Home_Hello_Connector2_svnt Home_Hello_Connector2_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt Home_Hello_Connector_lem_stub \ - Home_Hello_Connector2_stub Home_Hello_Connector2_svnt Home_Hello_Connector2_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Hello_SenderS.cpp - Hello_Sender_svnt.cpp - } - - Header_Files { - Hello_SenderS.h - Hello_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp deleted file mode 100644 index 7024dbf18ef..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp +++ /dev/null @@ -1,723 +0,0 @@ -// -*- C++ -*- -#include "Hello_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/Date_Time.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Reactor.h" - -namespace CIAO_Hello_Base_comp_Impl -{ - - fooSub_data_listener_exec_i::fooSub_data_listener_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Base_comp_Context::_duplicate (ctx)) - { - } - - fooSub_data_listener_exec_i::~fooSub_data_listener_exec_i (void) - { - } - - // Operations from Listener - void - fooSub_data_listener_exec_i::on_one_data ( - const ::DDSHello & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - } - - void - fooSub_data_listener_exec_i::on_many_data ( - const ::DDSHelloSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - fooSub_status_exec_i::fooSub_status_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Base_comp_Context::_duplicate (ctx)) - { - } - - fooSub_status_exec_i::~fooSub_status_exec_i (void) - { - //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~fooSub_status_exec_i\n"))); - } - - void - fooSub_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - fooSub_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - //ACE_DEBUG ((LM_ERROR, ACE_TEXT("port status listener::on_sample_lost\n"))); - } - - //============================================================ - // Component Executor Implementation Class: Base_comp_exec_i - //============================================================ - - Base_comp_exec_i::Base_comp_exec_i (void) - : baseAttr_ (1) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -2- Base_comp_exec_i::" - "Base_comp_exec_i \n")); - } - - Base_comp_exec_i::~Base_comp_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -10- Base_comp_exec_i::" - "~Base_comp_exec_i \n")); - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CORBA::Short - Base_comp_exec_i::baseAttr (void) - { - return this->baseAttr_; - } - - void - Base_comp_exec_i::baseAttr ( - ::CORBA::Short baseAttr) - { - this->baseAttr_ = baseAttr; - } - - ::Foo_conn::CCM_Listener_ptr - Base_comp_exec_i::get_fooSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ())) - { - fooSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - fooSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Foo_conn::CCM_Listener::_nil ()); - - this->ciao_fooSub_data_listener_ = tmp; - } - - return - ::Foo_conn::CCM_Listener::_duplicate ( - this->ciao_fooSub_data_listener_.in ()); - } - - - - ::CCM_DDS::CCM_PortStatusListener_ptr - Base_comp_exec_i::get_fooSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ())) - { - fooSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - fooSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_fooSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_fooSub_status_.in ()); - } - - ::Hello::CCM_Base_obj_ptr - Base_comp_exec_i::get_baseFacet (void) - { - return 0; - } - - // Operations from Components::SessionComponent. - void - Base_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_Base_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Base_comp_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -3- Base_comp_exec_i::" - "configuration_complete \n")); - } - - void - Base_comp_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -4- Base_comp_exec_i::" - "ccm_activate \n")); - } - - void - Base_comp_exec_i::ccm_passivate (void) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -8- Base_comp_exec_i::" - "ccm_passivate \n")); - } - - void - Base_comp_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_DEBUG, "Base_comp: -9- Base_comp_exec_i::" - "ccm_remove \n")); - } - - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Base_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Base_comp_exec_i); - - return retval; - } - -} -namespace CIAO_Hello_Base_comp_Impl -{ - //============================================================ - // Home Executor Implementation Class: SenderHome_exec_i - //============================================================ - - Base_compHome_exec_i::Base_compHome_exec_i () - { - ACE_DEBUG ((LM_DEBUG, " Base_compHome: -2- Base_compHome_exec_i::" - "Base_compHome_exec_i \n")); - } - - Base_compHome_exec_i::~Base_compHome_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, " Base_compHome: -11- Base_compHome_exec_i::" - "~Base_compHome_exec_i \n")); - } - - // All operations and attributes. - - // Factory operations. - - // Finder operations. - - // Implicit operations. - - ::Components::EnterpriseComponent_ptr - Base_compHome_exec_i::create (void) - { - ACE_DEBUG ((LM_DEBUG, " Base_compHome: -3- Base_compHome_exec_i::create\n")); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Base_compHome\n")); - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - - ACE_NEW_THROW_EX ( - retval, - CIAO_Hello_Base_comp_Impl::Base_comp_exec_i (), - ::CORBA::NO_MEMORY ()); - return retval; - } - - extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr - create_Hello_SenderHome_Impl (void) - { - ACE_DEBUG ((LM_DEBUG, " Base_compHome: -1- create_Hello_Base_compHome_Impl \n")); - - ::Components::HomeExecutorBase_ptr retval = - ::Components::HomeExecutorBase::_nil (); - - ACE_NEW_NORETURN ( - retval, - Base_compHome_exec_i ()); - - return retval; - } -} - -//============================================================ - // Component Executor Implementation Class: Derived_comp_exec_i - //============================================================ -namespace CIAO_Hello_Derived_comp_Impl -{ - barSub_data_listener_exec_i::barSub_data_listener_exec_i ( - ::Hello::CCM_Derived_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Derived_comp_Context::_duplicate (ctx)) - { - } - - barSub_data_listener_exec_i::~barSub_data_listener_exec_i (void) - { - } - - // Operations from Listener - void - barSub_data_listener_exec_i::on_one_data ( - const ::DDSHello & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - } - - void - barSub_data_listener_exec_i::on_many_data ( - const ::DDSHelloSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - - barSub_status_exec_i::barSub_status_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx) - : ciao_context_ ( - ::Hello::CCM_Base_comp_Context::_duplicate (ctx)) - { - } - - barSub_status_exec_i::~barSub_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - barSub_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - barSub_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - } - - Derived_comp_exec_i::Derived_comp_exec_i (void) - : baseAttr_ (10), - derivedAttr_ (100) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -2- Derived_comp_exec_i::" - "Derived_comp_exec_i \n")); - } - - Derived_comp_exec_i::~Derived_comp_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -10- Derived_comp_exec_i::" - "~Derived_comp_exec_i \n")); - } - - // Supported operations and attributes. - ::CORBA::LongLong - Derived_comp_exec_i::derivedAttr (void) - { - return this->derivedAttr_; - } - - void - Derived_comp_exec_i::derivedAttr ( - ::CORBA::LongLong derivedAttr) - { - this->derivedAttr_ = derivedAttr; - } - - - ::CORBA::Short - Derived_comp_exec_i::baseAttr (void) - { - return this->baseAttr_; - } - - void - Derived_comp_exec_i::baseAttr ( - ::CORBA::Short baseAttr) - { - this->baseAttr_ = baseAttr; - } - - // Component attributes and port operations. - - ::Foo_conn::CCM_Listener_ptr - Derived_comp_exec_i::get_fooSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ())) - { - CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Foo_conn::CCM_Listener::_nil ()); - - this->ciao_fooSub_data_listener_ = tmp; - } - - return - ::Foo_conn::CCM_Listener::_duplicate ( - this->ciao_fooSub_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Derived_comp_exec_i::get_fooSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ())) - { - CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_fooSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_fooSub_status_.in ()); - } - - ::Bar_conn::CCM_Listener_ptr - Derived_comp_exec_i::get_barSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_barSub_data_listener_.in ())) - { - barSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - barSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Bar_conn::CCM_Listener::_nil ()); - - this->ciao_barSub_data_listener_ = tmp; - } - - return - ::Bar_conn::CCM_Listener::_duplicate ( - this->ciao_barSub_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Derived_comp_exec_i::get_barSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_barSub_status_.in ())) - { - barSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - barSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_barSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_barSub_status_.in ()); - } - - ::Hello::CCM_Base_obj_ptr - Derived_comp_exec_i::get_baseFacet (void) - { - return 0; - } - - ::Hello::CCM_Derived_obj_ptr - Derived_comp_exec_i::get_derivedFacet (void) - { - return 0; - } - - // Operations from Components::SessionComponent. - void - Derived_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -3- Derived_comp_exec_i::" - ":set_session_contexti \n")); - this->ciao_context_ = - ::Hello::CCM_Derived_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Derived_comp_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -4- Derived_comp_exec_i::" - "configuration_complete \n")); - } - - void - Derived_comp_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -5- Derived_comp_exec_i::" - "ccm_activate \n")); - } - - void - Derived_comp_exec_i::ccm_passivate (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -8- Derived_comp_exec_i::" - "ccm_passivate \n")); - } - - void - Derived_comp_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_comp: -9- Derived_comp_exec_i::" - "ccm_remove \n")); - } - - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Derived_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Derived_comp_exec_i); - - return retval; - } - -} -namespace CIAO_Hello_Derived_comp_Impl -{ - //============================================================ - // Home Executor Implementation Class: Derived_compHome_exec_i - //============================================================ - - Derived_compHome_exec_i::Derived_compHome_exec_i () - { - ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -2- Derived_compHome_exec_i::" - "Derived_compHome_exec_i \n")); - - //compare current and original thread - } - - Derived_compHome_exec_i::~Derived_compHome_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -11- Derived_compHome_exec_i::" - "~Derived_compHome_exec_i \n")); - } - - // All operations and attributes. - - // Factory operations. - - // Finder operations. - - // Implicit operations. - - ::Components::EnterpriseComponent_ptr - Derived_compHome_exec_i::create (void) - { - ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -3- Derived_compHome_exec_i::create\n")); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Derived_compHome\n")); - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - - ACE_NEW_THROW_EX ( - retval, - CIAO_Hello_Derived_comp_Impl::Derived_comp_exec_i (), - ::CORBA::NO_MEMORY ()); - - return retval; - } - - extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr - create_Hello_Derived_compHome_Impl (void) - { - - ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -1- create_Hello_Derived_compHome_Impl \n")); - - ::Components::HomeExecutorBase_ptr retval = - ::Components::HomeExecutorBase::_nil (); - - - ACE_NEW_NORETURN ( - retval, - Derived_compHome_exec_i ()); - - return retval; - } -} -//============================================================ - // Component Executor Implementation Class: DerivedEmpty_comp_exec_i - //============================================================ -namespace CIAO_Hello_DerivedEmpty_comp_Impl -{ - DerivedEmpty_comp_exec_i::DerivedEmpty_comp_exec_i (void) - : baseAttr_ (1) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -2- DerivedEmpty_comp_exec_i::" - "DerivedEmpty_comp_exec_i \n")); - } - - DerivedEmpty_comp_exec_i::~DerivedEmpty_comp_exec_i (void) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -10- DerivedEmpty_comp_exec_i::" - "~DerivedEmpty_comp_exec_i \n")); - } - - // Supported operations and attributes. - - ::CORBA::Short - DerivedEmpty_comp_exec_i::baseAttr (void) - { - return this->baseAttr_; - } - - void - DerivedEmpty_comp_exec_i::baseAttr ( - ::CORBA::Short baseAttr) - { - this->baseAttr_ = baseAttr; - } - - // Component attributes and port operations. - - - ::Foo_conn::CCM_Listener_ptr - DerivedEmpty_comp_exec_i::get_fooSub_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ())) - { - CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Foo_conn::CCM_Listener::_nil ()); - - this->ciao_fooSub_data_listener_ = tmp; - } - - return - ::Foo_conn::CCM_Listener::_duplicate ( - this->ciao_fooSub_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - DerivedEmpty_comp_exec_i::get_fooSub_status (void) - { - if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ())) - { - CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_fooSub_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_fooSub_status_.in ()); - } - - - ::Hello::CCM_Base_obj_ptr - DerivedEmpty_comp_exec_i::get_baseFacet (void) - { - return 0; - } - // Operations from Components::SessionComponent. - - void - DerivedEmpty_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Hello::CCM_DerivedEmpty_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - DerivedEmpty_comp_exec_i::configuration_complete (void) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -3- DerivedEmpty_comp_exec_i::" - "configuration_completei \n")); - /* Your code here. */ - } - - void - DerivedEmpty_comp_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -4- DerivedEmpty_comp_exec_i::" - "ccm_activate \n")); - } - - void - DerivedEmpty_comp_exec_i::ccm_passivate (void) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -8- DerivedEmpty_comp_exec_i::" - "ccm_passivate \n")); - } - - void - DerivedEmpty_comp_exec_i::ccm_remove (void) - { - ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -9- DerivedEmpty_comp_exec_i::" - "ccm_remove \n")); - } - - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_DerivedEmpty_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - DerivedEmpty_comp_exec_i); - - return retval; - } - -} diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h deleted file mode 100644 index de5a3d6d89b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h +++ /dev/null @@ -1,365 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_ -#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_ - -#include /**/ "ace/pre.h" - -#include "Hello_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" -#include - -namespace CIAO_Hello_Base_comp_Impl -{ - - class HELLO_SENDER_EXEC_Export fooSub_data_listener_exec_i - : public virtual ::Foo_conn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - fooSub_data_listener_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx); - - virtual ~fooSub_data_listener_exec_i (void); - - // Operations and attributes from Hello::Listener - - virtual - void on_one_data ( - const ::DDSHello & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::DDSHelloSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - private: - ::Hello::CCM_Base_comp_Context_var ciao_context_; - }; - - class HELLO_SENDER_EXEC_Export fooSub_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - fooSub_status_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx); - virtual ~fooSub_status_exec_i (void); - - // Operations and attributes from CCM_DDS::PortStatusListener - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - - private: - ::Hello::CCM_Base_comp_Context_var ciao_context_; - }; - - - class Base_comp_exec_i; - - class HELLO_SENDER_EXEC_Export Base_comp_exec_i - : public virtual Base_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Base_comp_exec_i (void); - virtual ~Base_comp_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CORBA::Short - baseAttr (void); - - virtual void - baseAttr (::CORBA::Short baseAttr); - - virtual ::Foo_conn::CCM_Listener_ptr - get_fooSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_fooSub_status (void); - - virtual ::Hello::CCM_Base_obj_ptr - get_baseFacet (void); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - private: - ::Hello::CCM_Base_comp_Context_var ciao_context_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_; - ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_; - CORBA::Short baseAttr_; - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Base_comp_Impl (void); -} -namespace CIAO_Hello_Base_comp_Impl -{ - class HELLO_SENDER_EXEC_Export Base_compHome_exec_i - : public virtual Base_compHome_Exec, - public virtual ::CORBA::LocalObject - { - public: - Base_compHome_exec_i (void); - - virtual ~Base_compHome_exec_i (void); - - // All operations and attributes. - - // Factory operations. - - // Finder operations. - - // Implicit operations. - - virtual ::Components::EnterpriseComponent_ptr - create (void); - private: - - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr - create_Hello_Base_compHome_Impl (void); -} - -namespace CIAO_Hello_Derived_comp_Impl -{ - - class HELLO_SENDER_EXEC_Export barSub_data_listener_exec_i - : public virtual ::Bar_conn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - barSub_data_listener_exec_i ( - ::Hello::CCM_Derived_comp_Context_ptr ctx); - - virtual ~barSub_data_listener_exec_i (void); - - // Operations and attributes from Hello::Listener - - virtual - void on_one_data ( - const ::DDSHello & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::DDSHelloSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - private: - ::Hello::CCM_Derived_comp_Context_var ciao_context_; - }; - - class HELLO_SENDER_EXEC_Export barSub_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - barSub_status_exec_i ( - ::Hello::CCM_Base_comp_Context_ptr ctx); - virtual ~barSub_status_exec_i (void); - - // Operations and attributes from CCM_DDS::PortStatusListener - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - - private: - ::Hello::CCM_Base_comp_Context_var ciao_context_; - }; - - class HELLO_SENDER_EXEC_Export Derived_comp_exec_i - : public virtual Derived_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Derived_comp_exec_i (void); - virtual ~Derived_comp_exec_i (void); - - //@{ - /** Component attributes and port operations. */ - virtual ::CORBA::LongLong - derivedAttr (void); - - virtual void - derivedAttr (::CORBA::LongLong); - - virtual ::CORBA::Short - baseAttr (void); - - virtual void - baseAttr (::CORBA::Short baseAttr); - - virtual ::Foo_conn::CCM_Listener_ptr - get_fooSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_fooSub_status (void); - - virtual ::Bar_conn::CCM_Listener_ptr - get_barSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_barSub_status (void); - - virtual ::Hello::CCM_Base_obj_ptr - get_baseFacet (void); - - virtual ::Hello::CCM_Derived_obj_ptr - get_derivedFacet (void); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - private: - ::Hello::CCM_Derived_comp_Context_var ciao_context_; - ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_; - ::Bar_conn::CCM_Listener_var ciao_barSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_barSub_status_; - - CORBA::Short baseAttr_; - CORBA::ULongLong derivedAttr_; - // Atomic_Boolean ready_to_start_; - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_Derived_comp_Impl (void); -} - - -namespace CIAO_Hello_Derived_comp_Impl -{ - class HELLO_SENDER_EXEC_Export Derived_compHome_exec_i - : public virtual Derived_compHome_Exec, - public virtual ::CORBA::LocalObject - { - public: - Derived_compHome_exec_i (void); - - virtual ~Derived_compHome_exec_i (void); - - // All operations and attributes. - - // Factory operations. - // Finder operations. - - // Implicit operations. - - virtual ::Components::EnterpriseComponent_ptr - create (void); - private: - - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr - create_Hello_Derived_compHome_Impl (void); -} - -namespace CIAO_Hello_DerivedEmpty_comp_Impl -{ - class HELLO_SENDER_EXEC_Export DerivedEmpty_comp_exec_i - : public virtual DerivedEmpty_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - DerivedEmpty_comp_exec_i (void); - virtual ~DerivedEmpty_comp_exec_i (void); - - //@{ - /** Component attributes and port operations. */ - virtual ::CORBA::Short - baseAttr (void); - - virtual void - baseAttr (::CORBA::Short baseAttr); - - virtual ::Foo_conn::CCM_Listener_ptr - get_fooSub_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_fooSub_status (void); - - virtual ::Hello::CCM_Base_obj_ptr - get_baseFacet (void); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - private: - ::Hello::CCM_DerivedEmpty_comp_Context_var ciao_context_; - ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_; - CORBA::Short baseAttr_; - CORBA::ULongLong derivedAttr_; - }; - - extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Hello_DerivedEmpty_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp deleted file mode 100644 index 563002a03d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp +++ /dev/null @@ -1,753 +0,0 @@ - - - - Hello_Depl_1 - - - DerivedEmpty_compComponentImplementation - - - - - - component factory - - - tk_string - - - create_Hello_DerivedEmpty_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_DerivedEmpty_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DerivedEmpty_comp_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DerivedEmpty_comp_exec - - - - - - - Foo_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Foo_conn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Foo_conn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Foo_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Foo_Connector_exec - - - - - - - Bar_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Bar_conn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Bar_conn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Bar_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Bar_Connector_exec - - - - - - - - Base_compHomeComponentImplementation - - - - - - home factory - - - tk_string - - - create_Hello_Base_compHome_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Base_compHome_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Base_compHome_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Base_compHome_exec - - - - - - - Base_compComponentImplementation - - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.CCM.HomedComponent - - - - - - - Derived_compHomeComponentImplementation - - - - - home factory - - - tk_string - - - create_Hello_Derived_compHome_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Hello_Derived_compHome_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Derived_compHome_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Derived_compHome_exec - - - - - - - Derived_compComponentImplementation - - - - - edu.vanderbilt.dre.DAnCE.ImplementationType - - - tk_string - - - edu.vanderbilt.dre.CCM.HomedComponent - - - - - - - - Foo_Connector_1_Component - Node1 - - - - - domain_id - - - tk_long - - - 9 - - - - - topic_name - - - tk_string - - - Hello - - - - - - - Foo_Connector_2_Component - Node1 - - - - - domain_id - - - tk_long - - - 9 - - - - - topic_name - - - tk_string - - - Hello - - - - - - - Bar_Connector_1_Component - Node1 - - - - - domain_id - - - tk_long - - - 99 - - - - - topic_name - - - tk_string - - - Hello - - - - - - - Bar_Connector_2_Component - Node1 - - - - - domain_id - - - tk_long - - - 99 - - - - - topic_name - - - tk_string - - - Hello - - - - - - - Derived_comp_1_Component - Node1 - - - - edu.vanderbilt.dre.CIAO.ComponentHomeId - - - tk_string - - - Derived_compHome_1_Component - - - - - - - Derived_comp_2_Component - Node1 - - - - edu.vanderbilt.dre.CIAO.ComponentHomeId - - - tk_string - - - Derived_compHome_2_Component - - - - - - - Derived_compHome_1_Component - Node1 - - - - - - Derived_compHome_2_Component - Node1 - - - - - - DerivedEmpty_compComponent - Node1 - - - - - - - - writer_1_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - fooPub_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - writer_2_foo_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - fooPub_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - writer_1_bar_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - barPub_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - writer_2_bar_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - barPub_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - MessageConnection1 - - baseRecept - false - SimplexReceptacle - - - - baseFacet - true - Facet - - - - - - MessageConnection2 - - baseRecept - false - SimplexReceptacle - - - - baseFacet - true - Facet - - - - - - MessageConnectionDerived1 - - derivedRecept - false - SimplexReceptacle - - - - derivedFacet - true - Facet - - - - - - MessageConnectionDerived2 - - derivedRecept - false - SimplexReceptacle - - - - derivedFacet - true - Facet - - - - - - - Base_compHome_exec - - - Sender_exec - - - Base_compHome_svnt - - - Sender_svnt - - - Base_compHome_stub - - - Sender_stub - - - - - Derived_compHome_exec - - - Sender_exec - - - Derived_compHome_svnt - - - Sender_svnt - - - Derived_compHome_stub - - - Sender_stub - - - - - - Foo_Connector_exec - - - Home_Hello_Connector_exec - - - Foo_Connector_svnt - - - Home_Hello_Connector_svnt - - - Foo_Connector_stub - - - Home_Hello_Connector_stub - - - - Bar_Connector_exec - - - Home_Hello_Connector2_exec - - - Bar_Connector_svnt - - - Home_Hello_Connector2_svnt - - - Bar_Connector_stub - - - Home_Hello_Connector2_stub - - - - - - DerivedEmpty_comp_exec - - - Sender_exec - - - DerivedEmpty_comp_svnt - - - Sender_svnt - - - DerivedEmpty_comp_stub - - - Sender_stub - - - - DifferentProcess - - - - - - SameProcess - - - - - - - - SameProcess - - - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl deleted file mode 100755 index 5e41171ee32..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl +++ /dev/null @@ -1,250 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}"; - -#$ENV{'DANCE_LOG_LEVEL'}=10; -#$ENV{'CIAO_LOG_LEVEL'}=10; -#$ENV{'DANCE_TRACE_ENABLE'}=1; -#$ENV{'CIAO_TRACE_ENABLE'}=1; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "Node1.ior", "Node2.ior" ); -@iorfiles = 0; -@nodenames = ( "Node1", "Node2" ); - -# ior files other than daemon -# 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 = "DeploymentPlan.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl deleted file mode 100644 index ce6bd87d89a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file HomeT_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef HOMET_BASE_IDL -#define HOMET_BASE_IDL - -#pragma ndds typesupport "Base/HomeT_BaseSupport.h" -#pragma opendds typesupport "Base/HomeT_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "HomeTest" - -struct HomeTest { - string hello; - short iterator; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence HomeTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc deleted file mode 100644 index 5c0feebd8a5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (HomeT_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname =HomeT_Base_stub - dynamicflags += HOMET_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=HOMET_BASE_STUB_Export \ - -Wb,stub_export_include=HomeT_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - HomeT_Base.idl - } - - opendds_ts_flags += --export=HOMET_BASE_STUB_Export - - DDSGenerator_Files { - HomeT_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl deleted file mode 100644 index a79e1fbba8c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file HomeT_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef HOMET_CONNECTOR_IDL_ -#define HOMET_CONNECTOR_IDL_ - -#include -#include - -#include "Base/HomeT_Base.idl" - -#pragma ciao lem "Connector/HomeT_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/HomeT_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::HomeTest, ::HomeTestSeq> ConnComp; - -#endif /* HOMET_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc deleted file mode 100644 index 55fe9a1a65d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc +++ /dev/null @@ -1,150 +0,0 @@ -project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen HomeT_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=HomeT_Connector_stub_export.h \ - -Wb,skel_export_macro=HOMET_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=HomeT_Connector_svnt_export.h \ - -Wb,svnt_export_macro=HOMET_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=HomeT_Connector_svnt_export.h \ - -Wb,conn_export_macro=HOMET_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=HomeT_Connector_conn_export.h \ - -I .. - - IDL_Files { - HomeT_Connector.idl - } -} - -project(HomeT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += HomeT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=HomeT_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - HomeT_ConnectorE.idl - } -} - -project(HomeT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += HomeT_Connector_lem_gen \ - HomeT_Connector_stub \ - HomeT_Base_stub - libs += HomeT_Base_stub \ - HomeT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = HomeT_Connector_lem_stub - dynamicflags += HOMET_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HomeT_ConnectorEC.cpp - } - - Header_Files { - HomeT_ConnectorEC.h - HomeT_Connector_lem_stub_export.h - } - - Inline_Files { - HomeT_ConnectorEC.inl - } -} - -project(HomeT_Connector_stub) : ccm_stub, dds4ccm_base { - after += HomeT_Connector_idl_gen HomeT_Base_stub - libs += HomeT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = HomeT_Connector_stub - dynamicflags += HOMET_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HomeT_ConnectorC.cpp - } - - Header_Files { - HomeT_ConnectorC.h - HomeT_Connector_stub_export.h - } - - Inline_Files { - HomeT_ConnectorC.inl - } -} - -project(HomeT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += HomeT_Connector_lem_stub \ - HomeT_Connector_stub \ - HomeT_Base_stub - sharedname = HomeT_Connector_exec - libs += HomeT_Connector_stub \ - HomeT_Connector_lem_stub \ - HomeT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HOMET_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HomeT_Connector_conn.cpp - } - - Header_Files { - HomeT_Connector_conn.h - HomeT_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(HomeT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += HomeT_Connector_lem_stub \ - HomeT_Connector_exec \ - HomeT_Connector_stub - sharedname = HomeT_Connector_svnt - libs += HomeT_Connector_stub \ - HomeT_Connector_lem_stub \ - HomeT_Base_stub \ - HomeT_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += HOMET_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HomeT_ConnectorS.cpp - HomeT_Connector_svnt.cpp - } - - Header_Files { - HomeT_ConnectorS.h - HomeT_Connector_svnt.h - HomeT_Connector_svnt_export.h - } - - Inline_Files { - HomeT_ConnectorS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc deleted file mode 100644 index 2d7c73d6b01..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc +++ /dev/null @@ -1,167 +0,0 @@ -project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm { - custom_only = 1 - after = HomeT_Base_stub HomeT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=HOMET_HOMEC_STUB_Export \ - -Wb,stub_export_include=HomeT_HomeC_stub_export.h \ - -Wb,skel_export_macro=HOMET_HOMEC_SVNT_Export \ - -Wb,skel_export_include=HomeT_HomeC_svnt_export.h \ - -Wb,exec_export_macro=HOMET_HOMEC_EXEC_Export \ - -Wb,exec_export_include=HomeT_HomeC_exec_export.h \ - -I.. - - IDL_Files { - HomeT_HomeC.idl - } -} - -project(HomeT_HomeC_lem_gen) : ciaoidldefaults, dds4ccm { - after += HomeT_HomeC_idl_gen - custom_only = 1 - - idlflags += -Wb,export_macro=HOMET_HOMEC_LEM_STUB_Export \ - -Wb,export_include=HomeT_HomeC_lem_stub_export.h \ - -SS -Gxhst \ - -I $CIAO_ROOT/connectors -I.. - - IDL_Files { - HomeT_HomeCE.idl - } -} -project(HomeT_HomeC_lem_stub) : ccm_svnt, dds4ccm_base { - after += HomeT_HomeC_lem_gen HomeT_HomeC_stub HomeT_Base_stub \ - HomeT_Connector_stub - libs += HomeT_Base_stub HomeT_HomeC_stub HomeT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = HomeT_HomeC_lem_stub - dynamicflags += HOMET_HOMEC_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HomeT_HomeCEC.cpp - } - - Header_Files { - HomeT_HomeCEC.h - HomeT_HomeC_lem_stub_export.h - } - - Inline_Files { - HomeT_HomeCEC.inl - } -} -project(HomeT_HomeC_stub): ccm_stub, dds4ccm_base { - after += HomeT_Base_stub HomeT_HomeC_idl_gen HomeT_Connector_stub - sharedname = HomeT_HomeC_stub - libs += HomeT_Base_stub HomeT_Connector_stub - includes += .. - libpaths += .. - libout = ../lib - libpaths += ../lib - dynamicflags += HOMET_HOMEC_STUB_BUILD_DLL - - IDL_Files { - } - - Header_Files { - HomeT_HomeCC.h - HomeT_HomeC_stub_export.h - } - - Source_Files { - HomeT_HomeCC.cpp - } - - Inline_Files { - } -} - -project(HomeT_HomeC_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl { - after += HomeT_HomeC_lem_stub HomeT_HomeC_stub HomeT_Connector_lem_stub \ - HomeT_Connector_stub HomeT_Connector_exec - sharedname = HomeT_HomeC_exec - libs += HomeT_HomeC_stub \ - HomeT_HomeC_lem_stub \ - HomeT_Base_stub \ - HomeT_Connector_lem_stub \ - HomeT_Connector_stub \ - HomeT_Connector_exec - includes += . .. - libout = ../lib - libpaths += ../lib - - dynamicflags += HOMET_HOMEC_EXEC_BUILD_DLL - - IDL_Files { - } - - Header_Files { - HomeT_HomeC_exec.h - HomeT_HomeC_exec_export.h - } - - Source_Files { - HomeT_HomeC_exec.cpp - } - - Inline_Files { - } -} - -project(HomeT_HomeC_svnt) : ciao_servant, dds4ccm_base { - after += HomeT_Base_svnt HomeT_HomeC_exec HomeT_Connector_svnt - includes += .. - sharedname = HomeT_HomeC_svnt - - libs += HomeT_HomeC_stub HomeT_HomeC_lem_stub HomeT_HomeC_exec - libs += HomeT_Base_stub \ - HomeT_Connector_stub \ - HomeT_Connector_exec \ - HomeT_Connector_svnt \ - HomeT_Connector_lem_stub - - dynamicflags += HOMET_HOMEC_SVNT_BUILD_DLL - libout = ../lib - libpaths += ../lib - - IDL_Files { - } - - Header_Files { - HomeT_HomeCS.h - HomeT_HomeC_svnt.h - HomeT_HomeC_svnt_export.h - } - - Source_Files { - HomeT_HomeCS.cpp - HomeT_HomeC_svnt.cpp - } -} - -project (HomeT_HomeC_control) : ccm_stub, dds4ccm_base{ - after += HomeT_HomeC_svnt - exename = controller - libs += HomeT_HomeC_stub HomeT_Base_stub HomeT_Connector_stub - includes += .. - libout = ../lib - libpaths += ../lib - - IDL_Files { - } - - Header_Files { - } - - Source_Files { - controller.cpp - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl deleted file mode 100644 index d67b61385cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file HomeT_HomeC.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef HOMET_HOMEC_IDL_ -#define HOMET_HOMEC_IDL_ - -#include -#include "Connector/HomeT_Connector.idl" - -home ConnHome manages ConnComp::DDS_Event -{ - factory new_ConnComp (); -}; - -#endif /* HOMET_HOMEC_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp deleted file mode 100644 index b9026cd86b6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "HomeT_HomeC_exec.h" -#include "../Connector/HomeT_Connector_conn.h" - -namespace CIAO_ConnComp_DDS_Event_Impl -{ - /** - * Home Executor Implementation Class: ConnHome_exec_i - */ - - ConnHome_exec_i::ConnHome_exec_i (void) - { - } - - ConnHome_exec_i::~ConnHome_exec_i (void) - { - } - - ::Components::EnterpriseComponent_ptr - ConnHome_exec_i::new_ConnComp (void) - { - /* Your code here. */ - ACE_DEBUG ((LM_DEBUG, "ConnHome_exec_i::new_ConnComp: create connector.\n")); - - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_THROW_EX ( - retval, - CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i, - ::CORBA::NO_MEMORY ()); - - return retval; - } - - // Implicit operations. - - ::Components::EnterpriseComponent_ptr - ConnHome_exec_i::create (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_THROW_EX ( - retval, - CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i, - ::CORBA::NO_MEMORY ()); - - return retval; - } - - extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr - create_ConnHome_Impl (void) - { - ::Components::HomeExecutorBase_ptr retval = - ::Components::HomeExecutorBase::_nil (); - - ACE_NEW_NORETURN ( - retval, - ConnHome_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h deleted file mode 100644 index 1a2c2fb5ec7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_ -#define CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_ - -#include /**/ "ace/pre.h" - -#include "HomeT_HomeCEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "HomeT_HomeC_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ConnComp_DDS_Event_Impl -{ - class HOMET_HOMEC_EXEC_Export ConnHome_exec_i - : public virtual ConnHome_Exec, - public virtual ::CORBA::LocalObject - { - public: - ConnHome_exec_i (void); - - virtual ~ConnHome_exec_i (void); - - virtual ::Components::EnterpriseComponent_ptr - new_ConnComp (void); - - // Implicit operations. - - virtual ::Components::EnterpriseComponent_ptr - create (void); - }; - - extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr - create_ConnHome_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp deleted file mode 100644 index 3ca362ae9b3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp +++ /dev/null @@ -1,114 +0,0 @@ -//============================================================== -/** - * @file controller.cpp - * - * This is a controller that interact with the Home-component implementation. - * This test uses the explicit factory - * operation in the home interface to create a connector component - * instance, run it for a while, and destroy the component instance. - */ -//============================================================== - -#include "HomeT_HomeCC.h" -#include "Connector/HomeT_ConnectorEC.h" -#include "ace/streams.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *home_comp_ior_ = 0; - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:of")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'o': - break; - case 'f': - break; - case 'k': - home_comp_ior_ = get_opts.opt_arg (); - break; - case '?': // display help for use of the server. - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://HomeC.ior)\n" - "\n", - argv [0]), - -1); - break; - } - } - - if (home_comp_ior_ == 0) - { - home_comp_ior_ = ACE_TEXT("file://HomeC.ior"); - } - - return 0; -} - - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - try - { - // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // Resolve Home interface - CORBA::Object_var obj - = orb->string_to_object (home_comp_ior_); - - ConnHome_var home_comp - = ConnHome::_narrow (obj.in ()); - if (CORBA::is_nil (home_comp.in ())) - ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ConnHome objref\n"), -1); - - // starting Connector component - ACE_DEBUG ((LM_DEBUG, "Controller: Start create Connector component\n")); - - CORBA::Object_var tmp = home_comp->new_ConnComp (); - ConnComp::DDS_Event_var ce = ConnComp::DDS_Event::_narrow (tmp.in ()); - - if (CORBA::is_nil (ce.in ())) - ACE_ERROR((LM_ERROR, "Unable to start create Connector component\n")); - - ACE_DEBUG ((LM_DEBUG, "Controller: Started Connector component\n")); - - // Place to plug in some connector settings - ce->topic_name ("Shapes"); - ce->configuration_complete(); - // activate not possible - //ce->ccm_activate (); - - ACE_OS::sleep (5); - - ce->remove (); - - ACE_DEBUG ((LM_DEBUG, "Controller: removed Connector component\n")); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp deleted file mode 100644 index d3bfa3fced4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp +++ /dev/null @@ -1,110 +0,0 @@ - - - - Hello_Depl_1 - - - HomeTest_HomeImplementation - - - - - - home factory - - - tk_string - - - create_ConnHome_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ConnHome_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - HomeT_HomeC_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - HomeT_HomeC_exec - - - - - - - HomeTest_HomeInstance - ReceiverNode - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - HomeC.ior - - - - - edu.vanderbilt.dre.DAnCE.RegisterNaming - - - tk_string - - - HomeC - - - - - - - HomeT_HomeC_exec - - - HomeT_HomeC_exec - - - HomeT_HomeC_svnt - - - HomeT_HomeC_svnt - - - HomeT_HomeC_stub - - - HomeT_HomeC_stub - - - diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 231c89482ad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_DURABILITY_QOS - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl deleted file mode 100755 index 7efe33a5316..00000000000 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl +++ /dev/null @@ -1,267 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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'}"; -$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}"; - - -$ENV{'DANCE_LOG_LEVEL'}=0; -$ENV{'CIAO_LOG_LEVEL'}=0; -$ENV{'DANCE_TRACE_ENABLE'}=0; -$ENV{'CIAO_TRACE_ENABLE'}=0; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 1; -@ports = ( 60001 ); -@iorbases = ( "HomeC.ior" ); -@iorfiles = 0; -@nodenames = ("ReceiverNode"); - -$controller_exec = "$CIAO_ROOT/connectors/dds4ccm/tests/HomeTest/HomeComp/controller"; - - -# ior files other than daemon -# 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 = "DeploymentPlanConnOnly.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); -print "Invoking the controller\n"; -$controller = $tg_executor->CreateProcess ("$controller_exec", "-k file://HomeC.ior -o"); -$result = $controller->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); -if ($result != 0) { - print STDERR "ERROR: The controller returned $result\n"; - $status = 1; -} - -# put some delay here. -print "Sleeping 10 seconds to allow task to complete\n"; -sleep (5); - - - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl deleted file mode 100644 index 4fbc838ea63..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file IDL_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef IDL_TEST_BASE_IDL -#define IDL_TEST_BASE_IDL - -#pragma ndds typesupport "Base/IDL_Test_BaseSupport.h" -#pragma opendds typesupport "Base/IDL_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "IDL_Test" -#pragma DCPS_DATA_KEY "IDL_Test key" - -struct IDL_Test { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence IDL_TestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc deleted file mode 100644 index fcc12c2898c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (IDL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = IDL_Test_Base_stub - dynamicflags += IDL_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=IDL_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=IDL_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - IDL_Test_Base.idl - } - - opendds_ts_flags += --export=IDL_TEST_BASE_STUB_Export - - DDSGenerator_Files { - IDL_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl deleted file mode 100644 index c8806788e3e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef IDL_TEST_INTERFACES_IDL -#define IDL_TEST_INTERFACES_IDL - -#pragma ciao lem "Base/IDL_Test_InterfacesE.idl" - -interface idl_test_base_interface { - void do_something_base (); - readonly attribute string base_string_attr; -}; - -interface idl_test_derived_interface : idl_test_base_interface { - void do_something_derived (); - attribute string derived_string_attr; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc deleted file mode 100644 index 30886127db2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc +++ /dev/null @@ -1,105 +0,0 @@ -// This file is generated with "generate_component_mpc.pl IDL_Test_Interfaces" - -project(IDL_Test_Interfaces_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_STUB_Export \ - -Wb,stub_export_include=IDL_Test_Interfaces_stub_export.h \ - -Wb,skel_export_macro=IDL_TEST_INTERFACES_SVNT_Export \ - -Wb,skel_export_include=IDL_Test_Interfaces_svnt_export.h \ - -Wb,exec_export_macro=IDL_TEST_INTERFACES_EXEC_Export \ - -Wb,exec_export_include=IDL_Test_Interfaces_exec_export.h - - IDL_Files { - IDL_Test_Interfaces.idl - } -} - -project(IDL_Test_Interfaces_lem_gen) : ciaoidldefaults { - after += IDL_Test_Interfaces_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_LEM_STUB_Export \ - -Wb,stub_export_include=IDL_Test_Interfaces_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - IDL_Test_InterfacesE.idl - } -} - -project(IDL_Test_Interfaces_lem_stub) : ccm_svnt { - after += IDL_Test_Interfaces_lem_gen \ - IDL_Test_Interfaces_stub - libs += IDL_Test_Interfaces_stub - libout = ../lib - libpaths += ../lib - - sharedname = IDL_Test_Interfaces_lem_stub - dynamicflags += IDL_TEST_INTERFACES_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_InterfacesEC.cpp - } - - Header_Files { - IDL_Test_InterfacesEC.h - IDL_Test_Interfaces_lem_stub_export.h - } - - Inline_Files { - IDL_Test_InterfacesEC.inl - } -} - -project(IDL_Test_Interfaces_stub) : ccm_stub { - after += IDL_Test_Interfaces_idl_gen - libs += - libout = ../lib - libpaths += ../lib - - sharedname = IDL_Test_Interfaces_stub - dynamicflags += IDL_TEST_INTERFACES_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_InterfacesC.cpp - } - - Header_Files { - IDL_Test_InterfacesC.h - IDL_Test_Interfaces_stub_export.h - } - - Inline_Files { - IDL_Test_InterfacesC.inl - } -} - -project(IDL_Test_Interfaces_svnt) : ccm_svnt { - after += IDL_Test_Interfaces_idl_gen IDL_Test_Interfaces_stub - libs += IDL_Test_Interfaces_stub - libout = ../lib - libpaths += ../lib - - sharedname = IDL_Test_Interfaces_svnt - dynamicflags += IDL_TEST_INTERFACES_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_InterfacesS.cpp - } - - Header_Files { - IDL_Test_InterfacesS.h - IDL_Test_Interfaces_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl deleted file mode 100644 index fe8ba84ad89..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef BASE_COMPONENT_IDL -#define BASE_COMPONENT_IDL - -#include "Connector/IDL_Test_Connector.idl" -#include "Base/IDL_Test_Interfaces.idl" - -#pragma ciao lem "IDL_Test_Base_ComponentE.idl" -// #pragma ciao lem "Base/IDL_Test_BaseE.idl" - -component IDL_Test_Base_Component -{ - port IDL_Connector::DDS_Update info_base_update; - port IDL_Connector::DDS_Read info_base_read; - port IDL_Connector::DDS_Get info_base_get; - port IDL_Connector::DDS_Listen info_base_listen; - port IDL_Connector::DDS_StateListen info_base_state_listen; - port IDL_Connector::DDS_Write info_base_write; - - provides CCM_DDS::ConnectorStatusListener base_status_listener; - - attribute long base_attr; - - uses idl_test_derived_interface uses_derived_interface; - provides idl_test_base_interface prov_base_interface; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc deleted file mode 100644 index 60f17b07315..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc +++ /dev/null @@ -1,175 +0,0 @@ -project(IDL_Test_Base_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += IDL_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=BASE_COMPONENT_STUB_Export \ - -Wb,stub_export_include=Base_Component_stub_export.h \ - -Wb,skel_export_macro=BASE_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Base_Component_svnt_export.h \ - -Wb,svnt_export_macro=BASE_COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Base_Component_svnt_export.h \ - -Wb,exec_export_macro=BASE_COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Base_Component_exec_export.h \ - -I.. -Gex - - IDL_Files { - IDL_Test_Base_Component.idl - } -} - -project(IDL_Test_Base_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += IDL_Test_Base_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=BASE_COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Base_Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - IDL_Test_Base_ComponentE.idl - } -} - -project(IDL_Test_Base_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += IDL_Test_Base_Component_lem_gen \ - IDL_Test_Base_Component_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub - libs += Base_Component_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Interfaces_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Base_Component_lem_stub - dynamicflags += BASE_COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Base_ComponentEC.cpp - } - - Header_Files { - IDL_Test_Base_ComponentEC.h - Base_Component_lem_stub_export.h - } - - Inline_Files { - IDL_Test_Base_ComponentEC.inl - } -} - -project(IDL_Test_Base_Component_stub) : ccm_stub, dds4ccm_base { - after += IDL_Test_Base_Component_idl_gen \ - IDL_Test_Connector_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_lem_gen - libs += IDL_Test_Connector_stub \ - IDL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Base_Component_stub - dynamicflags += BASE_COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Base_ComponentC.cpp - } - - Header_Files { - IDL_Test_Base_ComponentC.h - Base_Component_stub_export.h - } - - Inline_Files { - IDL_Test_Base_ComponentC.inl - } -} - -project(IDL_Test_Base_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += IDL_Test_Base_Component_lem_stub \ - IDL_Test_Base_Component_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub - sharedname = Base_Component_exec - libs += Base_Component_stub \ - Base_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += BASE_COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Base_Component_exec.cpp - } - - Header_Files { - IDL_Test_Base_Component_exec.h - Base_Component_exec_export.h - } - - Inline_Files { - } -} - - -project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += IDL_Test_Base_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_svnt \ - IDL_Test_Base_Component_exec \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_svnt \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_stub - sharedname = Base_Component_svnt - libs += Base_Component_stub \ - Base_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_svnt \ - Base_Component_exec \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_svnt \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += BASE_COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Base_ComponentS.cpp - IDL_Test_Base_Component_svnt.cpp - } - - Header_Files { - IDL_Test_Base_ComponentS.h - IDL_Test_Base_Component_svnt.h - Base_Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl deleted file mode 100644 index b3d92882fb9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DERIVED_COMPONENT_IDL -#define DERIVED_COMPONENT_IDL - -#include "IDL_Test_Base_Component.idl" - -#pragma ciao lem "IDL_Test_Derived_ComponentE.idl" -// #pragma ciao lem "Base/IDL_Test_BaseE.idl" - -component IDL_Test_Derived_Component : IDL_Test_Base_Component -{ - port IDL_Connector::DDS_Update info_derived_update; - port IDL_Connector::DDS_Read info_derived_read; - port IDL_Connector::DDS_Get info_derived_get; - port IDL_Connector::DDS_Listen info_derived_listen; - port IDL_Connector::DDS_StateListen info_derived_state_listen; - port IDL_Connector::DDS_Write info_derived_write; - - provides CCM_DDS::ConnectorStatusListener derived_status_listener; - - attribute long derived_attr; - - provides idl_test_derived_interface prov_derived_interface; - uses idl_test_base_interface uses_base_interface; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc deleted file mode 100644 index 8ed2357e068..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc +++ /dev/null @@ -1,194 +0,0 @@ -project(IDL_Test_Derived_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += IDL_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_STUB_Export \ - -Wb,stub_export_include=Derived_Component_stub_export.h \ - -Wb,skel_export_macro=DERIVED_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Derived_Component_svnt_export.h \ - -Wb,svnt_export_macro=DERIVED_COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Derived_Component_svnt_export.h \ - -Wb,exec_export_macro=DERIVED_COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Derived_Component_exec_export.h \ - -I.. -Gex - - IDL_Files { - IDL_Test_Derived_Component.idl - } -} - -project(IDL_Test_Derived_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += IDL_Test_Derived_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Derived_Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - IDL_Test_Derived_ComponentE.idl - } -} - -project(IDL_Test_Derived_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += IDL_Test_Derived_Component_lem_gen \ - IDL_Test_Derived_Component_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Base_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Base_Component_lem_stub - libs += Derived_Component_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Base_stub \ - IDL_Test_Interfaces_stub \ - Base_Component_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Derived_Component_lem_stub - dynamicflags += DERIVED_COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Derived_ComponentEC.cpp - } - - Header_Files { - IDL_Test_Derived_ComponentEC.h - Derived_Component_lem_stub_export.h - } - - Inline_Files { - IDL_Test_Derived_ComponentEC.inl - } -} - -project(IDL_Test_Derived_Component_stub) : ccm_stub, dds4ccm_base { - after += IDL_Test_Derived_Component_idl_gen \ - IDL_Test_Connector_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_lem_gen \ - IDL_Test_Base_Component_stub \ - IDL_Test_Base_Component_lem_stub - libs += IDL_Test_Connector_stub \ - IDL_Test_Base_stub \ - Base_Component_stub \ - Base_Component_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Derived_Component_stub - dynamicflags += DERIVED_COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Derived_ComponentC.cpp - } - - Header_Files { - IDL_Test_Derived_ComponentC.h - Derived_Component_stub_export.h - } - - Inline_Files { - IDL_Test_Derived_ComponentC.inl - } -} - -project(IDL_Test_Derived_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += IDL_Test_Derived_Component_lem_stub \ - IDL_Test_Derived_Component_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Base_Component_exec \ - IDL_Test_Base_Component_lem_stub \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_lem - sharedname = Derived_Component_exec - libs += Derived_Component_stub \ - Derived_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_lem_stub \ - Base_Component_exec \ - Base_Component_lem_stub \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DERIVED_COMPONENT_EXEC_BUILD_DLL BASE_COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Derived_Component_exec.cpp - } - - Header_Files { - IDL_Test_Derived_Component_exec.h - Derived_Component_exec_export.h - } - - Inline_Files { - } -} - - -project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += IDL_Test_Derived_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_svnt \ - IDL_Test_Derived_Component_exec \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_svnt \ - IDL_Test_Base_Component_svnt \ - IDL_Test_Base_Component_lem_stub \ - IDL_Test_Base_Component_stub - sharedname = Derived_Component_svnt - libs += Derived_Component_stub \ - Derived_Component_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_stub \ - IDL_Test_Connector_svnt \ - Derived_Component_exec \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Interfaces_stub \ - IDL_Test_Interfaces_lem_stub \ - IDL_Test_Interfaces_svnt \ - Base_Component_svnt \ - Base_Component_lem_stub \ - Base_Component_stub - - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += DERIVED_COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Derived_ComponentS.cpp - IDL_Test_Derived_Component_svnt.cpp - } - - Header_Files { - IDL_Test_Derived_ComponentS.h - IDL_Test_Derived_Component_svnt.h - Derived_Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl deleted file mode 100644 index 68b04ad6255..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file IDL_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef IDL_TEST_CONNECTOR_IDL_ -#define IDL_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/IDL_Test_Base.idl" - -#pragma ciao lem "Connector/IDL_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/IDL_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::IDL_Test, ::IDL_TestSeq> IDL_Connector; - -#endif /* IDL_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc deleted file mode 100644 index fe9c859e55f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector" - -project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen IDL_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=IDL_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=IDL_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=IDL_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=IDL_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - IDL_Test_Connector.idl - } -} - -project(IDL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += IDL_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=IDL_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - IDL_Test_ConnectorE.idl - } -} - -project(IDL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub - libs += IDL_Test_Base_stub IDL_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = IDL_Test_Connector_lem_stub - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_ConnectorEC.cpp - } - - Header_Files { - IDL_Test_ConnectorEC.h - IDL_Test_Connector_lem_stub_export.h - } - - Inline_Files { - IDL_Test_ConnectorEC.inl - } -} - -project(IDL_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += IDL_Test_Connector_idl_gen IDL_Test_Base_stub - libs += IDL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = IDL_Test_Connector_stub - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_ConnectorC.cpp - } - - Header_Files { - IDL_Test_ConnectorC.h - IDL_Test_Connector_stub_export.h - } - - Inline_Files { - IDL_Test_ConnectorC.inl - } -} - -project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub - sharedname = IDL_Test_Connector_exec - libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_Connector_conn.cpp - } - - Header_Files { - IDL_Test_Connector_conn.h - IDL_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub - sharedname = IDL_Test_Connector_svnt - libs += IDL_Test_Connector_stub \ - IDL_Test_Connector_lem_stub \ - IDL_Test_Base_stub \ - IDL_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - IDL_Test_ConnectorS.cpp - IDL_Test_Connector_svnt.cpp - } - - Header_Files { - IDL_Test_ConnectorS.h - IDL_Test_Connector_svnt.h - IDL_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore deleted file mode 100644 index e2af81adef2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Writer_Base.cxx -/Writer_Base.h -/Writer_BasePlugin.cxx -/Writer_BasePlugin.h -/Writer_BaseSupport.cxx -/Writer_BaseSupport.h -/Writer_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl deleted file mode 100644 index 40b51ede68e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Writer_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_BASE_IDL -#define WRITER_BASE_IDL - -#pragma ndds typesupport "Base/Writer_BaseSupport.h" -#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "WriterTest" -#pragma DCPS_DATA_KEY "WriterTest key" - -struct WriterTest { - string key; //@key -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WriterTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc deleted file mode 100644 index 352e236cdbc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_DDSInstanceHandleBase_stub - dynamicflags += WRITER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ - -Wb,stub_export_include=Writer_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Writer_Base.idl - } - - opendds_ts_flags += --export=WRITER_BASE_STUB_Export - - DDSGenerator_Files { - Writer_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore deleted file mode 100644 index e8f96f6e9cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Writer_ConnectorE.idl -/Writer_Connector_conn.cpp -/Writer_Connector_conn.h -/Writer_Connector_conn_export.h -/Writer_Connector_lem_stub_export.h -/Writer_Connector_stub_export.h -/Writer_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl deleted file mode 100644 index 421f8585ccd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Writer_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_CONNECTOR_IDL_ -#define WRITER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Writer_Base.idl" - -#pragma ciao lem "Connector/Writer_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Writer_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; - -#endif /* Writer_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc deleted file mode 100644 index 5358384a9ed..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector" - -project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_DDSInstanceHandleBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_stub_export.h \ - -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Writer_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Writer_Connector_svnt_export.h \ - -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Writer_Connector_conn_export.h \ - -I .. - - IDL_Files { - Writer_Connector.idl - } -} - -project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_InstanceHandleConnector_idl_gen - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Writer_ConnectorE.idl - } -} - -project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub - libs += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_InstanceHandleConnector_lem_stub - dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorEC.cpp - } - - Header_Files { - Writer_ConnectorEC.h - Writer_Connector_lem_stub_export.h - } - - Inline_Files { - Writer_ConnectorEC.inl - } -} - -project(DDS_InstanceHandleConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_InstanceHandleConnector_idl_gen DDS_DDSInstanceHandleBase_stub - libs += DDS_DDSInstanceHandleBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_InstanceHandleConnector_stub - dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorC.cpp - } - - Header_Files { - Writer_ConnectorC.h - Writer_Connector_stub_export.h - } - - Inline_Files { - Writer_ConnectorC.inl - } -} - -project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub - sharedname = DDS_InstanceHandleConnector_exec - libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Connector_conn.cpp - } - - Header_Files { - Writer_Connector_conn.h - Writer_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub - sharedname = DDS_InstanceHandleConnector_svnt - libs += DDS_InstanceHandleConnector_stub \ - DDS_InstanceHandleConnector_lem_stub \ - DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorS.cpp - Writer_Connector_svnt.cpp - } - - Header_Files { - Writer_ConnectorS.h - Writer_Connector_svnt.h - Writer_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README b/CIAO/connectors/dds4ccm/tests/InstanceHandle/README deleted file mode 100644 index b53b09d7a3c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README +++ /dev/null @@ -1,6 +0,0 @@ - - -Test which shows how to use the DDSDataWriter directly. - -We use the Datawriter from the DDS4CCM library. After typecasting -it can be used to perform operations on DDS directly. diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore deleted file mode 100644 index 809d63704bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/Writer_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl deleted file mode 100644 index 7f022778f2e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_WRITER_ENTITY_SENDER_IDL -#define DDS_WRITER_ENTITY_SENDER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Sender - { - port WriterTestConnector::DDS_Write info_write; - attribute unsigned short keys; - }; -}; - -#endif /* DDS_WRITER_ENTITY_SENDER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc deleted file mode 100644 index a3867be6e49..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_InstanceHandleConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Writer_Sender.idl - } -} - -project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_DDSInstanceHandleSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Writer_SenderE.idl - } -} - -project(DDS_DDSInstanceHandleSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_DDSInstanceHandleSender_lem_gen DDS_DDSInstanceHandleSender_stub \ - DDS_DDSInstanceHandleBase_stub - libs += DDS_DDSInstanceHandleBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderEC.cpp - } - - Header_Files { - Writer_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Writer_SenderEC.inl - } -} - -project(DDS_DDSInstanceHandleSender_stub) : ccm_stub, dds4ccm_base { - after += DDS_DDSInstanceHandleSender_idl_gen DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_stub - libs += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderC.cpp - } - - Header_Files { - Writer_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Writer_SenderC.inl - } -} - -project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DDSInstanceHandleSender_lem_stub DDS_DDSInstanceHandleSender_stub \ - DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Sender_exec.cpp - } - - Header_Files { - Writer_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \ - DDS_InstanceHandleConnector_stub \ - DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_svnt \ - DDS_InstanceHandleConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderS.cpp - Writer_Sender_svnt.cpp - } - - Header_Files { - Writer_SenderS.h - Writer_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp deleted file mode 100644 index 1016da9ffcf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp +++ /dev/null @@ -1,368 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "Connector/Writer_Connector_conn.h" -#include "dds4ccm/impl/Utils.h" -#if (CIAO_DDS4CCM_NDDS == 1) -# include "dds4ccm/impl/ndds/DataWriter_T.h" -#endif - -namespace CIAO_Writer_Sender_Impl -{ - /** - * Starter - */ - - StartHandler::StartHandler(Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - StartHandler::handle_exception (ACE_HANDLE) - { - this->callback_.run (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5), - dds_writer_ (0) - { - ACE_NEW_THROW_EX (this->rh_, - StartHandler (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->rh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::unregister_handles () - { - ::WriterTestConnector::Writer_var ccm_writer = - this->ciao_context_->get_connection_info_write_data (); - - for (Writer_Table::iterator i = this->ktests_.begin (); - i != this->ktests_.end (); - ++i) - { - try - { - ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()]; - ccm_writer->unregister_instance (i->second, hnd); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Unregistered <%C> - valid ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - i->first.c_str (), - DDS_INSTANCE_HANDLE_LOG(hnd))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("unknown exception caught during unregister_instance.\n"))); - } - } - } - - void - Sender_exec_i::register_handles () - { - ::WriterTestConnector::Writer_var ccm_writer = - this->ciao_context_->get_connection_info_write_data (); - Writer_Table::iterator i = this->ktests_.begin (); - for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i) - { - DDS::InstanceHandle_t const hnd = - ccm_writer->register_instance (i->second); - if (hnd == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Unable to register handle for <%C>\n"), - i->first.c_str ())); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"), - i->second->key.in ())); - this->handles_[i->first.c_str ()] = hnd; - } - } - - void - Sender_exec_i::test_equality () - { -#if (CIAO_DDS4CCM_NDDS == 1) - Writer_Table::iterator i = this->ktests_.begin (); - for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i) - { - ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()]; - - DDS_InstanceHandle_t dds_hnd = - this->dds_writer_->lookup_instance (i->second); - ::DDS::InstanceHandle_t ccm_dds_hnd; - ccm_dds_hnd <<= dds_hnd; - if (ccm_hnd == ccm_dds_hnd) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - " - "== operator seems to work for CCM handles " - "for key <%C>\n", - i->first.c_str ())); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - " - "== operator doesn't seem to work for CCM " - "handles for key <%C>\n", - i->first.c_str ())); - } - } -#endif - } - - void - Sender_exec_i::test_non_equality () - { -#if (CIAO_DDS4CCM_NDDS == 1) - Writer_Table::iterator i = this->ktests_.begin (); - for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i) - { - ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()]; - - Writer_Table::iterator unequal = i; - ++unequal; - if (unequal == this->ktests_.end ()) - { - unequal = this->ktests_.begin (); - } - - DDS_InstanceHandle_t const dds_hnd = - this->dds_writer_->lookup_instance (unequal->second); - DDS::InstanceHandle_t ccm_dds_hnd; - ccm_dds_hnd <<= dds_hnd; - if (ccm_dds_hnd != ccm_hnd) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - " - "!= operator seems to work for CCM " - "handles for key <%C>\n", - i->first.c_str ())); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - " - "!= operator doesn't seem to work for CCM " - "handles for key <%C>\n", - i->first.c_str ())); - } - } - unregister_handles (); -#endif - } - - void - Sender_exec_i::run () - { - test_equality (); - test_non_equality (); - } - - void - Sender_exec_i::start (void) - { - this->reactor ()->notify (this->rh_); - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { -#if (CIAO_DDS4CCM_NDDS == 1) - typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; - - ::DDS::DataWriter_var dds_dw = - this->ciao_context_->get_connection_info_write_dds_entity (); - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ()); - - if (ccm_dw) - { - - ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - DataWriter_type * typed_ccm_dw = dynamic_cast (tmp.in ()); - if (typed_ccm_dw) - { - DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity (); - if (dds_datawriter) - { - this->dds_writer_ = - ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter); - if (!this->dds_writer_) - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error narrowing to a typed " - "DDS DataWriter.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error getting DDS DataWriter.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "Error casting DataWriter to typed DataWriter\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - " - "::DDS::DataWriter of CCM DataWriter seems nil\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " - "Error casting DataWriter to CCM DataWriter\n")); - throw ::CORBA::INTERNAL (); - } -#endif - } - - void - Sender_exec_i::ccm_activate (void) - { - this->start (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - WriterTest *new_key = 0; - ACE_NEW_THROW_EX (new_key, - WriterTest, - ::CORBA::NO_MEMORY ()); - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - - this->ktests_[key] = new_key; - } - register_handles (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h deleted file mode 100644 index e58efe30434..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h +++ /dev/null @@ -1,145 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_SENDER_EXEC_TJDDGS_H_ -#define CIAO_WRITER_SENDER_EXEC_TJDDGS_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -class WriterTestDataWriter; - -namespace CIAO_Writer_Sender_Impl -{ - class Sender_exec_i; - - /** - * Starter - */ - - class StartHandler : - public ACE_Event_Handler - { - public: - StartHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void run (void); - - //@} - - private: - ::Writer::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - StartHandler *rh_; - WriterTestDataWriter *dds_writer_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table ktests_; - - typedef std::map CCM_Handles; - CCM_Handles handles_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - - void register_handles (void); - void unregister_handles (void); - void test_equality (void); - void test_non_equality (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp deleted file mode 100644 index 667af39b5f4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp +++ /dev/null @@ -1,225 +0,0 @@ - - - - DDSWriterEntity_Depl_1 - - - Writer_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_WriterTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WriterTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Writer_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Writer_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Writer_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - DDSWriterEntity - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - - - dds_writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - ccm_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Writer_Connector_exec - - - DDS_InstanceHandleConnector_exec - - - Writer_Connector_svnt - - - DDS_InstanceHandleConnector_svnt - - - Writer_Connector_stub - - - DDS_InstanceHandleConnector_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl deleted file mode 100755 index b4aa8bc1187..00000000000 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore deleted file mode 100644 index 81427ef4af0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Keyed_Test_Base.cxx -/Keyed_Test_Base.h -/Keyed_Test_BasePlugin.cxx -/Keyed_Test_BasePlugin.h -/Keyed_Test_BaseSupport.cxx -/Keyed_Test_BaseSupport.h -/Keyed_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl deleted file mode 100644 index 8e4b306067e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Keyed_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_BASE_IDL -#define KEYED_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Keyed_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "KeyedTest" -#pragma DCPS_DATA_KEY "KeyedTest key" - -struct KeyedTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence KeyedTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc deleted file mode 100644 index 078218a4403..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Keyed_Test_Base_stub - dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Keyed_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Keyed_Test_Base.idl - } - - opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Keyed_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore deleted file mode 100644 index 45abed70a3b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Keyed_Test_ConnectorE.idl -/Keyed_Test_Connector_conn.cpp -/Keyed_Test_Connector_conn.h -/Keyed_Test_Connector_conn_export.h -/Keyed_Test_Connector_lem_stub_export.h -/Keyed_Test_Connector_stub_export.h -/Keyed_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl deleted file mode 100644 index ec6bf377372..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Keyed_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_CONNECTOR_IDL_ -#define KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Keyed_Test_Base.idl" - -#pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Keyed_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTestConnector; - -#endif /* KEYED_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc deleted file mode 100644 index d2561449876..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector" - -project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Keyed_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Keyed_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Keyed_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Keyed_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=KEYED_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Keyed_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Keyed_Test_Connector.idl - } -} - -project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Keyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Keyed_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Keyed_Test_ConnectorE.idl - } -} - -project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub - libs += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Keyed_Test_Connector_lem_stub - dynamicflags += KEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ConnectorEC.cpp - } - - Header_Files { - Keyed_Test_ConnectorEC.h - Keyed_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Keyed_Test_ConnectorEC.inl - } -} - -project(DDS_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Keyed_Test_Connector_idl_gen DDS_Keyed_Test_Base_stub - libs += DDS_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Keyed_Test_Connector_stub - dynamicflags += KEYED_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ConnectorC.cpp - } - - Header_Files { - Keyed_Test_ConnectorC.h - Keyed_Test_Connector_stub_export.h - } - - Inline_Files { - Keyed_Test_ConnectorC.inl - } -} - -project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub - sharedname = DDS_Keyed_Test_Connector_exec - libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += KEYED_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_Connector_conn.cpp - } - - Header_Files { - Keyed_Test_Connector_conn.h - Keyed_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub - sharedname = DDS_Keyed_Test_Connector_svnt - libs += DDS_Keyed_Test_Connector_stub \ - DDS_Keyed_Test_Connector_lem_stub \ - DDS_Keyed_Test_Base_stub \ - DDS_Keyed_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += KEYED_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ConnectorS.cpp - Keyed_Test_Connector_svnt.cpp - } - - Header_Files { - Keyed_Test_ConnectorS.h - Keyed_Test_Connector_svnt.h - Keyed_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README b/CIAO/connectors/dds4ccm/tests/KeyedSamples/README deleted file mode 100644 index 815c984d9f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README +++ /dev/null @@ -1,16 +0,0 @@ - - -This test creates instances in DDS by using the -updater port. After that, every instance is updated. -The number of instances (keys) and the number of -updates (iterations) per key can be defined in -the deployment plan. - -The Receiver checks whether the keys were updated -correctly by using the read_one method on the reader. -The Receiver should know the number of instances (keys) and -the number of iterations per key. These should be configured -in the deployment plan. - -An error is reported when the receiver did not receive -the correct number of samples. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore deleted file mode 100644 index b91d247a16e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Keyed_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl deleted file mode 100644 index 3625c4df97a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Keyed_Test_Connector.idl" - -module Keyed_Test -{ - component Receiver - { - port KeyedTestConnector::DDS_Get info_out; - attribute unsigned long rate; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc deleted file mode 100644 index 2e5f6338f89..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Keyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Keyed_Test_Receiver.idl - } -} - -project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Keyed_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Keyed_Test_ReceiverE.idl - } -} - -project(DDS_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Keyed_Test_Receiver_lem_gen DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub - libs += Receiver_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ReceiverEC.cpp - } - - Header_Files { - Keyed_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Keyed_Test_ReceiverEC.inl - } -} - -project(DDS_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Keyed_Test_Receiver_idl_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_gen - libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ReceiverC.cpp - } - - Header_Files { - Keyed_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Keyed_Test_ReceiverC.inl - } -} - -project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_Receiver_exec.cpp - } - - Header_Files { - Keyed_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_ReceiverS.cpp - Keyed_Test_Receiver_svnt.cpp - } - - Header_Files { - Keyed_Test_ReceiverS.h - Keyed_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp deleted file mode 100644 index 3efe7830874..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp +++ /dev/null @@ -1,336 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Keyed_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/TimeUtilities.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_Keyed_Test_Receiver_Impl -{ - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.read (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Keyed_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Keyed_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (1) - , iterations_ (10) - , keys_ (5) - , expected_ (50) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::check_received_samples () - { - bool all_received = true; - for (Last_Iteration_Table::iterator iter = this->last_iters_.begin (); - iter != this->last_iters_.end () && all_received; - ++iter) - { - all_received = iter->second == this->iterations_; - if (iter->second > this->iterations_) - { - all_received = true; - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_received_samples - " - "ERROR: Unexpected iteration received-> Bailing out\n")); - } - } - if (all_received) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All samples received. Stop the timer\n"))); - this->reactor ()->cancel_timer (this->ticker_); - } - } - - void - Receiver_exec_i::read (void) - { - ::KeyedTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - if (::CORBA::is_nil (reader.in ())) - { - return; - } - try - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - KeyedTest keyedtest_info; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", i); - keyedtest_info.key = CORBA::string_dup (key); - ::CCM_DDS::ReadInfo readinfo; - reader->read_one_last (keyedtest_info, readinfo, ::DDS::HANDLE_NIL); - - ACE_Time_Value tv; - tv <<= readinfo.source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") - ACE_TEXT (" -> date =%#T\n"), - &tv)); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE keyed test info : ") - ACE_TEXT ("received keyedtest_info for <%C> at %u\n"), - keyedtest_info.key.in (), - keyedtest_info.iteration)); - this->last_iters_[key] = keyedtest_info.iteration; - check_received_samples (); - } - } - catch(const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: KeyedTest_Read: ") - ACE_TEXT ("Unexpected InternalError exception received <%C>\n"), - ::CIAO::DDS4CCM::translate_retcode (ex.error_code))); - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("KeyedTest_Read: ") - ACE_TEXT ("Expected NonExistent received\n"))); - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CORBA::ULong - Receiver_exec_i::rate (void) - { - return this->rate_; - } - - void - Receiver_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - this->expected_ = this->iterations_ * this->keys_; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - this->expected_ = this->iterations_ * this->keys_; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Keyed_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(0, usec), - ACE_Time_Value(0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - CORBA::UShort received_ = 0; - for (Last_Iteration_Table::iterator iter = this->last_iters_.begin (); - iter != this->last_iters_.end (); - ++iter) - { - ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary for <%C>: last sample <%u> - expected <%u>\n", - iter->first.c_str(), - iter->second, - this->iterations_)); - received_ += iter->second; - } - - if (received_ < this->expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n", - this->expected_, received_)); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Keyed_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h deleted file mode 100644 index 5007c45e48e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h +++ /dev/null @@ -1,185 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_ -#define CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_ - -#include /**/ "ace/pre.h" - -#include "Keyed_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Keyed_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Read action Generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Keyed_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Keyed_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read (void); - - //@} - - private: - ::Keyed_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - - ::CORBA::ULong rate_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - CORBA::ULong expected_; - - read_action_Generator * ticker_; - - typedef std::map Last_Iteration_Table; - Last_Iteration_Table last_iters_; - - //@} - - //@{ - /** User defined private operations. */ - void check_received_samples (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Keyed_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore deleted file mode 100644 index c1b2aa59427..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Keyed_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl deleted file mode 100644 index 53d1d773a02..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_KEYED_TEST_SENDER_IDL -#define DDS_KEYED_TEST_SENDER_IDL - -#include "Connector/Keyed_Test_Connector.idl" - -module Keyed_Test -{ - component Sender - { - port KeyedTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned long rate; - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc deleted file mode 100644 index 08b009018c2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Keyed_Test_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Keyed_Test_Sender.idl - } -} - -project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Keyed_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Keyed_Test_SenderE.idl - } -} - -project(DDS_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Keyed_Test_Sender_lem_gen DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Base_stub - libs += DDS_Keyed_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_SenderEC.cpp - } - - Header_Files { - Keyed_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Keyed_Test_SenderEC.inl - } -} - -project(DDS_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Keyed_Test_Sender_idl_gen DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub - libs += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_SenderC.cpp - } - - Header_Files { - Keyed_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Keyed_Test_SenderC.inl - } -} - -project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_Sender_exec.cpp - } - - Header_Files { - Keyed_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_SenderS.cpp - Keyed_Test_Sender_svnt.cpp - } - - Header_Files { - Keyed_Test_SenderS.h - Keyed_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp deleted file mode 100644 index 27a0fadf166..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp +++ /dev/null @@ -1,309 +0,0 @@ -// -*- C++ -*- -#include "Keyed_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Keyed_Test_Sender_Impl -{ - - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1) - , keys_ (5) - , iterations_ (10) - , ready_to_start_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick (void) - { - if (this->last_key_ != this->ktests_.end ()) - { - try - { - KeyedTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ++this->last_key_->second->iteration; - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n", - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - // Onto the next iteration - this->last_key_ = this->ktests_.begin (); - while (this->last_key_ != this->ktests_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - ++this->last_key_; - } - else - { - break; - } - } - } - } - - void - Sender_exec_i::start (void) - { - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::get_started (void) - { - this->ready_to_start_ = true; - this->start (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - KeyedTest *new_key = new KeyedTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->ktests_[key] = new_key; - } - this->last_key_ = this->ktests_.begin (); -} - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - - if (!this->ready_to_start_.value()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ") - ACE_TEXT ("ERROR Sender never got ready to start\n"))); - } - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::ULong - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Keyed_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Keyed_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h deleted file mode 100644 index d4fe9f73c97..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h +++ /dev/null @@ -1,166 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_ -#define CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_ - -#include /**/ "ace/pre.h" - -#include "Keyed_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Keyed_Test_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Write generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void tick (void); - - //@} - - private: - ::Keyed_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::ULong rate_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - void start (void); - void stop (void); - - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Keyed_Test_Table; - - Keyed_Test_Table ktests_; - Keyed_Test_Table::iterator last_key_; - Atomic_Boolean ready_to_start_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Keyed_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp deleted file mode 100644 index 42100b2f165..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp +++ /dev/null @@ -1,414 +0,0 @@ - - - - Keyed_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Keyed_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Keyed_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Keyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_KeyedTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_KeyedTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Keyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Keyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Keyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Keyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 9 - - - - - - Keyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Keyed_Test - - - - - - Keyed_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Keyed_Test - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ulong - - - 1 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 9 - - - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Keyed_Test_Connector_exec - - - DDS_Keyed_Test_Connector_exec - - - Keyed_Test_Connector_svnt - - - DDS_Keyed_Test_Connector_svnt - - - Keyed_Test_Connector_stub - - - DDS_Keyed_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore deleted file mode 100644 index e2af81adef2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Writer_Base.cxx -/Writer_Base.h -/Writer_BasePlugin.cxx -/Writer_BasePlugin.h -/Writer_BaseSupport.cxx -/Writer_BaseSupport.h -/Writer_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl deleted file mode 100644 index 525042673a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Writer_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_BASE_IDL -#define WRITER_BASE_IDL - -#pragma ndds typesupport "Base/Writer_BaseSupport.h" -#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "WriterTest" -#pragma DCPS_DATA_KEY "WriterTest key" - -struct WriterTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WriterTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc deleted file mode 100644 index 3bd9e122988..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_KeyedWriterBase_stub - dynamicflags += WRITER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ - -Wb,stub_export_include=Writer_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Writer_Base.idl - } - - opendds_ts_flags += --export=WRITER_BASE_STUB_Export - - DDSGenerator_Files { - Writer_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore deleted file mode 100644 index 6f350aec5b1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Writer_ConnectorE.idl diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl deleted file mode 100644 index 421f8585ccd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Writer_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_CONNECTOR_IDL_ -#define WRITER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Writer_Base.idl" - -#pragma ciao lem "Connector/Writer_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Writer_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; - -#endif /* Writer_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc deleted file mode 100644 index 740baf34850..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector" - -project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_KeyedWriterBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_stub_export.h \ - -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Writer_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Writer_Connector_svnt_export.h \ - -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Writer_Connector_conn_export.h \ - -I .. - - IDL_Files { - Writer_Connector.idl - } -} - -project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_KeyedWriterConnector_idl_gen - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Writer_ConnectorE.idl - } -} - -project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub - libs += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_KeyedWriterConnector_lem_stub - dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorEC.cpp - } - - Header_Files { - Writer_ConnectorEC.h - Writer_Connector_lem_stub_export.h - } - - Inline_Files { - Writer_ConnectorEC.inl - } -} - -project(DDS_KeyedWriterConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_KeyedWriterConnector_idl_gen DDS_KeyedWriterBase_stub - libs += DDS_KeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_KeyedWriterConnector_stub - dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorC.cpp - } - - Header_Files { - Writer_ConnectorC.h - Writer_Connector_stub_export.h - } - - Inline_Files { - Writer_ConnectorC.inl - } -} - -project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub - sharedname = DDS_KeyedWriterConnector_exec - libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Connector_conn.cpp - } - - Header_Files { - Writer_Connector_conn.h - Writer_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub - sharedname = DDS_KeyedWriterConnector_svnt - libs += DDS_KeyedWriterConnector_stub \ - DDS_KeyedWriterConnector_lem_stub \ - DDS_KeyedWriterBase_stub \ - DDS_KeyedWriterConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorS.cpp - Writer_Connector_svnt.cpp - } - - Header_Files { - Writer_ConnectorS.h - Writer_Connector_svnt.h - Writer_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README deleted file mode 100644 index 1f985b8a361..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README +++ /dev/null @@ -1,12 +0,0 @@ - - -KeyedWriter tests the DDS_Writer. It tests write_one -and write_many, in combination with register_instance. - -In descriptors/USER_QOS_PROFILE.xml, max_instances is -set to one. An exception should be thrown when the second -instance is registered. Every subsequent write of -unregistered keys, should result in an error. - -When invoking write_many, writing the first sample should succeed. -Writing every subsequent sample should fail. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore deleted file mode 100644 index f2f7d84b894..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/Writer_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl deleted file mode 100644 index 2d720fba655..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Receiver - { - port WriterTestConnector::DDS_Listen info_out; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc deleted file mode 100644 index 97e9a371bc2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_KeyedWriterConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Writer_Receiver.idl - } -} - -project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_KeyedWriterReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Writer_ReceiverE.idl - } -} - -project(DDS_KeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_KeyedWriterReceiver_lem_gen DDS_KeyedWriterReceiver_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub - libs += Receiver_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverEC.cpp - } - - Header_Files { - Writer_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Writer_ReceiverEC.inl - } -} - -project(DDS_KeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_KeyedWriterReceiver_idl_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_gen - libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverC.cpp - } - - Header_Files { - Writer_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Writer_ReceiverC.inl - } -} - -project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterReceiver_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Receiver_exec.cpp - } - - Header_Files { - Writer_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverS.cpp - Writer_Receiver_svnt.cpp - } - - Header_Files { - Writer_ReceiverS.h - Writer_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp deleted file mode 100644 index 61de3516863..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Receiver_exec.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Writer_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort iterations, - Atomic_ULong &samples_received) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - , iterations_ (iterations) - , samples_received_ (samples_received) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::WriterTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - ++samples_received_; - ACE_DEBUG ((LM_DEBUG, "WriterTest_Listener: " - "received writer info for <%C> at <%u> handle " - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - "\n", - datum.key.in (), - datum.iteration, - DDS_INSTANCE_HANDLE_LOG(info.instance_handle))); - if (datum.iteration > this->iterations_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ") - ACE_TEXT ("greater than expected : ") - ACE_TEXT ("expected <%u> - received <%u>\n"), - this->iterations_, datum.iteration)); - } - if (datum.iteration == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ") - ACE_TEXT ("is zero\n"))); - } - } - - void - info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /*data*/, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ") - ACE_TEXT ("on_many_data has been called.\n"))); - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (10) - , keys_ (0) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::WriterTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->iterations_ * this->iterations_, - this->samples_received_), - ::WriterTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::WriterTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_.value () != - (::CORBA::ULong)this->iterations () * this->keys ()) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " - "ERROR: did not receive the expected number " - "of samples. expected <%u> - received <%u>\n", - this->iterations() * this->keys (), - this->samples_received_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - " - "OK: received the expected number of samples <%u>\n", - this->iterations() * this->keys ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h deleted file mode 100644 index 5cb2cf2a135..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h +++ /dev/null @@ -1,185 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_ -#define CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Writer_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::WriterTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort iterations, - Atomic_ULong &samples_received); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from WriterTestConnector::Listener. */ - - virtual - void on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::WriterTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - ::CORBA::UShort iterations_; - Atomic_ULong &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::WriterTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Atomic_ULong samples_received_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore deleted file mode 100644 index 809d63704bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/Writer_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl deleted file mode 100644 index 64984e084f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_KEYED_TEST_SENDER_IDL -#define DDS_KEYED_TEST_SENDER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Sender - { - port WriterTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short rate; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc deleted file mode 100644 index ae3e8824de0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_KeyedWriterConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Writer_Sender.idl - } -} - -project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_KeyedWriterSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Writer_SenderE.idl - } -} - -project(DDS_KeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_KeyedWriterSender_lem_gen DDS_KeyedWriterSender_stub DDS_KeyedWriterBase_stub - libs += DDS_KeyedWriterBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderEC.cpp - } - - Header_Files { - Writer_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Writer_SenderEC.inl - } -} - -project(DDS_KeyedWriterSender_stub) : ccm_stub, dds4ccm_base { - after += DDS_KeyedWriterSender_idl_gen DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub - libs += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderC.cpp - } - - Header_Files { - Writer_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Writer_SenderC.inl - } -} - -project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterSender_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Sender_exec.cpp - } - - Header_Files { - Writer_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_KeyedWriterBase_stub DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderS.cpp - Writer_Sender_svnt.cpp - } - - Header_Files { - Writer_SenderS.h - Writer_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp deleted file mode 100644 index e379640308a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp +++ /dev/null @@ -1,482 +0,0 @@ -// -*- C++ -*- -#include "Writer_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Writer_Sender_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - //============================================================ - // pulse_Generator - //============================================================ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1) - , iterations_ (10) - , keys_ (5) - , assignment_ (WRITE_KEYED) - , last_iteration_ (0) - { - this->ticker_ = new pulse_Generator (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::rate (void) - { - return - this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::UShort rate) - { - this->rate_ = - rate; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return - this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations + 2; //for extra tests. - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return - this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys + 1; //for extra tests. - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - void - Sender_exec_i::reset_iterations () - { - for (Writer_Table::iterator i = this->ktests_.begin (); - i != this->ktests_.end (); - ++i) - { - i->second->iteration = 0; - } - } - - void - Sender_exec_i::unregister_handles () - { - for (Writer_Table::iterator i = this->ktests_.begin (); - i != this->ktests_.end (); - ++i) - { - try - { - ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()]; - WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - writer->unregister_instance (i->second, hnd); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"), - i->first.c_str (), - i->second->iteration, - DDS_INSTANCE_HANDLE_LOG(hnd))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("unknown exception caught during unregister_instance.\n"))); - } - } - } - - void - Sender_exec_i::register_handles() - { - WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - Writer_Table::iterator i = this->ktests_.begin (); - ::DDS::InstanceHandle_t hnd = writer->register_instance (i->second); - if (hnd == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"), - i->first.c_str (), i->second->iteration)); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance with <%C> - iteration <%d> - ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"), - i->second->key.in (), - i->second->iteration, - DDS_INSTANCE_HANDLE_LOG(hnd))); - this->handles_[i->first.c_str ()] = hnd; - ++i; - // Test exception. In Qos, max_instances is set to 1 - // so only one instance may be registered. - hnd = writer->register_instance (i->second); - if (hnd != ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Shouldn't be able to register instance for <%C> - iteration <%d>\n"), - i->first.c_str (), i->second->iteration)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Registering second key not succeeded.\n"), - i->first.c_str (), i->second->iteration)); - } - } - - void - Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment) - { - this->last_key_ = this->ktests_.begin (); - this->assignment_ = assignment; - reset_iterations (); - } - - void - Sender_exec_i::write_keyed () - { - WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - if (this->last_key_ != this->ktests_.end ()) - { - bool exception_caught = false; - try - { - ++this->last_key_->second->iteration; - ::DDS::InstanceHandle_t const hnd = - this->handles_[this->last_key_->first.c_str ()]; - writer->write_one (this->last_key_->second, hnd); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - this->last_key_->first.c_str (), - this->last_key_->second->iteration, - DDS_INSTANCE_HANDLE_LOG(hnd))); - } - catch (const CCM_DDS::InternalError& ) - { - exception_caught = true; - if (this->last_key_ == this->ktests_.begin ()) - { - // The first key should throw this exception; all others - // shouldn't - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - } - // Only the first iterations are registered. - if (this->last_key_ != this->ktests_.begin () && !exception_caught) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No exception caught ") - ACE_TEXT ("while writing unregistered data\n"))); - } - ++this->last_key_; - } - else - { - // Onto the next iteration - this->last_key_ = this->ktests_.begin (); - while (this->last_key_ != this->ktests_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - //next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->ktests_.end ()) - { - unregister_handles (); - start_new_assignment (WRITE_MULTI); - } - } - } - - void - Sender_exec_i::write_many () - { - bool expected_exception_thrown = false; - WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - WriterTestSeq write_many_seq; - write_many_seq.length (this->keys_ * this->iterations_); - ::CORBA::ULong iter_key = 0; - for (Writer_Table::iterator iter = this->ktests_.begin (); - iter != this->ktests_.end (); - ++iter) - { - ++iter_key; - for (int i = 1; i < this->iterations_ + 1; ++i) - { - char key[7]; - WriterTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key.key = CORBA::string_dup(key); - new_key.iteration = i; - write_many_seq[iter_key + i - 2] = new_key; - } - } - try - { - writer->write_many (write_many_seq); - } - catch (const CCM_DDS::InternalError& ex) - { - if (ex.index == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal excep ") - ACE_TEXT ("while write many for first instance : index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - else - { - expected_exception_thrown = true; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected Internal excep ") - ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - if (!expected_exception_thrown) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Expected Internal excep ") - ACE_TEXT ("was not thrown\n"))); - } - - this->assignment_ = WRITE_NONE; - } - - void - Sender_exec_i::tick () - { - switch (this->assignment_) - { - case WRITE_KEYED: - write_keyed (); - break; - case WRITE_MULTI: - write_many (); - default: - break; - } - } - - void - Sender_exec_i::get_started (void) - { - this->start (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - WriterTest *new_key = new WriterTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 1; - - this->ktests_[key] = new_key; - } - this->last_key_ = this->ktests_.begin (); - register_handles (); - reset_iterations (); - } - - void - Sender_exec_i::start (void) - { - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h deleted file mode 100644 index 38e2567c28c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h +++ /dev/null @@ -1,173 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_ -#define CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Writer_Sender_Impl -{ - class Sender_exec_i; - - enum WRITER_ASSIGNMENT { - WRITE_NONE, - WRITE_KEYED, - WRITE_MULTI - }; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // pulse_Generator - //============================================================ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &pulse_callback_; - }; - - class SENDER_EXEC_Export Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort - rate (void); - - virtual void - rate ( - ::CORBA::UShort rate); - - virtual ::CORBA::UShort - iterations (void); - - virtual void - iterations ( - ::CORBA::UShort iterations); - - virtual ::CORBA::UShort - keys (void); - - virtual void - keys ( - ::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - void tick (); - void get_started (void); - - private: - void start (void); - void stop (void); - - pulse_Generator * ticker_; - ::Writer::CCM_Sender_Context_var ciao_context_; - - ::CORBA::UShort rate_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - WRITER_ASSIGNMENT assignment_; - CORBA::Long last_iteration_; - - void reset_iterations (); - void register_handles (); - void unregister_handles (); - void start_new_assignment ( - WRITER_ASSIGNMENT assignment); - void write_keyed (); - void write_many (); - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table ktests_; - - typedef std::map Writer_Table_Handles; - Writer_Table_Handles handles_; - - Writer_Table::iterator last_key_; - - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml deleted file mode 100644 index 9a0058b545a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - 1 - 1 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp deleted file mode 100644 index bee6cd9054f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp +++ /dev/null @@ -1,427 +0,0 @@ - - - - KeyedWriter_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Writer_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_WriterTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WriterTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Writer_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Writer_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - iterations - - - tk_ushort - - - 3 - - - - - keys - - - tk_ushort - - - 2 - - - - - - Writer_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - KeyedWriter - - - - - qos_profile - - - tk_string - - - KeyedWriter_Library#KeyedWriterProfile - - - - - - Writer_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - KeyedWriter - - - - - qos_profile - - - tk_string - - - KeyedWriter_Library#KeyedWriterProfile - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ushort - - - 3 - - - - - keys - - - tk_ushort - - - 2 - - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - _datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Writer_Connector_exec - - - DDS_KeyedWriterConnector_exec - - - Writer_Connector_svnt - - - DDS_KeyedWriterConnector_svnt - - - Writer_Connector_stub - - - DDS_KeyedWriterConnector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 4a2347f0029..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - 1 - 1 - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/LateBinding/README b/CIAO/connectors/dds4ccm/tests/LateBinding/README deleted file mode 100644 index 91cd5ff4d98..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/README +++ /dev/null @@ -1,40 +0,0 @@ - - -Normally when a DDS4CCM connector starts, it prepares DDS by creating -several DDS entities, like a domain participant and topic. -LateBinding means that a DDS4CCM connector is started but doesn't prepare -DDS (apart from a domain participant). The only thing the user has to do -is leave the topic_name in the deployment plan blank. -When a topic name is provided later on, the DDS4CCM connector will start -to prepare DDS. - -There're two test created: -1. ReadGet -In this test, the topic name for the sender DDS4CCM connector is provided by -the deployment plan. Therefor the sender is allowed to write samples a -little while after the component is activated. After the sender has written -its samples, it informs the receiver about this via the ReaderStarter interface -(see Base/ReaderStarter.idl). ReaderStarter is a 'normal' interface (no DDS4CCM -connector). The connection is listed in the deployment plan. - -The deployment plan doens't provide a topic name for the DDS4CCM connector -on the receiver side. This means that the receiver need to set the topic name -programmatically. -When the receiver is signaled by the sender that is allowed to read the samples, it -first tests whether an BAD_INV exception is thrown when a component starts reading -without having set the topic name. -After that the topic name is set programmatically (see RG_LateBinding_Receiver_impl.cpp, -set_topic_name_reader ()). -After that, the receiver starts to check whether the latest expected sample is -available in DDS. If so, the receiver starts to read the data. -The receiver also checks whether a NonChangeable exception is thrown when the topic -name is set a second time. - -In this test, the executor code on the receiver side (RG_LateBinding_Receiver_exec.cpp) -works as a proxy between CIAO and the actual implementation (RG_LateBinding_Receiver_impl.cpp). -This is the best way since the executor code is separeted from the business logic. - -2. WriteUpdate - - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl deleted file mode 100644 index b5c6b38d89a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file RG_LateBinding_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_LATEBINDING_BASE_IDL -#define RG_LATEBINDING_BASE_IDL - -#pragma ndds typesupport "Base/RG_LateBinding_BaseSupport.h" -#pragma opendds typesupport "Base/RG_LateBinding_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "RG_LateBindingTest" -#pragma DCPS_DATA_KEY "RG_LateBindingTest key" - -struct RG_LateBindingTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence RG_LateBindingTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc deleted file mode 100644 index d5836d47455..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (RG_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = RG_LateBindingBase_stub - dynamicflags += RG_LATEBINDING_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=RG_LATEBINDING_BASE_STUB_Export \ - -Wb,stub_export_include=LateBinding_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - RG_LateBinding_Base.idl - } - - opendds_ts_flags += --export=RG_LATEBINDING_BASE_STUB_Export - - DDSGenerator_Files { - RG_LateBinding_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl deleted file mode 100644 index 9fc6196148d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_STARTER_IDL -#define READER_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface ReaderStarter -{ - void start_read (); - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); -}; - -#endif /* READER_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc deleted file mode 100644 index 5d746aae933..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc +++ /dev/null @@ -1,110 +0,0 @@ -project(Reader_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += Reader_Starter_lem_gen Reader_Starter_stub - libs += Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(Reader_Starter_stub) : ccm_stub, dds4ccm_base { - after += Reader_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Reader_Starter_lem_stub Reader_Starter_stub - sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl deleted file mode 100644 index bed24d9fcac..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file RG_LateBinding_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_LATEBINDING_CONNECTOR_IDL_ -#define RG_LATEBINDING_CONNECTOR_IDL_ - -#include -#include - -#include "Base/RG_LateBinding_Base.idl" - -#pragma ciao lem "Connector/RG_LateBinding_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/RG_LateBinding_BaseTypeSupport.idl" -#endif - -module RG_LateBinding -{ - module ::CCM_DDS::Typed < ::RG_LateBindingTest, ::RG_LateBindingTestSeq> RG_LateBindingTestConnector; -}; - -#endif /* RG_LateBinding_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc deleted file mode 100644 index 36c96d27d93..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l .. -o ../lib -u DDS RG_LateBinding_Connector" - -project (RG_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen RG_LateBindingBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LateBinding_Connector_stub_export.h \ - -Wb,skel_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,svnt_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,conn_export_macro=RG_LATEBINDING_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LateBinding_Connector_conn_export.h \ - -I .. - - IDL_Files { - RG_LateBinding_Connector.idl - } -} - -project (RG_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += RG_LateBindingConnector_idl_gen - idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=RG_LateBinding_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - RG_LateBinding_ConnectorE.idl - } -} - -project (RG_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += RG_LateBindingConnector_lem_gen RG_LateBindingConnector_stub \ - RG_LateBindingBase_stub - libs += RG_LateBindingBase_stub RG_LateBindingConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RG_LateBindingConnector_lem_stub - dynamicflags += RG_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ConnectorEC.cpp - } - - Header_Files { - RG_LateBinding_ConnectorEC.h - RG_LateBinding_Connector_lem_stub_export.h - } - - Inline_Files { - RG_LateBinding_ConnectorEC.inl - } -} - -project (RG_LateBindingConnector_stub) : ccm_stub, dds4ccm_base { - after += RG_LateBindingConnector_idl_gen RG_LateBindingBase_stub - libs += RG_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RG_LateBindingConnector_stub - dynamicflags += RG_LATEBINDING_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ConnectorC.cpp - } - - Header_Files { - RG_LateBinding_ConnectorC.h - RG_LateBinding_Connector_stub_export.h - } - - Inline_Files { - RG_LateBinding_ConnectorC.inl - } -} - -project (RG_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl { - after += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \ - RG_LateBindingBase_stub - sharedname = RG_LateBindingConnector_exec - libs += RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \ - RG_LateBindingBase_stub RG_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RG_LATEBINDING_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_Connector_conn.cpp - } - - Header_Files { - RG_LateBinding_Connector_conn.h - RG_LateBinding_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (RG_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl { - after += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_exec \ - RG_LateBindingConnector_stub - sharedname = RG_LateBindingConnector_svnt - libs += RG_LateBindingConnector_stub \ - RG_LateBindingConnector_lem_stub \ - RG_LateBindingBase_stub \ - RG_LateBindingConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RG_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ConnectorS.cpp - RG_LateBinding_Connector_svnt.cpp - } - - Header_Files { - RG_LateBinding_ConnectorS.h - RG_LateBinding_Connector_svnt.h - RG_LateBinding_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl deleted file mode 100644 index 1200b3f78b6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/RG_LateBinding_Connector.idl" -#include "Base/Reader_Starter.idl" - -module RG_LateBinding -{ - component Receiver - { - port RG_LateBindingTestConnector::DDS_Get info_get; - port RG_LateBindingTestConnector::DDS_Read info_read; - - provides ReaderStarter start_reading; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc deleted file mode 100644 index 7332a7f6d2a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project (RG_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += RG_LateBindingConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - IDL_Files { - RG_LateBinding_Receiver.idl - } -} - -project (RG_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += RG_LateBindingReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - RG_LateBinding_ReceiverE.idl - } -} - -project (RG_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += RG_LateBindingReceiver_lem_gen RG_LateBindingReceiver_stub RG_LateBindingConnector_stub \ - RG_LateBindingBase_stub Reader_Starter_stub - libs += Receiver_stub RG_LateBindingConnector_stub RG_LateBindingBase_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ReceiverEC.cpp - } - - Header_Files { - RG_LateBinding_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - RG_LateBinding_ReceiverEC.inl - } -} - -project (RG_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base { - after += RG_LateBindingReceiver_idl_gen RG_LateBindingConnector_stub \ - RG_LateBindingBase_stub RG_LateBindingConnector_lem_gen \ - Reader_Starter_stub Reader_Starter_lem_stub - libs += RG_LateBindingConnector_stub RG_LateBindingBase_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ReceiverC.cpp - } - - Header_Files { - RG_LateBinding_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - RG_LateBinding_ReceiverC.inl - } -} - -project (RG_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += RG_LateBindingReceiver_lem_stub RG_LateBindingReceiver_stub \ - RG_LateBindingBase_stub RG_LateBindingConnector_stub \ - RG_LateBindingConnector_lem_stub \ - Reader_Starter_lem_stub Reader_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \ - RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \ - Reader_Starter_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_Receiver_exec.cpp - RG_LateBinding_Receiver_impl.cpp - } - - Header_Files { - RG_LateBinding_Receiver_exec.h - RG_LateBinding_Receiver_impl.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project (RG_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += RG_LateBindingReceiver_lem_stub RG_LateBindingBase_stub \ - RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \ - RG_LateBindingReceiver_exec RG_LateBindingConnector_lem_stub \ - Reader_Starter_stub \ - Reader_Starter_svnt Reader_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \ - RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \ - Receiver_exec RG_LateBindingConnector_lem_stub \ - Reader_Starter_stub Reader_Starter_svnt \ - Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_ReceiverS.cpp - RG_LateBinding_Receiver_svnt.cpp - } - - Header_Files { - RG_LateBinding_ReceiverS.h - RG_LateBinding_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp deleted file mode 100644 index b3aecb9d732..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "RG_LateBinding_Receiver_exec.h" -#include "RG_LateBinding_Receiver_impl.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_RG_LateBinding_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_read_status_exec_i - */ - - info_read_status_exec_i::info_read_status_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_read_status_exec_i::~info_read_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::ReaderStarter - - void - reader_start_exec_i::start_read (void) - { - this->callback_.start_read (); - } - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : impl_ (0) - , keys_ (5) - , iterations_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->impl_; - } - - // Supported operations and attributes. - - void - Receiver_exec_i::start_read (void) - { - ACE_NEW_THROW_EX (this->impl_, - RG_LateBinding_Receiver_impl ( - this->ciao_context_.in (), - this->iterations_, - this->keys_), - ::CORBA::INTERNAL ()); - this->impl_->start (); - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_read_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ())) - { - info_read_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_read_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_read_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_read_status_.in ()); - } - - ::CCM_ReaderStarter_ptr - Receiver_exec_i::get_start_reading (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReaderStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_ReaderStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::RG_LateBinding::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_LateBinding_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h deleted file mode 100644 index 60016c8a865..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h +++ /dev/null @@ -1,214 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_ -#define CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_ - -#include /**/ "ace/pre.h" - -#include "RG_LateBinding_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_RG_LateBinding_Receiver_Impl -{ - class RG_LateBinding_Receiver_impl; - class Receiver_exec_i; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_read_status_exec_i - */ - - class info_read_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_read_status_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_read_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_ReaderStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from ReaderStarter. */ - - virtual - void start_read (void); - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - //@} - - private: - ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_read_status (void); - - virtual ::CCM_ReaderStarter_ptr - get_start_reading (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void keys (::CORBA::UShort keys); - void iterations (::CORBA::UShort iterations); - - void start_read (void); - //@} - - private: - ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_; - ::CCM_ReaderStarter_var ciao_reader_start_; - - RG_LateBinding_Receiver_impl *impl_; - - //@} - - //@{ - /** User defined members. */ - ::CORBA::UShort keys_; - ::CORBA::UShort iterations_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_LateBinding_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp deleted file mode 100644 index d41f01ef4f2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp +++ /dev/null @@ -1,373 +0,0 @@ -#include "RG_LateBinding_Receiver_impl.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_RG_LateBinding_Receiver_Impl -{ - - /** - * Check last - */ - LastSampleChecker::LastSampleChecker (RG_LateBinding_Receiver_impl &callback, - const ::CORBA::UShort &iterations) - : callback_ (callback) - , iterations_ (iterations) - { - } - - LastSampleChecker::~LastSampleChecker () - { - } - - int - LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - { - this->callback_.start_read (); - } - return 0; - } - - /** - * RG_LateBinding_Receiver_impl - */ - RG_LateBinding_Receiver_impl::RG_LateBinding_Receiver_impl ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort & iterations, - const ::CORBA::UShort & keys) - : ciao_context_ ( - ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - , iterations_ (iterations) - , keys_ (keys) - , checker_ (0) - { - } - - RG_LateBinding_Receiver_impl::~RG_LateBinding_Receiver_impl () - { - delete this->checker_; - } - - ACE_Reactor* - RG_LateBinding_Receiver_impl::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - RG_LateBinding_Receiver_impl::check_last (void) - { - ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - try - { - RG_LateBindingTest datum; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - datum.key = CORBA::string_dup (key); - reader->read_one_last ( - datum, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d>\n", - datum.iteration, - this->iterations_)); - return datum.iteration >= this->iterations_; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - void - RG_LateBinding_Receiver_impl::start (void) - { - this->test_exception (); - this->set_topic_name_reader (); - - ACE_NEW_THROW_EX (this->checker_, - LastSampleChecker (*this, - this->iterations_), - ::CORBA::NO_MEMORY ()); - if (this->reactor ()->schedule_timer (this->checker_, - 0, - ACE_Time_Value (1, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - " - "ERROR: Error while starting LastSampleChecker\n")); - } - } - - void - RG_LateBinding_Receiver_impl::start_read () - { - if (this->checker_) - { - this->reactor ()->cancel_timer (this->checker_); - } - this->start_reading (); - this->set_topic_name_getter (); - this->start_getting (); - this->set_topic_name_reader (); - this->set_topic_name_getter (); - } - - void - RG_LateBinding_Receiver_impl::check_samples ( - const char * test, - const RG_LateBindingTestSeq& samples, - const ::CORBA::UShort& expected) - { - bool error = samples.length () != expected; - if (ACE_OS::strcmp (test, "get") == 0) - { - error = !(samples.length () > 0); - } - if (error) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::check_samples - " - "ERROR: Unexpected number of %C samples received: " - "expected <%d> - received <%u>\n", - test, - expected, - samples.length ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - " - "%C Samples found: <%u>\n", - test, - samples.length ())); - } - for (::CORBA::ULong i = 0; - i < samples.length (); - ++i) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - " - "Sample %C: sample <%d> - key <%C> - iteration <%d>\n", - test, - i, - samples[i].key.in (), - samples[i].iteration)); - } - } - - void - RG_LateBinding_Receiver_impl::test_exception (void) - { - try - { - if (! ::CORBA::is_nil (this->ciao_context_.in ())) - { - ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - " - "ERROR: Unable to get writer interface from the " - "CIAO context\n")); - return; - } - - RG_LateBindingTest sample; - ::CCM_DDS::ReadInfo readinfo; - sample.key = CORBA::string_dup ("KEY_1"); - reader->read_one_last (sample, - readinfo, - ::DDS::HANDLE_NIL); - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - " - "ERROR: No exception caught before topic name has been set\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - " - "ERROR: CIAO context seems to be NIL\n")); - } - } - catch (const ::CORBA::BAD_INV_ORDER &) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::test_exception - " - "Expected BAD_INV_ORDER thrown.\n")); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_LateBinding_Receiver_impl::test_exception - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - " - "ERROR: expected and unknown exception caught\n")); - } - } - - void - RG_LateBinding_Receiver_impl::start_reading (void) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_reading - " - "Start reading\n")); - ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - try - { - RG_LateBindingTestSeq samples; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (samples, readinfo_seq); - this->check_samples ("read", samples, this->iterations_ * this->keys_); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_LateBinding_Receiver_impl::start_reading - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_reading - " - "ERROR: Caught unknow exception\n")); - } - } - - void - RG_LateBinding_Receiver_impl::start_getting (void) - { - try - { - ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (::CORBA::is_nil (getter.in ())) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_getting - " - "ERROR: Unable to get writer interface from the " - "CIAO context\n")); - return; - } - DDS::Duration_t to; - to.sec = 1; - to.nanosec = 0; - getter->time_out (to); - - RG_LateBindingTestSeq samples; - ::CCM_DDS::ReadInfoSeq readinfos; - getter->get_many (samples, readinfos); - this->check_samples ("get", samples); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_LateBinding_Receiver_impl::start_getting - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_getting - " - "ERROR: expected and unknown exception caught\n")); - } - } - - void - RG_LateBinding_Receiver_impl::set_topic_name_reader (void) - { - try - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Setting topic name\n")); - ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Unable to get reader interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State_var conn = - ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name ("LateBindingTopic"); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Caught NonChangeable exception.\n")); - } - } - - void - RG_LateBinding_Receiver_impl::set_topic_name_getter (void) - { - try - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "Setting topic name\n")); - ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "Unable to get getter interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = getter->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event_var conn = - ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name ("LateBindingTopic"); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "ERROR: Caught NonChangeable exception.\n")); - } - } -} diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h deleted file mode 100644 index 4a721f26dc5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef RG_LATEBINDING_RECEIVER_IMPL_H_ -#define RG_LATEBINDING_RECEIVER_IMPL_H_ - -#include "RG_LateBinding_ReceiverEC.h" - -namespace CIAO_RG_LateBinding_Receiver_Impl -{ - class RG_LateBinding_Receiver_impl; - - /** - * LastSampleChecker - */ - class LastSampleChecker - : public ACE_Event_Handler - { - public: - LastSampleChecker (RG_LateBinding_Receiver_impl &callback, - const ::CORBA::UShort &iterations); - - virtual ~LastSampleChecker (void); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - RG_LateBinding_Receiver_impl &callback_; - const ::CORBA::UShort iterations_; - - }; - - /** - * RG_LateBinding_Receiver_impl - */ - class RG_LateBinding_Receiver_impl - { - public: - RG_LateBinding_Receiver_impl ( - ::RG_LateBinding::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort & iterations, - const ::CORBA::UShort & keys); - ~RG_LateBinding_Receiver_impl (void); - - void start (void); - bool check_last (void); - void start_read (void); - - private: - ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_; - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - - LastSampleChecker * checker_; - - void set_topic_name_reader (); - void set_topic_name_getter (); - - void start_reading (void); - void start_getting (void); - void test_exception (void); - - void check_samples ( - const char * test, - const RG_LateBindingTestSeq& samples, - const ::CORBA::UShort& expected=0); - - ACE_Reactor* reactor (void); - }; -}; - -#endif /* RG_LATEBINDING_RECEIVER_IMPL_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl deleted file mode 100644 index 729bd69b7ff..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_LATEBINDING_SENDER_IDL -#define RG_LATEBINDING_SENDER_IDL - -#include "Connector/RG_LateBinding_Connector.idl" -#include "Base/Reader_Starter.idl" - -module RG_LateBinding -{ - component Sender - { - port RG_LateBindingTestConnector::DDS_Write info_write; - - attribute unsigned short iterations; - attribute unsigned short keys; - - uses ReaderStarter reader_start; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc deleted file mode 100644 index 78eed5dedfb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc +++ /dev/null @@ -1,150 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (RG_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm { - after += RG_LateBindingConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - RG_LateBinding_Sender.idl - } -} - -project (RG_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += RG_LateBindingSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - RG_LateBinding_SenderE.idl - } -} - -project (RG_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += RG_LateBindingSender_lem_gen RG_LateBindingSender_stub \ - RG_LateBindingBase_stub Reader_Starter_stub - libs += RG_LateBindingBase_stub Sender_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_SenderEC.cpp - } - - Header_Files { - RG_LateBinding_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - RG_LateBinding_SenderEC.inl - } -} - -project (RG_LateBindingSender_stub) : ccm_stub, dds4ccm_base { - after += RG_LateBindingSender_idl_gen RG_LateBindingBase_stub \ - RG_LateBindingConnector_stub Reader_Starter_stub \ - Reader_Starter_lem_stub - libs += RG_LateBindingBase_stub RG_LateBindingConnector_stub \ - Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_SenderC.cpp - } - - Header_Files { - RG_LateBinding_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - RG_LateBinding_SenderC.inl - } -} - -project (RG_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += RG_LateBindingSender_lem_stub RG_LateBindingSender_stub \ - RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \ - Reader_Starter_svnt Reader_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub RG_LateBindingBase_stub \ - RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \ - Reader_Starter_stub Reader_Starter_svnt Reader_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_Sender_exec.cpp - } - - Header_Files { - RG_LateBinding_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (RG_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += RG_LateBindingBase_stub RG_LateBindingSender_lem_stub RG_LateBindingConnector_stub \ - RG_LateBindingConnector_svnt RG_LateBindingConnector_lem_stub \ - Reader_Starter_stub Reader_Starter_lem_stub Reader_Starter_svnt - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - RG_LateBindingBase_stub RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \ - RG_LateBindingConnector_lem_stub Reader_Starter_stub \ - Reader_Starter_lem_stub Reader_Starter_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_LateBinding_SenderS.cpp - RG_LateBinding_Sender_svnt.cpp - } - - Header_Files { - RG_LateBinding_SenderS.h - RG_LateBinding_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp deleted file mode 100644 index c09bc0d4593..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp +++ /dev/null @@ -1,229 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "RG_LateBinding_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_RG_LateBinding_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - this->callback_.start_write (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::start_write (void) - { - try - { - ::RG_LateBinding::RG_LateBindingTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - RG_LateBindingTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - sample.iteration = iter; - writer->write_one (sample, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample written : key <%C> - iteration <%d>\n", - tmp, iter)); - } - } - ACE_Time_Value tv (2, 0); - ACE_OS::sleep (tv); - ReaderStarter_var starter = - this->ciao_context_->get_connection_reader_start (); - if (!::CORBA::is_nil (starter.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Inform the receiver that all samples were written\n")); - starter->set_reader_properties (this->keys (), this->iterations ()); - starter->start_read (); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: unable to get connection to the ReaderStarter\n")); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Caught NonChangeable exception.\n")); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::RG_LateBinding::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - delete this->to_handler_; - this->to_handler_ = 0; - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_LateBinding_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h deleted file mode 100644 index 8d50a38a418..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "RG_LateBinding_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_RG_LateBinding_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start_write (void); - //@} - - private: - ::RG_LateBinding::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_LateBinding_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml deleted file mode 100644 index 5e798c88e8a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp deleted file mode 100644 index 5840362a6d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp +++ /dev/null @@ -1,461 +0,0 @@ - - - - LateBinding_Depl_1 - - - ReceiverComponentImplementation - - - - - component factory - - - tk_string - - - create_RG_LateBinding_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_LateBinding_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LateBinding_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - RG_LateBinding_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - RG_LateBinding_Connector_exec - - - - - - - LateBinding_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - RG_LateBinding_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - RG_LateBinding_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_RG_LateBinding_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_LateBinding_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - LateBinding_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - LateBindingTopic - - - - - qos_profile - - - tk_string - - - LateBinding_Library#LateBindingProfile - - - - - - - LateBinding_ReceiverEventConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - - - - - - qos_profile - - - tk_string - - - LateBinding_Library#LateBindingProfile - - - - - - - LateBinding_ReceiverStateConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - - - - - - qos_profile - - - tk_string - - - LateBinding_Library#LateBindingProfile - - - - - - - SenderComponent - SenderNode - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - reader_starter - - reader_start - false - SimplexReceptacle - - - - start_reading - true - Facet - - - - - - reader_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - getter_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - RG_LateBinding_Connector_exec - - - RG_LateBindingConnector_exec - - - RG_LateBinding_Connector_svnt - - - RG_LateBindingConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 84fcb573f76..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl deleted file mode 100644 index 426f463bad1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file WU_LateBinding_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WU_LATEBINDING_BASE_IDL -#define WU_LATEBINDING_BASE_IDL - -#pragma ndds typesupport "Base/WU_LateBinding_BaseSupport.h" -#pragma opendds typesupport "Base/WU_LateBinding_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "WU_LateBindingTest" -#pragma DCPS_DATA_KEY "WU_LateBindingTest key" - -struct WU_LateBindingTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WU_LateBindingTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc deleted file mode 100644 index 335ea30e1fd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (WU_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = WU_LateBindingBase_stub - dynamicflags += WU_LATEBINDING_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WU_LATEBINDING_BASE_STUB_Export \ - -Wb,stub_export_include=LateBinding_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - WU_LateBinding_Base.idl - } - - opendds_ts_flags += --export=WU_LATEBINDING_BASE_STUB_Export - - DDSGenerator_Files { - WU_LateBinding_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl deleted file mode 100644 index e8842df52d2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file WU_LateBinding_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WU_LATEBINDING_CONNECTOR_IDL_ -#define WU_LATEBINDING_CONNECTOR_IDL_ - -#include -#include - -#include "Base/WU_LateBinding_Base.idl" - -#pragma ciao lem "Connector/WU_LateBinding_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/WU_LateBinding_BaseTypeSupport.idl" -#endif - -module WU_LateBinding -{ - module ::CCM_DDS::Typed < ::WU_LateBindingTest, ::WU_LateBindingTestSeq> WU_LateBindingTestConnector; -}; - -#endif /* WU_LateBinding_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc deleted file mode 100644 index b79dd250fa6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l .. -o ../lib -u DDS WU_LateBinding_Connector" - -project (WU_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen WU_LateBindingBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LateBinding_Connector_stub_export.h \ - -Wb,skel_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,conn_export_macro=WU_LATEBINDING_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LateBinding_Connector_conn_export.h \ - -I .. - - IDL_Files { - WU_LateBinding_Connector.idl - } -} - -project (WU_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += WU_LateBindingConnector_idl_gen - idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=WU_LateBinding_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - WU_LateBinding_ConnectorE.idl - } -} - -project (WU_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += WU_LateBindingConnector_lem_gen WU_LateBindingConnector_stub \ - WU_LateBindingBase_stub - libs += WU_LateBindingBase_stub WU_LateBindingConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = WU_LateBindingConnector_lem_stub - dynamicflags += WU_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ConnectorEC.cpp - } - - Header_Files { - WU_LateBinding_ConnectorEC.h - WU_LateBinding_Connector_lem_stub_export.h - } - - Inline_Files { - WU_LateBinding_ConnectorEC.inl - } -} - -project (WU_LateBindingConnector_stub) : ccm_stub, dds4ccm_base { - after += WU_LateBindingConnector_idl_gen WU_LateBindingBase_stub - libs += WU_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = WU_LateBindingConnector_stub - dynamicflags += WU_LATEBINDING_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ConnectorC.cpp - } - - Header_Files { - WU_LateBinding_ConnectorC.h - WU_LateBinding_Connector_stub_export.h - } - - Inline_Files { - WU_LateBinding_ConnectorC.inl - } -} - -project (WU_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl { - after += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub \ - WU_LateBindingBase_stub - sharedname = WU_LateBindingConnector_exec - libs += WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub \ - WU_LateBindingBase_stub WU_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WU_LATEBINDING_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_Connector_conn.cpp - } - - Header_Files { - WU_LateBinding_Connector_conn.h - WU_LateBinding_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (WU_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl { - after += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_exec \ - WU_LateBindingConnector_stub - sharedname = WU_LateBindingConnector_svnt - libs += WU_LateBindingConnector_stub \ - WU_LateBindingConnector_lem_stub \ - WU_LateBindingBase_stub \ - WU_LateBindingConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WU_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ConnectorS.cpp - WU_LateBinding_Connector_svnt.cpp - } - - Header_Files { - WU_LateBinding_ConnectorS.h - WU_LateBinding_Connector_svnt.h - WU_LateBinding_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl deleted file mode 100644 index 23006b60fa6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/WU_LateBinding_Connector.idl" - -module WU_LateBinding -{ - component Receiver - { - port WU_LateBindingTestConnector::DDS_Listen info_out_event; - port WU_LateBindingTestConnector::DDS_StateListen info_out_state; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc deleted file mode 100644 index 768ee30fdb4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project (WU_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += WU_LateBindingConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - IDL_Files { - WU_LateBinding_Receiver.idl - } -} - -project (WU_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += WU_LateBindingReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - WU_LateBinding_ReceiverE.idl - } -} - -project (WU_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += WU_LateBindingReceiver_lem_gen WU_LateBindingReceiver_stub WU_LateBindingConnector_stub WU_LateBindingBase_stub - libs += Receiver_stub WU_LateBindingConnector_stub WU_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ReceiverEC.cpp - } - - Header_Files { - WU_LateBinding_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - WU_LateBinding_ReceiverEC.inl - } -} - -project (WU_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base { - after += WU_LateBindingReceiver_idl_gen WU_LateBindingConnector_stub WU_LateBindingBase_stub WU_LateBindingConnector_lem_gen - libs += WU_LateBindingConnector_stub WU_LateBindingBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ReceiverC.cpp - } - - Header_Files { - WU_LateBinding_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - WU_LateBinding_ReceiverC.inl - } -} - -project (WU_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += WU_LateBindingReceiver_lem_stub WU_LateBindingReceiver_stub \ - WU_LateBindingBase_stub WU_LateBindingConnector_stub \ - WU_LateBindingConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub \ - WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_Receiver_exec.cpp - WU_LateBinding_Receiver_impl.cpp - } - - Header_Files { - WU_LateBinding_Receiver_exec.h - WU_LateBinding_Receiver_impl.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project (WU_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += WU_LateBindingReceiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingReceiver_exec WU_LateBindingConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt Receiver_exec WU_LateBindingConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_ReceiverS.cpp - WU_LateBinding_Receiver_svnt.cpp - } - - Header_Files { - WU_LateBinding_ReceiverS.h - WU_LateBinding_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp deleted file mode 100644 index 5f78d422ccb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp +++ /dev/null @@ -1,332 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "WU_LateBinding_Receiver_exec.h" -#include "WU_LateBinding_Receiver_impl.h" - -namespace CIAO_WU_LateBinding_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_event_data_listener_exec_i - */ - - info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void) - { - } - - // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::Listener - - void - info_out_event_data_listener_exec_i::on_one_data (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - WU_LateBinding_Receiver_impl::on_one_data(datum); - } - - void - info_out_event_data_listener_exec_i::on_many_data (const ::WU_LateBindingTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - WU_LateBinding_Receiver_impl::on_many_data(); - } - - /** - * Facet Executor Implementation Class: info_out_event_status_exec_i - */ - - info_out_event_status_exec_i::info_out_event_status_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_event_status_exec_i::~info_out_event_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_state_data_listener_exec_i - */ - - info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void) - { - } - - // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::StateListener - - void - info_out_state_data_listener_exec_i::on_creation (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - WU_LateBinding_Receiver_impl::on_creation(datum); - } - - void - info_out_state_data_listener_exec_i::on_one_update (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - WU_LateBinding_Receiver_impl::on_one_update(datum); - } - - void - info_out_state_data_listener_exec_i::on_many_updates (const ::WU_LateBindingTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - void - info_out_state_data_listener_exec_i::on_deletion (const ::WU_LateBindingTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_state_status_exec_i - */ - - info_out_state_status_exec_i::info_out_state_status_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_state_status_exec_i::~info_out_state_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_event_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ())) - { - info_out_event_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_event_data_listener_exec_i ( - this->ciao_context_.in ()), - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_event_data_listener_ = tmp; - } - - return - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_event_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_event_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ())) - { - info_out_event_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_event_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_event_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_event_status_.in ()); - } - - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_state_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ())) - { - info_out_state_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_state_data_listener_exec_i ( - this->ciao_context_.in ()), - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_nil ()); - - this->ciao_info_out_state_data_listener_ = tmp; - } - - return - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_duplicate ( - this->ciao_info_out_state_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_state_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ())) - { - info_out_state_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_state_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_state_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_state_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::WU_LateBinding::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - WU_LateBinding_Receiver_impl::start( - this->ciao_context_.in ()); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WU_LateBinding_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h deleted file mode 100644 index af9db76cc06..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h +++ /dev/null @@ -1,247 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_ -#define CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_ - -#include /**/ "ace/pre.h" - -#include "WU_LateBinding_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_WU_LateBinding_Receiver_Impl -{ - - /** - * Provider Executor Implementation Class: info_out_event_data_listener_exec_i - */ - - class info_out_event_data_listener_exec_i - : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_event_data_listener_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_event_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::Listener. */ - - virtual - void on_one_data (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::WU_LateBindingTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_event_status_exec_i - */ - - class info_out_event_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_event_status_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_event_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_state_data_listener_exec_i - */ - - class info_out_state_data_listener_exec_i - : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_state_data_listener_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_state_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::StateListener. */ - - virtual - void on_creation (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates (const ::WU_LateBindingTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion (const ::WU_LateBindingTest & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_state_status_exec_i - */ - - class info_out_state_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_state_status_exec_i ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_state_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr - get_info_out_event_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_event_status (void); - - virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr - get_info_out_state_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_state_status (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_; - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WU_LateBinding_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp deleted file mode 100644 index 849eaf56162..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "WU_LateBinding_Receiver_impl.h" - -WU_LateBinding_Receiver_impl::WU_LateBinding_Receiver_impl () -{ -} - -WU_LateBinding_Receiver_impl::~WU_LateBinding_Receiver_impl () -{ -} - -void -WU_LateBinding_Receiver_impl::start ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx) -{ - ::CCM_DDS::DataListenerControl_var dlc = - ctx->get_connection_info_out_event_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - - dlc = ctx->get_connection_info_out_state_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); -} - -void -WU_LateBinding_Receiver_impl::on_one_data (const ::WU_LateBindingTest & datum) -{ - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_data - ") - ACE_TEXT ("received data for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); -} - -void -WU_LateBinding_Receiver_impl::on_many_data (void) -{ - ACE_ERROR ((LM_ERROR, "WU_LateBinding_Receiver_impl::on_many_data : " - "Error: No callback to this method expected.\n")); -} - -void -WU_LateBinding_Receiver_impl::on_creation (const ::WU_LateBindingTest & datum) -{ - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_creation - ") - ACE_TEXT ("Data created for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); -} - -void -WU_LateBinding_Receiver_impl::on_one_update (const ::WU_LateBindingTest & datum) -{ - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_update - ") - ACE_TEXT ("received updated data for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); -} - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h deleted file mode 100644 index bd13e00c19c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef WU_LATEBINDING_RECEIVER_IMPL_H_ -#define WU_LATEBINDING_RECEIVER_IMPL_H_ - -#include "WU_LateBinding_ReceiverEC.h" - -class WU_LateBinding_Receiver_impl -{ -public: - WU_LateBinding_Receiver_impl (void); - ~WU_LateBinding_Receiver_impl (void); - - static void start ( - ::WU_LateBinding::CCM_Receiver_Context_ptr ctx); - - static void on_one_data (const ::WU_LateBindingTest & datum); - static void on_many_data (void); - - static void on_creation (const ::WU_LateBindingTest & datum); - static void on_one_update (const ::WU_LateBindingTest & datum); -}; - -#endif /* WU_LATEBINDING_RECEIVER_IMPL_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl deleted file mode 100644 index 8a2169dd68b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WU_LATEBINDING_SENDER_IDL -#define WU_LATEBINDING_SENDER_IDL - -#include "Connector/WU_LateBinding_Connector.idl" - -module WU_LateBinding -{ - component Sender - { - port WU_LateBindingTestConnector::DDS_Write info_write; - port WU_LateBindingTestConnector::DDS_Update info_update; - - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc deleted file mode 100644 index e14ce1c88a2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (WU_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm { - after += WU_LateBindingConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - WU_LateBinding_Sender.idl - } -} - -project (WU_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += WU_LateBindingSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - WU_LateBinding_SenderE.idl - } -} - -project (WU_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += WU_LateBindingSender_lem_gen WU_LateBindingSender_stub WU_LateBindingBase_stub - libs += WU_LateBindingBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_SenderEC.cpp - } - - Header_Files { - WU_LateBinding_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - WU_LateBinding_SenderEC.inl - } -} - -project (WU_LateBindingSender_stub) : ccm_stub, dds4ccm_base { - after += WU_LateBindingSender_idl_gen WU_LateBindingBase_stub WU_LateBindingConnector_stub - libs += WU_LateBindingBase_stub WU_LateBindingConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_SenderC.cpp - } - - Header_Files { - WU_LateBinding_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - WU_LateBinding_SenderC.inl - } -} - -project (WU_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += WU_LateBindingSender_lem_stub WU_LateBindingSender_stub \ - WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub WU_LateBindingBase_stub \ - WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_Sender_exec.cpp - } - - Header_Files { - WU_LateBinding_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (WU_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += WU_LateBindingBase_stub WU_LateBindingSender_lem_stub WU_LateBindingConnector_stub \ - WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WU_LateBinding_SenderS.cpp - WU_LateBinding_Sender_svnt.cpp - } - - Header_Files { - WU_LateBinding_SenderS.h - WU_LateBinding_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp deleted file mode 100644 index 90932adb836..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp +++ /dev/null @@ -1,400 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "WU_LateBinding_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_WU_LateBinding_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *arg) - { - // Notify the subscribers - unsigned long assingment = reinterpret_cast (arg); - if (assingment == 0) - { - this->callback_.start_event_test (); - } - else if (assingment == 1) - { - this->callback_.start_state_test (); - this->callback_.set_topic_name_writer (); - this->callback_.set_topic_name_updater (); - } - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->to_handler_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::test_exception (void) - { - try - { - ::WU_LateBinding::WU_LateBindingTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - " - "ERROR: Unable to get writer interface from the " - "CIAO context\n")); - return; - } - WU_LateBindingTest sample; - sample.key = ::CORBA::string_dup ("KEY_1"); - sample.iteration = 1; - writer->write_one (sample, ::DDS::HANDLE_NIL); - ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - " - "ERROR: No exception thrown while calling write_one " - "on a late binded connector (port).\n")); - } - catch (const ::CORBA::BAD_INV_ORDER &) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_exception - " - "Expected BAD_INV_ORDER thrown.\n")); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - " - "ERROR: expected and unknown exception caught\n")); - } - } - - void - Sender_exec_i::set_topic_name_writer (void) - { - try - { - ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get writer interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event_var conn = - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name ("LateBindingTopic"); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); - } - } - - void - Sender_exec_i::start_event_test (void) - { - // Set the topic name on the connector first. Therefor we need to - // get to the connector first. - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Set topic name.\n")); - try - { - this->set_topic_name_writer (); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Topic name set, start writing.\n")); - - ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - WU_LateBindingTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - sample.iteration = iter; - writer->write_one (sample, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample written : key <%C> - iteration <%d>\n", - tmp, iter)); - ACE_Time_Value tv (0, 50000); - ACE_OS::sleep (tv); - } - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - void - Sender_exec_i::set_topic_name_updater(void) - { - try - { - ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get updater interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = updater->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State_var conn = - ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name ("LateBindingTopic"); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught NonChangeable exception.\n")); - } - catch (const ::CORBA::Exception &ex) - { - ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); - } - } - - void - Sender_exec_i::start_state_test (void) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - " - "Start\n")); - try - { - this->set_topic_name_updater (); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - " - "Topic name set, start updating.\n")); - ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - for (::CORBA::UShort key = this->keys_ + 1; - key < (2 * this->keys_) + 1; - ++key) - { - WU_LateBindingTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - sample.iteration = 0; - updater->create_one (sample); - - for (::CORBA::UShort iter = this->iterations_ + 1; - iter < (2 * this->iterations_) + 1; - ++iter) - { - sample.iteration = iter; - updater->update_one (sample, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - " - "Sample updated : key <%C> - iteration <%d>\n", - tmp, iter)); - ACE_Time_Value tv (0, 50000); - ACE_OS::sleep (tv); - } - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_state_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::WU_LateBinding::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->test_exception (); - if (this->reactor ()->schedule_timer ( - this->to_handler_, - reinterpret_cast (0), - ACE_Time_Value (5, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - if (this->reactor ()->schedule_timer ( - this->to_handler_, - reinterpret_cast (1), - ACE_Time_Value (10, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WU_LateBinding_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h deleted file mode 100644 index 769eaa04ea9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "WU_LateBinding_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_WU_LateBinding_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void set_topic_name_writer (void); - void set_topic_name_updater (void); - void start_event_test (void); - void start_state_test (void); - //@} - - private: - ::WU_LateBinding::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - //@} - - //@{ - /** User defined private operations. */ - void - test_exception (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WU_LateBinding_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp deleted file mode 100644 index ee83b8b148b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp +++ /dev/null @@ -1,512 +0,0 @@ - - - - LateBinding_Depl_1 - - - ReceiverComponentImplementation - - - - - component factory - - - tk_string - - - create_WU_LateBinding_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WU_LateBinding_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LateBinding_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - WU_LateBinding_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - WU_LateBinding_Connector_exec - - - - - - - LateBinding_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - WU_LateBinding_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - WU_LateBinding_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_WU_LateBinding_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WU_LateBinding_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - iterations - - - tk_ushort - - - 10 - - - - - - - LateBinding_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - - - - - - - - LateBinding_SenderStateConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - - - - - - - - LateBinding_ReceiverEventConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - LateBindingTopic - - - - - - - LateBinding_ReceiverStateConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - LateBindingTopic - - - - - - - SenderComponent - SenderNode - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - event_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_event_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - event_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_event_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - state_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_state_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - - state_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_state_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - WU_LateBinding_Connector_exec - - - WU_LateBindingConnector_exec - - - WU_LateBinding_Connector_svnt - - - WU_LateBindingConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore deleted file mode 100644 index f7983c1daad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LMBM_Test_Base.cxx -/LMBM_Test_Base.h -/LMBM_Test_BasePlugin.cxx -/LMBM_Test_BasePlugin.h -/LMBM_Test_BaseSupport.cxx -/LMBM_Test_BaseSupport.h -/LMBM_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl deleted file mode 100644 index 6bf85749d83..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file LMBM_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL -#define LISTEN_MANY_BY_MANY_TEST_BASE_IDL - -#pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h" -#pragma opendds typesupport "Base/LMBM_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ListenManyByManyTest" -#pragma DCPS_DATA_KEY "ListenManyByManyTest key" - -struct ListenManyByManyTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ListenManyByManyTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc deleted file mode 100644 index d1c40e1a642..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_LMBM_Test_Base_stub - dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=LMBM_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - LMBM_Test_Base.idl - } - - opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export - - DDSGenerator_Files { - LMBM_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore deleted file mode 100644 index f2ddf77157f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LMBM_Test_ConnectorE.idl -/LMBM_Test_Connector_conn.cpp -/LMBM_Test_Connector_conn.h -/LMBM_Test_Connector_conn_export.h -/LMBM_Test_Connector_lem_stub_export.h -/LMBM_Test_Connector_stub_export.h -/LMBM_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl deleted file mode 100644 index e0a84abc65d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file LMBM_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_ -#define LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/LMBM_Test_Base.idl" - -#pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/LMBM_Test_BaseTypeSupport.idl" -#endif - -module LMBM_Test -{ - module ::CCM_DDS::Typed - < ::ListenManyByManyTest, ::ListenManyByManyTestSeq> - ListenManyByManyTestConnector; -}; - -#endif /* LMBM_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc deleted file mode 100644 index e7d1335755f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector" - -project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_LMBM_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LMBM_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LMBM_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LMBM_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LMBM_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - LMBM_Test_Connector.idl - } -} - -project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LMBM_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=LMBM_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - LMBM_Test_ConnectorE.idl - } -} - -project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub - libs += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LMBM_Test_Connector_lem_stub - dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ConnectorEC.cpp - } - - Header_Files { - LMBM_Test_ConnectorEC.h - LMBM_Test_Connector_lem_stub_export.h - } - - Inline_Files { - LMBM_Test_ConnectorEC.inl - } -} - -project(DDS_LMBM_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_LMBM_Test_Connector_idl_gen DDS_LMBM_Test_Base_stub - libs += DDS_LMBM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LMBM_Test_Connector_stub - dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ConnectorC.cpp - } - - Header_Files { - LMBM_Test_ConnectorC.h - LMBM_Test_Connector_stub_export.h - } - - Inline_Files { - LMBM_Test_ConnectorC.inl - } -} - -project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub - sharedname = DDS_LMBM_Test_Connector_exec - libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_Connector_conn.cpp - } - - Header_Files { - LMBM_Test_Connector_conn.h - LMBM_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub - sharedname = DDS_LMBM_Test_Connector_svnt - libs += DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Connector_lem_stub \ - DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ConnectorS.cpp - LMBM_Test_Connector_svnt.cpp - } - - Header_Files { - LMBM_Test_ConnectorS.h - LMBM_Test_Connector_svnt.h - LMBM_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README deleted file mode 100644 index ee5fd301c5e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README +++ /dev/null @@ -1,3 +0,0 @@ - - -This test tests the listener. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore deleted file mode 100644 index 5ee54e35bee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LMBM_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl deleted file mode 100644 index 9e3766eaf6d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/LMBM_Test_Connector.idl" - -module LMBM_Test -{ - component Receiver - { - port ListenManyByManyTestConnector::DDS_Listen info_listen; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc deleted file mode 100644 index 2755f25ef87..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LMBM_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - LMBM_Test_Receiver.idl - } -} - -project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LMBM_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - LMBM_Test_ReceiverE.idl - } -} - -project(DDS_LMBM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LMBM_Test_Receiver_lem_gen DDS_LMBM_Test_Receiver_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub - libs += Receiver_stub DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ReceiverEC.cpp - } - - Header_Files { - LMBM_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - LMBM_Test_ReceiverEC.inl - } -} - -project(DDS_LMBM_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_LMBM_Test_Receiver_idl_gen DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_lem_gen - libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ReceiverC.cpp - } - - Header_Files { - LMBM_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - LMBM_Test_ReceiverC.inl - } -} - -project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Receiver_stub \ - DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_Receiver_exec.cpp - } - - Header_Files { - LMBM_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ - DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ - Receiver_exec DDS_LMBM_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_ReceiverS.cpp - LMBM_Test_Receiver_svnt.cpp - } - - Header_Files { - LMBM_Test_ReceiverS.h - LMBM_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp deleted file mode 100644 index 5d44bb9e6e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp +++ /dev/null @@ -1,259 +0,0 @@ -// -*- C++ -*- -#include "LMBM_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_LMBM_Test_Receiver_Impl -{ - //============================================================ - // ListenManyByManyTest_Listener_exec_i - //============================================================ - ListenManyByManyTest_Listener_exec_i::ListenManyByManyTest_Listener_exec_i ( - ::LMBM_Test::CCM_Receiver_Context_ptr context, - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many, - Atomic_ULong &samples_read) - : context_ (::LMBM_Test::CCM_Receiver_Context::_duplicate (context)), - received_one_by_one_ (received_one_by_one), - received_many_by_many_ (received_many_by_many), - samples_read_ (samples_read) - { - } - - ListenManyByManyTest_Listener_exec_i::~ListenManyByManyTest_Listener_exec_i (void) - { - } - - void - ListenManyByManyTest_Listener_exec_i::on_one_data ( - const ListenManyByManyTest & /*an_instance*/, - const ::CCM_DDS::ReadInfo & /*info*/) - { - // Just count; this value is checked on ccm_remove. - ++this->received_one_by_one_; - } - - void - ListenManyByManyTest_Listener_exec_i::on_many_data ( - const ListenManyByManyTestSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info) - { - if (an_instance.length () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: " - "instance sequence length is nil\n")); - return; - } - for (CORBA::ULong i = 0 ; i < info.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, "ListenManyByManyTest_Listener_exec_i::on_many_data: " - "key <%C> - iteration <%d>\n", - an_instance[i].key.in (), - an_instance[i].iteration)); - if (info[i].instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: " - "instance handle %d seems to be nil" - "key <%C> - iteration <%d>\n", - i, - an_instance[i].key.in (), - an_instance[i].iteration)); - } - if (info[i].source_timestamp.sec == 0 && - info[i].source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - an_instance[i].key.in (), - an_instance[i].iteration)); - } - } - this->received_many_by_many_ += an_instance.length (); - try - { - ::LMBM_Test::ListenManyByManyTestConnector::Reader_var reader = - this->context_->get_connection_info_listen_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ListenManyByManyTest_Listener_exec_i::on_many_data - " - "ERROR: Reader seems nil\n")); - } - ::ListenManyByManyTestSeq seq; - ::CCM_DDS::ReadInfoSeq infos; - reader->read_all (seq, infos); - this->samples_read_ += seq.length (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ListenManyByManyTest_Listener_exec_i::on_many_data - ") - ACE_TEXT ("Read <%u> samples\n"), - seq.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : received_one_by_one_ (0), - received_many_by_many_ (0), - samples_read_ (0), - iterations_ (10), - keys_ (5) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::MANY_BY_MANY); - } - - ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - return new ListenManyByManyTest_Listener_exec_i ( - this->context_.in (), - this->received_one_by_one_, - this->received_many_by_many_, - this->samples_read_); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_listen_connector_status (void) - { - return::CCM_DDS::CCM_ConnectorStatusListener::_nil (); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::LMBM_Test::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) - { - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - CORBA::ULong const expected = this->keys_ * this->iterations_; - if (this->received_many_by_many_.value () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: " - "Didn't receive samples on many_by_many " - "callback while mode is MANY_BY_MANY " - "expected <%u> - received <%u>\n", - expected, - this->received_many_by_many_.value ())); - } - else if (expected != this->received_many_by_many_.value ()) - { - ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: " - "Didn't receive the expected " - "number of samples on many_by_many " - "callback while mode is MANY_BY_MANY " - "expected <%u> - received <%u>\n", - expected, - this->received_many_by_many_.value ())); - } - if (this->received_one_by_one_.value () > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: " - "Received samples on one_by_one " - "callback while mode is MANY_BY_MANY " - "expected <0> - received <%u>\n", - this->received_one_by_one_.value ())); - } - if (this->received_one_by_one_.value () == 0 && - this->received_many_by_many_.value () > 0) - { - ACE_DEBUG ((LM_DEBUG, "MANY_BY_MANY: " - "Received only data on " - "many_by_many callback. " - "Test passed!\n")); - } - if (this->samples_read_.value () == 0) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read no samples\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read <%u> samples\n"), - this->samples_read_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LMBM_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h deleted file mode 100644 index 5ed192bd716..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h +++ /dev/null @@ -1,107 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "LMBM_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_LMBM_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Bool; - - //============================================================ - // ListenManyByManyTest_Listener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ListenManyByManyTest_Listener_exec_i - : public virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenManyByManyTest_Listener_exec_i ( - ::LMBM_Test::CCM_Receiver_Context_ptr context, - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many, - Atomic_ULong &samples_read_); - virtual ~ListenManyByManyTest_Listener_exec_i (void); - - virtual void - on_one_data ( - const ListenManyByManyTest & an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const ListenManyByManyTestSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - ::LMBM_Test::CCM_Receiver_Context_var context_; - Atomic_ULong &received_one_by_one_; - Atomic_ULong &received_many_by_many_; - Atomic_ULong &samples_read_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - void start (); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_listen_connector_status (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: - ::LMBM_Test::CCM_Receiver_Context_var context_; - - Atomic_ULong received_one_by_one_; - Atomic_ULong received_many_by_many_; - Atomic_ULong samples_read_; - - CORBA::UShort iterations_; - CORBA::UShort keys_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LMBM_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore deleted file mode 100644 index 67fbbeecce3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LMBM_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl deleted file mode 100644 index 212523aedbd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL -#define DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL - -#include "Connector/LMBM_Test_Connector.idl" - -module LMBM_Test -{ - component Sender - { - port ListenManyByManyTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener info_write_connector_status; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc deleted file mode 100644 index 38d973b980a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_LMBM_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - LMBM_Test_Sender.idl - } -} - -project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LMBM_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - LMBM_Test_SenderE.idl - } -} - -project(DDS_LMBM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LMBM_Test_Sender_lem_gen DDS_LMBM_Test_Sender_stub \ - DDS_LMBM_Test_Base_stub - libs += DDS_LMBM_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_SenderEC.cpp - } - - Header_Files { - LMBM_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - LMBM_Test_SenderEC.inl - } -} - -project(DDS_LMBM_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_LMBM_Test_Sender_idl_gen DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub - libs += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_SenderC.cpp - } - - Header_Files { - LMBM_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - LMBM_Test_SenderC.inl - } -} - -project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LMBM_Test_Sender_lem_stub DDS_LMBM_Test_Sender_stub \ - DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_Sender_exec.cpp - } - - Header_Files { - LMBM_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Sender_lem_stub \ - DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ - DDS_LMBM_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_SenderS.cpp - LMBM_Test_Sender_svnt.cpp - } - - Header_Files { - LMBM_Test_SenderS.h - LMBM_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp deleted file mode 100644 index 7651884518b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp +++ /dev/null @@ -1,317 +0,0 @@ -// -*- C++ -*- -#include "LMBM_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "ace/Date_Time.h" - -namespace CIAO_LMBM_Test_Sender_Impl -{ - //============================================================ - // WriteTicker - //============================================================ - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - //============================================================ - // WriteManyHandler - //============================================================ - WriteManyHandler::WriteManyHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteManyHandler::handle_exception (ACE_HANDLE) - { - this->callback_.write_one (); - return 0; - } - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->callback_.get_started (); - } - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - , started_ (false) - { - this->ticker_ = new WriteTicker (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - void - Sender_exec_i::write_one (void) - { - ::LMBM_Test::ListenManyByManyTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (this->last_key_ != this->samples_.end ()) - { - try - { - ++this->last_key_->second->iteration; - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n", - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - // Onto the next iteration - this->last_key_ = this->samples_.begin (); - while (this->last_key_ != this->samples_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - // Next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->samples_.end ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - } - - void - Sender_exec_i::get_started (void) - { - this->started_ = true; - try - { - this->start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - ListenManyByManyTest *new_key = new ListenManyByManyTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_info_write_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LMBM_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - if (!this->started_) - { - ACE_ERROR ((LM_ERROR, - "Sender_exec_i::ccm_passivate - " - "ERROR: No publication matched received. " - "Test didn't run\n")); - } - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LMBM_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h deleted file mode 100644 index 83efbc805d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_ -#define CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_ - -#include /**/ "ace/pre.h" - -#include "LMBM_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_LMBM_Test_Sender_Impl -{ - class Sender_exec_i; - - //============================================================ - // WriteTicker - //============================================================ - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // WriteManyHandler - //============================================================ - class WriteManyHandler : - public ACE_Event_Handler - { - public: - WriteManyHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_write_connector_status(void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void write_one (void); - //@} - - private: - ::LMBM_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes and port operations. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - - bool started_; - //@} - - //@{ - /** User defined members. */ - WriteTicker *ticker_; - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table samples_; - Writer_Table::iterator last_key_; - //@} - - //@{ - /** User defined private operations. */ - void start (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LMBM_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml deleted file mode 100644 index 7dc9f195e6c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp deleted file mode 100644 index e01b4fb8d8c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp +++ /dev/null @@ -1,434 +0,0 @@ - - - - LMBM_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_LMBM_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LMBM_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LMBM_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - LMBM_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - LMBM_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_LMBM_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LMBM_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - LMBM_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - ListenManyByMany_Library#ListenManyByManyProfile - - - - - topic_name - - - tk_string - - - LMBM_Test - - - - - - LMBM_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - ListenManyByMany_Library#ListenManyByManyProfile - - - - - topic_name - - - tk_string - - - LMBM_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_listen_data_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - info_write_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - LMBM_Test_Connector_exec - - - DDS_LMBM_Test_Connector_exec - - - LMBM_Test_Connector_svnt - - - DDS_LMBM_Test_Connector_svnt - - - LMBM_Test_Connector_stub - - - DDS_LMBM_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 556d5caa0a6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore deleted file mode 100644 index 114e9b43a72..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LNE_Test_Base.cxx -/LNE_Test_Base.h -/LNE_Test_BasePlugin.cxx -/LNE_Test_BasePlugin.h -/LNE_Test_BaseSupport.cxx -/LNE_Test_BaseSupport.h -/LNE_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl deleted file mode 100644 index 5a602952dfc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file LNE_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL -#define LISTEN_NOT_ENABLED_TEST_BASE_IDL - -#pragma ndds typesupport "Base/LNE_Test_BaseSupport.h" -#pragma opendds typesupport "Base/LNE_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ListenNotEnabledTest" -#pragma DCPS_DATA_KEY "ListenNotEnabledTest key" - -struct ListenNotEnabledTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ListenNotEnabledTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc deleted file mode 100644 index b5df76f5087..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_LNE_Test_Base_stub - dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=LNE_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - LNE_Test_Base.idl - } - - opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export - - DDSGenerator_Files { - LNE_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore deleted file mode 100644 index f6572cdd875..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LNE_Test_ConnectorE.idl -/LNE_Test_Connector_conn.cpp -/LNE_Test_Connector_conn.h -/LNE_Test_Connector_conn_export.h -/LNE_Test_Connector_lem_stub_export.h -/LNE_Test_Connector_stub_export.h -/LNE_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl deleted file mode 100644 index 6a2a85a04eb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file LNE_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_ -#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/LNE_Test_Base.idl" - -#pragma ciao lem "Connector/LNE_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/LNE_Test_BaseTypeSupport.idl" -#endif - -module LNE_Test -{ - module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTestConnector; -}; - -#endif /* LNE_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc deleted file mode 100644 index f22272b8265..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector" - -project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_LNE_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LNE_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LNE_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LNE_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LNE_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - LNE_Test_Connector.idl - } -} - -project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LNE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=LNE_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - LNE_Test_ConnectorE.idl - } -} - -project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub - libs += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LNE_Test_Connector_lem_stub - dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ConnectorEC.cpp - } - - Header_Files { - LNE_Test_ConnectorEC.h - LNE_Test_Connector_lem_stub_export.h - } - - Inline_Files { - LNE_Test_ConnectorEC.inl - } -} - -project(DDS_LNE_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_LNE_Test_Connector_idl_gen DDS_LNE_Test_Base_stub - libs += DDS_LNE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LNE_Test_Connector_stub - dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ConnectorC.cpp - } - - Header_Files { - LNE_Test_ConnectorC.h - LNE_Test_Connector_stub_export.h - } - - Inline_Files { - LNE_Test_ConnectorC.inl - } -} - -project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub - sharedname = DDS_LNE_Test_Connector_exec - libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS_LNE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_Connector_conn.cpp - } - - Header_Files { - LNE_Test_Connector_conn.h - LNE_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub - sharedname = DDS_LNE_Test_Connector_svnt - libs += DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Connector_lem_stub \ - DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ConnectorS.cpp - LNE_Test_Connector_svnt.cpp - } - - Header_Files { - LNE_Test_ConnectorS.h - LNE_Test_Connector_svnt.h - LNE_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README deleted file mode 100644 index ee5fd301c5e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README +++ /dev/null @@ -1,3 +0,0 @@ - - -This test tests the listener. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore deleted file mode 100644 index 7b8c7f24fa3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LNE_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl deleted file mode 100644 index 007ec0ba135..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/LNE_Test_Connector.idl" - -module LNE_Test -{ - component Receiver - { - port ListenNotEnabledTestConnector::DDS_Listen info_listen; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc deleted file mode 100644 index 1e0ddcdb130..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LNE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - LNE_Test_Receiver.idl - } -} - -project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LNE_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - LNE_Test_ReceiverE.idl - } -} - -project(DDS_LNE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LNE_Test_Receiver_lem_gen DDS_LNE_Test_Receiver_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub - libs += Receiver_stub DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ReceiverEC.cpp - } - - Header_Files { - LNE_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - LNE_Test_ReceiverEC.inl - } -} - -project(DDS_LNE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_LNE_Test_Receiver_idl_gen DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_lem_gen - libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ReceiverC.cpp - } - - Header_Files { - LNE_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - LNE_Test_ReceiverC.inl - } -} - -project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Receiver_stub \ - DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_Receiver_exec.cpp - } - - Header_Files { - LNE_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ - DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ - Receiver_exec DDS_LNE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_ReceiverS.cpp - LNE_Test_Receiver_svnt.cpp - } - - Header_Files { - LNE_Test_ReceiverS.h - LNE_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp deleted file mode 100644 index d03b5ce15ce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "LNE_Test_Receiver_exec.h" - -namespace CIAO_LNE_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::LNE_Test::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many) - : ciao_context_ ( - ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx)) - , received_one_by_one_ (received_one_by_one) - , received_many_by_many_ (received_many_by_many) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::LNE_Test::ListenNotEnabledTestConnector::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::ListenNotEnabledTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - // Just count; this value is checked on ccm_remove. - ++this->received_one_by_one_; - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::ListenNotEnabledTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - // Just count; this value is checked on ccm_remove. - ++this->received_many_by_many_; - } - - /** - * Facet Executor Implementation Class: info_listen_status_exec_i - */ - - info_listen_status_exec_i::info_listen_status_exec_i ( - ::LNE_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_listen_status_exec_i::~info_listen_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : received_one_by_one_ (0) - , received_many_by_many_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - this->received_one_by_one_, - this->received_many_by_many_), - ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ())) - { - info_listen_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_listen_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_listen_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LNE_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::NOT_ENABLED); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->received_one_by_one_.value () > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: " - "Received samples on one_by_one " - "callback while mode is NOT_ENABLED " - "expected <0> - received <%u>\n", - this->received_one_by_one_.value ())); - } - if (this->received_many_by_many_.value () > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: " - "Received samples on many_by_many " - "callback while mode is NOT_ENABLED " - "expected <0> - received <%u>\n", - this->received_many_by_many_.value ())); - } - if (this->received_one_by_one_.value () == 0 && - this->received_many_by_many_.value () == 0) - { - ACE_DEBUG ((LM_DEBUG, "NOT ENABLED: " - "Received no data at all." - "Test passed!\n")); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LNE_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h deleted file mode 100644 index 18929491328..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h +++ /dev/null @@ -1,174 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_ -#define CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_ - -#include /**/ "ace/pre.h" - -#include "LNE_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_LNE_Test_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::LNE_Test::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from LNE_Test::ListenNotEnabledTestConnector::Listener. */ - - virtual - void on_one_data (const ::ListenNotEnabledTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ListenNotEnabledTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::LNE_Test::CCM_Receiver_Context_var ciao_context_; - Atomic_ULong &received_one_by_one_; - Atomic_ULong &received_many_by_many_; - }; - - /** - * Provider Executor Implementation Class: info_listen_status_exec_i - */ - - class info_listen_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_status_exec_i ( - ::LNE_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_listen_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::LNE_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::LNE_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_var ciao_info_listen_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_; - //@} - - //@{ - /** User defined members. */ - Atomic_ULong received_one_by_one_; - Atomic_ULong received_many_by_many_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LNE_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore deleted file mode 100644 index 0b9e96eacf9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LNE_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl deleted file mode 100644 index 0c09fb7fdde..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL -#define DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL - -#include "Connector/LNE_Test_Connector.idl" - -module LNE_Test -{ - component Sender - { - port ListenNotEnabledTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc deleted file mode 100644 index 0511fba5491..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_LNE_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - LNE_Test_Sender.idl - } -} - -project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LNE_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - LNE_Test_SenderE.idl - } -} - -project(DDS_LNE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LNE_Test_Sender_lem_gen DDS_LNE_Test_Sender_stub \ - DDS_LNE_Test_Base_stub - libs += DDS_LNE_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_SenderEC.cpp - } - - Header_Files { - LNE_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - LNE_Test_SenderEC.inl - } -} - -project(DDS_LNE_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_LNE_Test_Sender_idl_gen DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub - libs += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_SenderC.cpp - } - - Header_Files { - LNE_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - LNE_Test_SenderC.inl - } -} - -project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LNE_Test_Sender_lem_stub DDS_LNE_Test_Sender_stub \ - DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_Sender_exec.cpp - } - - Header_Files { - LNE_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LNE_Test_Base_stub DDS_LNE_Test_Sender_lem_stub \ - DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ - DDS_LNE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_SenderS.cpp - LNE_Test_Sender_svnt.cpp - } - - Header_Files { - LNE_Test_SenderS.h - LNE_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp deleted file mode 100644 index 1d2bf03e4fd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp +++ /dev/null @@ -1,293 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "LNE_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_LNE_Test_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * WriteHandler - */ - - WriteManyHandler::WriteManyHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteManyHandler::handle_exception (ACE_HANDLE) - { - this->callback_.write_many (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - ACE_NEW_THROW_EX (this->rh_, - WriteManyHandler (*this), - ::CORBA::NO_MEMORY ()); - - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->rh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - void - Sender_exec_i::write_many (void) - { - ListenNotEnabledTestSeq write_many; - write_many.length (this->keys_ * this->iterations_); - for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - ListenNotEnabledTest new_key; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - new_key.key = CORBA::string_dup(tmp); - for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - new_key.iteration = iter; - write_many[key + iter - 2] = new_key; - } - } - - ::LNE_Test::ListenNotEnabledTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - try - { - ACE_Time_Value tv (1, 0); - ACE_OS::sleep (tv); - writer->write_many (write_many); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"), - write_many.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - - void - Sender_exec_i::get_started (void) - { - try - { - this->start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - this->reactor ()->notify (this->rh_); - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LNE_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LNE_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h deleted file mode 100644 index c734f167b6f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_ -#define CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_ - -#include /**/ "ace/pre.h" - -#include "LNE_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_LNE_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * WriteHandler - */ - - class WriteManyHandler : - public ACE_Event_Handler - { - public: - WriteManyHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void write_many (void); - - //@} - - private: - ::LNE_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - WriteManyHandler *rh_; - //@} - - //@{ - /** User defined private operations. */ - void start (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LNE_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp deleted file mode 100644 index 4a83501042c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp +++ /dev/null @@ -1,371 +0,0 @@ - - - - LNE_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_LNE_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LNE_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LNE_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - LNE_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - LNE_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_LNE_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LNE_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - LNE_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - LNE_Test - - - - - - LNE_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LNE_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - LNE_Test_Connector_exec - - - DDS_LNE_Test_Connector_exec - - - LNE_Test_Connector_svnt - - - DDS_LNE_Test_Connector_svnt - - - LNE_Test_Connector_stub - - - DDS_LNE_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl deleted file mode 100755 index c6321471979..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore deleted file mode 100644 index e34f295b1bb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LOBO_Test_Base.cxx -/LOBO_Test_Base.h -/LOBO_Test_BasePlugin.cxx -/LOBO_Test_BasePlugin.h -/LOBO_Test_BaseSupport.cxx -/LOBO_Test_BaseSupport.h -/LOBO_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl deleted file mode 100644 index 565b7e98142..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file LOBO_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL -#define LISTEN_ONE_BY_ONE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h" -#pragma opendds typesupport "Base/LOBO_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ListenOneByOneTest" -#pragma DCPS_DATA_KEY "ListenOneByOneTest key" - -struct ListenOneByOneTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ListenOneByOneTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc deleted file mode 100644 index 8b3b8acbf22..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_LOBO_Test_Base_stub - dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=LOBO_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - LOBO_Test_Base.idl - } - - opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - LOBO_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore deleted file mode 100644 index 406ee55c6bd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/LOBO_Test_ConnectorE.idl -/LOBO_Test_Connector_conn.cpp -/LOBO_Test_Connector_conn.h -/LOBO_Test_Connector_conn_export.h -/LOBO_Test_Connector_lem_stub_export.h -/LOBO_Test_Connector_stub_export.h -/LOBO_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl deleted file mode 100644 index 9f1928117a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file LOBO_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_ -#define LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/LOBO_Test_Base.idl" - -#pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/LOBO_Test_BaseTypeSupport.idl" -#endif - -module LOBO_Test -{ - module ::CCM_DDS::Typed - < ::ListenOneByOneTest, ::ListenOneByOneTestSeq> - ListenOneByOneTestConnector; -}; - -#endif /* LOBO_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc deleted file mode 100644 index 0bc3d164d54..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector" - -project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_LOBO_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LOBO_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LOBO_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LOBO_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LOBO_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - LOBO_Test_Connector.idl - } -} - -project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LOBO_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=LOBO_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - LOBO_Test_ConnectorE.idl - } -} - -project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub - libs += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LOBO_Test_Connector_lem_stub - dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ConnectorEC.cpp - } - - Header_Files { - LOBO_Test_ConnectorEC.h - LOBO_Test_Connector_lem_stub_export.h - } - - Inline_Files { - LOBO_Test_ConnectorEC.inl - } -} - -project(DDS_LOBO_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_LOBO_Test_Connector_idl_gen DDS_LOBO_Test_Base_stub - libs += DDS_LOBO_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_LOBO_Test_Connector_stub - dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ConnectorC.cpp - } - - Header_Files { - LOBO_Test_ConnectorC.h - LOBO_Test_Connector_stub_export.h - } - - Inline_Files { - LOBO_Test_ConnectorC.inl - } -} - -project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub - sharedname = DDS_LOBO_Test_Connector_exec - libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_Connector_conn.cpp - } - - Header_Files { - LOBO_Test_Connector_conn.h - LOBO_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub - sharedname = DDS_LOBO_Test_Connector_svnt - libs += DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Connector_lem_stub \ - DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ConnectorS.cpp - LOBO_Test_Connector_svnt.cpp - } - - Header_Files { - LOBO_Test_ConnectorS.h - LOBO_Test_Connector_svnt.h - LOBO_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README deleted file mode 100644 index ee5fd301c5e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README +++ /dev/null @@ -1,3 +0,0 @@ - - -This test tests the listener. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore deleted file mode 100644 index 20dd17a46af..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LOBO_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl deleted file mode 100644 index 2944d3b6c0c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/LOBO_Test_Connector.idl" - -module LOBO_Test -{ - component Receiver - { - port ListenOneByOneTestConnector::DDS_Listen info_listen; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc deleted file mode 100644 index d1d0bb8fc63..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_LOBO_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - LOBO_Test_Receiver.idl - } -} - -project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LOBO_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - LOBO_Test_ReceiverE.idl - } -} - -project(DDS_LOBO_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LOBO_Test_Receiver_lem_gen DDS_LOBO_Test_Receiver_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub - libs += Receiver_stub DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ReceiverEC.cpp - } - - Header_Files { - LOBO_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - LOBO_Test_ReceiverEC.inl - } -} - -project(DDS_LOBO_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_LOBO_Test_Receiver_idl_gen DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_lem_gen - libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ReceiverC.cpp - } - - Header_Files { - LOBO_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - LOBO_Test_ReceiverC.inl - } -} - -project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Receiver_stub \ - DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_Receiver_exec.cpp - } - - Header_Files { - LOBO_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ - DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ - Receiver_exec DDS_LOBO_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_ReceiverS.cpp - LOBO_Test_Receiver_svnt.cpp - } - - Header_Files { - LOBO_Test_ReceiverS.h - LOBO_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp deleted file mode 100644 index ac725d4923d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp +++ /dev/null @@ -1,266 +0,0 @@ -// -*- C++ -*- -#include "LOBO_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_LOBO_Test_Receiver_Impl -{ - //============================================================ - // ListenOneByOneTest_Listener_exec_i - //============================================================ - ListenOneByOneTest_Listener_exec_i::ListenOneByOneTest_Listener_exec_i ( - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many, - ACE_Thread_ID &thread_id) - : received_one_by_one_ (received_one_by_one), - received_many_by_many_ (received_many_by_many), - thread_id_ (thread_id) - { - } - - ListenOneByOneTest_Listener_exec_i::~ListenOneByOneTest_Listener_exec_i (void) - { - } - - void - ListenOneByOneTest_Listener_exec_i::on_one_data ( - const ListenOneByOneTest & an_instance, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - - ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: " - "key <%C> - iteration <%d>\n", - an_instance.key.in (), - an_instance.iteration)); - if (info.instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: " - "instance handle seems to be nil " - "key <%C> - iteration <%d>\n", - an_instance.key.in (), - an_instance.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: " - "source timestamp seems to be nil (nil) " - "key <%C> - iteration <%d>\n", - an_instance.key.in (), - an_instance.iteration)); - } - ++this->received_one_by_one_; - } - - void - ListenOneByOneTest_Listener_exec_i::on_many_data ( - const ListenOneByOneTestSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & /*info*/) - { - // Just count. Is checked on ccm_remove. - this->received_many_by_many_ += an_instance.length (); - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : received_one_by_one_ (0), - received_many_by_many_ (0), - thread_id_listener_ (0, 0), - iterations_ (10), - keys_ (5) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - return new ListenOneByOneTest_Listener_exec_i ( - this->received_one_by_one_, - this->received_many_by_many_, - this->thread_id_listener_); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_listen_connector_status (void) - { - return ::CCM_DDS::CCM_ConnectorStatusListener::_nil (); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::LOBO_Test::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) - { - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - CORBA::ULong expected = this->keys_ * this->iterations_; - if (this->received_one_by_one_.value () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: " - "Didn't receive samples on one_by_one " - "callback while mode is ONE_BY_ONE " - "expected <%u> - received <%u>\n", - expected, - this->received_one_by_one_.value ())); - } - else if (expected != this->received_one_by_one_.value ()) - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: " - "Didn't receive the expected " - "number of samples on one_by_one " - "callback while mode is ONE_BY_ONE " - "expected <%u> - received <%u>\n", - expected, - this->received_one_by_one_.value ())); - } - if (this->received_many_by_many_.value () > 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: " - "Received samples on many_by_many " - "callback while mode is ONE_BY_ONE " - "expected <0> - received <%u>\n", - this->received_many_by_many_.value ())); - } - if (this->received_one_by_one_.value () > 0 && - this->received_many_by_many_.value () == 0) - { - ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: " - "Received only data on " - "one_by_one callback. " - "Test passed!\n")); - } - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LOBO_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h deleted file mode 100644 index e171b512da7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h +++ /dev/null @@ -1,107 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "LOBO_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/OS_NS_Thread.h" - - - -#include - -namespace CIAO_LOBO_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Bool; - - //============================================================ - // ListenOneByOneTest_Listener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i - : public virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenOneByOneTest_Listener_exec_i ( - Atomic_ULong &received_one_by_one, - Atomic_ULong &received_many_by_many, - ACE_Thread_ID &thread_id); - virtual ~ListenOneByOneTest_Listener_exec_i (void); - - virtual void - on_one_data ( - const ListenOneByOneTest & an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const ListenOneByOneTestSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - Atomic_ULong &received_one_by_one_; - Atomic_ULong &received_many_by_many_; - ACE_Thread_ID &thread_id_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - void start (); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_listen_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_listen_connector_status (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: - ::LOBO_Test::CCM_Receiver_Context_var context_; - - Atomic_ULong received_one_by_one_; - Atomic_ULong received_many_by_many_; - ACE_Thread_ID thread_id_listener_; - - CORBA::UShort iterations_; - CORBA::UShort keys_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LOBO_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore deleted file mode 100644 index 630065578bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/LOBO_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl deleted file mode 100644 index d399d7cc53b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL -#define DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL - -#include "Connector/LOBO_Test_Connector.idl" - -module LOBO_Test -{ - component Sender - { - port ListenOneByOneTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc deleted file mode 100644 index 7fee73abf3b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_LOBO_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - LOBO_Test_Sender.idl - } -} - -project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_LOBO_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - LOBO_Test_SenderE.idl - } -} - -project(DDS_LOBO_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LOBO_Test_Sender_lem_gen DDS_LOBO_Test_Sender_stub \ - DDS_LOBO_Test_Base_stub - libs += DDS_LOBO_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_SenderEC.cpp - } - - Header_Files { - LOBO_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - LOBO_Test_SenderEC.inl - } -} - -project(DDS_LOBO_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_LOBO_Test_Sender_idl_gen DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub - libs += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_SenderC.cpp - } - - Header_Files { - LOBO_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - LOBO_Test_SenderC.inl - } -} - -project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_LOBO_Test_Sender_lem_stub DDS_LOBO_Test_Sender_stub \ - DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_Sender_exec.cpp - } - - Header_Files { - LOBO_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Sender_lem_stub \ - DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ - DDS_LOBO_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_SenderS.cpp - LOBO_Test_Sender_svnt.cpp - } - - Header_Files { - LOBO_Test_SenderS.h - LOBO_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp deleted file mode 100644 index 63aee1fa2c2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp +++ /dev/null @@ -1,297 +0,0 @@ -// -*- C++ -*- -#include "LOBO_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "ace/Date_Time.h" - -namespace CIAO_LOBO_Test_Sender_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - //============================================================ - // WriteManyHandler - //============================================================ - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - this->ticker_ = new WriteTicker (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - void - Sender_exec_i::write_one (void) - { - if (this->last_key_ != this->samples_.end ()) - { - try - { - ++this->last_key_->second->iteration; - ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n", - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - // Onto the next iteration - this->last_key_ = this->samples_.begin (); - while (this->last_key_ != this->samples_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - // Next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->samples_.end ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - } - - void - Sender_exec_i::get_started (void) - { - try - { - start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - ListenOneByOneTest *new_key = new ListenOneByOneTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::LOBO_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LOBO_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h deleted file mode 100644 index 310030d1ff8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h +++ /dev/null @@ -1,141 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_ -#define CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_ - -#include /**/ "ace/pre.h" - -#include "LOBO_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_LOBO_Test_Sender_Impl -{ - class Sender_exec_i; - - //============================================================ - // WriteTicker - //============================================================ - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations);//@} - - //@{ - /** Operations from Components::SessionComponent. */ - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined operations */ - void get_started (void); - void write_one (void); - //@} - - private: - ::LOBO_Test::CCM_Sender_Context_var ciao_context_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - - ACE_Reactor* reactor (void); - void start (void); - - WriteTicker *ticker_; - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table samples_; - Writer_Table::iterator last_key_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_LOBO_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp deleted file mode 100644 index 0273c9d561a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp +++ /dev/null @@ -1,393 +0,0 @@ - - - - LOBO_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_LOBO_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LOBO_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - LOBO_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - LOBO_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - LOBO_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_LOBO_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_LOBO_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - LOBO_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - LOBO_Test - - - - - - LOBO_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - LOBO_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - LOBO_Test_Connector_exec - - - DDS_LOBO_Test_Connector_exec - - - LOBO_Test_Connector_svnt - - - DDS_LOBO_Test_Connector_svnt - - - LOBO_Test_Connector_stub - - - DDS_LOBO_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl deleted file mode 100644 index ad271593b5c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Event_MemLeakDetection_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef EVENT_MEMLEAKDETECTION_TEST_BASE_IDL -#define EVENT_MEMLEAKDETECTION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Event_MemLeakDetection_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Event_MemLeakDetection_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "Event_MemLeakDetectionTest" -#pragma DCPS_DATA_KEY "Event_MemLeakDetectionTest key" - -struct Event_MemLeakDetectionTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Event_MemLeakDetectionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc deleted file mode 100644 index e3ec1e97771..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_EMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_EMLDT_Base_stub - dynamicflags += EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Event_MemLeakDetection_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Event_MemLeakDetection_Test_Base.idl - } - - opendds_ts_flags += --export=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Event_MemLeakDetection_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl deleted file mode 100644 index c9e204f356b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Event_MemLeakDetection_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_CONNECTOR_IDL_ -#define KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Event_MemLeakDetection_Test_Base.idl" - -#pragma ciao lem "Connector/Event_MemLeakDetection_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Event_MemLeakDetection_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::Event_MemLeakDetectionTest, ::Event_MemLeakDetectionTestSeq> Event_MemLeakDetectionConnector; - -#endif /* Event_MemLeakDetection_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc deleted file mode 100644 index c3663a91361..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l .. -o ../lib -u DDS Event_MemLeakDetection_Test_Connector" - -project(DDS_EMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_EMLDT_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Event_MemLeakDetection_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Event_MemLeakDetection_Test_Connector.idl - } -} - -project(DDS_EMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_EMLDT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Event_MemLeakDetection_Test_ConnectorE.idl - } -} - -project(DDS_EMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_EMLDT_Connector_lem_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub - libs += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_EMLDT_Connector_lem_stub - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ConnectorEC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ConnectorEC.h - Event_MemLeakDetection_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_ConnectorEC.inl - } -} - -project(DDS_EMLDT_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_EMLDT_Connector_idl_gen DDS_EMLDT_Base_stub - libs += DDS_EMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_EMLDT_Connector_stub - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ConnectorC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ConnectorC.h - Event_MemLeakDetection_Test_Connector_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_ConnectorC.inl - } -} - -project(DDS_EMLDT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub - sharedname = DDS_EMLDT_Connector_exec - libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_Connector_conn.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_Connector_conn.h - Event_MemLeakDetection_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_exec DDS_EMLDT_Connector_stub - sharedname = DDS_EMLDT_Connector_svnt - libs += DDS_EMLDT_Connector_stub \ - DDS_EMLDT_Connector_lem_stub \ - DDS_EMLDT_Base_stub \ - DDS_EMLDT_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ConnectorS.cpp - Event_MemLeakDetection_Test_Connector_svnt.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ConnectorS.h - Event_MemLeakDetection_Test_Connector_svnt.h - Event_MemLeakDetection_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl deleted file mode 100644 index 452db0b4622..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Event_MemLeakDetection_Test_Connector.idl" - -module Event_MemLeakDetection_Test -{ - component Receiver - { - port Event_MemLeakDetectionConnector::DDS_Listen info_listen; - port Event_MemLeakDetectionConnector::DDS_Get info_get; - provides CCM_DDS::ConnectorStatusListener status_listener; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc deleted file mode 100644 index 3cc1aa2ad3a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_EMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_EMLDT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. -Gex - - IDL_Files { - Event_MemLeakDetection_Test_Receiver.idl - } -} - -project(DDS_EMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_EMLDT_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Event_MemLeakDetection_Test_ReceiverE.idl - } -} - -project(DDS_EMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_EMLDT_Receiver_lem_gen DDS_EMLDT_Receiver_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub - libs += Receiver_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ReceiverEC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_ReceiverEC.inl - } -} - -project(DDS_EMLDT_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_EMLDT_Receiver_idl_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_gen - libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ReceiverC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_ReceiverC.inl - } -} - -project(DDS_EMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Receiver_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_Receiver_exec.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_EMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Receiver_exec DDS_EMLDT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt Receiver_exec DDS_EMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_ReceiverS.cpp - Event_MemLeakDetection_Test_Receiver_svnt.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_ReceiverS.h - Event_MemLeakDetection_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl deleted file mode 100644 index 1c63ca8799c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL -#define DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL - -#include "Connector/Event_MemLeakDetection_Test_Connector.idl" - -module Event_MemLeakDetection_Test -{ - component Sender - { - port Event_MemLeakDetectionConnector::DDS_Write info_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc deleted file mode 100644 index b3a68ef7736..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_EMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_EMLDT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. -Gex - - IDL_Files { - Event_MemLeakDetection_Test_Sender.idl - } -} - -project(DDS_EMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_EMLDT_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Event_MemLeakDetection_Test_SenderE.idl - } -} - -project(DDS_EMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_EMLDT_Sender_lem_gen DDS_EMLDT_Sender_stub DDS_EMLDT_Base_stub - libs += DDS_EMLDT_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_SenderEC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_SenderEC.inl - } -} - -project(DDS_EMLDT_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_EMLDT_Sender_idl_gen DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub - libs += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_SenderC.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Event_MemLeakDetection_Test_SenderC.inl - } -} - -project(DDS_EMLDT_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Sender_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_Sender_exec.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_EMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_EMLDT_Base_stub DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_MemLeakDetection_Test_SenderS.cpp - Event_MemLeakDetection_Test_Sender_svnt.cpp - } - - Header_Files { - Event_MemLeakDetection_Test_SenderS.h - Event_MemLeakDetection_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp deleted file mode 100644 index e9cd40feb02..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp +++ /dev/null @@ -1,549 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Event_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Event_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Event_MemLeakDetection_Test - - - - - - Event_MemLeakDetection_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Event_MemLeakDetection_Test - - - - - - SenderComponent - SenderNode - - - - - - - listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - listen_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - - listen_rawlistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - listen_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - listen_dds_reader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_dds_entity - false - SimplexReceptacle - - - - push_consumer_dds_entity - true - Facet - - - - - - listen_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_filter_config - false - SimplexReceptacle - - - - push_consumer_filter_config - true - Facet - - - - - - getter_portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_consumer_status - false - SimplexReceptacle - - - - - - getter_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - getter_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - getter_dds_reader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_consumer_dds_entity - true - Facet - - - - - - getter_filter_config - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_filter_config - false - SimplexReceptacle - - - - pull_consumer_filter_config - true - Facet - - - - - - connector_status_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - status_listener - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - writer_dds_writer - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Event_MemLeakDetection_Test_Connector_exec - - - DDS_EMLDT_Connector_exec - - - Event_MemLeakDetection_Test_Connector_svnt - - - DDS_EMLDT_Connector_svnt - - - Event_MemLeakDetection_Test_Connector_stub - - - DDS_EMLDT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp deleted file mode 100644 index 4256b05cf8e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp +++ /dev/null @@ -1,98 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - Event_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_exec - - - - - - Event_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Event_MemLeakDetection_Test - - - - - - - Event_MemLeakDetection_Test_Connector_exec - - - DDS_EMLDT_Connector_exec - - - Event_MemLeakDetection_Test_Connector_svnt - - - DDS_EMLDT_Connector_svnt - - - Event_MemLeakDetection_Test_Connector_stub - - - DDS_EMLDT_Connector_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp deleted file mode 100644 index 5b21c73b194..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp +++ /dev/null @@ -1,196 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Event_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - Event_MemLeakDetection_Test_ConnectorComponent - ReceiverNode - - - - - topic_name - - - tk_string - - - Event_MemLeakDetection_Test - - - - - - - listen_data_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - Event_MemLeakDetection_Test_Connector_exec - - - DDS_EMLDT_Connector_exec - - - Event_MemLeakDetection_Test_Connector_svnt - - - DDS_EMLDT_Connector_svnt - - - Event_MemLeakDetection_Test_Connector_stub - - - DDS_EMLDT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp deleted file mode 100644 index 02076f6c94b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp +++ /dev/null @@ -1,194 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - Event_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetectionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Event_MemLeakDetection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - Event_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Event_MemLeakDetection_Test - - - - - - SenderComponent - SenderNode - - - - - - - writer_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Event_MemLeakDetection_Test_Connector_exec - - - DDS_EMLDT_Connector_exec - - - Event_MemLeakDetection_Test_Connector_svnt - - - DDS_EMLDT_Connector_svnt - - - Event_MemLeakDetection_Test_Connector_stub - - - DDS_EMLDT_Connector_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp deleted file mode 100644 index b6b83f64b6f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp +++ /dev/null @@ -1,88 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp deleted file mode 100644 index 5989ffb91a7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp +++ /dev/null @@ -1,87 +0,0 @@ - - - - Event_MemLeakDetection_Test_Depl_1 - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Event_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - SenderComponent - SenderNode - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl deleted file mode 100755 index 41c8906cbb8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl +++ /dev/null @@ -1,216 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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; - -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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\n"; - - $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); - $DEAMONS[$i]->Spawn (); - - if ($tg_daemons[$i]->WaitForFileTimed($iorbase, - 2 * $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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - if ($tg_naming->WaitForFileTimed ($ior_nsbase, - 2 * $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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - if ($tg_exe_man->WaitForFileTimed ($ior_embase, - 2 * $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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - - print "Sleeping 5 seconds to allow task to complete\n"; - sleep (5); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Executor finished.\n"; - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl deleted file mode 100644 index eee91874471..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file State_MemLeakDetection_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef STATE_MEMLEAKDETECTION_TEST_BASE_IDL -#define STATE_MEMLEAKDETECTION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/State_MemLeakDetection_Test_BaseSupport.h" -#pragma opendds typesupport "Base/State_MemLeakDetection_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "State_MemLeakDetectionTest" -#pragma DCPS_DATA_KEY "State_MemLeakDetectionTest key" - -struct State_MemLeakDetectionTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence State_MemLeakDetectionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc deleted file mode 100644 index 860e3832f7d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SMLDT_Base_stub - dynamicflags += STATE_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=State_MemLeakDetection_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - State_MemLeakDetection_Test_Base.idl - } - - opendds_ts_flags += --export=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - State_MemLeakDetection_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl deleted file mode 100644 index 81046dbecf5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file State_MemLeakDetection_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_CONNECTOR_IDL_ -#define KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/State_MemLeakDetection_Test_Base.idl" - -#pragma ciao lem "Connector/State_MemLeakDetection_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/State_MemLeakDetection_Test_BaseTypeSupport.idl" -#endif - -module State_MemLeakDetection_Test -{ - module ::CCM_DDS::Typed < ::State_MemLeakDetectionTest, ::State_MemLeakDetectionTestSeq> State_MemLeakDetectionTestConnector; -}; - -#endif /* STATE_MEMLEAKDETECTION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc deleted file mode 100644 index 982b2e13c0a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l .. -o ../lib -u DDS State_MemLeakDetection_Test_Connector" - -project(DDS_SMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SMLDT_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=State_MemLeakDetection_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - State_MemLeakDetection_Test_Connector.idl - } -} - -project(DDS_SMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SMLDT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - State_MemLeakDetection_Test_ConnectorE.idl - } -} - -project(DDS_SMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SMLDT_Connector_lem_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub - libs += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SMLDT_Connector_lem_stub - dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ConnectorEC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ConnectorEC.h - State_MemLeakDetection_Test_Connector_lem_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_ConnectorEC.inl - } -} - -project(DDS_SMLDT_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SMLDT_Connector_idl_gen DDS_SMLDT_Base_stub - libs += DDS_SMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SMLDT_Connector_stub - dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ConnectorC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ConnectorC.h - State_MemLeakDetection_Test_Connector_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_ConnectorC.inl - } -} - -project(DDS_SMLDT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub - sharedname = DDS_SMLDT_Connector_exec - libs += DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_Connector_conn.cpp - } - - Header_Files { - State_MemLeakDetection_Test_Connector_conn.h - State_MemLeakDetection_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_exec DDS_SMLDT_Connector_stub - sharedname = DDS_SMLDT_Connector_svnt - libs += DDS_SMLDT_Connector_stub \ - DDS_SMLDT_Connector_lem_stub \ - DDS_SMLDT_Base_stub \ - DDS_SMLDT_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ConnectorS.cpp - State_MemLeakDetection_Test_Connector_svnt.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ConnectorS.h - State_MemLeakDetection_Test_Connector_svnt.h - State_MemLeakDetection_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl deleted file mode 100644 index 21d432741b9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/State_MemLeakDetection_Test_Connector.idl" - -module State_MemLeakDetection_Test -{ - component Receiver - { - port State_MemLeakDetectionTestConnector::DDS_Read info_read; - port State_MemLeakDetectionTestConnector::DDS_Get info_get; - port State_MemLeakDetectionTestConnector::DDS_Listen info_listen; - port State_MemLeakDetectionTestConnector::DDS_StateListen info_statelisten; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc deleted file mode 100644 index e1c826c54f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_SMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SMLDT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. -Gex - - IDL_Files { - State_MemLeakDetection_Test_Receiver.idl - } -} - -project(DDS_SMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SMLDT_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - State_MemLeakDetection_Test_ReceiverE.idl - } -} - -project(DDS_SMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SMLDT_Receiver_lem_gen DDS_SMLDT_Receiver_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub - libs += Receiver_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ReceiverEC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_ReceiverEC.inl - } -} - -project(DDS_SMLDT_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_SMLDT_Receiver_idl_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_gen - libs += DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ReceiverC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_ReceiverC.inl - } -} - -project(DDS_SMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Receiver_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_Receiver_exec.cpp - } - - Header_Files { - State_MemLeakDetection_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Receiver_exec DDS_SMLDT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt Receiver_exec DDS_SMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_ReceiverS.cpp - State_MemLeakDetection_Test_Receiver_svnt.cpp - } - - Header_Files { - State_MemLeakDetection_Test_ReceiverS.h - State_MemLeakDetection_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl deleted file mode 100644 index b0da02cc828..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL -#define DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL - -#include "Connector/State_MemLeakDetection_Test_Connector.idl" - -module State_MemLeakDetection_Test -{ - component Sender - { - port State_MemLeakDetectionTestConnector::DDS_Update info_update; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc deleted file mode 100644 index 5dfdcfd1e7b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_SMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SMLDT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. -Gex - - IDL_Files { - State_MemLeakDetection_Test_Sender.idl - } -} - -project(DDS_SMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SMLDT_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - State_MemLeakDetection_Test_SenderE.idl - } -} - -project(DDS_SMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SMLDT_Sender_lem_gen DDS_SMLDT_Sender_stub DDS_SMLDT_Base_stub - libs += DDS_SMLDT_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_SenderEC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_SenderEC.inl - } -} - -project(DDS_SMLDT_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_SMLDT_Sender_idl_gen DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub - libs += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_SenderC.cpp - } - - Header_Files { - State_MemLeakDetection_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - State_MemLeakDetection_Test_SenderC.inl - } -} - -project(DDS_SMLDT_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Sender_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_Sender_exec.cpp - } - - Header_Files { - State_MemLeakDetection_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SMLDT_Base_stub DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_MemLeakDetection_Test_SenderS.cpp - State_MemLeakDetection_Test_Sender_svnt.cpp - } - - Header_Files { - State_MemLeakDetection_Test_SenderS.h - State_MemLeakDetection_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp deleted file mode 100644 index d30bbd86d82..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp +++ /dev/null @@ -1,721 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - State_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - State_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - State_MemLeakDetection_Test - - - - - - State_MemLeakDetection_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - State_MemLeakDetection_Test - - - - - - SenderComponent - SenderNode - - - - - - - - update_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - update_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_dds_entity - false - SimplexReceptacle - - - - observable_dds_entity - true - Facet - - - - - - - - get_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - get_fresh_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - get_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_observer_dds_entity - true - Facet - - - - - get_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_filter_config - false - SimplexReceptacle - - - - pull_observer_filter_config - true - Facet - - - - - - get_status_mirrorport - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_observer_status - false - SimplexReceptacle - - - - - - - read_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - read_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_dds_entity - false - SimplexReceptacle - - - - passive_observer_dds_entity - true - Facet - - - - - read_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_filter_config - false - SimplexReceptacle - - - - passive_observer_filter_config - true - Facet - - - - - - read_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_status - true - Facet - - - - passive_observer_status - false - SimplexReceptacle - - - - - - - listen_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - listen_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_observer_data_control - true - Facet - - - - - listen_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_dds_entity - false - SimplexReceptacle - - - - push_observer_dds_entity - true - Facet - - - - - listen_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_filter_config - false - SimplexReceptacle - - - - push_observer_filter_config - true - Facet - - - - - - listen_data_listener_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_observer_data_listener - false - SimplexReceptacle - - - - - listen_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_status - true - Facet - - - - push_observer_status - false - SimplexReceptacle - - - - - - - statelisten_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - statelisten_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - statelisten_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_dds_entity - false - SimplexReceptacle - - - - push_state_observer_dds_entity - true - Facet - - - - - statelisten_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_filter_config - false - SimplexReceptacle - - - - push_state_observer_filter_config - true - Facet - - - - - - statelisten_data_listener_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - statelisten_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - State_MemLeakDetection_Test_Connector_exec - - - DDS_SMLDT_Connector_exec - - - State_MemLeakDetection_Test_Connector_svnt - - - DDS_SMLDT_Connector_svnt - - - State_MemLeakDetection_Test_Connector_stub - - - DDS_SMLDT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp deleted file mode 100644 index 8229bbea42c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp +++ /dev/null @@ -1,98 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - State_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_exec - - - - - - State_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - State_MemLeakDetection_Test - - - - - - - State_MemLeakDetection_Test_Connector_exec - - - DDS_SMLDT_Connector_exec - - - State_MemLeakDetection_Test_Connector_svnt - - - DDS_SMLDT_Connector_svnt - - - State_MemLeakDetection_Test_Connector_stub - - - DDS_SMLDT_Connector_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp deleted file mode 100644 index 4730cdeebc2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp +++ /dev/null @@ -1,197 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - State_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - State_MemLeakDetection_Test_ConnectorComponent - ReceiverNode - - - - - topic_name - - - tk_string - - - State_MemLeakDetection_Test - - - - - - - - - listen_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - - State_MemLeakDetection_Test_Connector_exec - - - DDS_SMLDT_Connector_exec - - - State_MemLeakDetection_Test_Connector_svnt - - - DDS_SMLDT_Connector_svnt - - - State_MemLeakDetection_Test_Connector_stub - - - DDS_SMLDT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp deleted file mode 100644 index b59e4f83a58..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp +++ /dev/null @@ -1,196 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - State_MemLeakDetection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - State_MemLeakDetection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - State_MemLeakDetection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - State_MemLeakDetection_Test - - - - - - SenderComponent - SenderNode - - - - - - - - update_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - State_MemLeakDetection_Test_Connector_exec - - - DDS_SMLDT_Connector_exec - - - State_MemLeakDetection_Test_Connector_svnt - - - DDS_SMLDT_Connector_svnt - - - State_MemLeakDetection_Test_Connector_stub - - - DDS_SMLDT_Connector_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp deleted file mode 100644 index 68a2babe7ad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp +++ /dev/null @@ -1,88 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp deleted file mode 100644 index ddbadbb155c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp +++ /dev/null @@ -1,87 +0,0 @@ - - - - State_MemLeakDetection_Test_Depl_1 - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_MemLeakDetection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - SenderComponent - SenderNode - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl deleted file mode 100755 index 41c8906cbb8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl +++ /dev/null @@ -1,216 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# 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; - -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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\n"; - - $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); - $DEAMONS[$i]->Spawn (); - - if ($tg_daemons[$i]->WaitForFileTimed($iorbase, - 2 * $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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - if ($tg_naming->WaitForFileTimed ($ior_nsbase, - 2 * $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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - if ($tg_exe_man->WaitForFileTimed ($ior_embase, - 2 * $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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - - print "Sleeping 5 seconds to allow task to complete\n"; - sleep (5); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Executor finished.\n"; - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl deleted file mode 100644 index de5a9830077..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file TypeRegistration_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef MLD_TYPE_REGISTRATION_TEST_BASE_IDL -#define MLD_TYPE_REGISTRATION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/TypeRegistration_Test_BaseSupport.h" -#pragma opendds typesupport "Base/TypeRegistration_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "MLDTypeRegistrationTest" -#pragma DCPS_DATA_KEY "MLDTypeRegistrationTest key" - -struct MLDTypeRegistrationTest { - unsigned long key; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence MLDTypeRegistrationTestSeq; -#endif - -#endif /* MLD_TYPE_REGISTRATION_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc deleted file mode 100644 index 745f93aafcf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (TypeRegistration_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = TypeRegistration_Base_stub - dynamicflags += MLD_TYPE_REGISTRATION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=TypeRegistration_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - TypeRegistration_Test_Base.idl - } - - opendds_ts_flags += --export=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - TypeRegistration_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl deleted file mode 100644 index 7bcc7fc0fb0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/TypeRegistration_Test_Connector.idl" - -module MLD_TypeRegistration_Test -{ - component CFTTestComponent - { - port MLDTypeRegistrationTestConn::DDS_Write writer; - port MLDTypeRegistrationTestConn::DDS_Listen listener; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc deleted file mode 100644 index eb49c7a53e6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(TypeRegistration_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += TypeRegistration_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - TypeRegistration_Test_Component.idl - } -} - -project(TypeRegistration_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += TypeRegistration_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - TypeRegistration_Test_ComponentE.idl - } -} - -project(TypeRegistration_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += TypeRegistration_Component_lem_gen TypeRegistration_Component_stub \ - TypeRegistration_Connector_stub TypeRegistration_Base_stub - libs += Component_stub TypeRegistration_Connector_stub \ - TypeRegistration_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ComponentEC.cpp - } - - Header_Files { - TypeRegistration_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - TypeRegistration_Test_ComponentEC.inl - } -} - -project(TypeRegistration_Component_stub) : ccm_stub, dds4ccm_base { - after += TypeRegistration_Component_idl_gen TypeRegistration_Connector_stub \ - TypeRegistration_Base_stub TypeRegistration_Connector_lem_gen - libs += TypeRegistration_Connector_stub TypeRegistration_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ComponentC.cpp - } - - Header_Files { - TypeRegistration_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - TypeRegistration_Test_ComponentC.inl - } -} - -project(TypeRegistration_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += TypeRegistration_Component_lem_stub TypeRegistration_Component_stub \ - TypeRegistration_Base_stub TypeRegistration_Connector_stub \ - TypeRegistration_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub TypeRegistration_Base_stub \ - TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_Component_exec.cpp - } - - Header_Files { - TypeRegistration_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(TypeRegistration_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += TypeRegistration_Component_lem_stub TypeRegistration_Base_stub \ - TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \ - TypeRegistration_Component_exec TypeRegistration_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub TypeRegistration_Base_stub \ - TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \ - Component_exec TypeRegistration_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ComponentS.cpp - TypeRegistration_Test_Component_svnt.cpp - } - - Header_Files { - TypeRegistration_Test_ComponentS.h - TypeRegistration_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp deleted file mode 100644 index 0e58496fb5f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp +++ /dev/null @@ -1,289 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "TypeRegistration_Test_Component_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl -{ - /** - * WriteTicker - */ - WriteTicker::WriteTicker (CFTTestComponent_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - /** - * Facet Executor Implementation Class: listener_data_listener_exec_i - */ - - listener_data_listener_exec_i::listener_data_listener_exec_i ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx) - : ciao_context_ ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx)) - { - } - - listener_data_listener_exec_i::~listener_data_listener_exec_i (void) - { - } - - // Operations from ::MLDTypeRegistrationTestConn::Listener - - void - listener_data_listener_exec_i::on_one_data (const ::MLDTypeRegistrationTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, "listener_data_listener_exec_i::on_one_data: " - "key <%u>\n", - datum.key)); - } - - void - listener_data_listener_exec_i::on_many_data (const ::MLDTypeRegistrationTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: listener_status_exec_i - */ - - listener_status_exec_i::listener_status_exec_i ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx) - : ciao_context_ ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx)) - { - } - - listener_status_exec_i::~listener_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - listener_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - listener_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: CFTTestComponent_exec_i - */ - - CFTTestComponent_exec_i::CFTTestComponent_exec_i (void) - : ticker_(0) - , iterator(0) - { - ACE_NEW_THROW_EX (this->ticker_, - WriteTicker (*this), - ::CORBA::NO_MEMORY ()); - } - - CFTTestComponent_exec_i::~CFTTestComponent_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - CFTTestComponent_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - CFTTestComponent_exec_i::write_one (void) - { - MLDTypeRegistrationTest new_key; - new_key.key = ++this->iterator; - - MLDTypeRegistrationTestConn::Writer_var writer = - this->ciao_context_->get_connection_writer_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - " - "ERROR: Writer seems to be nil\n")); - return; - } - try - { - writer->write_one (new_key, ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - " - "ERROR: caught InternalError exception while writing <%d> to DDS.\n", - this->iterator)); - } - catch (const ::CORBA::Exception& ) - { - ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - " - "ERROR: caught CORBA exception while writing <%d> to DDS.\n", - this->iterator)); - } - } - - // Component attributes and port operations. - - ::MLDTypeRegistrationTestConn::CCM_Listener_ptr - CFTTestComponent_exec_i::get_listener_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_listener_data_listener_.in ())) - { - listener_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - listener_data_listener_exec_i ( - this->ciao_context_.in ()), - ::MLDTypeRegistrationTestConn::CCM_Listener::_nil ()); - - this->ciao_listener_data_listener_ = tmp; - } - - return - ::MLDTypeRegistrationTestConn::CCM_Listener::_duplicate ( - this->ciao_listener_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - CFTTestComponent_exec_i::get_listener_status (void) - { - if ( ::CORBA::is_nil (this->ciao_listener_status_.in ())) - { - listener_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - listener_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_listener_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_listener_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - CFTTestComponent_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - CFTTestComponent_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - CFTTestComponent_exec_i::ccm_activate (void) - { - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_listener_data_control(); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - CFTTestComponent_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer(this->ticker_); - } - - void - CFTTestComponent_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - CFTTestComponent_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h deleted file mode 100644 index e4790cb99e3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_ -#define CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_ - -#include /**/ "ace/pre.h" - -#include "TypeRegistration_Test_ComponentEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Component_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl -{ - class CFTTestComponent_exec_i; - - /** - * WriteTicker - */ - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (CFTTestComponent_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - CFTTestComponent_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: listener_data_listener_exec_i - */ - - class listener_data_listener_exec_i - : public virtual ::MLDTypeRegistrationTestConn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - listener_data_listener_exec_i ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx); - virtual ~listener_data_listener_exec_i (void); - - /** @name Operations and attributes from MLDTypeRegistrationTestConn::Listener */ - //@{ - - virtual - void on_one_data (const ::MLDTypeRegistrationTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::MLDTypeRegistrationTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: listener_status_exec_i - */ - - class listener_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - listener_status_exec_i ( - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx); - virtual ~listener_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: CFTTestComponent_exec_i - */ - - class CFTTestComponent_exec_i - : public virtual CFTTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - CFTTestComponent_exec_i (void); - virtual ~CFTTestComponent_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::MLDTypeRegistrationTestConn::CCM_Listener_ptr - get_listener_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_listener_status (void); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - void write_one (void); - //@} - - private: - ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::MLDTypeRegistrationTestConn::CCM_Listener_var ciao_listener_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_listener_status_; - //@} - - /** @name User defined members. */ - //@{ - WriteTicker *ticker_; - ::CORBA::ULong iterator; - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl deleted file mode 100644 index 6b6c822a884..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file TypeRegistration_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ -#define MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/TypeRegistration_Test_Base.idl" - -#pragma ciao lem "Connector/TypeRegistration_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/TypeRegistration_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::MLDTypeRegistrationTest, ::MLDTypeRegistrationTestSeq> MLDTypeRegistrationTestConn; - -#endif /* MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc deleted file mode 100644 index ba4a82920d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TypeRegistration_Base -l .. -o ../lib -u DDS TypeRegistration_Connector" - -project(TypeRegistration_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen TypeRegistration_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=TypeRegistration_Connector_stub_export.h \ - -Wb,skel_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=TypeRegistration_Connector_svnt_export.h \ - -Wb,svnt_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=TypeRegistration_Connector_svnt_export.h \ - -Wb,conn_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=TypeRegistration_Connector_conn_export.h \ - -I .. - - IDL_Files { - TypeRegistration_Test_Connector.idl - } -} - -project(TypeRegistration_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += TypeRegistration_Connector_idl_gen - idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=TypeRegistration_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - TypeRegistration_Test_ConnectorE.idl - } -} - -project(TypeRegistration_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += TypeRegistration_Connector_lem_gen TypeRegistration_Connector_stub TypeRegistration_Base_stub - libs += TypeRegistration_Base_stub TypeRegistration_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TypeRegistration_Connector_lem_stub - dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ConnectorEC.cpp - } - - Header_Files { - TypeRegistration_Test_ConnectorEC.h - TypeRegistration_Test_Connector_lem_stub_export.h - } - - Inline_Files { - TypeRegistration_Test_ConnectorEC.inl - } -} - -project(TypeRegistration_Connector_stub) : ccm_stub, dds4ccm_base { - after += TypeRegistration_Connector_idl_gen TypeRegistration_Base_stub - libs += TypeRegistration_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TypeRegistration_Connector_stub - dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ConnectorC.cpp - } - - Header_Files { - TypeRegistration_Test_ConnectorC.h - TypeRegistration_Test_Connector_stub_export.h - } - - Inline_Files { - TypeRegistration_Test_ConnectorC.inl - } -} - -project(TypeRegistration_Connector_exec) : ciao_executor, dds4ccm_impl { - after += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_stub TypeRegistration_Base_stub - sharedname = TypeRegistration_Connector_exec - libs += TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub TypeRegistration_Base_stub TypeRegistration_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_Connector_conn.cpp - } - - Header_Files { - TypeRegistration_Test_Connector_conn.h - TypeRegistration_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(TypeRegistration_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_exec TypeRegistration_Connector_stub - sharedname = TypeRegistration_Connector_svnt - libs += TypeRegistration_Connector_stub \ - TypeRegistration_Connector_lem_stub \ - TypeRegistration_Base_stub \ - TypeRegistration_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TypeRegistration_Test_ConnectorS.cpp - TypeRegistration_Test_Connector_svnt.cpp - } - - Header_Files { - TypeRegistration_Test_ConnectorS.h - TypeRegistration_Test_Connector_svnt.h - TypeRegistration_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp deleted file mode 100644 index 73f2782d197..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp +++ /dev/null @@ -1,253 +0,0 @@ - - - - MLDTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_MLD_TypeRegistration_Test_CFTTestComponent_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_MLD_TypeRegistration_Test_CFTTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - MLD_TypeRegistration_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_MLDTypeRegistrationTestConn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_MLDTypeRegistrationTestConn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TypeRegistration_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TypeRegistration_Connector_exec - - - - - - - - Component - ComponentNode - - - - - - - MLD_TypeRegistration_Test_Connector_Writer - ComponentNode - - - - - topic_name - - - tk_string - - - MLDTypeRegistration_Writer - - - - - - - MLD_TypeRegistration_Test_Connector_Listener - ComponentNode - - - - - topic_name - - - tk_string - - - MLDTypeRegistration_Listener - - - - - - - listener_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - listener_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - listener_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - listener_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - writer_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - TypeRegistration_Connector_exec - - - TypeRegistration_Connector_exec - - - TypeRegistration_Connector_svnt - - - TypeRegistration_Connector_svnt - - - TypeRegistration_Connector_stub - - - TypeRegistration_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl deleted file mode 100755 index a7dfbd85bf6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Component.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl deleted file mode 100644 index e88f8982ae7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file MultiTopic_Base.idl - * @author - */ - -#ifndef MULTITOPIC_IDL -#define MULTITOPIC_IDL - -#pragma ndds typesupport "Base/MultiTopic_BaseSupport.h" -#pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ShapeType" -#pragma DCPS_DATA_KEY "ShapeType color" - -struct ShapeType { - string color; //@key - long x; - long y; - long shapesize; -}; -#pragma keylist ShapeType color - -#pragma DCPS_DATA_TYPE "Attributes" -#pragma DCPS_DATA_KEY "Attributes shape" -#pragma DCPS_DATA_KEY "Attributes color" - -struct Attributes { - string shape; //@key - string color; //@key - float speed; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ShapeTypeSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence AttributesSeq; -#endif - -#pragma keylist Attributes shape color - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc deleted file mode 100644 index 8ad8c86b97c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_MultiTopic_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_MultiTopic_Base_stub - dynamicflags += MULTITOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=MULTITOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=MultiTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - MultiTopic_Base.idl - } - - opendds_ts_flags += --export=MULTITOPIC_BASE_STUB_Export - - DDSGenerator_Files { - MultiTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl deleted file mode 100644 index 90493e79a63..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file MultiTopic_Connector.idl - * @author - */ - -#ifndef MULTITOPIC_CONNECTOR_IDL_ -#define MULTITOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/MultiTopic_Base.idl" - -#pragma ciao lem "Connector/MultiTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/MultiTopic_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS_MT::Typed_MT < ::ShapeType, ::ShapeTypeSeq> Shapes; - -#endif /* MULTITOPIC_CONNECTOR_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc deleted file mode 100644 index 1453e0e781c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc +++ /dev/null @@ -1,156 +0,0 @@ -project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm { - custom_only = 1 - after += DDS_MultiTopic_Base_stub - idlflags += -Wb,stub_export_macro=CCM_DDS_MT_STUB_Export \ - -Wb,stub_export_include=ccm_dds_mt_stub_export.h \ - -Wb,skel_export_macro=CCM_DDS_MT_SKEL_Export \ - -Wb,skel_export_include=ccm_dds_mt_skel_export.h \ - -SS -Scc -Sci -Gxhst \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - ccm_dds_mt.idl - } -} - -project(DDS_MultiTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CCM_Example_MT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=MultiTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=MultiTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=MultiTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=MULTITOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=MultiTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - MultiTopic_Connector.idl - } - -} - -project(DDS_MultiTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_MultiTopic_Connector_idl_gen - idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=MultiTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - MultiTopic_ConnectorE.idl - } -} - -project(DDS_MultiTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_MultiTopic_Connector_lem_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub - libs += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MultiTopic_Connector_lem_stub - dynamicflags += MULTITOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ConnectorEC.cpp - } - - Header_Files { - MultiTopic_ConnectorEC.h - MultiTopic_Connector_lem_stub_export.h - } - - Inline_Files { - MultiTopic_ConnectorEC.inl - } -} - -project(DDS_MultiTopic_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_MultiTopic_Connector_idl_gen DDS_MultiTopic_Base_stub - libs += DDS_MultiTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MultiTopic_Connector_stub - dynamicflags += MULTITOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ConnectorC.cpp - } - - Header_Files { - MultiTopic_ConnectorC.h - MultiTopic_Connector_stub_export.h - } - - Inline_Files { - MultiTopic_ConnectorC.inl - } -} - -project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub - sharedname = DDS_MultiTopic_Connector_exec - libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTITOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_Connector_conn.cpp - } - - Header_Files { - MultiTopic_Connector_conn.h - MultiTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub - sharedname = DDS_MultiTopic_Connector_svnt - libs += DDS_MultiTopic_Connector_stub \ - DDS_MultiTopic_Connector_lem_stub \ - DDS_MultiTopic_Base_stub \ - DDS_MultiTopic_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTITOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ConnectorS.cpp - MultiTopic_Connector_svnt.cpp - } - - Header_Files { - MultiTopic_ConnectorS.h - MultiTopic_Connector_svnt.h - MultiTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp deleted file mode 100644 index e62a9213235..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp +++ /dev/null @@ -1,653 +0,0 @@ -#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" - -template -DDS_MT_Event_Connector_T::DDS_MT_Event_Connector_T (void) - : reactor_ (0) -{ -} - -template -typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_sq_data (void) -{ - ACE_TRACE ("DDS_MT_Event_Connector_T::get_supplier_sq_data"); - - typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = - this->sq_supplier_.get_data (); - return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); -} - -template -typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_sq_dds_entity (void) -{ - - return CCM_TYPE::supplier_sq_traits::dds_entity_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_sq_fresh_data (void) -{ - typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_var_type fresh_data = - this->pull_consumer_sq_.get_fresh_data (); - return CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_duplicate ( - fresh_data.in ()); -} - -template -typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_sq_data (void) -{ - - return CCM_TYPE::pull_consumer_sq_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_sq_dds_entity (void) -{ - - return CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_nil (); -} - -template -::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T::pull_consumer_sq_filter (void) -{ - return 0; -} - -template -void -DDS_MT_Event_Connector_T::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&) -{ - -} - -template -::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_MT_Event_Connector_T::get_pull_consumer_sq_filter_config(void) -{ - - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T::get_push_consumer_sq_filter_config(void) -{ - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T::push_consumer_sq_filter (void) -{ - return 0; -} - -template -void -DDS_MT_Event_Connector_T::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &) -{ - -} - -template -typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_sq_data (void) -{ - - return CCM_TYPE::push_consumer_sq_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_sq_data_control (void) -{ - - return CCM_TYPE::push_consumer_sq_traits::data_control_type::_nil (); -} - -template -typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_sq_dds_entity (void) -{ - - return CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_nil (); -} - -//TRIANGEL - -template -typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_tr_data (void) -{ - ACE_TRACE ("DDS_MT_Event_Connector_T::get_supplier_tr_data"); - - typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = - this->tr_supplier_.get_data (); - return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); -} - -template -typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_tr_dds_entity (void) -{ - - return CCM_TYPE::supplier_tr_traits::dds_entity_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_tr_fresh_data (void) -{ - typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_var_type fresh_data = - this->pull_consumer_tr_.get_fresh_data (); - - return CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_duplicate ( - fresh_data.in ()); -} - -template -typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_tr_data (void) -{ - - return CCM_TYPE::pull_consumer_tr_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_tr_dds_entity (void) -{ - - return CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_nil (); -} - -template -::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T::pull_consumer_tr_filter (void) -{ - - return 0; -} - -template -void -DDS_MT_Event_Connector_T::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&) -{ -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T::get_pull_consumer_tr_filter_config(void) -{ - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T::get_push_consumer_tr_filter_config(void) -{ - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T::push_consumer_tr_filter (void) -{ - return 0; -} - -template -void -DDS_MT_Event_Connector_T::push_consumer_tr_filter ( - const ::CCM_DDS::QueryFilter &) -{ -} - -template -typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_tr_data (void) -{ - return CCM_TYPE::push_consumer_tr_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_tr_data_control (void) -{ - - return CCM_TYPE::push_consumer_tr_traits::data_control_type::_nil (); -} - -template -typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_tr_dds_entity (void) -{ - - return CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_nil (); -} - -//CIRCLE - -template -typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_cl_data (void) -{ - ACE_TRACE ("DDS_MT_Event_Connector_T::get_supplier_cl_data"); - typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = - this->cl_supplier_.get_data (); - return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); -} - -template -typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_supplier_cl_dds_entity (void) -{ - - return CCM_TYPE::supplier_cl_traits::dds_entity_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_cl_fresh_data (void) -{ - return CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_cl_data (void) -{ - - return CCM_TYPE::pull_consumer_cl_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_pull_consumer_cl_dds_entity (void) -{ - - return CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_nil (); -} - -template -::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T::pull_consumer_cl_filter (void) -{ - - return 0; -} - -template -void -DDS_MT_Event_Connector_T::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&) -{ - -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T::get_pull_consumer_cl_filter_config(void) -{ - - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T::get_push_consumer_cl_filter_config(void) -{ - - return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); -} - -template -::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T::push_consumer_cl_filter (void) -{ - return 0; -} - -template -void -DDS_MT_Event_Connector_T::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &) -{ - -} - -template -typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_cl_data (void) -{ - return CCM_TYPE::push_consumer_cl_traits::data_type::_nil (); -} - -template -typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_cl_data_control (void) -{ - typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_var_type dlc = - this->push_consumer_cl_.get_data_control (); - return CCM_TYPE::push_consumer_cl_traits::data_control_type::_duplicate (dlc.in ()); -} - -template -typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T::get_push_consumer_cl_dds_entity (void) -{ - return CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_nil (); -} - -template -char * -DDS_MT_Event_Connector_T::topic_name_sq (void) -{ - return CORBA::string_dup (this->topic_name_sq_.in ()); -} - -template -void -DDS_MT_Event_Connector_T::topic_name_sq ( - const char * topic_name_sq) -{ - this->topic_name_sq_ = topic_name_sq; -} - -template -char * -DDS_MT_Event_Connector_T::topic_name_tr (void) -{ - return CORBA::string_dup (this->topic_name_tr_.in ()); -} - -template -void -DDS_MT_Event_Connector_T::topic_name_tr ( - const char * topic_name_tr) -{ - this->topic_name_tr_ = topic_name_tr; -} - -template -char * -DDS_MT_Event_Connector_T::topic_name_cl (void) -{ - return CORBA::string_dup (this->topic_name_cl_.in ()); -} - -template -void -DDS_MT_Event_Connector_T::topic_name_cl ( - const char * topic_name_cl) -{ - this->topic_name_cl_ = topic_name_cl; -} - -template -void -DDS_MT_Event_Connector_T::create_topics ( - const char * typesupport_name) -{ - this->init_topic (this->domain_participant_.in (), - this->topic_sq_.inout (), - this->topic_name_sq_.in (), - typesupport_name); - if (::CORBA::is_nil (this->topic_sq_.in ())) - { - ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - " - "Error creating topic for Square\n")); - throw ::CORBA::INTERNAL (); - } - this->init_topic (this->domain_participant_.in (), - this->topic_tr_.inout (), - this->topic_name_tr_.in (), - typesupport_name); - if (::CORBA::is_nil (this->topic_tr_.in ())) - { - ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - " - "Error creating topic for Triangle\n")); - throw ::CORBA::INTERNAL (); - } - this->init_topic (this->domain_participant_.in (), - this->topic_cl_.inout (), - this->topic_name_cl_.in (), - typesupport_name); - if (::CORBA::is_nil (this->topic_cl_.in ())) - { - ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - " - "Error creating topic for Circle\n")); - throw ::CORBA::INTERNAL (); - } -} - -template -void -DDS_MT_Event_Connector_T::configuration_complete (void) -{ - // Init default domain (Base_Connector) - this->init_domain (this->domain_participant_.inout ()); - - // Init type (TopicBase_Connector) - ::CORBA::String_var typesupport_name; -#if (CIAO_DDS4CCM_NDDS==1) - typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ()); -#elif (CIAO_DDS4CCM_OPENDDS==1) - typename DDS_TYPE::type_support type; - typesupport_name = type.get_type_name (); -#endif - this->register_type (this->domain_participant_.in (), - typesupport_name.in ()); - - // Create the topics needed (this class) - this->create_topics (typesupport_name); - - // Init the subscriber and publisher (TopicBase_Connector) - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_.inout ()); - - this->sq_supplier_.configuration_complete ( - this->topic_sq_.in (), - this->publisher_.in (), - this->qos_profile_, - this->qos_xml_); - this->tr_supplier_.configuration_complete ( - this->topic_tr_.in (), - this->publisher_.in (), - this->qos_profile_, - this->qos_xml_); - this->cl_supplier_.configuration_complete ( - this->topic_cl_.in (), - this->publisher_.in (), - this->qos_profile_, - this->qos_xml_); - this->pull_consumer_sq_.configuration_complete ( - this->topic_sq_.in (), - this->subscriber_.in (), - this->qos_profile_, - this->qos_xml_); - this->pull_consumer_tr_.configuration_complete ( - this->topic_tr_.in (), - this->subscriber_.in (), - this->qos_profile_, - this->qos_xml_); - this->push_consumer_cl_.configuration_complete ( - this->topic_cl_.in (), - this->subscriber_.in (), - this->qos_profile_, - this->qos_xml_); -} - -template -void -DDS_MT_Event_Connector_T::activate_topics (void) -{ - this->activate_topic (this->reactor_, - this->topic_sq_.in (), - this->topiclistener_sq_.inout ()); - this->activate_topic (this->reactor_, - this->topic_tr_.in (), - this->topiclistener_tr_.inout ()); - this->activate_topic (this->reactor_, - this->topic_cl_.in (), - this->topiclistener_cl_.inout ()); -} - -template -void -DDS_MT_Event_Connector_T::ccm_activate (void) -{ - this->activate_topics (); - this->activate_subscriber (this->reactor_, - this->subscriber_.in (), - this->subscriber_listener_.inout ()); - this->activate_publisher (this->reactor_, - this->publisher_.in (), - this->publisher_listener_.inout ()); - - this->sq_supplier_.activate (); - this->tr_supplier_.activate (); - this->cl_supplier_.activate (); - - ::CCM_DDS::PortStatusListener_var pull_consumer_sq_psl = - this->context_->get_connection_pull_consumer_sq_status (); - this->pull_consumer_sq_.activate (pull_consumer_sq_psl.in (), - this->reactor_); - - ::CCM_DDS::PortStatusListener_var pull_consumer_tr_psl = - this->context_->get_connection_pull_consumer_tr_status (); - this->pull_consumer_tr_.activate (pull_consumer_tr_psl.in (), - this->reactor_); - - ::CCM_DDS::PortStatusListener_var push_consumer_cl_psl = - this->context_->get_connection_push_consumer_cl_status (); - - this->dl_ = this->context_->get_connection_push_consumer_cl_data_listener (); - this->push_consumer_cl_.activate (this->dl_.in (), - push_consumer_cl_psl.in (), - this->reactor_); -} - -template -void -DDS_MT_Event_Connector_T::passivate_topics (void) -{ - ::DDS::TopicListener_var topic_listener = this->topiclistener_sq_._retn (); - if (!::CORBA::is_nil (topic_listener.in ())) - { - this->passivate_topic (this->topic_sq_.in (), - topic_listener.in ()); - } - topic_listener = this->topiclistener_tr_._retn (); - if (!::CORBA::is_nil (topic_listener.in ())) - { - this->passivate_topic (this->topic_tr_.in (), - topic_listener.in ()); - } - topic_listener = this->topiclistener_cl_._retn (); - if (!::CORBA::is_nil (topic_listener.in ())) - { - this->passivate_topic (this->topic_cl_.in (), - topic_listener.in ()); - } -} - -template -void -DDS_MT_Event_Connector_T::ccm_passivate (void) -{ - this->sq_supplier_.passivate (); - this->tr_supplier_.passivate (); - this->cl_supplier_.passivate (); - - this->pull_consumer_sq_.passivate (); - this->pull_consumer_tr_.passivate (); - - this->push_consumer_cl_.passivate (); - - this->passivate_topics (); - - ::DDS::SubscriberListener_var subscriber_listener = - this->subscriber_listener_._retn (); - if (!::CORBA::is_nil (subscriber_listener.in ())) - { - this->passivate_subscriber (this->subscriber_.in (), - subscriber_listener.in ()); - } - ::DDS::PublisherListener_var publisher_listener = - this->publisher_listener_._retn (); - if (!::CORBA::is_nil (publisher_listener.in ())) - { - this->passivate_publisher (this->publisher_.in (), - publisher_listener.in ()); - } -} - -template -void -DDS_MT_Event_Connector_T::remove_topics (void) -{ - this->remove_topic (this->domain_participant_.in (), - this->topic_sq_.inout ()); - this->remove_topic (this->domain_participant_.in (), - this->topic_tr_.inout ()); - this->remove_topic (this->domain_participant_.in (), - this->topic_cl_.inout ()); -} - -template -void -DDS_MT_Event_Connector_T::ccm_remove (void) -{ - this->sq_supplier_.remove (this->publisher_.in ()); - this->tr_supplier_.remove (this->publisher_.in ()); - this->cl_supplier_.remove (this->publisher_.in ()); - - this->pull_consumer_sq_.remove (this->subscriber_.in ()); - this->pull_consumer_tr_.remove (this->subscriber_.in ()); - this->push_consumer_cl_.remove (this->subscriber_.in ()); - - this->remove_topics (); - - /** - * - * In order to close down in a thread safe and memory leak free manner, one - * should first declare a temporary _var variable and assign this one with the - * class member, using _retn (). This'll free all references to the class member - * so one's sure that the only one left is the temporary _var variable. This - * one should be used in calls to the 'remove_xxx' methods. - **/ - ::DDS::Publisher_var publisher = this->publisher_._retn (); - if (!::CORBA::is_nil (publisher.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher.in ()); - } - ::DDS::Subscriber_var subscriber = this->subscriber_._retn (); - if (!::CORBA::is_nil (subscriber.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber.in ()); - } - - ::CORBA::String_var typesupport_name; -#if (CIAO_DDS4CCM_NDDS==1) - typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ()); -#elif (CIAO_DDS4CCM_OPENDDS==1) - typename DDS_TYPE::type_support type; - typesupport_name = type.get_type_name (); -#endif - this->unregister_type (this->domain_participant_.in (), - typesupport_name.in ()); - - ::DDS::DomainParticipant_var dp = this->domain_participant_._retn (); - if (!::CORBA::is_nil (dp.in ())) - { - this->remove_domain (dp.in ()); - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h deleted file mode 100644 index 81486213f69..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h +++ /dev/null @@ -1,287 +0,0 @@ -#ifndef DDS_MT_CONNECTOR_T_H_ -#define DDS_MT_CONNECTOR_T_H_ - -#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" -#include "connectors/dds4ccm/impl/DDS_Write_T.h" -#include "connectors/dds4ccm/impl/DDS_Get_T.h" -#include "connectors/dds4ccm/impl/DDS_Listen_T.h" -#include "connectors/dds4ccm/impl/DataListenerControl_T.h" - -template -class DDS_MT_Event_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ - -typedef DDS_TopicBase_Connector_T TopicBaseConnector; - -public: - DDS_MT_Event_Connector_T (void); - - /** - * Square connector - **/ - virtual - typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type - get_supplier_sq_data (void); - - virtual - typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type - get_supplier_sq_dds_entity (void); - - virtual - typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type - get_pull_consumer_sq_fresh_data (void); - - virtual - typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type - get_pull_consumer_sq_data (void); - - virtual - typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type - get_pull_consumer_sq_dds_entity (void); - - virtual - CCM_DDS::QueryFilter* - pull_consumer_sq_filter (void); - - virtual - void - pull_consumer_sq_filter (const CCM_DDS::QueryFilter&); - - virtual - ::CCM_DDS::CCM_ContentFilterSetting_ptr - get_pull_consumer_sq_filter_config(void); - - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_sq_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_sq_filter (void); - - virtual - void - push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type - get_push_consumer_sq_data (void); - - virtual - typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type - get_push_consumer_sq_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type - get_push_consumer_sq_dds_entity (void); - - /** - * Triangle connector - **/ - virtual - typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type - get_supplier_tr_data (void); - - virtual - typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type - get_supplier_tr_dds_entity (void); - - virtual - typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type - get_pull_consumer_tr_fresh_data (void); - - virtual - typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type - get_pull_consumer_tr_data (void); - - virtual - typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type - get_pull_consumer_tr_dds_entity (void); - - virtual - CCM_DDS::QueryFilter* - pull_consumer_tr_filter (void); - - virtual - void - pull_consumer_tr_filter (const CCM_DDS::QueryFilter&); - - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_pull_consumer_tr_filter_config(void); - - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_tr_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_tr_filter (void); - - virtual - void - push_consumer_tr_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type - get_push_consumer_tr_data (void); - - virtual - typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type - get_push_consumer_tr_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type - get_push_consumer_tr_dds_entity (void); - - /** - * Circle connector - **/ - virtual - typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type - get_supplier_cl_data (void); - - virtual - typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type - get_supplier_cl_dds_entity (void); - - virtual - typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type - get_pull_consumer_cl_fresh_data (void); - - virtual - typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type - get_pull_consumer_cl_data (void); - - virtual - typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type - get_pull_consumer_cl_dds_entity (void); - - virtual - CCM_DDS::QueryFilter* - pull_consumer_cl_filter (void); - - virtual - void - pull_consumer_cl_filter (const CCM_DDS::QueryFilter&); - - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_pull_consumer_cl_filter_config(void); - - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_cl_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_cl_filter (void); - - virtual - void - push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type - get_push_consumer_cl_data (void); - - virtual - typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type - get_push_consumer_cl_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type - get_push_consumer_cl_dds_entity (void); - - /** - * Topic names. - **/ - virtual char * topic_name_sq (void); - virtual void topic_name_sq (const char * topic_name_sq); - virtual char * topic_name_tr (void); - virtual void topic_name_tr (const char * topic_name_tr); - virtual char * topic_name_cl (void); - virtual void topic_name_cl (const char * topic_name_cl); - - /** - * Deployment methods. - **/ - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - -private: - DDS_Write_T < - typename CCM_TYPE::supplier_sq_traits, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - sq_supplier_; - - DDS_Write_T < - typename CCM_TYPE::supplier_tr_traits, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - tr_supplier_; - - DDS_Write_T < - typename CCM_TYPE::supplier_cl_traits, - typename DDS_TYPE::typed_writer_type, - typename DDS_TYPE::value_type, - SEQ_TYPE> - cl_supplier_; - - DDS_Get_T < - typename CCM_TYPE::pull_consumer_sq_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - FIXED> - pull_consumer_sq_; - - DDS_Get_T < - typename CCM_TYPE::pull_consumer_tr_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - FIXED> - pull_consumer_tr_; - - DDS_Listen_T< - typename CCM_TYPE::push_consumer_cl_traits, - typename DDS_TYPE::typed_reader_type, - typename DDS_TYPE::value_type, - SEQ_TYPE, - CIAO::DDS4CCM::DDS4CCM_TAKE> - push_consumer_cl_; - - /// Connection to the receiver implementation - typename CCM_TYPE::push_consumer_cl_traits::data_listener_type::_var_type dl_; - - CORBA::String_var topic_name_sq_; - CORBA::String_var topic_name_tr_; - CORBA::String_var topic_name_cl_; - - ::DDS::Topic_var topic_sq_; - ::DDS::Topic_var topic_tr_; - ::DDS::Topic_var topic_cl_; - - ::DDS::TopicListener_var topiclistener_sq_; - ::DDS::TopicListener_var topiclistener_tr_; - ::DDS::TopicListener_var topiclistener_cl_; - - ACE_Reactor * reactor_; - - void create_topics (const char * typesupport_name); - - void activate_topics (void); - void passivate_topics (void); - void remove_topics (void); -}; - -#include "MultiTopic_Connector_T.cpp" - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl deleted file mode 100644 index 321861eff88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef CCM_DDS_MT_IDL -#define CCM_DDS_MT_IDL - -#include - -#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl" -#include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl" -#include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl" -#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl" - -#pragma dds4ccm impl "MultiTopic_Connector_T.h" - -#include - -/** - * @namespace CCM_DDS_MT - * - * Module containing all @ref MT related entities. Non-typed constructs are - * directly defined in this module, while typed constructs are in a templated - * sub-module. - */ -module CCM_DDS_MT -{ - module Typed_MT TSeq> - { - alias CCM_DDS::Typed DDS_Typed; - typedef DDS_Typed::DataReader DataReader; - typedef DDS_Typed::DataWriter DataWriter; - - // DDS MT Connector - // ------------------ - connector DDS_MT_Event : CCM_DDS::DDS_Base { - mirrorport DDS_Typed::DDS_Write supplier_sq; - mirrorport DDS_Typed::DDS_Get pull_consumer_sq; - mirrorport DDS_Typed::DDS_Listen push_consumer_sq; - mirrorport DDS_Typed::DDS_Write supplier_tr; - mirrorport DDS_Typed::DDS_Get pull_consumer_tr; - mirrorport DDS_Typed::DDS_Listen push_consumer_tr; - mirrorport DDS_Typed::DDS_Write supplier_cl; - mirrorport DDS_Typed::DDS_Get pull_consumer_cl; - mirrorport DDS_Typed::DDS_Listen push_consumer_cl; - - attribute string topic_name_sq; - attribute string topic_name_tr; - attribute string topic_name_cl; - }; - }; -}; - -#endif // CCM_DDS_MT_IDL - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl deleted file mode 100644 index 69c0b85ea58..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/MultiTopic_Connector.idl" - -module Shapes -{ - component Receiver - { - port DDS_Typed::DDS_Get info_get_sq; - port DDS_Typed::DDS_Get info_get_tr; - port DDS_Typed::DDS_Listen info_out_cl; - - attribute unsigned long rate; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc deleted file mode 100644 index 4119c175422..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc +++ /dev/null @@ -1,137 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver" - -project(DDS_MultiTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_MultiTopic_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - MultiTopic_Receiver.idl - } -} - -project(DDS_MultiTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_MultiTopic_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - MultiTopic_ReceiverE.idl - } -} - -project(DDS_MultiTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_MultiTopic_Receiver_lem_gen DDS_MultiTopic_Receiver_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub - libs += Receiver_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ReceiverEC.cpp - } - - Header_Files { - MultiTopic_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - MultiTopic_ReceiverEC.inl - } -} - -project(DDS_MultiTopic_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_MultiTopic_Receiver_idl_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_lem_gen - libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ReceiverC.cpp - } - - Header_Files { - MultiTopic_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - MultiTopic_ReceiverC.inl - } -} - -project(DDS_MultiTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Receiver_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_Receiver_exec.cpp - } - - Header_Files { - MultiTopic_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultiTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Receiver_exec DDS_MultiTopic_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt Receiver_exec DDS_MultiTopic_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_ReceiverS.cpp - MultiTopic_Receiver_svnt.cpp - } - - Header_Files { - MultiTopic_ReceiverS.h - MultiTopic_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp deleted file mode 100644 index 57932fba639..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp +++ /dev/null @@ -1,396 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "MultiTopic_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/OS_NS_time.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/TimeUtilities.h" - -#define TIME_OUT_SEC 1 - -namespace CIAO_Shapes_Receiver_Impl -{ - - //============================================================ - // read_action_Generator - //============================================================ - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, - const void *) - { - this->pulse_callback_.get_one (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Shapes::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" : ") - ACE_TEXT ("received CIRCLE for <%C> at %u:%u:%u\n"), - datum.color.in (), - datum.x, - datum.y, - datum.shapesize)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : ticker_ (0), - rate_ (0) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - - void - Receiver_exec_i::get_one (void) - { - ShapeType_var shape_info; - ::CCM_DDS::ReadInfo_var readinfo; - - try - { - ::Shapes::DDS_Typed::Getter_var getter_sq = - this-> ciao_context_->get_connection_info_get_sq_fresh_data (); - if (!::CORBA::is_nil (getter_sq.in ())) - { - if (getter_sq->get_one (shape_info.out (), readinfo.out ())) - { - ACE_Time_Value time; - time <<= readinfo->source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ReadInfo -> ") - ACE_TEXT ("date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" No data available for <%C>\n"), - shape_info->color.in ())); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " - "ERROR: Getter for seems to be nil\n")); - } - - ::Shapes::DDS_Typed::Getter_var getter_tr = - this-> ciao_context_->get_connection_info_get_tr_fresh_data (); - if (!::CORBA::is_nil (getter_tr.in ())) - { - if (getter_tr->get_one (shape_info.out (), readinfo.out ())) - { - ACE_Time_Value time; - time <<= readinfo->source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ReadInfo -> ") - ACE_TEXT ("date = %#T\n"), &time)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" : No data available for <%C>\n"), - shape_info->color.in ())); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " - "ERROR: Getter for TRIANGLE seems to be nil\n")); - } - //Circle is retrieved by the listener functionality - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n"))); - } - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (1, usec), - ACE_Time_Value (2*TIME_OUT_SEC, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Receiver_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - } - // Component attributes and port operations. - - ::Shapes::DDS_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_out_sq_data_listener (void) - { - return ::Shapes::DDS_Typed::CCM_Listener::_nil (); - } - - ::Shapes::DDS_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_out_tr_data_listener (void) - { - return ::Shapes::DDS_Typed::CCM_Listener::_nil (); - } - - ::Shapes::DDS_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_out_cl_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_cl_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Shapes::DDS_Typed::CCM_Listener::_nil ()); - - this->ciao_info_out_cl_data_listener_ = tmp; - } - - return - ::Shapes::DDS_Typed::CCM_Listener::_duplicate ( - this->ciao_info_out_cl_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_sq_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_tr_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_cl_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_sq_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_tr_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_cl_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CORBA::ULong - Receiver_exec_i::rate (void) - { - return this->rate_; - } - - void - Receiver_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc_cl = - this->ciao_context_->get_connection_info_out_cl_data_control (); - if (::CORBA::is_nil (lc_cl.in ())) - { - ACE_ERROR ((LM_INFO, - ACE_TEXT ("Error: Listener control receptacle cl is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc_cl->mode (::CCM_DDS::ONE_BY_ONE); - - ::DDS::Duration_t to; - to.sec = TIME_OUT_SEC; - to.nanosec = 0; - - ::Shapes::DDS_Typed::Getter_var getter_sq = - this-> ciao_context_->get_connection_info_get_sq_fresh_data (); - if (CORBA::is_nil (getter_sq.in ())) - { - ACE_ERROR ((LM_INFO, - ACE_TEXT ("Error: Getter of SQUARE seems to be nil!\n"))); - throw ::CORBA::INTERNAL (); - } - getter_sq->time_out (to); - - ::Shapes::DDS_Typed::Getter_var getter_tr = - this-> ciao_context_->get_connection_info_get_tr_fresh_data (); - if (CORBA::is_nil (getter_tr.in ())) - { - ACE_ERROR ((LM_INFO, - ACE_TEXT ("Error: Getter of TRIANGLE seems to be nil!\n"))); - throw ::CORBA::INTERNAL (); - } - getter_tr->time_out (to); - this->start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->stop(); - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h deleted file mode 100644 index d6da1384e16..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h +++ /dev/null @@ -1,195 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_ -#define CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_ - - -#include "MultiTopic_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Shapes_Receiver_Impl -{ - class Receiver_exec_i; - /** - * @class reader activity generator - * - * @brief an active object used by Receiver to perform a periodical read action - * - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class RECEIVER_EXEC_Export info_out_data_listener_exec_i - : public virtual ::Shapes::DDS_Typed::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Shapes::Listener. */ - - virtual - void on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ShapeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Shapes::DDS_Typed::CCM_Listener_ptr - get_info_out_sq_data_listener (void); - - virtual ::Shapes::DDS_Typed::CCM_Listener_ptr - get_info_out_tr_data_listener (void); - - virtual ::Shapes::DDS_Typed::CCM_Listener_ptr - get_info_out_cl_data_listener (void); - - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_sq_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_tr_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_cl_status (void); - - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_sq_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_tr_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_cl_status (void); - - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - virtual void get_one (void); - virtual void start (void); - virtual void stop (void); - - //@} - - private: - ::Shapes::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Shapes::DDS_Typed::CCM_Listener_var ciao_info_out_cl_data_listener_; - - read_action_Generator * ticker_; - - ::CORBA::ULong rate_; - //@} - - //@{ - /** User defined members. */ - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl deleted file mode 100644 index a406582c556..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef DDS_MULTITOPIC_SENDER_IDL -#define DDS_MULTITOPIC_SENDER_IDL - -#include "Connector/MultiTopic_Connector.idl" - -module Shapes -{ - component Sender - { - port DDS_Typed::DDS_Write info_write_sq; - port DDS_Typed::DDS_Write info_write_tr; - port DDS_Typed::DDS_Write info_write_cl; - - attribute unsigned long rate; - attribute unsigned short max_x; - attribute unsigned short max_y; - attribute unsigned short max_size; - attribute boolean resize_shape; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc deleted file mode 100644 index 8b4677dde14..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_MultiTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_MultiTopic_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_MultiTopic_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - MultiTopic_Sender.idl - } -} - -project(DDS_MultiTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_MultiTopic_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - MultiTopic_SenderE.idl - } -} - -project(DDS_MultiTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_MultiTopic_Sender_lem_gen DDS_MultiTopic_Sender_stub DDS_MultiTopic_Base_stub - libs += Sender_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_SenderEC.cpp - } - - Header_Files { - MultiTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - MultiTopic_SenderEC.inl - } -} - -project(DDS_MultiTopic_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_MultiTopic_Sender_idl_gen DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub - libs += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_SenderC.cpp - } - - Header_Files { - MultiTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - MultiTopic_SenderC.inl - } -} - -project(DDS_MultiTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Sender_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub - libpaths += ../lib - includes += .. ../Connector - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_Sender_exec.cpp - } - - Header_Files { - MultiTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultiTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_MultiTopic_Base_stub DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultiTopic_SenderS.cpp - MultiTopic_Sender_svnt.cpp - } - - Header_Files { - MultiTopic_SenderS.h - MultiTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp deleted file mode 100644 index f8239046c6b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp +++ /dev/null @@ -1,350 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "MultiTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Sender_Impl -{ - //============================================================ - // pulse_Generator - //============================================================ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - Sender_exec_i::Sender_exec_i (void) - : rate_ (0), - max_x_ (0), - max_y_ (0), - max_size_ (0), - resize_shape_ (false), - TypeOfShape (SHAPE_TYPE_SQUARE) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->square_, - ShapeType, - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->triangle_, - ShapeType, - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->circle_, - ShapeType, - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - delete this->square_; - delete this->triangle_; - delete this->circle_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - try - { - ::Shapes::DDS_Typed::Writer_var writer; - if (this->TypeOfShape == SHAPE_TYPE_SQUARE) - { - writer = this->ciao_context_->get_connection_info_write_sq_data (); - } - else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE) - { - writer = this->ciao_context_->get_connection_info_write_tr_data (); - } - else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE) - { - writer = this->ciao_context_->get_connection_info_write_cl_data (); - } - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick () - " - "ERROR: Unable to get connection to writer\n")); - return; - } - - if (this->TypeOfShape == SHAPE_TYPE_SQUARE) - { - this->TypeOfShape = SHAPE_TYPE_TRIANGLE; - writer->write_one (*square_, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("UPDATED Shape_info Square for <%C> %u:%u:%u\n"), - this->square_->color.in (), - this->square_->x, - this->square_->y, - this->square_->shapesize)); - } - else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE) - { - this->TypeOfShape = SHAPE_TYPE_CIRCLE; - writer->write_one (*triangle_, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("UPDATED Shape_info Triangle for <%C> %u:%u:%u\n"), - this->triangle_->color.in (), - this->triangle_->x, - this->triangle_->y, - this->triangle_->shapesize)); - } - else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE) - { - this->TypeOfShape = SHAPE_TYPE_SQUARE; - writer->write_one (*circle_, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("UPDATED Shape_info Circle for <%C> %u:%u:%u\n"), - this->circle_->color.in (), - this->circle_->x, - this->circle_->y, - this->circle_->shapesize)); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), - this->square_->color.in (), this->square_->color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - this->square_->color.in ())); - } - } - - // Component attributes and port operations. - - ::CORBA::ULong - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::max_x (void) - { - return this->max_x_; - } - - void - Sender_exec_i::max_x ( - const ::CORBA::UShort max_x) - { - this->max_x_ = max_x; - } - - ::CORBA::UShort - Sender_exec_i::max_y (void) - { - return this->max_y_; - } - - void - Sender_exec_i::max_y ( - const ::CORBA::UShort max_y) - { - this->max_y_ = max_y; - } - - ::CORBA::UShort - Sender_exec_i::max_size (void) - { - return this->max_size_; - } - - void - Sender_exec_i::max_size ( - const ::CORBA::UShort max_size) - { - this->max_size_ = max_size; - } - - ::CORBA::Boolean - Sender_exec_i::resize_shape (void) - { - return this->resize_shape_; - } - - void - Sender_exec_i::resize_shape ( - const ::CORBA::Boolean resize_shape) - { - this->resize_shape_ = resize_shape; - } - - - void - Sender_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - try - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - delete this->ticker_; - delete this->square_; - delete this->triangle_; - delete this->circle_; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - " - "ERROR: unexpected exception caught while shutting down.\n")); - } - } - - // Operations from Components::SessionComponent. - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - this->square_->x = ACE_OS::rand () % this->max_x_; - this->square_->y = ACE_OS::rand () % this->max_y_; - this->square_->shapesize = max_size_; - this->square_->color = CORBA::string_dup("GREEN"); - - this->triangle_->x = ACE_OS::rand () % this->max_x_; - this->triangle_->y = ACE_OS::rand () % this->max_y_; - this->triangle_->shapesize = max_size_; - this->triangle_->color = CORBA::string_dup("YELLOW"); - - this->circle_->x = ACE_OS::rand () % this->max_x_; - this->circle_->y = ACE_OS::rand () % this->max_y_; - this->circle_->shapesize = max_size_; - this->circle_->color = CORBA::string_dup("BLUE"); - - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void) - { - - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h deleted file mode 100644 index 62cf9fa7d06..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h +++ /dev/null @@ -1,160 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_ -#define CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_ - - -#include "MultiTopic_SenderEC.h" -#include "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_Shapes_Sender_Impl -{ - class Sender_exec_i; - //============================================================ - // pulse_Generator - //============================================================ - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class SENDER_EXEC_Export Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - enum TYPE_OF_SHAPE { - SHAPE_TYPE_SQUARE, - SHAPE_TYPE_TRIANGLE, - SHAPE_TYPE_CIRCLE - }; - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::ULong rate (void); - - virtual void rate (::CORBA::ULong rate); - - virtual ::CORBA::UShort max_x (void); - - virtual void max_x (::CORBA::UShort max_x); - - virtual ::CORBA::UShort max_y (void); - - virtual void max_y (::CORBA::UShort max_y); - - virtual ::CORBA::UShort max_size (void); - - virtual void max_size (::CORBA::UShort max_size); - - virtual ::CORBA::Boolean resize_shape (void); - - virtual void resize_shape (::CORBA::Boolean resize_shape); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (); - void start (); - void stop (); - //@} - - private: - ::Shapes::CCM_Sender_Context_var ciao_context_; - - ShapeType* square_; - ShapeType* triangle_; - ShapeType* circle_; - pulse_Generator * ticker_; - - //@{ - /** Component attributes. */ - - ::CORBA::ULong rate_; - - ::CORBA::UShort max_x_; - - ::CORBA::UShort max_y_; - - ::CORBA::UShort max_size_; - - ::CORBA::Boolean resize_shape_; - //@} - - //@{ - /** User defined members. */ - TYPE_OF_SHAPE TypeOfShape; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp deleted file mode 100644 index 780be477216..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp +++ /dev/null @@ -1,526 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shape_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_DDS_MT_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_DDS_MT_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shape_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - rate - - - tk_ulong - - - 1 - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - topic_name_sq - - - tk_string - - - Square - - - - - topic_name_tr - - - tk_string - - - Triangle - - - - - topic_name_cl - - - tk_string - - - Circle - - - - - - Shapes_ConnectorReceiverInstance - ReceiverNode - - - - - topic_name_sq - - - tk_string - - - Square - - - - - topic_name_tr - - - tk_string - - - Triangle - - - - - topic_name_cl - - - tk_string - - - Circle - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ulong - - - 1 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 25 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - - - - writer_sq_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_sq_data - false - SimplexReceptacle - - - - supplier_sq_data - true - Facet - - - - - - writer_tr_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_tr_data - false - SimplexReceptacle - - - - supplier_tr_data - true - Facet - - - - - - writer_cl_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_cl_data - false - SimplexReceptacle - - - - supplier_cl_data - true - Facet - - - - - - - - - - info_get_sq_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_sq_fresh_data - false - SimplexReceptacle - - - - pull_consumer_sq_fresh_data - true - Facet - - - - - - info_get_tr_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_tr_fresh_data - false - SimplexReceptacle - - - - pull_consumer_tr_fresh_data - true - Facet - - - - - - - _listenercontrol_cl - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_cl_data_control - false - SimplexReceptacle - - - - push_consumer_cl_data_control - true - Facet - - - - - _listener_cl - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_cl_data_listener - true - Facet - - - - push_consumer_cl_data_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_Connector_exec - - - DDS_MultiTopic_Connector_exec - - - Shapes_Connector_svnt - - - DDS_MultiTopic_Connector_svnt - - - Shapes_Connector_stub - - - DDS_MultiTopic_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl deleted file mode 100755 index 10f73a3be9f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl deleted file mode 100644 index cd0486eba27..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file MultipleTemp_Base.idl - * @author Marijke Hengstmengel - */ - -#ifndef MULTIPLE_TEMP_BASE_IDL -#define MULTIPLE_TEMP_BASE_IDL - -#pragma ndds typesupport "Base/MultipleTemp_BaseSupport.h" -#pragma opendds typesupport "Base/MultipleTemp_BaseSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopicOne" -#pragma DCPS_DATA_KEY "TestTopicOne keyOne" -#pragma DCPS_DATA_TYPE "TestTopicTwo" -#pragma DCPS_DATA_KEY "TestTopicTwo keyTwo" - - -struct TestTopicOne { - string keyOne; //@key - long x; -}; - -struct TestTopicTwo { - string keyTwo; //@key - long y; - long z; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicOneSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicTwoSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc deleted file mode 100644 index 0b0e2cc5639..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc +++ /dev/null @@ -1,25 +0,0 @@ -project (DDS_MultipleTemp_Base_stub) : taoidldefaults, dds4ccm_ts_default { - requires += dummy_label - sharedname = DDS_MultipleTemp_Base_stub - dynamicflags += MULTIPLE_TEMP_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=MULTIPLE_TEMP_BASE_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - MultipleTemp_Base.idl - } - - opendds_ts_flags += --export=MULTIPLE_TEMP_BASE_STUB_Export - - DDSGenerator_Files { - MultipleTemp_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl deleted file mode 100644 index 4ce01c01aaa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file MultipleTemp_Connector.idl - * @author Marijke Hengstmengel - */ - -#ifndef MULTIPLE_TEMP_CONNECTOR_IDL_ -#define MULTIPLE_TEMP_CONNECTOR_IDL_ - -#include -#include - -#include "Base/MultipleTemp_Base.idl" - -#pragma ciao lem "Connector/MultipleTemp_ConnectorE.idl" - -module MultipleTemp -{ - module ::CCM_DDS::Duplex_Typed < ::TestTopicOne, ::TestTopicOneSeq, ::TestTopicTwo, ::TestTopicTwoSeq> MultipleTempConnector; -}; - -#endif /* MULTIPLE_TEMP_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc deleted file mode 100644 index 06b2767a604..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc +++ /dev/null @@ -1,166 +0,0 @@ -project (DDS_MLT_idl_gen) : taoidldefaults, anytypecode, dds4ccm { - requires += dummy_label - custom_only = 1 - idlflags += -Wb,stub_export_macro=CCM_DDS_MLT_STUB_Export \ - -Wb,stub_export_include=ccm_dds_mlt_stub_export.h \ - -Wb,skel_export_macro=CCM_DDS_MLT_SKEL_Export \ - -Wb,skel_export_include=ccm_dds_mlt_skel_export.h \ - -SS -Scc -Sci -Gxhst \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - ccm_dds_mlt.idl - } -} - -project(DDS_MT_TEMP_Connector_idl_gen) : connectoridldefaults, dds4ccm { - requires += dummy_label - after += DDS4CCM_idl_gen DDS_MLT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Connector_stub_export.h \ - -Wb,skel_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=MultipleTemp_Connector_svnt_export.h \ - -Wb,svnt_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=MultipleTemp_Connector_svnt_export.h \ - -Wb,conn_export_macro=MULTIPLE_TEMP_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=MultipleTemp_Connector_conn_export.h \ - -I .. - - IDL_Files { - MultipleTemp_Connector.idl - } -} - -project(DDS_MT_TEMP_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - after += DDS_MT_TEMP_Connector_idl_gen - idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - MultipleTemp_ConnectorE.idl - } -} - -project(DDS_MT_TEMP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MT_TEMP_Connector_lem_stub - dynamicflags += MULTIPLE_TEMP_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorEC.cpp - } - - Header_Files { - MultipleTemp_ConnectorEC.h - MultipleTemp_Connector_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_ConnectorEC.inl - } -} - -project(DDS_MultipleTemp_Connector_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MT_TEMP_Connector_idl_gen DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MultipleTemp_Connector_stub - dynamicflags += MULTIPLE_TEMP_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorC.cpp - } - - Header_Files { - MultipleTemp_ConnectorC.h - MultipleTemp_Connector_stub_export.h - } - - Inline_Files { - MultipleTemp_ConnectorC.inl - } -} - -project(DDS_MultipleTemp_Connector_exec) : ciao_executor, dds4ccm_impl { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - sharedname = DDS_MultipleTemp_Connector_exec - libs += DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTIPLE_TEMP_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Template_Files{ - MultipleTemp_Connector_T.cpp - } - - Source_Files { - MultipleTemp_Connector_conn.cpp - } - - Header_Files { - MultipleTemp_Connector_conn.h - MultipleTemp_Connector_conn_export.h - MultipleTemp_Connector_T.h - } - - Inline_Files { - } -} - - -project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_exec DDS_MultipleTemp_Connector_stub - sharedname = DDS_MultipleTemp_Connector_svnt - libs += DDS_MultipleTemp_Connector_stub \ - DDS_MT_TEMP_Connector_lem_stub \ - DDS_MultipleTemp_Base_stub \ - DDS_MultipleTemp_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTIPLE_TEMP_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorS.cpp - MultipleTemp_Connector_svnt.cpp - } - - Header_Files { - MultipleTemp_ConnectorS.h - MultipleTemp_Connector_svnt.h - MultipleTemp_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp deleted file mode 100644 index 4b4f467b572..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp +++ /dev/null @@ -1,517 +0,0 @@ -#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h" -#include "ace/Reactor.h" - -template -FooConnector_Connector_T::FooConnector_Connector_T(void) - : push_consumer_t_ (), - push_consumer_y_ (), - reactor_ (0) -{ -} - - -/** - * Type registration both topics - **/ -template -void -FooConnector_Connector_T::register_type ( - ::DDS::DomainParticipant_ptr participant, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::register_type"); - - ::DDS::ReturnCode_t retcode_t = ::DDS::RETCODE_OK; - ::DDS::ReturnCode_t retcode_y = ::DDS::RETCODE_OK; -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_DomainParticipant_i *part = - dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant); - if (!part) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_MultipleTemp_FooConnector_T::register_type - " - "Unable to cast the DomainParticipant proxy to its internal " - "representation.\n")); - throw ::CORBA::INTERNAL (); - } - - typedef ::CIAO::NDDS::DDS_TypeFactory_T dds_type_factory_t; - typedef ::CIAO::NDDS::DDS_TypeFactory_T dds_type_factory_y; - - ::CIAO::NDDS::DDS_TypeFactory_i * factory_t = 0; - ::CIAO::NDDS::DDS_TypeFactory_i * factory_y = 0; - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - - - ACE_NEW_THROW_EX (factory_t, - dds_type_factory_t (), - ::CORBA::NO_MEMORY ()); - ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_t, - factory_t, participant); - - ACE_NEW_THROW_EX (factory_y, - dds_type_factory_y (), - ::CORBA::NO_MEMORY ()); - - ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_y, - factory_y, participant); - - retcode_t = DDS_TYPE_T::type_support::register_type( - part->get_rti_entity (), typesupport_name_t); - - retcode_y = DDS_TYPE_Y::type_support::register_type( - part->get_rti_entity (), typesupport_name_y); - -#endif - if ((retcode_t != ::DDS::RETCODE_OK) && (retcode_y != ::DDS::RETCODE_OK)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_MultipleTemp_FooConnector_T::register_type - " - "Error registering type T <%C> and type Y <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_t),::CIAO::DDS4CCM::translate_retcode (retcode_y))); - throw ::CCM_DDS::InternalError (retcode_t, 0); - } -} - -template -void -FooConnector_Connector_T::unregister_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::unregister_type"); -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_TypeFactory_i * factory = - ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (typesupport_name, participant); - delete factory; -#else - ACE_UNUSED_ARG (participant); - ACE_UNUSED_ARG (typesupport_name); -#endif - -} - -template -char * -FooConnector_Connector_T::topic_name_t (void) -{ - return CORBA::string_dup (this->topic_name_t_.in ()); -} - -template -void -FooConnector_Connector_T::topic_name_t ( - const char * topic_name_t) -{ - this->topic_name_t_ = topic_name_t; -} - -template -::CCM_DDS::CCM_ContentFilterSetting * -FooConnector_Connector_T::get_push_consumer_t_filter_config(void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_filter_config"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter * -FooConnector_Connector_T::push_consumer_t_filter (void) -{ - return this->push_consumer_t_.filter (); -} - -template -void -FooConnector_Connector_T::push_consumer_t_filter ( - const ::CCM_DDS::QueryFilter &filter) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::push_consumer_t_filter"); - this->push_consumer_t_.filter (filter); -} - -template -typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_t_data (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_data (); -} - -template -typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_t_data_control (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data_control"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_data_control (); -} - -template -typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_t_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_dds_entity"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_dds_entity (); -} - -template -typename CCM_TYPE::observable_t_traits::data_type::_ptr_type -FooConnector_Connector_T::get_observable_t_data (void) -{ -// return CCM_TYPE::observable_t_traits::data_type::_nil(); - this->observable_t_.set_component (this); - return this->observable_t_.get_data (); -} - -template -typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T::get_observable_t_dds_entity (void) -{ - this->observable_t_.set_component (this); - return this->observable_t_.get_dds_entity (); -} - -// Y -template -char * -FooConnector_Connector_T::topic_name_y (void) -{ - return CORBA::string_dup (this->topic_name_y_.in ()); -} - -template -void -FooConnector_Connector_T::topic_name_y ( - const char * topic_name_y) -{ - this->topic_name_y_ = topic_name_y; -} - -template -::CCM_DDS::CCM_ContentFilterSetting* -FooConnector_Connector_T::get_push_consumer_y_filter_config(void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_filter_config"); - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_filter_config (); -} - -template -::CCM_DDS::QueryFilter * - FooConnector_Connector_T::push_consumer_y_filter (void) -{ - return this->push_consumer_y_.filter (); -} - -template -void -FooConnector_Connector_T::push_consumer_y_filter ( - const ::CCM_DDS::QueryFilter &filter) -{ - this->push_consumer_y_.filter (filter); -} - -template -typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_y_data (void) -{ - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_data (); -} - -template -typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_y_data_control (void) -{ - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_data_control (); -} - -template -typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T::get_push_consumer_y_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_dds_entity"); - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_dds_entity (); -} - -template -typename CCM_TYPE::observable_y_traits::data_type::_ptr_type -FooConnector_Connector_T::get_observable_y_data (void) -{ - this->observable_y_.set_component (this); - return this->observable_y_.get_data (); -} - -template -typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T::get_observable_y_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_observable_y_dds_entity"); - this->observable_y_.set_component (this); - return this->observable_y_.get_dds_entity (); -} - -template -void -FooConnector_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete"); - // Init default domain in Base_Connector - BaseConnector::configuration_complete (); - - if (::CORBA::is_nil (this->domain_participant_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T::configuration complete init_domain - " - "Error domain_participant\n")); - throw ::CORBA::INTERNAL (); - } - - // Second argument can be removed if register_type is changed in (Topic)Base_Connector_T - this->register_type (this->domain_participant_.in (), - "dummy_name"); - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - - // Create the topics needed - this->init_topic (this->domain_participant_.in (), - this->topic_t_.inout () , - this->topic_name_t_.in (), - typesupport_name_t); - - if (::CORBA::is_nil (this->topic_t_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - " - "Error creating topic for t\n")); - throw ::CORBA::INTERNAL (); - } - - this->init_topic (this->domain_participant_.in (), - this->topic_y_.inout () , - this->topic_name_y_.in (), - typesupport_name_y); - - if (::CORBA::is_nil (this->topic_y_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - " - "Error creating topic for y\n")); - throw ::CORBA::INTERNAL (); - } - - // Init the subscriber and publisher - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_t_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_t_.inout ()); - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_y_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_y_.inout ()); - - this->observable_t_.configuration_complete ( - this->topic_t_.in (), - this->publisher_t_.in (), - this->qos_profile_); - this->observable_y_.configuration_complete ( - this->topic_y_.in (), - this->publisher_y_.in (), - this->qos_profile_); - - this->dl_t_ = this->context_->get_connection_push_consumer_t_data_listener (); - this->dl_y_ = this->context_->get_connection_push_consumer_y_data_listener (); - - this->push_consumer_t_psl = - this->context_->get_connection_push_consumer_t_status (); - - this->push_consumer_y_psl = - this->context_->get_connection_push_consumer_y_status (); - - - this->push_consumer_t_.configuration_complete ( - this->topic_t_.in (), - this->subscriber_t_.in (), - this->qos_profile_); - this->push_consumer_y_.configuration_complete ( - this->topic_y_.in (), - this->subscriber_y_.in (), - this->qos_profile_); -} - -template -void -FooConnector_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_activate"); - BaseConnector::ccm_activate (); - ACE_Reactor* reactor = 0; - - this->activate_subscriber (reactor, - this->subscriber_t_.in (), - this->subscriber_t_listener_.inout ()); - this->activate_publisher (reactor, - this->publisher_t_.in (), - this->publisher_t_listener_.inout ()); - - this->activate_topic ( reactor, - this->topic_t_.in (), - this->topiclistener_t_.inout ()); - this->activate_topic (reactor, - this->topic_y_.in (), - this->topiclistener_y_.inout ()); - - this->push_consumer_t_.activate (this->dl_t_.in (), - push_consumer_t_psl.in (), - this->reactor_); - - this->push_consumer_y_.activate (this->dl_y_.in (), - push_consumer_y_psl.in (), - this->reactor_); - this->observable_t_.activate (); - this->observable_y_.activate (); -} - -template -void -FooConnector_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_passivate"); - - if (ACE_OS::strlen (this->topic_name_t_) != 0) - { - this->observable_t_.passivate (); - this->push_consumer_t_.passivate (); - } - if (ACE_OS::strlen (this->topic_name_y_) != 0) - { - this->observable_y_.passivate (); - this->push_consumer_y_.passivate (); - } - - ::DDS::TopicListener_var topiclistener_t = - this->topiclistener_t_._retn (); - if (! CORBA::is_nil (topiclistener_t.in ())) - { - this->passivate_topic (this->topic_t_.in (), - topiclistener_t.in ()); - } - - ::DDS::TopicListener_var topiclistener_y = - this->topiclistener_y_._retn (); - if (! CORBA::is_nil (topiclistener_y.in ())) - { - this->passivate_topic (this->topic_y_.in (), - topiclistener_y.in ()); - } - - ::DDS::SubscriberListener_var subscriber_t_listener = - this->subscriber_t_listener_._retn (); - if (!::CORBA::is_nil (subscriber_t_listener.in ())) - { - this->passivate_subscriber (this->subscriber_t_.in (), - subscriber_t_listener.in ()); - } - - ::DDS::PublisherListener_var publisher_t_listener = - this->publisher_t_listener_._retn (); - if (!::CORBA::is_nil (publisher_t_listener.in ())) - { - this->passivate_publisher (this->publisher_t_.in (), - publisher_t_listener.in ()); - } - - ::DDS::SubscriberListener_var subscriber_y_listener = - this->subscriber_y_listener_._retn (); - if (!::CORBA::is_nil (subscriber_y_listener.in ())) - { - this->passivate_subscriber (this->subscriber_y_.in (), - subscriber_y_listener.in ()); - } - - ::DDS::PublisherListener_var publisher_y_listener = - this->publisher_y_listener_._retn (); - if (!::CORBA::is_nil (publisher_y_listener.in ())) - { - this->passivate_publisher (this->publisher_y_.in (), - publisher_y_listener.in ()); - } - - BaseConnector::ccm_passivate (); -} - -template -void -FooConnector_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_remove"); - - if (ACE_OS::strlen (this->topic_name_t_) != 0) - { - this->observable_t_.remove (this->publisher_t_.in ()); - this->push_consumer_t_.remove (this->subscriber_t_.in ()); - - } - - if (ACE_OS::strlen (this->topic_name_y_) != 0) - { - this->observable_y_.remove (this->publisher_y_.in ()); - this->push_consumer_y_.remove (this->subscriber_y_.in ()); - } - - ::DDS::Topic_var topic_t = this->topic_t_._retn (); - if (! CORBA::is_nil (topic_t.in ())) - { - this->remove_topic (this->domain_participant_.in (), - topic_t.in ()); - } - - ::DDS::Topic_var topic_y = this->topic_y_._retn (); - if (! CORBA::is_nil (topic_y.in ())) - { - this->remove_topic (this->domain_participant_.in (), - topic_y.in ()); - } - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - this->unregister_type (this->domain_participant_.in (), - typesupport_name_t); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - this->unregister_type (this->domain_participant_.in (), - typesupport_name_y); - - ::DDS::Publisher_var publisher_t = this->publisher_t_._retn (); - if (!::CORBA::is_nil (publisher_t.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher_t.in ()); - } - - ::DDS::Subscriber_var subscriber_t = this->subscriber_t_._retn (); - if (!::CORBA::is_nil (subscriber_t.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber_t.in ()); - } - - ::DDS::Publisher_var publisher_y = this->publisher_y_._retn (); - if (!::CORBA::is_nil (publisher_y.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher_y.in ()); - } - ::DDS::Subscriber_var subscriber_y = this->subscriber_y_._retn (); - if (!::CORBA::is_nil (subscriber_y.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber_y.in ()); - } - - BaseConnector::ccm_remove (); - } diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h deleted file mode 100644 index 140f5aab79d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h +++ /dev/null @@ -1,193 +0,0 @@ -#ifndef DDS_MLT_CONNECTOR_T_H_ -#define DDS_MLT_CONNECTOR_T_H_ - -#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h" -#include "connectors/dds4ccm/impl/DDS_Write_T.h" -#include "connectors/dds4ccm/impl/DDS_Get_T.h" -#include "connectors/dds4ccm/impl/DDS_Listen_T.h" -#include "connectors/dds4ccm/impl/DDS_Update_T.h" -#include "connectors/dds4ccm/impl/DataListenerControl_T.h" - -template -class FooConnector_Connector_T - : public virtual DDS_Base_Connector_T -{ - - typedef DDS_Base_Connector_T BaseConnector; - -public: - FooConnector_Connector_T (void); - - virtual - void - register_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - - virtual - void - unregister_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - - /** - * T type connector - **/ - // DDS_Listen operations - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_t_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_t_filter (void); - - virtual - void - push_consumer_t_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type - get_push_consumer_t_data (void); - - virtual - typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type - get_push_consumer_t_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type - get_push_consumer_t_dds_entity (void); - - // DDS_Update operations - virtual - typename CCM_TYPE::observable_t_traits::data_type::_ptr_type - get_observable_t_data (void); - - virtual - typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type - get_observable_t_dds_entity (void); - - - - /** - * Y type connector - **/ - // DDS_Listen operations - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_y_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_y_filter (void); - - virtual - void - push_consumer_y_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type - get_push_consumer_y_data (void); - - virtual - typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type - get_push_consumer_y_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type - get_push_consumer_y_dds_entity (void); - - // DDS_Update operations - virtual - typename CCM_TYPE::observable_y_traits::data_type::_ptr_type - get_observable_y_data (void); - - virtual - typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type - get_observable_y_dds_entity (void); - - - - /** - * Topic names. - **/ - virtual char * topic_name_t (void); - virtual void topic_name_t (const char * topic_name_t); - virtual char * topic_name_y (void); - virtual void topic_name_y (const char * topic_name_y); - - /** - * Deployment methods. - **/ - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - -private: - DDS_Listen_T< - typename CCM_TYPE::push_consumer_t_traits, - typename DDS_TYPE_T::typed_reader_type, - typename DDS_TYPE_T::value_type, - SEQ_TYPE_T> - push_consumer_t_; - DDS_Listen_T< - typename CCM_TYPE::push_consumer_y_traits, - typename DDS_TYPE_Y::typed_reader_type, - typename DDS_TYPE_Y::value_type, - SEQ_TYPE_Y> - push_consumer_y_; - - DDS_Update_T< - typename CCM_TYPE::observable_t_traits, - typename DDS_TYPE_T::typed_writer_type, - typename DDS_TYPE_T::value_type, - SEQ_TYPE_T> - observable_t_; - - DDS_Update_T< - typename CCM_TYPE::observable_y_traits, - typename DDS_TYPE_Y::typed_writer_type, - typename DDS_TYPE_Y::value_type, - SEQ_TYPE_Y> - observable_y_; - - //connection to the receiver implementation - typename CCM_TYPE::push_consumer_t_traits::data_listener_type::_var_type dl_t_; - typename CCM_TYPE::push_consumer_y_traits::data_listener_type::_var_type dl_y_; - - ::CCM_DDS::PortStatusListener_var push_consumer_t_psl; - ::CCM_DDS::PortStatusListener_var push_consumer_y_psl; - - ::DDS::Publisher_var publisher_t_; - ::DDS::PublisherListener_var publisher_t_listener_; - ::DDS::Subscriber_var subscriber_t_; - ::DDS::SubscriberListener_var subscriber_t_listener_; - - ::DDS::Publisher_var publisher_y_; - ::DDS::PublisherListener_var publisher_y_listener_; - ::DDS::Subscriber_var subscriber_y_; - ::DDS::SubscriberListener_var subscriber_y_listener_; - - CORBA::String_var topic_name_t_; - CORBA::String_var topic_name_y_; - - ::DDS::Topic_var topic_t_; - ::DDS::Topic_var topic_y_; - - ::DDS::TopicListener_var topiclistener_t_; - ::DDS::TopicListener_var topiclistener_y_; - - ACE_Reactor * reactor_; - - void create_topics (const char * typesupport_name); - -}; - -#include "MultipleTemp_Connector_T.cpp" - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl deleted file mode 100644 index 9a3df82c7f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef CCM_DDS_MLT_IDL -#define CCM_DDS_MLT_IDL - -#include - -#pragma dds4ccm impl "MultipleTemp_Connector_T.h" - -#include - -module CCM_DDS -{ - module Duplex_Typed TSeq, typename Y, sequence YSeq> { - alias Typed T_Typed; - alias Typed Y_Typed; - - connector FooConnector : CCM_DDS::DDS_Base - { - mirrorport T_Typed::DDS_Listen push_consumer_t; - mirrorport Y_Typed::DDS_Listen push_consumer_y; - mirrorport T_Typed::DDS_Update observable_t; - mirrorport Y_Typed::DDS_Update observable_y; - - attribute string topic_name_t; - attribute string topic_name_y; - - }; - }; -}; - -#endif // CCM_DDS_MLT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl deleted file mode 100644 index 6b259d3b560..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/MultipleTemp_Connector.idl" - -module MultipleTemp -{ - component Receiver - { - port MultipleTempConnector::T_Typed::DDS_Listen info_one_out; - port MultipleTempConnector::Y_Typed::DDS_Listen info_two_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc deleted file mode 100644 index e7d436114cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc +++ /dev/null @@ -1,141 +0,0 @@ -project(DDS_MultipleTemp_Receiver_idl_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - after += DDS_MT_TEMP_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - MultipleTemp_Receiver.idl - } -} - -project(DDS_MultipleTemp_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - MultipleTemp_ReceiverE.idl - } -} - -project(DDS_MT_TEMP_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_lem_gen DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libs += Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverEC.cpp - } - - Header_Files { - MultipleTemp_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_ReceiverEC.inl - } -} - -project(DDS_MultipleTemp_Receiver_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_idl_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_gen - libs += DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverC.cpp - } - - Header_Files { - MultipleTemp_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - MultipleTemp_ReceiverC.inl - } -} - -project(DDS_MultipleTemp_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_Receiver_exec.cpp - } - - Header_Files { - MultipleTemp_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - requires += dummy_label - after += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MultipleTemp_Receiver_exec DDS_MT_TEMP_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt Receiver_exec DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverS.cpp - MultipleTemp_Receiver_svnt.cpp - } - - Header_Files { - MultipleTemp_ReceiverS.h - MultipleTemp_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp deleted file mode 100644 index 0f6ccb4596c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp +++ /dev/null @@ -1,250 +0,0 @@ -// -*- C++ -*- -// Test for MULTIPLE_TEMPLATES - -#include "MultipleTemp_Receiver_exec.h" -#include "ace/Log_Msg.h" - -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/TimeUtilities.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_MultipleTemp_Receiver_Impl -{ - CORBA::UShort received_one= 0; - CORBA::UShort received_two= 0; - - //============================================================ - // ListenOne_Listener_exec_i Listener to topic One - //============================================================ - ListenOne_Listener_exec_i::ListenOne_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx)) - - { - } - - ListenOne_Listener_exec_i::~ListenOne_Listener_exec_i (void) - { - } - - void - ListenOne_Listener_exec_i::on_one_data ( - const TestTopicOne & an_instance, - const ::CCM_DDS::ReadInfo & info) - { - ACE_DEBUG ((LM_DEBUG, "ListenOne_Listener_exec_i::on_one_data: " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - if ( info.instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - } - ++received_one; - } - - void - ListenOne_Listener_exec_i::on_many_data ( - const TestTopicOneSeq & , - const ::CCM_DDS::ReadInfoSeq & ) - { - } - //============================================================ - // ListenTwo_Listener_exec_i Listener to topic Two - //============================================================ - ListenTwo_Listener_exec_i::ListenTwo_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - ListenTwo_Listener_exec_i::~ListenTwo_Listener_exec_i (void) - { - } - - void - ListenTwo_Listener_exec_i::on_one_data ( - const TestTopicTwo & an_instance, - const ::CCM_DDS::ReadInfo & info) - { - ACE_DEBUG ((LM_DEBUG, "ListenTwo_Listener_exec_i::on_one_data: " - "key <%C> - y <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - if (::DDS::HANDLE_NIL == info.instance_handle) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - y <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - } - ++received_two; - } - - void - ListenTwo_Listener_exec_i::on_many_data ( - const TestTopicTwoSeq & , - const ::CCM_DDS::ReadInfoSeq & ) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - // Port operations. - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_one_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_two_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_one_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_one_data_listener_.in ())) - { - ListenOne_Listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ListenOne_Listener_exec_i ( - this->ciao_context_.in ()), - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_nil ()); - this->ciao_info_out_one_data_listener_ = tmp; - } - - return - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_duplicate ( - this->ciao_info_out_one_data_listener_.in ()); - } - - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_two_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_two_data_listener_.in ())) - { - ListenTwo_Listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ListenTwo_Listener_exec_i ( - this->ciao_context_.in ()), - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_nil ()); - this->ciao_info_out_two_data_listener_ = tmp; - } - - return - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_duplicate ( - this->ciao_info_out_two_data_listener_.in ()); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::MultipleTemp::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var dlc_one = - this->ciao_context_->get_connection_info_one_out_data_control (); - ::CCM_DDS::DataListenerControl_var dlc_two = - this->ciao_context_->get_connection_info_two_out_data_control (); - dlc_one->mode (::CCM_DDS::ONE_BY_ONE); - dlc_two->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (received_one != 8) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver: " - "Received wrong number of topic one: " - "received <%C> - expected <8>\n", - received_one)); - } - if (received_two != 8) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver: " - "Received wrong number of topic two: " - "received <%C> - expected <8>\n", - received_two)); - } - if ((received_two == 8) && (received_one == 8)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver: " - "Received received expected topics.\n")); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h deleted file mode 100644 index f49ef8e3df1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "MultipleTemp_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - - -namespace CIAO_MultipleTemp_Receiver_Impl -{ - class Receiver_exec_i; - - //============================================================ - // ListenOneByOneTest_Listener_exec_i one - //============================================================ - class RECEIVER_EXEC_Export ListenOne_Listener_exec_i - : public virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenOne_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx); - - virtual ~ListenOne_Listener_exec_i (void); - - virtual void - on_one_data ( - const TestTopicOne& an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const TestTopicOneSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - }; - //============================================================ - // ListenOneByOneTest_Listener_exec_i two - //============================================================ - class RECEIVER_EXEC_Export ListenTwo_Listener_exec_i - : public virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenTwo_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx); - - virtual ~ListenTwo_Listener_exec_i (void); - - virtual void - on_one_data ( - const TestTopicTwo& an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const TestTopicTwoSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - }; - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr - get_info_one_out_data_listener (void); - virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr - get_info_two_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_one_out_status (void); - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_two_out_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_var ciao_info_out_one_data_listener_; - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_var ciao_info_out_two_data_listener_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl deleted file mode 100644 index 8d9bc7ac108..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_MULTIPLE_TEMP_SENDER_IDL -#define DDS_MULTIPLE_TEMP_SENDER_IDL - -#include "Connector/MultipleTemp_Connector.idl" - -module MultipleTemp -{ - component Sender - { - port MultipleTempConnector::T_Typed::DDS_Update test_topic_one_update; - port MultipleTempConnector::Y_Typed::DDS_Update test_topic_two_update; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc deleted file mode 100644 index 2fad9a0818e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc +++ /dev/null @@ -1,142 +0,0 @@ -project(DDS_MultipleTemp_Sender_idl_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MT_TEMP_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - MultipleTemp_Sender.idl - } -} - -project(DDS_MultipleTemp_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MultipleTemp_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - MultipleTemp_SenderE.idl - } -} - -project(DDS_MultipleTemp_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Sender_lem_gen DDS_MultipleTemp_Sender_stub DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderEC.cpp - } - - Header_Files { - MultipleTemp_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_SenderEC.inl - } -} - -project(DDS_MultipleTemp_Sender_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Sender_idl_gen DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - libs += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderC.cpp - } - - Header_Files { - MultipleTemp_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - MultipleTemp_SenderC.inl - } -} - -project(DDS_MultipleTemp_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Sender_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_Sender_exec.cpp - } - - Header_Files { - MultipleTemp_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - requires += dummy_label - after += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderS.cpp - MultipleTemp_Sender_svnt.cpp - } - - Header_Files { - MultipleTemp_SenderS.h - MultipleTemp_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp deleted file mode 100644 index 5df1ea1c79c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp +++ /dev/null @@ -1,373 +0,0 @@ -// -*- C++ -*- -//Test Multiple templates connector -#include "MultipleTemp_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_MultipleTemp_Sender_Impl -{ - - //============================================================ - // Pulse generator - //============================================================ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE), - test_ok_(true) - { - this->ticker_ = new pulse_Generator (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - // Supported operations and attributes. - CORBA::Boolean - Sender_exec_i::create_one_topic() - { - CORBA::Boolean result = true; - TestTopicOne i = this->topic_one_seq_one_[0]; - TestTopicTwo u = this->topic_two_seq_one_[0]; - try - { - if ( ::CORBA::is_nil (this->updater_one_) || - ::CORBA::is_nil (this->updater_two_)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil"))); - result= false; - } - else - { - this->updater_one_->create_one(i); - this->updater_two_->create_one(u); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("MultipleTemp: create_one for both topics ") - ACE_TEXT ("<%C> and <%C>\n"), - i.keyOne.in(), u.keyTwo.in())); - } - } - catch(const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ") - ACE_TEXT ("AlreadyCreated with test updater") - ACE_TEXT (" create_one <%C> or <%C>.\n"), - i.keyOne.in(), u.keyTwo.in())); - result= false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one.\n"))); - result = false;; - } - return result; - } - - - CORBA::Boolean - Sender_exec_i::update_one_topic() - { - //update already created instance with handle nil - CORBA::Boolean result = true; - TestTopicOne i = this->topic_one_seq_one_[0]; - TestTopicTwo u = this->topic_two_seq_one_[0]; - - try - { - this->updater_one_->update_one(i, DDS::HANDLE_NIL); - this->updater_two_->update_one(u, DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("MultipleTemp: update_one with already") - ACE_TEXT (" existing instance with DDS::HANDLE_NIL,") - ACE_TEXT (" key <%C> and key <%C>\n"), - i.keyOne.in(), u.keyTwo.in())); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ") - ACE_TEXT ("NonExistent with test updater ") - ACE_TEXT ("update_one.\n"))); - result = false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one.\n"))); - result = false; - } - return result; - } - - CORBA::Boolean - Sender_exec_i::create_many_topics() - { - //create many with no exception - CORBA::Boolean result = false; - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("create_many both topics : <%u> samples\n"), - this->topic_one_seq_many_.length ())); - this->updater_one_->create_many (this->topic_one_seq_many_); - this->updater_two_->create_many (this->topic_two_seq_many_); - - result = true; - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR Unexpected exception:") - ACE_TEXT (" NonExistent with test updater create_many\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error in updater:") - ACE_TEXT (" create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - - } - return result; - } - - CORBA::Boolean - Sender_exec_i::update_many_topics() - { - CORBA::Boolean result = false; - try - { - this->updater_one_->update_many (this->topic_one_seq_many_); - this->updater_two_->update_many (this->topic_two_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_one_seq_many_.length ())); - result = true; - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unexpected exception: NonExistent ") - ACE_TEXT ("with test updater update_many.\n"))); - result = false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - result = false; - } - return result; - } - - void - Sender_exec_i::add_instances_of_topic () - { - //make 4 sequences of instances as testdata - CORBA::UShort total = 3; - this->topic_one_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[9]; - TestTopicOne new_key; - ACE_OS::sprintf (key, "keyONE_%d", i); - new_key.keyOne = CORBA::string_dup(key); - new_key.x = i; - this->topic_one_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_one_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[10]; - TestTopicOne new_key; - ACE_OS::sprintf (key, "manyOne_%d", i); - new_key.keyOne = CORBA::string_dup(key); - new_key.x = i; - this->topic_one_seq_many_[i-1] = new_key; - } - this->topic_two_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[9]; - TestTopicTwo new_key; - ACE_OS::sprintf (key, "keyTWO_%d", i); - new_key.keyTwo = CORBA::string_dup(key); - new_key.y = i; - new_key.z = i; - this->topic_two_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_two_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[10]; - TestTopicTwo new_key; - ACE_OS::sprintf (key, "manyTwo_%d", i); - new_key.keyTwo = CORBA::string_dup(key); - new_key.y = i; - new_key.z = i; - this->topic_two_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick () - { - if(this->test_ok_.value()) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one_topic(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_ONE; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one_topic(); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many_topics(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many_topics(); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - } - void - Sender_exec_i::start (void) - { - long sec = 3L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - delete this->ticker_; - } - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::MultipleTemp::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - this->updater_one_ = - this->context_->get_connection_test_topic_one_update_data (); - this->updater_two_ = - this->context_->get_connection_test_topic_two_update_data (); - } - - void - Sender_exec_i::ccm_activate (void) - { - this->add_instances_of_topic (); - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - if(!this->test_ok_.value()) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Error in MultipleTemp in Sender"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h deleted file mode 100644 index 7158bbe145e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - -#include "MultipleTemp_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_MultipleTemp_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - enum MULTIPLE_TEMP_TEST { - UPDATE_CREATE, - UPDATE_ONE, - CREATE_MANY, - UPDATE_MANY, - END_TEST - }; - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &pulse_callback_; - }; - - 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); - void tick (void); - - private: - ACE_Reactor* reactor (void); - void start (void); - void stop (void); - void add_instances_of_topic (void); - CORBA::Boolean create_one_topic(void); - CORBA::Boolean update_one_topic(void); - CORBA::Boolean create_many_topics(void); - CORBA::Boolean update_many_topics(void); - - pulse_Generator * ticker_; - ::MultipleTemp::CCM_Sender_Context_var context_; - ::MultipleTemp::MultipleTempConnector::T_Typed::Updater_var updater_one_; - ::MultipleTemp::MultipleTempConnector::Y_Typed::Updater_var updater_two_; - - MULTIPLE_TEMP_TEST test_nr_; - Atomic_Boolean test_ok_; - TestTopicOneSeq topic_one_seq_one_; - TestTopicOneSeq topic_one_seq_many_; - TestTopicTwoSeq topic_two_seq_one_; - TestTopicTwoSeq topic_two_seq_many_; - - }; - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Sender_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp deleted file mode 100644 index 49bff6b4ba0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp +++ /dev/null @@ -1,489 +0,0 @@ - - - - MultipleTemp_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_MultipleTemp_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_MultipleTemp_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - MultipleTemp_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_MultipleTemp_MultipleTempConnector_FooConnector_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_MultipleTemp_MultipleTempConnector_FooConnector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_MultipleTemp_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_MultipleTemp_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_MultipleTemp_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_MultipleTemp_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - MultipleTemp_ConnectorComponent - SenderNode - - - - - topic_name_t - - - tk_string - - - TestOne - - - - - topic_name_y - - - tk_string - - - TestTwo - - - - - - MultipleTemp_ConnectorComponent2 - ReceiverNode - - - - - topic_name_t - - - tk_string - - - TestOne - - - - - topic_name_y - - - tk_string - - - TestTwo - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol_one - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_one_out_data_control - false - SimplexReceptacle - - - - push_consumer_t_data_control - true - Facet - - - - - _statelistener_one - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_one_out_data_listener - true - Facet - - - - push_consumer_t_data_listener - false - SimplexReceptacle - - - - - - info_one_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_one_out_data - false - SimplexReceptacle - - - - push_consumer_t_data - true - Facet - - - - - updater_one_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_one_update_data - false - SimplexReceptacle - - - - observable_t_data - true - Facet - - - - - - _listenercontrol_two - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_two_out_data_control - false - SimplexReceptacle - - - - push_consumer_y_data_control - true - Facet - - - - - _statelistener_two - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_two_out_data_listener - true - Facet - - - - push_consumer_y_data_listener - false - SimplexReceptacle - - - - - - - info_two_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_two_out_data - false - SimplexReceptacle - - - - push_consumer_y_data - true - Facet - - - - - updater_two_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_two_update_data - false - SimplexReceptacle - - - - observable_y_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - DDS_MultipleTemp_Connector_exec - - - DDS_MultipleTemp_Connector_exec - - - DDS_MultipleTemp_Connector_svnt - - - DDS_MultipleTemp_Connector_svnt - - - MultipleTemp_Connector_stub - - - DDS_MultipleTemp_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 -s\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/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore b/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore deleted file mode 100644 index d8421a46f0e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -/NoModule.cxx -/NoModule.h -/NoModulePlugin.cxx -/NoModulePlugin.h -/NoModuleSupport.cxx -/NoModuleSupport.h -/NoModule_Common_stub_export.h -/NoModule_ConnectorE.idl -/NoModule_Connector_conn.cpp -/NoModule_Connector_conn.h -/NoModule_Connector_conn_export.h -/NoModule_Connector_lem_stub_export.h -/NoModule_Connector_stub_export.h -/NoModule_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl deleted file mode 100644 index bbd7f4e74d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef NOMODULE_IDL -#define NOMODULE_IDL - -#pragma ndds typesupport "NoModuleSupport.h" -#pragma opendds typesupport "NoModuleTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "NoModuleType" -#pragma DCPS_DATA_KEY "NoModuleType value" - -struct NoModuleType { - string value; //@key -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence NoModuleTypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc deleted file mode 100644 index 0c26ca42da4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc +++ /dev/null @@ -1,22 +0,0 @@ -project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = NoModule_stub - dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \ - -Wb,stub_export_include=NoModule_Common_stub_export.h - - IDL_Files { - idlflags += -Gxhst - NoModule.idl - } - - opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export - - DDSGenerator_Files { - NoModule.idl - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl deleted file mode 100644 index 1826d617ae5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef NOMODULE_CONNECTOR_IDL -#define NOMODULE_CONNECTOR_IDL - -#include -#include - -#include "NoModule.idl" - -#pragma ciao lem "NoModule_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "NoModuleTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConnector; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc deleted file mode 100644 index 445ed545e45..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc +++ /dev/null @@ -1,130 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -b dds4ccm_base NoModule_Connector" - -project(NoModule_Connector_idl_gen) : connectoridldefaults, dds4ccm { - custom_only = 1 - after += NoModule_stub - idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=NoModule_Connector_stub_export.h \ - -Wb,skel_export_macro=NOMODULE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=NoModule_Connector_svnt_export.h \ - -Wb,conn_export_macro=NOMODULE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=NoModule_Connector_conn_export.h \ - -Gxhex -Gxhsk -Gxhst - IDL_Files { - NoModule_Connector.idl - } -} - -project(NoModule_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - after += NoModule_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=NoModule_Connector_lem_stub_export.h \ - -SS -Gxhst - - IDL_Files { - NoModule_ConnectorE.idl - } -} - -project(NoModule_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += NoModule_Connector_lem_gen NoModule_Connector_stub - libs += NoModule_Connector_stub - - - sharedname = NoModule_Connector_lem_stub - dynamicflags += NOMODULE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoModule_ConnectorEC.cpp - } - - Header_Files { - NoModule_ConnectorEC.h - NoModule_Connector_lem_stub_export.h - } - - Inline_Files { - NoModule_ConnectorEC.inl - } -} - -project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base { - after += NoModule_Connector_idl_gen NoModule_stub - libs += NoModule_stub - - - sharedname = NoModule_Connector_stub - dynamicflags += NOMODULE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoModule_ConnectorC.cpp - } - - Header_Files { - NoModule_ConnectorC.h - NoModule_Connector_stub_export.h - } - - Inline_Files { - NoModule_ConnectorC.inl - } -} - -project(NoModule_Connector_exec) : ciao_executor, dds4ccm_impl { - after += NoModule_Connector_lem_stub NoModule_Connector_stub - sharedname = NoModule_Connector_exec - libs += NoModule_Connector_stub NoModule_Connector_lem_stub NoModule_stub - - dynamicflags += NOMODULE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoModule_Connector_conn.cpp - } - - Header_Files { - NoModule_Connector_conn.h - NoModule_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += NoModule_Connector_lem_stub - sharedname = NoModule_Connector_svnt - libs += NoModule_Connector_stub NoModule_Connector_lem_stub NoModule_stub - - - dynamicflags += NOMODULE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NoModule_ConnectorS.cpp - NoModule_Connector_svnt.cpp - } - - Header_Files { - NoModule_ConnectorS.h - NoModule_Connector_svnt.h - NoModule_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl deleted file mode 100644 index be43e622d8f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file NonChangeable_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef NONCHANGEABLE_BASE_IDL -#define NONCHANGEABLE_BASE_IDL - -#pragma ndds typesupport "Base/NonChangeable_BaseSupport.h" -#pragma opendds typesupport "Base/NonChangeable_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "NonChangeableTest" - -struct NonChangeableTest { - string key; - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence NonChangeableTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc deleted file mode 100644 index 02f3162309f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_NonChangeableBase_stub - dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \ - -Wb,stub_export_include=NonChangeable_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - NonChangeable_Base.idl - } - - opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export - - DDSGenerator_Files { - NonChangeable_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl deleted file mode 100644 index 56afbc8213c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file NonChangeable_Component.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/NonChangeable_Connector.idl" - -module NonChangeable -{ - component NonChangeableComponent - { - port NonChangeableTestConnector::DDS_Get info_get; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc deleted file mode 100644 index b9aa5408dfe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(NonChangeable_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_NonChangeableConnector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - NonChangeable_Component.idl - } -} - -project(NonChangeable_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += NonChangeable_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - NonChangeable_ComponentE.idl - } -} - -project(NonChangeable_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += NonChangeable_Component_lem_gen NonChangeable_Component_stub \ - DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub - libs += Component_stub DDS_NonChangeableConnector_stub \ - DDS_NonChangeableBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ComponentEC.cpp - } - - Header_Files { - NonChangeable_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - NonChangeable_ComponentEC.inl - } -} - -project(NonChangeable_Component_stub) : ccm_stub, dds4ccm_base { - after += NonChangeable_Component_idl_gen DDS_NonChangeableConnector_stub \ - DDS_NonChangeableBase_stub DDS_NonChangeableConnector_lem_gen - libs += DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ComponentC.cpp - } - - Header_Files { - NonChangeable_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - NonChangeable_ComponentC.inl - } -} - -project(NonChangeable_Component_exec) : ciao_executor, dds4ccm_impl { - after += NonChangeable_Component_lem_stub NonChangeable_Component_stub \ - DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub \ - DDS_NonChangeableConnector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_Component_exec.cpp - } - - Header_Files { - NonChangeable_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += NonChangeable_Component_lem_stub DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \ - NonChangeable_Component_exec DDS_NonChangeableConnector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \ - Component_exec DDS_NonChangeableConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ComponentS.cpp - NonChangeable_Component_svnt.cpp - } - - Header_Files { - NonChangeable_ComponentS.h - NonChangeable_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp deleted file mode 100644 index f9f8da29692..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp +++ /dev/null @@ -1,255 +0,0 @@ -// -*- C++ -*- -#include "NonChangeable_Component_exec.h" - -#include "dds4ccm/impl/Utils.h" - -#define DOMAIN_ID_IN_DP 56 -#define TOPIC_NAME_IN_DP "NonChangeable" - -#define DW_MAX_BLOCKING_TIME_SEC 11 -#define DW_MAX_BLOCKING_TIME_NSEC 200 - -namespace CIAO_NonChangeable_NonChangeableComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - bool - Component_exec_i::test_topic_name ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn) - { - try - { - conn->topic_name ("nonchangeable_test"); - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_topic_name - " - "Able to reset topic name without an exception.\n")); - return true; - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - " - "ERROR: Unable to reset topic name.\n")); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - " - "ERROR: Caught unexpected exception.\n")); - } - return false; - } - - bool - Component_exec_i::test_key_fields ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn) - { - try - { - ::DDS::StringSeq fields; - fields.length (2); - fields[0] = CORBA::string_dup ("field_0"); - fields[1] = CORBA::string_dup ("field_1"); - conn->key_fields (fields); - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - " - "ERROR: Able to set key fields without " - "an exception.\n")); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_key_fields - " - "Caught expected exception.\n")); - return true; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_key_fields - " - "ERROR: Caught unexpected exception.\n")); - return false; - } - return false; - } - - bool - Component_exec_i::test_domain_id ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn) - { - try - { - conn->domain_id (64); - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - " - "ERROR: Able to set domain ID without " - "an exception.\n")); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_domain_id - " - "Caught expected exception.\n")); - return true; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - " - "ERROR: Caught unexpected exception.\n")); - return false; - } - return false; - } - - bool - Component_exec_i::test_qos_profile ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn) - { - try - { - conn->qos_profile ("nonchangeable_profile"); - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - " - "ERROR: Able to set QoS profile without " - "an exception.\n")); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_qos_profile - " - "Caught expected exception.\n")); - return true; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - " - "ERROR: Caught unexpected exception.\n")); - return false; - } - return false; - } - - bool - Component_exec_i::test_filter ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn) - { - try - { - ::CCM_DDS::QueryFilter filter; - filter.expression = ::CORBA::string_dup ("na"); - conn->pull_consumer_filter (filter); - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - " - "ERROR: Able to set filter without " - "an exception.\n")); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_filter - " - "Caught expected exception.\n")); - return true; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - " - "ERROR: Caught unexpected exception.\n")); - return false; - } - return false; - } - - // Operations from Components::SessionComponent. - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_info_get_status (void) - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::NonChangeable::CCM_NonChangeableComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - ::NonChangeable::NonChangeableTestConnector::Reader_var reader = - this->context_->get_connection_info_get_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - " - "Unable to get reader interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_var conn = - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - - if (this->test_topic_name (conn.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Set topic_name test passed.\n")); - } - if (this->test_key_fields (conn.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Set key_fields test passed.\n")); - } - if (this->test_domain_id (conn.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Set domain_id test passed.\n")); - } - if (this->test_qos_profile (conn.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n")); - } - if (this->test_filter (conn.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n")); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NonChangeable_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h deleted file mode 100644 index bce33e2e3b4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h +++ /dev/null @@ -1,75 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "NonChangeable_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_NonChangeable_NonChangeableComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual NonChangeableComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status(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: - ::NonChangeable::CCM_NonChangeableComponent_Context_var context_; - - bool - test_key_fields ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - - bool - test_attributes ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - - bool - test_qos_profile ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - - bool - test_topic_name ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - - bool - test_domain_id ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - - bool - test_filter ( - ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_NonChangeable_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl deleted file mode 100644 index a848e17fe87..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file NonChangeable_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef NONCHANGABLE_CONNECTOR_IDL_ -#define NONCHANGABLE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/NonChangeable_Base.idl" - -#pragma ciao lem "Connector/NonChangeable_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/NonChangeable_BaseTypeSupport.idl" -#endif - -module NonChangeable -{ - module ::CCM_DDS::Typed - < ::NonChangeableTest, ::NonChangeableTestSeq> - NonChangeableTestConnector; -}; - -#endif /* NonChangeable_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc deleted file mode 100644 index c2e73a35ca1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector" - -project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_NonChangeableBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=NonChangeable_Connector_stub_export.h \ - -Wb,skel_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=NonChangeable_Connector_svnt_export.h \ - -Wb,svnt_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=NonChangeable_Connector_svnt_export.h \ - -Wb,conn_export_macro=NONCHANGABLE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=NonChangeable_Connector_conn_export.h \ - -I .. - - IDL_Files { - NonChangeable_Connector.idl - } -} - -project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_NonChangeableConnector_idl_gen - idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=NonChangeable_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - NonChangeable_ConnectorE.idl - } -} - -project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub - libs += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_NonChangeableConnector_lem_stub - dynamicflags += NONCHANGABLE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ConnectorEC.cpp - } - - Header_Files { - NonChangeable_ConnectorEC.h - NonChangeable_Connector_lem_stub_export.h - } - - Inline_Files { - NonChangeable_ConnectorEC.inl - } -} - -project(DDS_NonChangeableConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_NonChangeableConnector_idl_gen DDS_NonChangeableBase_stub - libs += DDS_NonChangeableBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_NonChangeableConnector_stub - dynamicflags += NONCHANGABLE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ConnectorC.cpp - } - - Header_Files { - NonChangeable_ConnectorC.h - NonChangeable_Connector_stub_export.h - } - - Inline_Files { - NonChangeable_ConnectorC.inl - } -} - -project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub - sharedname = DDS_NonChangeableConnector_exec - libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS_NonChangeableBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += NONCHANGABLE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_Connector_conn.cpp - } - - Header_Files { - NonChangeable_Connector_conn.h - NonChangeable_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub - sharedname = DDS_NonChangeableConnector_svnt - libs += DDS_NonChangeableConnector_stub \ - DDS_NonChangeableConnector_lem_stub \ - DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += NONCHANGABLE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_ConnectorS.cpp - NonChangeable_Connector_svnt.cpp - } - - Header_Files { - NonChangeable_ConnectorS.h - NonChangeable_Connector_svnt.h - NonChangeable_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README deleted file mode 100644 index 15c5a62a44f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README +++ /dev/null @@ -1,15 +0,0 @@ - - -This test tests whether the connection attributes -can be set once the configuration is complete. -This shouldn't be allowed and therefore a -NonChangeable exception must be thrown. - -The following attributes are tested: - * key_fields - * domain_id - * qos_profile - * topic_name - -An error is reported for every attribute where -no NonChangeable exception was catched. diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp deleted file mode 100644 index cd45205b5b5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp +++ /dev/null @@ -1,198 +0,0 @@ - - - - NonChangeableAttribute_Depl_1 - - - NonChangeableComponentmplementation - - - - - - component factory - - - tk_string - - - create_NonChangeable_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_NonChangeable_NonChangeableComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - NonChangeableConnectorImplementation - - - - - - component factory - - - tk_string - - - create_NonChangeable_NonChangeableTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_NonChangeable_NonChangeableTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - NonChangeableConnector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - NonChangeableConnector_exec - - - - - - - NonChangeableComponentInstance - ComponentNode - - - - - - - NonChangeableConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - NonChangeable - - - - - - - info_get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - NonChangeableConnector_exec - - - DDS_NonChangeableConnector_exec - - - NonChangeableConnector_svnt - - - DDS_NonChangeableConnector_svnt - - - NonChangeableConnector_stub - - - DDS_NonChangeableConnector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl deleted file mode 100755 index 445ce8b9d56..00000000000 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode"); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); - -# 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\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/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl deleted file mode 100644 index c67d2b6caba..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file OIT_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ON_INCONSISTENT_TOPIC_TEST_BASE_IDL -#define ON_INCONSISTENT_TOPIC_TEST_BASE_IDL - -#pragma ndds typesupport "Base/OIT_Test_BaseSupport.h" -#pragma opendds typesupport "Base/OIT_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "OIT_Receiver_Topic" -#pragma DCPS_DATA_KEY "OIT_Receiver_Topic symbol" - -struct OIT_Receiver_Topic { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence OIT_Receiver_TopicSeq; -#endif - -#pragma DCPS_DATA_TYPE "OIT_Sender_Topic" -#pragma DCPS_DATA_KEY "OIT_Sender_Topic symbol" - -struct OIT_Sender_Topic { - string symbol; //@key - long x; - short y; - long z; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence OIT_Sender_TopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc deleted file mode 100644 index 0b13c2744f6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = OIT_Test_Base_stub - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=OIT_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - OIT_Test_Base.idl - } - - opendds_ts_flags += --export=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export - - DDSGenerator_Files { - OIT_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore deleted file mode 100644 index 70b981aaaec..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/OIT_Test_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl deleted file mode 100644 index 8c1ab7b70f2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "ReceiverConnector/OIT_Receiver_Connector.idl" - -module OIT_Test -{ - component Receiver - { - port OIT_Receiver_TopicConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc deleted file mode 100644 index 2d0d4f3ed85..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += OIT_Receiver_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - OIT_Test_Receiver.idl - } -} - -project(OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += OIT_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - OIT_Test_ReceiverE.idl - } -} - -project(OIT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += OIT_Test_Receiver_lem_gen OIT_Test_Receiver_stub \ - OIT_Receiver_Connector_stub OIT_Test_Base_stub - libs += Receiver_stub OIT_Receiver_Connector_stub \ - OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_ReceiverEC.cpp - } - - Header_Files { - OIT_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - OIT_Test_ReceiverEC.inl - } -} - -project(OIT_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += OIT_Test_Receiver_idl_gen OIT_Receiver_Connector_stub \ - OIT_Test_Base_stub OIT_Receiver_Connector_lem_gen - libs += OIT_Receiver_Connector_stub OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_ReceiverC.cpp - } - - Header_Files { - OIT_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - OIT_Test_ReceiverC.inl - } -} - -project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += OIT_Test_Receiver_lem_stub OIT_Test_Receiver_stub \ - OIT_Test_Base_stub OIT_Receiver_Connector_stub \ - OIT_Receiver_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \ - OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_Receiver_exec.cpp - } - - Header_Files { - OIT_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += OIT_Test_Receiver_lem_stub OIT_Test_Base_stub \ - OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \ - OIT_Test_Receiver_exec OIT_Receiver_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \ - OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \ - Receiver_exec OIT_Receiver_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_ReceiverS.cpp - OIT_Test_Receiver_svnt.cpp - } - - Header_Files { - OIT_Test_ReceiverS.h - OIT_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp deleted file mode 100644 index 2484942d900..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// -*- C++ -*- -#include "OIT_Test_Receiver_exec.h" - -#include "ace/Log_Msg.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_OIT_Test_Receiver_Impl -{ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &inconsistent, - ACE_Thread_ID &thread_id) - : inconsistent_ (inconsistent), - thread_id_ (thread_id) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr /* the_topic */, - const DDS::InconsistentTopicStatus & /* status */) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - this->inconsistent_ = true; - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind /*status_kind*/) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : inconsistent_ (false), - thread_id_listener_ (0, 0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - - // Port operations. - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->inconsistent_, - this->thread_id_listener_); - } - - ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - return ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::OIT_Test::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) - { - if (!this->inconsistent_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_inconsistent_topic'\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'on_inconsistent_topic'\n"))); - } - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string(list_buf); - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OIT_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h deleted file mode 100644 index dcc1b2c12d9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h +++ /dev/null @@ -1,102 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "OIT_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_OIT_Test_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &, - ACE_Thread_ID &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &inconsistent_; - ACE_Thread_ID &thread_id_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Supported operations and attributes. - // Component attributes. - - // Port operations. - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::OIT_Test::CCM_Receiver_Context_var context_; - - Atomic_Boolean inconsistent_; - ACE_Thread_ID thread_id_listener_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OIT_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore deleted file mode 100644 index 241d5a1d74e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/OIT_Receiver_ConnectorE.idl -/OIT_Receiver_Connector_conn.cpp -/OIT_Receiver_Connector_conn.h -/OIT_Receiver_Connector_conn_export.h -/OIT_Receiver_Connector_lem_stub_export.h -/OIT_Receiver_Connector_stub_export.h -/OIT_Receiver_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl deleted file mode 100644 index e326c3f6bb0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file OIT_Receiver_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ -#define ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/OIT_Test_Base.idl" - -#pragma ciao lem "ReceiverConnector/OIT_Receiver_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/OIT_Test_BaseTypeSupport.idl" -#endif - -module OIT_Test -{ - module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq> - OIT_Receiver_TopicConnector; -}; - -#endif /* ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc deleted file mode 100644 index 092a37dcd4c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Receiver_Connector" - -project(OIT_Receiver_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen OIT_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=OIT_Receiver_Connector_stub_export.h \ - -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=OIT_Receiver_Connector_svnt_export.h \ - -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=OIT_Receiver_Connector_svnt_export.h \ - -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=OIT_Receiver_Connector_conn_export.h \ - -I .. - - IDL_Files { - OIT_Receiver_Connector.idl - } -} - -project(OIT_Receiver_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += OIT_Receiver_Connector_idl_gen - idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=OIT_Receiver_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - OIT_Receiver_ConnectorE.idl - } -} - -project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub - libs += OIT_Test_Base_stub OIT_Receiver_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = OIT_Receiver_Connector_lem_stub - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Receiver_ConnectorEC.cpp - } - - Header_Files { - OIT_Receiver_ConnectorEC.h - OIT_Receiver_Connector_lem_stub_export.h - } - - Inline_Files { - OIT_Receiver_ConnectorEC.inl - } -} - -project(OIT_Receiver_Connector_stub) : ccm_stub, dds4ccm_base { - after += OIT_Receiver_Connector_idl_gen OIT_Test_Base_stub - libs += OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = OIT_Receiver_Connector_stub - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Receiver_ConnectorC.cpp - } - - Header_Files { - OIT_Receiver_ConnectorC.h - OIT_Receiver_Connector_stub_export.h - } - - Inline_Files { - OIT_Receiver_ConnectorC.inl - } -} - -project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl { - after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_stub OIT_Test_Base_stub - sharedname = OIT_Receiver_Connector_exec - libs += OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Receiver_Connector_conn.cpp - } - - Header_Files { - OIT_Receiver_Connector_conn.h - OIT_Receiver_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub - sharedname = OIT_Receiver_Connector_svnt - libs += OIT_Receiver_Connector_stub \ - OIT_Receiver_Connector_lem_stub \ - OIT_Test_Base_stub \ - OIT_Receiver_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Receiver_ConnectorS.cpp - OIT_Receiver_Connector_svnt.cpp - } - - Header_Files { - OIT_Receiver_ConnectorS.h - OIT_Receiver_Connector_svnt.h - OIT_Receiver_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore deleted file mode 100644 index 49adbc26bc2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/OIT_Test_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl deleted file mode 100644 index afcd1df6db4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL -#define ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL - -#include "SenderConnector/OIT_Sender_Connector.idl" - -module OIT_Test -{ - component Sender - { - port OIT_Sender_TopicConnector::DDS_Write topic_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc deleted file mode 100644 index fb5578f9df6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += OIT_Sender_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - OIT_Test_Sender.idl - } -} - -project(OIT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += OIT_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - OIT_Test_SenderE.idl - } -} - -project(OIT_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += OIT_Test_Sender_lem_gen OIT_Test_Sender_stub \ - OIT_Test_Base_stub - libs += OIT_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_SenderEC.cpp - } - - Header_Files { - OIT_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - OIT_Test_SenderEC.inl - } -} - -project(OIT_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += OIT_Test_Sender_idl_gen OIT_Test_Base_stub \ - OIT_Sender_Connector_stub - libs += OIT_Test_Base_stub OIT_Sender_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_SenderC.cpp - } - - Header_Files { - OIT_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - OIT_Test_SenderC.inl - } -} - -project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += OIT_Test_Sender_lem_stub OIT_Test_Sender_stub \ - OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub OIT_Test_Base_stub \ - OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_Sender_exec.cpp - } - - Header_Files { - OIT_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += OIT_Test_Base_stub OIT_Test_Sender_lem_stub \ - OIT_Sender_Connector_stub \ - OIT_Sender_Connector_svnt OIT_Sender_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub OIT_Test_Base_stub \ - OIT_Sender_Connector_stub OIT_Sender_Connector_svnt \ - OIT_Sender_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Test_SenderS.cpp - OIT_Test_Sender_svnt.cpp - } - - Header_Files { - OIT_Test_SenderS.h - OIT_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp deleted file mode 100644 index e7c710051a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp +++ /dev/null @@ -1,189 +0,0 @@ -// -*- C++ -*- -#include "OIT_Test_Sender_exec.h" - -#include "ace/Log_Msg.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_OIT_Test_Sender_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &inconsistent, - ACE_Thread_ID &thread_id) - : inconsistent_ (inconsistent), - thread_id_ (thread_id) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - this->inconsistent_ = true; - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind /*status_kind*/) - { - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : inconsistent_ (false), - thread_id_listener_ (0, 0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->inconsistent_, - this->thread_id_listener_); - } - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = ::OIT_Test::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) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if (this->inconsistent_.value ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ") - ACE_TEXT ("'on_inconsistent_topic'\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_inconsistent_topic'\n"))); - } - - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string(list_buf); - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread ID for ConnectorStatusListener not set!\n")); - } - - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: " - "Thread switch for ConnectorStatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: " - "Thread switch for ConnectorStatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OIT_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h deleted file mode 100644 index b580b33a4bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - - -#include "OIT_Test_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - - -namespace CIAO_OIT_Test_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &, - ACE_Thread_ID &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &inconsistent_; - ACE_Thread_ID &thread_id_; - }; - - //============================================================ - // Sender_exec_i - //============================================================ - 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 CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - private: - ::OIT_Test::CCM_Sender_Context_var context_; - - Atomic_Boolean inconsistent_; - ACE_Thread_ID thread_id_listener_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_OIT_Test_Sender_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore deleted file mode 100644 index b16bcc4261d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/OIT_Sender_ConnectorE.idl -/OIT_Sender_Connector_conn.cpp -/OIT_Sender_Connector_conn.h -/OIT_Sender_Connector_conn_export.h -/OIT_Sender_Connector_lem_stub_export.h -/OIT_Sender_Connector_stub_export.h -/OIT_Sender_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl deleted file mode 100644 index a8e1bd58cbf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl +++ /dev/null @@ -1,26 +0,0 @@ - -/** - * @file OIT_Sender_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ -#define ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ - -#include -#include -#include "Base/OIT_Test_Base.idl" - -#pragma ciao lem "SenderConnector/OIT_Sender_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/OIT_Test_BaseTypeSupport.idl" -#endif - -module OIT_Test -{ - module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq> - OIT_Sender_TopicConnector; -}; - -#endif /* ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc deleted file mode 100644 index 199cdb2ec8a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Sender_Connector" - -project(OIT_Sender_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen OIT_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=OIT_Sender_Connector_stub_export.h \ - -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=OIT_Sender_Connector_svnt_export.h \ - -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=OIT_Sender_Connector_svnt_export.h \ - -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=OIT_Sender_Connector_conn_export.h \ - -I .. - - IDL_Files { - OIT_Sender_Connector.idl - } -} - -project(OIT_Sender_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += OIT_Sender_Connector_idl_gen - idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=OIT_Sender_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - OIT_Sender_ConnectorE.idl - } -} - -project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub - libs += OIT_Test_Base_stub OIT_Sender_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = OIT_Sender_Connector_lem_stub - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Sender_ConnectorEC.cpp - } - - Header_Files { - OIT_Sender_ConnectorEC.h - OIT_Sender_Connector_lem_stub_export.h - } - - Inline_Files { - OIT_Sender_ConnectorEC.inl - } -} - -project(OIT_Sender_Connector_stub) : ccm_stub, dds4ccm_base { - after += OIT_Sender_Connector_idl_gen OIT_Test_Base_stub - libs += OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = OIT_Sender_Connector_stub - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Sender_ConnectorC.cpp - } - - Header_Files { - OIT_Sender_ConnectorC.h - OIT_Sender_Connector_stub_export.h - } - - Inline_Files { - OIT_Sender_ConnectorC.inl - } -} - -project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl { - after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub OIT_Test_Base_stub - sharedname = OIT_Sender_Connector_exec - libs += OIT_Sender_Connector_stub OIT_Sender_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Sender_Connector_conn.cpp - } - - Header_Files { - OIT_Sender_Connector_conn.h - OIT_Sender_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub - sharedname = OIT_Sender_Connector_svnt - libs += OIT_Sender_Connector_stub \ - OIT_Sender_Connector_lem_stub \ - OIT_Test_Base_stub \ - OIT_Sender_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - OIT_Sender_ConnectorS.cpp - OIT_Sender_Connector_svnt.cpp - } - - Header_Files { - OIT_Sender_ConnectorS.h - OIT_Sender_Connector_svnt.h - OIT_Sender_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp deleted file mode 100644 index ddc1025aa90..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp +++ /dev/null @@ -1,403 +0,0 @@ - - - - On_Inconsistent_Topic_Depl - - - ReceiverImplementation - - - - - - component factory - - - tk_string - - - create_OIT_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OIT_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Sender_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_Connector_exec - - - - - - - Receiver_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_Connector_exec - - - - - - - SenderImplementation - - - - - - component factory - - - tk_string - - - create_OIT_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_OIT_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Receiver_ConnectorComponent - ReceiverNode - - - - - topic_name - - - tk_string - - - TestOIT - - - - - - - - SenderComponent - SenderNode - - - - - - - Sender_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestOIT - - - - - - - info_out_reader - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - topic_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - test_sec_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - - Sender_Connector_exec - - - OIT_Sender_Connector_exec - - - Sender_Connector_svnt - - - OIT_Sender_Connector_svnt - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - - Receiver_Connector_exec - - - OIT_Receiver_Connector_exec - - - Receiver_Connector_svnt - - - OIT_Receiver_Connector_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl deleted file mode 100755 index 8de796937cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore deleted file mode 100644 index db0a52d9a85..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -/OFM_Connector.cxx -/OFM_Connector.h -/OFM_ConnectorE.idl -/OFM_ConnectorPlugin.cxx -/OFM_ConnectorPlugin.h -/OFM_ConnectorSupport.cxx -/OFM_ConnectorSupport.h -/OFM_Connector_conn.cpp -/OFM_Connector_conn.h -/OFM_Connector_conn_export.h -/OFM_Connector_lem_stub_export.h -/OFM_Connector_stub_export.h -/OFM_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl deleted file mode 100644 index fe3f5c1236f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef OFM_BASE_IDL -#define OFM_BASE_IDL - -#pragma ndds typesupport "OFM_BaseSupport.h" -#pragma opendds typesupport "OFM_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "Topic1" -#pragma DCPS_DATA_KEY "Topic1 key_value_topic1" - -struct Topic1 { - string key_value_topic1; //@key - long long_value; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Topic1Seq; -#endif - -#pragma DCPS_DATA_TYPE "Topic2" -#pragma DCPS_DATA_KEY "Topic2 key_value_topic2" - -struct Topic2 { - string key_value_topic2; //@key - float float_value; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Topic2Seq; -#endif - -#pragma DCPS_DATA_TYPE "Topic3" -#pragma DCPS_DATA_KEY "Topic3 key_value_topic3" - -struct Topic3 { - string key_value_topic3; //@key - short short_value; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence Topic3Seq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl deleted file mode 100644 index 1554b27a1aa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef OFM_CONNECTOR_IDL -#define OFM_CONNECTOR_IDL - -#include -#include - -#include "OFM_Base.idl" - -#pragma ciao lem "OFM_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "OFM_BaseTypeSupport.idl" -#endif - -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/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc deleted file mode 100644 index a61728181f5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc +++ /dev/null @@ -1,147 +0,0 @@ -project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = OFM_Base_stub - dynamicflags += OFM_CONNECTOR_BASE_STUB_BUILD_DLL - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=OFM_CONNECTOR_BASE_STUB_Export \ - -Wb,stub_export_include=OFM_Connector_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - OFM_Base.idl - } - - opendds_ts_flags += --export=OFM_CONNECTOR_BASE_STUB_Export - - DDSGenerator_Files { - OFM_Base.idl - } - - Source_Files { - } -} - - -project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm { - custom_only = 1 - after += OFM_Base_stub - idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=OFM_Connector_stub_export.h \ - -Wb,skel_export_macro=OFM_CONNECTOR_SKEL_Export \ - -Wb,skel_export_include=OFM_Connector_skel_export.h \ - -Wb,conn_export_macro=OFM_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=OFM_Connector_conn_export.h \ - -Wb,svnt_export_macro=OFM_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=OFM_Connector_svnt_export.h - - IDL_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 OFM_Base_stub - libs += OFM_Connector_stub OFM_Base_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, dds4ccm_ts_default { - after += OFM_Connector_idl_gen OFM_Base_stub - 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 { - after += OFM_Connector_lem_stub OFM_Connector_stub OFM_Base_stub - libs += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub - sharedname = OFM_Connector_exec - - 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 { - after += OFM_Connector_lem_stub - libs += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub - sharedname = OFM_Connector_svnt - - dynamicflags += OFM_CONNECTOR_SVNT_BUILD_DLL OFM_CONNECTOR_SKEL_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 { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore deleted file mode 100644 index b4b90bfc61a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -/OneFile_Connector.cxx -/OneFile_Connector.h -/OneFile_ConnectorE.idl -/OneFile_ConnectorPlugin.cxx -/OneFile_ConnectorPlugin.h -/OneFile_ConnectorSupport.cxx -/OneFile_ConnectorSupport.h -/OneFile_Connector_conn.cpp -/OneFile_Connector_conn.h -/OneFile_Connector_conn_export.h -/OneFile_Connector_lem_stub_export.h -/OneFile_Connector_stub_export.h -/OneFile_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl deleted file mode 100644 index afbaa15e6ce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file OneFile_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ONEFILE_BASE_IDL_ -#define ONEFILE_BASE_IDL_ - -#pragma ndds typesupport "OneFile_BaseSupport.h" -#pragma opendds typesupport "OneFile_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "OneFileTopic" -#pragma DCPS_DATA_KEY "OneFileTopic hello" - -struct OneFileTopic { - string hello; //@key - long iteration; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence OneFileTopicSeq; -#endif - -#endif /* ONEFILE_BASE_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl deleted file mode 100644 index 9ec4b65b603..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file OneFile_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef ONEFILE_CONNECTOR_IDL_ -#define ONEFILE_CONNECTOR_IDL_ - -#include -#include - -#include "OneFile_Base.idl" - -#pragma ciao lem "OneFile_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "OneFile_BaseTypeSupport.idl" -#endif - -module OneFile_Connector -{ - module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector; -}; - -module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector; - -#endif /* ONEFILE_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc deleted file mode 100644 index c459b45c687..00000000000 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc +++ /dev/null @@ -1,148 +0,0 @@ -project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = OneFile_Base_stub - dynamicflags += ONEFILE_CONNECTOR_BASE_STUB_BUILD_DLL - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=ONEFILE_CONNECTOR_BASE_STUB_Export \ - -Wb,stub_export_include=ONEFILE_Connector_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - OneFile_Base.idl - } - - opendds_ts_flags += --export=ONEFILE_CONNECTOR_BASE_STUB_Export - - DDSGenerator_Files { - OneFile_Base.idl - } - - Source_Files { - } -} - -project(OneFile_Connector_idl_gen) : connectoridldefaults, dds4ccm { - custom_only = 1 - after += OneFile_Base_stub - idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=OneFile_Connector_stub_export.h \ - -Wb,skel_export_macro=ONEFILE_CONNECTOR_SKEL_Export \ - -Wb,skel_export_include=OneFile_Connector_skel_export.h \ - -Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=OneFile_Connector_conn_export.h \ - -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=OneFile_Connector_svnt_export.h - - IDL_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 OneFile_Base_stub - libs += OneFile_Connector_stub OneFile_Base_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, dds4ccm_ts_default { - after += OneFile_Connector_idl_gen OneFile_Base_stub - 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 { - after += OneFile_Connector_lem_stub OneFile_Connector_stub OneFile_Base_stub - libs += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub - sharedname = OneFile_Connector_exec - - 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 { - after += OneFile_Connector_lem_stub - sharedname = OneFile_Connector_svnt - libs += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub - - dynamicflags += ONEFILE_CONNECTOR_SVNT_BUILD_DLL ONEFILE_CONNECTOR_SKEL_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 { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore b/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore deleted file mode 100644 index 4142f2e29ed..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -/ccm_dds_psat.cxx -/ccm_dds_psat.h -/ccm_dds_psatE.idl -/ccm_dds_psatPlugin.cxx -/ccm_dds_psatPlugin.h -/ccm_dds_psatSupport.cxx -/ccm_dds_psatSupport.h -/ccm_dds_psat_conn.cpp -/ccm_dds_psat_conn.h -/ccm_dds_psat_conn_export.h -/ccm_dds_psat_lem_stub_export.h -/ccm_dds_psat_stub_export.h -/ccm_dds_psat_svnt_export.h -/lib -/psat_connE.idl -/psat_conn_conn.h -/psat_type.cxx -/psat_type.h -/psat_typePlugin.cxx -/psat_typePlugin.h -/psat_typeSupport.cxx -/psat_typeSupport.h -/psat_type_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h deleted file mode 100644 index 0f1bcc115dd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef DDS_PSAT_CONNECTOR_T -#define DDS_PSAT_CONNECTOR_T - -#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" - -template -class DDS_PSAT_Event_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ - virtual - typename CCM_TYPE::supplier_traits::data_type::_ptr_type - get_supplier_data (void) - { - return CCM_TYPE::supplier_traits::data_type::_nil (); - } - - virtual - typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type - get_supplier_dds_entity (void) - { - return CCM_TYPE::supplier_traits::dds_entity_type::_nil (); - } - - virtual - typename CCM_TYPE::consumer_traits::data_type::_ptr_type - get_consumer_data (void) - { - return CCM_TYPE::consumer_traits::data_type::_nil (); - } - - virtual - typename CCM_TYPE::consumer_traits::data_control_type::_ptr_type - get_consumer_data_control (void) - { - return CCM_TYPE::consumer_traits::data_control_type::_nil (); - } - - virtual - typename CCM_TYPE::consumer_traits::dds_entity_type::_ptr_type - get_consumer_dds_entity (void) - { - return CCM_TYPE::consumer_traits::dds_entity_type::_nil (); - } - - virtual - typename CCM_TYPE::consumer_traits::buffer_control_type::_ptr_type - get_consumer_buffer_control (void) - { - return CCM_TYPE::consumer_traits::buffer_control_type::_nil (); - } - - virtual - ::CCM_DDS_PSAT::SharedMemoryConfig * - shared_memory_config (void) - { - return 0; - } - - virtual - void - shared_memory_config ( - const ::CCM_DDS_PSAT::SharedMemoryConfig & /*shared_memory_config */) - { - } - - virtual - ::CCM_DDS_PSAT::BufferPoolConfig - attach_buffer_config (void) - { - return ::CCM_DDS_PSAT::BufferPoolConfig (); - } - - virtual - void - attach_buffer_config ( - const ::CCM_DDS_PSAT::BufferPoolConfig & /* attach_buffer_config */) - { - } - - virtual - ::CCM_DDS_PSAT::TransportConfig * - transports_config (void) - { - return 0; - } - - virtual - void - transports_config ( - const ::CCM_DDS_PSAT::TransportConfig & /* transports_config */) - { - } -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl deleted file mode 100644 index 92d41cef253..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file PSAT_Connector.idl - */ - -#ifndef PSAT_CONNECTOR_USER_IDL -#define PSAT_CONNECTOR_USER_IDL - -#include - -#include "ccm_dds_psat.idl" -#include "psat_type.idl" - -#pragma ciao lem "PSAT_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "psat_typeTypeSupport.idl" -#endif - -module ::CCM_DDS_PSAT::Typed_PSAT < ::TestTopic, ::TestTopicSeq> TestTopicMod; - -#endif /* PSAT_CONNECTOR_USER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl deleted file mode 100644 index df0e7d7ff28..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl +++ /dev/null @@ -1,248 +0,0 @@ -#ifndef CCM_DDS_PSAT_IDL -#define CCM_DDS_PSAT_IDL - -#pragma dds4ccm impl "DDS_PSAT_Connector_T.h" - -#if defined (__TAO_IDL) -#include -#endif - -/** - * @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 - // --------------------------- - - const long FIXED_STRING_SIZE = 50; - - typedef char FixedString[FIXED_STRING_SIZE]; - - typedef sequence StrSeq; - - enum EndianType - { - PSAT_AD_LITTLE_ENDIAN, - PSAT_AD_BIG_ENDIAN - }; - - struct DataShape - { - long long num_blocks; - - long long block_length; - - long long stride; - }; - - struct SubscriberSideInfo - { - long long transferred_length; - - long long sample_incomplete_deadline_usec; - - boolean deliver_sample; - - long long destination_offset; - }; - - struct ConnectorPrivateInfo - { - FixedString publisher_connector_id; - - long long internal_buffer_id; - - }; - - struct PSAT_Header - { - long long sample_start_address; - - long long ad_buffer_id; - - long long source_offset; - - DataShape psat_view; - - EndianType source_endian; - - boolean sample_complete; - - SubscriberSideInfo subscriber_side_info; - - ConnectorPrivateInfo connector_only_info; - }; - - struct BasicUDM - { - PSAT_Header psatHeader; - }; - - struct AsynchErrorInfo - { - string get_rid_of_this; // TEMPORARY FIELD SO THE STRUCT COMPILES - }; - - struct SharedMemoryConfig - { - string name; - - long long size; - - long long alignment; - }; - - struct BufferPoolConfig - { - long long buffer_start_offset; - - long long num_buffers; - - long long buffer_size; - }; - - struct TransportConfig - { - StrSeq allowed_interfaces; - - StrSeq denied_interfaces; - - StrSeq transport_preference; - }; - - // ---------- - // Exceptions - // ---------- - - exception SharedMemoryInitError - { - string explanation; - }; - - exception InvalidConnectorAttributes - { - string explanation; - }; - - exception NoAvailableAD_Buffer - { - string explanation; - }; - - exception InvalidAD_BufferState - { - string explanation; - }; - - exception InvalidUDM - { - string explanation; - }; - - exception UnsucessfulFlush - { - string explanation; - }; - - module Typed_PSAT TSeq> - { - alias CCM_DDS::Typed DDS_Typed; - typedef DDS_Typed::DataReader DataReader; - typedef DDS_Typed::DataWriter DataWriter; - - local interface PSAT_BufferControl - { - void release_buffer(in T datum) - raises(InvalidAD_BufferState, InvalidUDM); - - void flush() raises(UnsucessfulFlush); - }; - - local interface PSAT_Writer : PSAT_BufferControl - { - void create_data(out T datum) - raises(CCM_DDS::InternalError, NoAvailableAD_Buffer); - - void create_data_override(out T datum) - raises(CCM_DDS::InternalError); - - void create_data_w_existing(in T existing_datum, out T datum) - raises(CCM_DDS::InternalError, InvalidAD_BufferState); - - void notify_on_buffer_available(in long long timeoutUsec); - - void write_one(in T datum) - raises(CCM_DDS::InternalError, InvalidUDM); - }; - - local interface PSAT_WriterStatusListener - { - void on_buffer_available(); - - void on_buffer_wait_timeout(); - }; - - local interface PSAT_Interceptor - { - void on_metadata_intercept(inout T datum); - }; - - local interface PSAT_ReaderStatusListener : CCM_DDS::PortStatusListener - { - void on_copy_unsupported(in T datum, in AsynchErrorInfo info); - void on_data_corruption(in T datum, in AsynchErrorInfo info); - void on_incomplete_transfer(in T datum, in AsynchErrorInfo info); - void on_invalid_UDM(in T datum, in AsynchErrorInfo info); - }; - - // -------------- - // DDS PSAT Ports - // -------------- - - 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(CCM_DDS::NonChangeable); - - attribute BufferPoolConfig attach_buffer_config - setraises(CCM_DDS::NonChangeable); - - attribute TransportConfig transports_config - setraises(CCM_DDS::NonChangeable); - }; - }; -}; - -#endif // CCM_DDS_PSAT_IDL - diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc deleted file mode 100644 index 90be1668a36..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ /dev/null @@ -1,204 +0,0 @@ -project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_CCM_Example_PSAT_type_stub - dynamicflags += PSAT_TYPE_STUB_BUILD_DLL - libout = lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PSAT_TYPE_STUB_Export \ - -Wb,stub_export_include=psat_type_stub_export.h - - IDL_Files { - idlflags += -Gxhst - psat_type.idl - } - - opendds_ts_flags += --export=PSAT_TYPE_STUB_Export - - DDSGenerator_Files { - psat_type.idl - } - - Source_Files { - } -} - -project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm, dds4ccm_stub, ccm_stub { - sharedname = DDS_CCM_Example_PSAT_stub - dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL - libout = lib - - idlflags += -SS \ - -Wb,stub_export_macro=CCM_DDS_PSAT_STUB_Export \ - -Wb,stub_export_include=ccm_dds_psat_stub_export.h \ - -Wb,skel_export_macro=CCM_DDS_PSAT_SKEL_Export \ - -Wb,skel_export_include=ccm_dds_psat_skel_export.h \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - idlflags += -Gxhst -Gxhsk - ccm_dds_psat.idl - } - - opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export -I $(CIAO_ROOT)/connectors/dds4ccm/idl - ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl - - DDSGenerator_Files { - ccm_dds_psat.idl - } - - Source_Files { - } -} - - -project(PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_CCM_Example_PSAT_type_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=PSAT_Connector_stub_export.h \ - -Wb,skel_export_macro=PSAT_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=PSAT_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PSAT_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=PSAT_Connector_svnt_export.h \ - -Wb,conn_export_macro=PSAT_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=PSAT_Connector_conn_export.h \ - -I .. - - IDL_Files { - PSAT_Connector.idl - } -} - -project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += PSAT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=PSAT_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - PSAT_ConnectorE.idl - } -} - -project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += PSAT_Connector_lem_gen \ - DDS_PSAT_Connector_stub \ - DDS_CCM_Example_PSAT_stub - libs += DDS_CCM_Example_PSAT_stub \ - DDS_PSAT_Connector_stub - libpaths += lib - libout = lib - includes += .. - sharedname = PSAT_Connector_lem_stub - dynamicflags += PSAT_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSAT_ConnectorEC.cpp - } - - Header_Files { - PSAT_ConnectorEC.h - PSAT_Connector_lem_stub_export.h - } - - Inline_Files { - PSAT_ConnectorEC.inl - } -} - -project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base { - after += PSAT_Connector_idl_gen DDS_CCM_Example_PSAT_stub DDS_CCM_Example_PSAT_type_stub - libs += DDS_CCM_Example_PSAT_stub - libpaths += lib - libout = lib - includes += .. - sharedname = DDS_PSAT_Connector_stub - dynamicflags += PSAT_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSAT_ConnectorC.cpp - } - - Header_Files { - PSAT_ConnectorC.h - PSAT_Connector_stub_export.h - } - - Inline_Files { - PSAT_ConnectorC.inl - } -} - -project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CCM_Example_PSAT_type_stub \ - PSAT_Connector_lem_stub \ - DDS_PSAT_Connector_stub - sharedname = DDS_PSAT_Connector_exec - libs += DDS_CCM_Example_PSAT_type_stub \ - DDS_PSAT_Connector_stub \ - PSAT_Connector_lem_stub \ - DDS_CCM_Example_PSAT_stub - libpaths += lib - libout = lib - includes += .. - dynamicflags += PSAT_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSAT_Connector_conn.cpp - } - - Header_Files { - DDS_PSAT_Connector_T.h - PSAT_Connector_conn.h - PSAT_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += PSAT_Connector_lem_stub \ - DDS_PSAT_Connector_exec \ - DDS_PSAT_Connector_skel - sharedname = DDS_PSAT_Connector_svnt - libs += DDS_PSAT_Connector_stub \ - PSAT_Connector_lem_stub \ - DDS_CCM_Example_PSAT_stub \ - DDS_PSAT_Connector_exec - libpaths += lib - libout = lib - includes += .. - dynamicflags += PSAT_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSAT_ConnectorS.cpp - PSAT_Connector_svnt.cpp - } - - Header_Files { - PSAT_ConnectorS.h - PSAT_Connector_svnt.h - PSAT_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl deleted file mode 100644 index 49ff5697c10..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file psat_type.idl - */ - -#ifndef PSAT_TYPE_IDL -#define PSAT_TYPE_IDL - -#pragma ndds typesupport "psat_typeSupport.h" -#pragma opendds typesupport "psat_typeTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore deleted file mode 100644 index 2d9b539ddab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/PSL_DeadlineTest_Base.cxx -/PSL_DeadlineTest_Base.h -/PSL_DeadlineTest_BasePlugin.cxx -/PSL_DeadlineTest_BasePlugin.h -/PSL_DeadlineTest_BaseSupport.cxx -/PSL_DeadlineTest_BaseSupport.h -/PSL_DeadlineTest_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl deleted file mode 100644 index 7ea3138441f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file PSL_DeadlineTest_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef PSL_DEADLINETEST_BASE_IDL -#define PSL_DEADLINETEST_BASE_IDL - -#pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h" -#pragma opendds typesupport "Base/PSL_DeadlineTest_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc deleted file mode 100644 index 66e0b1762cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_PSL_DeadlineTest_Base_stub - dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \ - -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - PSL_DeadlineTest_Base.idl - } - - opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export - - DDSGenerator_Files { - PSL_DeadlineTest_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore deleted file mode 100644 index 4a97096073c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/PSL_DeadlineTest_ConnectorE.idl -/PSL_DeadlineTest_Connector_conn.cpp -/PSL_DeadlineTest_Connector_conn.h -/PSL_DeadlineTest_Connector_conn_export.h -/PSL_DeadlineTest_Connector_lem_stub_export.h -/PSL_DeadlineTest_Connector_stub_export.h -/PSL_DeadlineTest_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl deleted file mode 100644 index 6f3117be92e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file PSL_DeadlineTest_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef PSL_DeadlineTest_CONNECTOR_IDL_ -#define PSL_DeadlineTest_CONNECTOR_IDL_ - -#include -#include - -#include "Base/PSL_DeadlineTest_Base.idl" - -#pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/PSL_DeadlineTest_BaseTypeSupport.idl" -#endif - -module PSL_DeadlineTest -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSLDeadlineConnector; -}; - -#endif /* PSL_DeadlineTest_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc deleted file mode 100644 index 60489f913ca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector" - -project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_PSL_DeadlineTest_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=PSL_DeadlineTest_Connector_stub_export.h \ - -Wb,skel_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=PSL_DeadlineTest_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=PSL_DeadlineTest_Connector_svnt_export.h \ - -Wb,conn_export_macro=PSL_DEADLINETEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=PSL_DeadlineTest_Connector_conn_export.h \ - -I .. - - IDL_Files { - PSL_DeadlineTest_Connector.idl - } -} - -project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_PSL_DT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=PSL_DeadlineTest_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - PSL_DeadlineTest_ConnectorE.idl - } -} - -project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub - libs += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_PSL_DT_Connector_lem_stub - dynamicflags += PSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ConnectorEC.cpp - } - - Header_Files { - PSL_DeadlineTest_ConnectorEC.h - PSL_DeadlineTest_Connector_lem_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_ConnectorEC.inl - } -} - -project(DDS_PSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_DT_Connector_idl_gen DDS_PSL_DeadlineTest_Base_stub - libs += DDS_PSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_PSL_DeadlineTest_Connector_stub - dynamicflags += PSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ConnectorC.cpp - } - - Header_Files { - PSL_DeadlineTest_ConnectorC.h - PSL_DeadlineTest_Connector_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_ConnectorC.inl - } -} - -project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub - sharedname = DDS_PSL_DeadlineTest_Connector_exec - libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_Connector_conn.cpp - } - - Header_Files { - PSL_DeadlineTest_Connector_conn.h - PSL_DeadlineTest_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub - sharedname = DDS_PSL_DeadlineTest_Connector_svnt - libs += DDS_PSL_DeadlineTest_Connector_stub \ - DDS_PSL_DT_Connector_lem_stub \ - DDS_PSL_DeadlineTest_Base_stub \ - DDS_PSL_DeadlineTest_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ConnectorS.cpp - PSL_DeadlineTest_Connector_svnt.cpp - } - - Header_Files { - PSL_DeadlineTest_ConnectorS.h - PSL_DeadlineTest_Connector_svnt.h - PSL_DeadlineTest_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore deleted file mode 100644 index dc6edf4befa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/PSL_DeadlineTest_ReceiverE.idl -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl deleted file mode 100644 index 28afda4aea3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/PSL_DeadlineTest_Connector.idl" - -module PSL_DeadlineTest -{ - component Receiver - { - port PSLDeadlineConnector::DDS_Get info_get; - port PSLDeadlineConnector::DDS_Listen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc deleted file mode 100644 index d69a0858a80..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_PSL_DT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - PSL_DeadlineTest_Receiver.idl - } -} - -project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_PSL_DeadlineTest_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PSL_DeadlineTest_ReceiverE.idl - } -} - -project(DDS_PSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Receiver_lem_gen DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub - libs += Receiver_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ReceiverEC.cpp - } - - Header_Files { - PSL_DeadlineTest_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_ReceiverEC.inl - } -} - -project(DDS_PSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Receiver_idl_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_gen - libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ReceiverC.cpp - } - - Header_Files { - PSL_DeadlineTest_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_ReceiverC.inl - } -} - -project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_Receiver_exec.cpp - } - - Header_Files { - PSL_DeadlineTest_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_ReceiverS.cpp - PSL_DeadlineTest_Receiver_svnt.cpp - } - - Header_Files { - PSL_DeadlineTest_ReceiverS.h - PSL_DeadlineTest_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp deleted file mode 100644 index d0e8cc74f2d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ /dev/null @@ -1,504 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "PSL_DeadlineTest_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/TimeUtilities.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_PSL_DeadlineTest_Receiver_Impl -{ - - /** - * Read action Generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.read_all(); - return 0; - } - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx, - Atomic_Short &deadline_port_get, - ACE_Thread_ID &thread_id_get) - : ciao_context_ ( - ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx)) - , deadline_port_get_ (deadline_port_get) - , thread_id_get_ (thread_id_get) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status) - { - if (! ::CORBA::is_nil (the_reader) && status.total_count != 0) - { - ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - " - "on_requested_deadline_missed received in PSL of the Getter\n")); - ++this->deadline_port_get_; - ACE_Thread_ID t_id; - this->thread_id_get_ = t_id; - } - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::PSL_DeadlineTest::PSLDeadlineConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_one_data - ") - ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"), - datum.key.in (), - datum.x)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx, - Atomic_Short &deadline_port_listener, - ACE_Thread_ID &thread_id_listener) - : ciao_context_ ( - ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx)) - , deadline_port_listener_ (deadline_port_listener) - , thread_id_listener_ (thread_id_listener) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status) - { - if (! ::CORBA::is_nil (the_reader) && status.total_count != 0) - { - ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - " - "on_requested_deadline_missed received in PSL of the Listener\n")); - ++this->deadline_port_listener_; - ACE_Thread_ID t_id; - this->thread_id_listener_ = t_id; - } - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : deadline_port_listener_ (0) - , deadline_port_get_ (0) - , thread_id_listener_listener_ (0, 0) - , thread_id_listener_get_ (0, 0) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_all (void) - { - ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - if (::CORBA::is_nil (reader.in ())) - { - return; - } - TestTopicSeq TestTopic_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - try - { - reader->read_all(TestTopic_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) - { - ACE_Time_Value tv; - tv <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date =%#T ") - ACE_TEXT ("for sample %C:%u\n"), - &tv, - TestTopic_infos[i].key.in (), - TestTopic_infos[i].x)); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n"))); - } - } - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in (), - this->deadline_port_get_, - this->thread_id_listener_get_), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in (), - this->deadline_port_listener_, - this->thread_id_listener_listener_), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::PSL_DeadlineTest::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::NOT_ENABLED); - - // calculate the interval time - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(2, 0), - ACE_Time_Value(1, 300000)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->deadline_port_get_.value () == 0) - { - - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Get in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ") - ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Get in Receiver\n"), - this->deadline_port_get_.value () - )); - } - if (this->deadline_port_listener_.value () == 0) - { - - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Listener in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ") - ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Listener in Receiver\n"), - this->deadline_port_listener_.value () - )); - } - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf_1 [65]; - this->thread_id_listener_get_.to_string (list_buf_1); - //check thread switch for listener 1 - if (this->thread_id_listener_get_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for PortStatusListener Get not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_get_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "OK : " - "Thread switch for PortStatusListener Get seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread switch for PortStatusListener Get " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #else - else if (this->thread_id_listener_get_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #endif - - //check thread switch for listener 2 - char list_buf_2 [65]; - this->thread_id_listener_listener_.to_string (list_buf_2); - if (this->thread_id_listener_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for PortStatusListener Listener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "OK : " - "Thread switch for PortStatusListener Listener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread switch for PortStatusListener Listener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #else - else if (this->thread_id_listener_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_DeadlineTest_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h deleted file mode 100644 index 28003e60820..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h +++ /dev/null @@ -1,240 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_ -#define CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_ - -#include /**/ "ace/pre.h" - -#include "PSL_DeadlineTest_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_PSL_DeadlineTest_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Short; - - class Receiver_exec_i; - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx, - Atomic_Short &deadline_port_get, - ACE_Thread_ID &thread_id_get); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_; - Atomic_Short &deadline_port_get_; - ACE_Thread_ID &thread_id_get_; - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from PSL_DeadlineTest::PSLDeadlineConnector::Listener. */ - - virtual - void on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx, - Atomic_Short &deadline_port_listener, - ACE_Thread_ID &thread_id_listener); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_; - Atomic_Short &deadline_port_listener_; - ACE_Thread_ID &thread_id_listener_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_all(void); - - //@} - - private: - ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - - Atomic_Short deadline_port_listener_; - Atomic_Short deadline_port_get_; - ACE_Thread_ID thread_id_listener_listener_; - ACE_Thread_ID thread_id_listener_get_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_DeadlineTest_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore deleted file mode 100644 index c687f2550a7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/PSL_DeadlineTest_SenderE.idl -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl deleted file mode 100644 index 0d5dc07f572..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_PSL_DEADLINETEST_SENDER_IDL -#define DDS_PSL_DEADLINETEST_SENDER_IDL - -#include "Connector/PSL_DeadlineTest_Connector.idl" - -module PSL_DeadlineTest -{ - component Sender - { - port PSLDeadlineConnector::DDS_Write test_topic_write; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc deleted file mode 100644 index 6a4e5555900..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_PSL_DT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - PSL_DeadlineTest_Sender.idl - } -} - -project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_PSL_DeadlineTest_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - PSL_DeadlineTest_SenderE.idl - } -} - -project(DDS_PSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Sender_lem_gen DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DeadlineTest_Base_stub - libs += DDS_PSL_DeadlineTest_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_SenderEC.cpp - } - - Header_Files { - PSL_DeadlineTest_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_SenderEC.inl - } -} - -project(DDS_PSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Sender_idl_gen DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub - libs += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_SenderC.cpp - } - - Header_Files { - PSL_DeadlineTest_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_SenderC.inl - } -} - -project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_Sender_exec.cpp - } - - Header_Files { - PSL_DeadlineTest_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_SenderS.cpp - PSL_DeadlineTest_Sender_svnt.cpp - } - - Header_Files { - PSL_DeadlineTest_SenderS.h - PSL_DeadlineTest_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp deleted file mode 100644 index fc1f81ade1f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp +++ /dev/null @@ -1,292 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "PSL_DeadlineTest_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_PSL_DeadlineTest_Sender_Impl -{ - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - /** - * Facet Executor Implementation Class: test_topic_connector_status_exec_i - */ - - test_topic_connector_status_exec_i::test_topic_connector_status_exec_i ( - ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx) - : ciao_context_ ( - ::PSL_DeadlineTest::CCM_Sender_Context::_duplicate (ctx)) - { - } - - test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind /* status_kind */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer = - this->ciao_context_->get_connection_test_topic_write_data (); - - for (PSL_DLTest_Table::iterator i = this->_ktests_.begin (); - i != this->_ktests_.end (); - ++i) - { - try - { - if (! ::CORBA::is_nil (writer.in ())) - { - writer->write_one(i->second,::DDS::HANDLE_NIL); - i->second->x++; - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"), - i->first.c_str ())); - } - } - } - - void - Sender_exec_i::start (void) - { - // deadline period in QoS is set to two so the reader expects data every - // two seconds. Setting the interval to somewhat more than two seconds, - // the reader should (almost) always receive an on_requested_deadline_missed - // callback from DDS. - long sec = 2L; - long const usec = 100000L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - void - Sender_exec_i::add_instance_of_topic (const char * key, int x) - { - TestTopic *new_key = new TestTopic; - new_key->key = CORBA::string_dup(key); - new_key->x = x; - this->_ktests_[key] = new_key; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ())) - { - test_topic_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - test_topic_connector_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_test_topic_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_test_topic_connector_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::PSL_DeadlineTest::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - //add 2 different instances of topic - this->add_instance_of_topic ("ONE", 1); - this->add_instance_of_topic ("ONE", 2); - this->add_instance_of_topic ("ONE", 3); - this->add_instance_of_topic ("ONE", 4); - this->add_instance_of_topic ("ONE", 5); - this->add_instance_of_topic ("TWO", 1); - this->add_instance_of_topic ("TWO", 2); - this->add_instance_of_topic ("TWO", 3); - this->add_instance_of_topic ("TWO", 4); - this->add_instance_of_topic ("TWO", 5); - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_DeadlineTest_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h deleted file mode 100644 index 7ad27c5579e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h +++ /dev/null @@ -1,185 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_ -#define CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_ - -#include /**/ "ace/pre.h" - -#include "PSL_DeadlineTest_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_PSL_DeadlineTest_Sender_Impl -{ - - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - /** - * Write action generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: test_topic_connector_status_exec_i - */ - - class test_topic_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - test_topic_connector_status_exec_i ( - ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx); - virtual ~test_topic_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - - //@} - - private: - ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_; - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map PSL_DLTest_Table; - PSL_DLTest_Table _ktests_; - - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - - void add_instance_of_topic (const char *, int x ); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_DeadlineTest_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml deleted file mode 100644 index 3f0b16fb65f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 1 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - 2 - - - - 2 - 0 - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - 1 - - - TRANSIENT_DURABILITY_QOS - - - - 1 - 50000000 - - - - - 2 - 0 - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp deleted file mode 100644 index 516e0b44275..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp +++ /dev/null @@ -1,431 +0,0 @@ - - - - PSL_DeadlineTest_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_DeadlineTest_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_DeadlineTest_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - PSL_DeadlineTest_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PSL_DeadlineTest_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PSL_DeadlineTest_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_DeadlineTest_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_DeadlineTest_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - PSL_DeadlineTest_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - Deadline_Library#DeadlineProfile - - - - - - PSL_DeadlineTest_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - Deadline_Library#DeadlineProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistener2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - PSL_DeadlineTest_Connector_exec - - - DDS_PSL_DeadlineTest_Connector_exec - - - PSL_DeadlineTest_Connector_svnt - - - DDS_PSL_DeadlineTest_Connector_svnt - - - PSL_DeadlineTest_Connector_stub - - - DDS_PSL_DeadlineTest_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 116879bcf87..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - 1 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - 2 - - - - 10 - - - - - 2 - 0 - - - - - - - BEST_EFFORT_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - 1 - - - TRANSIENT_DURABILITY_QOS - - - - 1 - 50000000 - - - - - 2 - 0 - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl deleted file mode 100755 index 3318cb486e1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore deleted file mode 100644 index 944232d98a4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/PSL_SampleLost_Base.cxx -/PSL_SampleLost_Base.h -/PSL_SampleLost_BasePlugin.cxx -/PSL_SampleLost_BasePlugin.h -/PSL_SampleLost_BaseSupport.cxx -/PSL_SampleLost_BaseSupport.h -/PSL_SampleLost_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl deleted file mode 100644 index 9ba9ea7c56b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file PSL_SampleLost_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef PSL_SAMPLELOST_BASE_IDL -#define PSL_SAMPLELOST_BASE_IDL - -#pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h" -#pragma opendds typesupport "Base/PSL_SampleLost_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc deleted file mode 100644 index 7fc4f39128e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_PSL_SampleLost_Base_stub - dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \ - -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - PSL_SampleLost_Base.idl - } - - opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export - - DDSGenerator_Files { - PSL_SampleLost_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl deleted file mode 100644 index b79b3fa1266..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file PSL_SampleLost_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef PSL_SampleLost_CONNECTOR_IDL_ -#define PSL_SampleLost_CONNECTOR_IDL_ - -#include -#include - -#include "Base/PSL_SampleLost_Base.idl" - -#pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/PSL_SampleLost_BaseTypeSupport.idl" -#endif - -module PSL_SampleLost -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSL_SampleLostConnector; -}; - -#endif /* PSL_SampleLost_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc deleted file mode 100644 index 1f208fcca53..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector" - -project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_PSL_SampleLost_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=PSL_SampleLost_Connector_stub_export.h \ - -Wb,skel_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=PSL_SampleLost_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=PSL_SampleLost_Connector_svnt_export.h \ - -Wb,conn_export_macro=PSL_SAMPLELOST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=PSL_SampleLost_Connector_conn_export.h \ - -I .. - - IDL_Files { - PSL_SampleLost_Connector.idl - } -} - -project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_PSL_SL_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=PSL_SampleLost_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - PSL_SampleLost_ConnectorE.idl - } -} - -project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub - libs += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_PSL_SL_Connector_lem_stub - dynamicflags += PSL_SAMPLELOST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ConnectorEC.cpp - } - - Header_Files { - PSL_SampleLost_ConnectorEC.h - PSL_SampleLost_Connector_lem_stub_export.h - } - - Inline_Files { - PSL_SampleLost_ConnectorEC.inl - } -} - -project(DDS_PSL_SampleLost_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_SL_Connector_idl_gen DDS_PSL_SampleLost_Base_stub - libs += DDS_PSL_SampleLost_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_PSL_SampleLost_Connector_stub - dynamicflags += PSL_SAMPLELOST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ConnectorC.cpp - } - - Header_Files { - PSL_SampleLost_ConnectorC.h - PSL_SampleLost_Connector_stub_export.h - } - - Inline_Files { - PSL_SampleLost_ConnectorC.inl - } -} - -project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub - sharedname = DDS_PSL_SampleLost_Connector_exec - libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PSL_SAMPLELOST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_Connector_conn.cpp - } - - Header_Files { - PSL_SampleLost_Connector_conn.h - PSL_SampleLost_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub - sharedname = DDS_PSL_SampleLost_Connector_svnt - libs += DDS_PSL_SampleLost_Connector_stub \ - DDS_PSL_SL_Connector_lem_stub \ - DDS_PSL_SampleLost_Base_stub \ - DDS_PSL_SampleLost_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PSL_SAMPLELOST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ConnectorS.cpp - PSL_SampleLost_Connector_svnt.cpp - } - - Header_Files { - PSL_SampleLost_ConnectorS.h - PSL_SampleLost_Connector_svnt.h - PSL_SampleLost_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl deleted file mode 100644 index 9d22dcc4c64..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/PSL_SampleLost_Connector.idl" - -module PSL_SampleLost -{ - component Receiver - { - port PSL_SampleLostConnector::DDS_Get info_get; - port PSL_SampleLostConnector::DDS_Listen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc deleted file mode 100644 index 1b65cc914fe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_PSL_SL_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - PSL_SampleLost_Receiver.idl - } -} - -project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_PSL_SampleLost_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PSL_SampleLost_ReceiverE.idl - } -} - -project(DDS_PSL_SL_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_SampleLost_Receiver_lem_gen DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub - libs += Receiver_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ReceiverEC.cpp - } - - Header_Files { - PSL_SampleLost_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - PSL_SampleLost_ReceiverEC.inl - } -} - -project(DDS_PSL_SampleLost_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_SampleLost_Receiver_idl_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_gen - libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ReceiverC.cpp - } - - Header_Files { - PSL_SampleLost_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - PSL_SampleLost_ReceiverC.inl - } -} - -project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_Receiver_exec.cpp - } - - Header_Files { - PSL_SampleLost_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_ReceiverS.cpp - PSL_SampleLost_Receiver_svnt.cpp - } - - Header_Files { - PSL_SampleLost_ReceiverS.h - PSL_SampleLost_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp deleted file mode 100644 index 73738cea795..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ /dev/null @@ -1,506 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "PSL_SampleLost_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/TimeUtilities.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_PSL_SampleLost_Receiver_Impl -{ - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.read_all(); - return 0; - } - - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &sample_port_get, - ACE_Thread_ID &thread_id_listener_get) - : ciao_context_ ( - ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx)) - , sample_port_get_ (sample_port_get) - , thread_id_listener_get_ (thread_id_listener_get) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & status) - { - ACE_Thread_ID t_id; - this->thread_id_listener_get_ = t_id; - - if (status.total_count > 0) - { - this->sample_port_get_ = true; - } - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::PSL_SampleLost::PSL_SampleLostConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("TestTopic_RawListener: ") - ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"), - datum.key.in (), - datum.x)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &sample_port_listener, - ACE_Thread_ID &thread_id_listener_listener) - : ciao_context_ ( - ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx)) - , sample_port_listener_ (sample_port_listener) - , thread_id_listener_listener_ (thread_id_listener_listener) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & status) - { - ACE_Thread_ID t_id; - this->thread_id_listener_listener_ = t_id; - - if (status.total_count > 0) - { - this->sample_port_listener_ = true; - } - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : sample_port_get_ (false) - , sample_port_listener_ (false) - , thread_id_listener_get_ (0, 0) - , thread_id_listener_listener_ (0, 0) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_all (void) - { - ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - - if (!::CORBA::is_nil (reader.in ())) - { - TestTopicSeq TestTopic_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - try - { - reader->read_all(TestTopic_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) - { - ACE_Time_Value tv; - tv <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); - } - for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ") - ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"), - i, - TestTopic_infos[i].key.in (), - TestTopic_infos[i].x)); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n"))); - } - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in (), - this->sample_port_get_, - this->thread_id_listener_get_), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in (), - this->sample_port_listener_, - this->thread_id_listener_listener_), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::PSL_SampleLost::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::NOT_ENABLED); - - // calculate the interval time - long const usec = 100000; - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(3, usec), - ACE_Time_Value(3, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - if(!this->sample_port_get_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_sample_lost' on DDS_Listen port in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ") - ACE_TEXT ("'on_sample_lost' in on DDS_Listen port Receiver\n") - )); - } - if (!this->sample_port_listener_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("error 'on_sample_lost' on DDS_Get port in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ") - ACE_TEXT ("'on_sample_lost' in on DDS_GET port Receiver\n") - )); - } - //get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf_1 [65]; - this->thread_id_listener_get_.to_string (list_buf_1); - - //check thread switch for listener 1 - if (this->thread_id_listener_get_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for PortStatusListener Get not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_get_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "OK : " - "Thread switch for PortStatusListener Get seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread switch for PortStatusListener Get " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #else - else if (this->thread_id_listener_get_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #endif - - //check thread switch for listener 2 - char list_buf_2 [65]; - this->thread_id_listener_listener_.to_string (list_buf_2); - if (this->thread_id_listener_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for PortStatusListener Listener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "OK : " - "Thread switch for PortStatusListener Listener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread switch for PortStatusListener Listener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #else - else if (this->thread_id_listener_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_SampleLost_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h deleted file mode 100644 index a70f89dfc7f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h +++ /dev/null @@ -1,241 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_ -#define CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_ - -#include /**/ "ace/pre.h" - -#include "PSL_SampleLost_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_PSL_SampleLost_Receiver_Impl -{ - - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - Receiver_exec_i &pulse_callback_; - }; - - /** - * Provider Executor Implementation Class: info_get_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &sample_port_get, - ACE_Thread_ID &thread_id_listener_get); - virtual ~info_get_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &sample_port_get_; - ACE_Thread_ID &thread_id_listener_get_; - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from PSL_SampleLost::PSL_SampleLostConnector::Listener. */ - - virtual - void on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &sample_port_listener, - ACE_Thread_ID &thread_id_listener_listener); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &sample_port_listener_; - ACE_Thread_ID &thread_id_listener_listener_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_all (void); - - //@} - - private: - ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - - Atomic_Boolean sample_port_get_; - Atomic_Boolean sample_port_listener_; - ACE_Thread_ID thread_id_listener_get_; - ACE_Thread_ID thread_id_listener_listener_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_SampleLost_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl deleted file mode 100644 index ca82d0a9095..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_PSL_SAMPLELOST_SENDER_IDL -#define DDS_PSL_SAMPLELOST_SENDER_IDL - -#include "Connector/PSL_SampleLost_Connector.idl" - -module PSL_SampleLost -{ - component Sender - { - port PSL_SampleLostConnector::DDS_Write test_topic_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc deleted file mode 100644 index 3df0cd46900..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_PSL_SL_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - PSL_SampleLost_Sender.idl - } -} - -project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_PSL_SampleLost_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - PSL_SampleLost_SenderE.idl - } -} - -project(DDS_PSL_SampleLost_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_SampleLost_Sender_lem_gen DDS_PSL_SampleLost_Sender_stub DDS_PSL_SampleLost_Base_stub - libs += DDS_PSL_SampleLost_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_SenderEC.cpp - } - - Header_Files { - PSL_SampleLost_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - PSL_SampleLost_SenderEC.inl - } -} - -project(DDS_PSL_SampleLost_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_PSL_SampleLost_Sender_idl_gen DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub - libs += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_SenderC.cpp - } - - Header_Files { - PSL_SampleLost_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - PSL_SampleLost_SenderC.inl - } -} - -project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Sender_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_Sender_exec.cpp - } - - Header_Files { - PSL_SampleLost_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_SenderS.cpp - PSL_SampleLost_Sender_svnt.cpp - } - - Header_Files { - PSL_SampleLost_SenderS.h - PSL_SampleLost_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp deleted file mode 100644 index f974995a892..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp +++ /dev/null @@ -1,270 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "PSL_SampleLost_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_PSL_SampleLost_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - , started_(false) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->started_ = true; - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - this->callback_.get_started (); - } - } - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - void - Sender_exec_i::tick () - { - ::PSL_SampleLost::PSL_SampleLostConnector::Writer_var writer = - this->ciao_context_->get_connection_test_topic_write_data (); - - for (PSL_DLTest_Table::iterator i = this->_ktests_.begin (); - i != this->_ktests_.end (); - ++i) - { - try - { - if (! ::CORBA::is_nil (writer.in ()) ) - { - writer->write_one(i->second,::DDS::HANDLE_NIL); - i->second->x++; - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"), - i->first.c_str ())); - } - } - } - - void - Sender_exec_i::get_started (void) - { - //add 2 different instances of topic - this->add_instance_of_topic ("ONE",1); - this->add_instance_of_topic ("TWO",2); - this->start (); - } - - void - Sender_exec_i::start (void) - { - long sec = 1L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - void - Sender_exec_i::add_instance_of_topic (const char * key, int x) - { - TestTopic *new_key = new TestTopic; - new_key->key = CORBA::string_dup(key); - new_key->x = x; - this->_ktests_[key] = new_key; - } - - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::PSL_SampleLost::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_SampleLost_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h deleted file mode 100644 index a5a5601e815..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h +++ /dev/null @@ -1,173 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_ -#define CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_ - -#include /**/ "ace/pre.h" - -#include "PSL_SampleLost_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_PSL_SampleLost_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - bool started_; - }; - - - /** - * Write action Generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void get_started (void); - - //@} - - private: - ::PSL_SampleLost::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map PSL_DLTest_Table; - PSL_DLTest_Table _ktests_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - - void add_instance_of_topic (const char *, int x ); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PSL_SampleLost_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml deleted file mode 100644 index d5ffa603e00..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - RELIABLE_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - 10 - 2 - 10 - - - - 3 - 0 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - - - 1 - 1 - 10 - 1 - 10 - - - TRANSIENT_DURABILITY_QOS - - - - 3 - 0 - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp deleted file mode 100644 index 63be232a68b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp +++ /dev/null @@ -1,430 +0,0 @@ - - - - PSL_SampleLost_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_SampleLost_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_SampleLost_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - PSL_SampleLost_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PSL_SampleLost_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PSL_SampleLost_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_PSL_SampleLost_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PSL_SampleLost_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - PSL_SampleLost_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - PSL_SampleLost_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - HelloTest_Library#HelloProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_consumer_status - false - SimplexReceptacle - - - - - _portstatuslistener2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_consumer_status - false - SimplexReceptacle - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - connector_status_connection_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - PSL_SampleLost_Connector_exec - - - DDS_PSL_SampleLost_Connector_exec - - - PSL_SampleLost_Connector_svnt - - - DDS_PSL_SampleLost_Connector_svnt - - - PSL_SampleLost_Connector_stub - - - DDS_PSL_SampleLost_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 9a3741f6c28..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 2 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - 10 - 10 - 2 - - - - 10 - - - - - 3 - 0 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 10 - - - 1 - 1 - 10 - 1 - 10 - - - TRANSIENT_DURABILITY_QOS - - - - 3 - 0 - - - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl deleted file mode 100755 index c5b1964e047..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp deleted file mode 100644 index 81b50b7a3e6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "deadline_qos_test.h" - -#include "duration.h" - -DeadlinePolicyTest::DeadlinePolicyTest () -{ -} - -bool -DeadlinePolicyTest::check (const ::DDS_DeadlineQosPolicy & dds_qos, - const ::DDS::DeadlineQosPolicy & qos) -{ - return Duration::check (dds_qos.period, qos.period); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h deleted file mode 100644 index b2dd688bb25..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DEADLINE_QOS_TEST_H_ -#define DEADLINE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h" - -class DeadlinePolicyTest -{ -public: - DeadlinePolicyTest (); - - static bool check (const ::DDS_DeadlineQosPolicy & dds_qos, - const ::DDS::DeadlineQosPolicy & qos); -}; - -#endif /* DEADLINE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp deleted file mode 100644 index cbc982daa7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "dest_order_qos_test.h" - -DestinationOrderPolicyTest::DestinationOrderPolicyTest () -{ -} - -bool -DestinationOrderPolicyTest::check (const ::DDS_DestinationOrderQosPolicy & dds_qos, - const ::DDS::DestinationOrderQosPolicy & qos) -{ - return dds_qos.kind == static_cast (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h deleted file mode 100644 index 941a0fcbf81..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DEST_ORDER_QOS_TEST_H_ -#define DEST_ORDER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h" - -class DestinationOrderPolicyTest -{ -public: - DestinationOrderPolicyTest (); - - static bool check (const ::DDS_DestinationOrderQosPolicy & dds_qos, - const ::DDS::DestinationOrderQosPolicy & qos); -}; - -#endif /* DEST_ORDER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp deleted file mode 100644 index 4c05f843c35..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "dp_factory_qos_test.h" - -#include "entity_factory_qos_test.h" - -DomainParticipantFactoryPolicyTest::DomainParticipantFactoryPolicyTest () -{ -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h deleted file mode 100644 index ee6daf56d75..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DP_FACTORY_QOS_TEST_H_ -#define DP_FACTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h" - -class DomainParticipantFactoryPolicyTest -{ -public: - DomainParticipantFactoryPolicyTest (); - -}; - -#endif /* DP_FACTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp deleted file mode 100644 index 649fef081ca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "dp_qos_test.h" - -#include "entity_factory_qos_test.h" -#include "user_data_qos_test.h" - -DomainParticipantPolicyTest::DomainParticipantPolicyTest () -{ -} - -int -DomainParticipantPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DomainParticipantQos policy; - DDS_DomainParticipantQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_PARTICIPANT_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h deleted file mode 100644 index e18a64c6481..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef DOMAINPARTICIPANT_QOS_TEST_H_ -#define DOMAINPARTICIPANT_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h" - -class DomainParticipantPolicyTest -{ -public: - DomainParticipantPolicyTest (); - - int run (); -}; - -#endif /* DOMAINPARTICIPANT_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp deleted file mode 100644 index 3b18c29614b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "dr_qos_test.h" - -#include "dur_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "user_data_qos_test.h" -#include "ownership_qos_test.h" -#include "tbf_qos_test.h" -#include "rd_lifecycle_qos_test.h" -#include "typeconsistencyenforcement_qos_test.h" - -DatareaderPolicyTest::DatareaderPolicyTest () -{ -} - -int -DatareaderPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DataReaderQos policy; - DDS_DataReaderQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_DATAREADER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - - if (!TimeBasedFilterPolicyTest::check (dds_policy.time_based_filter, - policy.time_based_filter)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in TimeBasedFilterQosPolicy.\n")); - ++ret; - } - - if (!ReaderDataLifecyclePolicyTest::check (dds_policy.reader_data_lifecycle, - policy.reader_data_lifecycle)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ReaderDataLifecycleQosPolicy.\n")); - ++ret; - } - -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - if (!TypeConsistencyEnforcementPolicyPolicyTest::check (dds_policy.type_consistency, - policy.type_consistency)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in TypeConsistencyEnforcementQosPolicy.\n")); - ++ret; - } -#endif - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h deleted file mode 100644 index 2c3cd0e8c60..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef DATAREADER_QOS_TEST_H_ -#define DATAREADER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h" - -class DatareaderPolicyTest -{ -public: - DatareaderPolicyTest (); - - int run (); -}; - -#endif /* DATAREADER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp deleted file mode 100644 index c764b6dccbf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "dur_qos_test.h" - -DurabilityPolicyTest::DurabilityPolicyTest () -{ -} - - -bool -DurabilityPolicyTest::check (const ::DDS_DurabilityQosPolicy & dds_qos, - const ::DDS::DurabilityQosPolicy & qos) -{ - return dds_qos.kind == static_cast (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h deleted file mode 100644 index 07d6aa9b9b2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DURABILITY_QOS_TEST_H_ -#define DURABILITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h" - -class DurabilityPolicyTest -{ -public: - DurabilityPolicyTest (); - - static bool check (const ::DDS_DurabilityQosPolicy & dds_qos, - const ::DDS::DurabilityQosPolicy & qos); -}; - -#endif /* DURABILITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp deleted file mode 100644 index 04e21f02bc3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "dur_service_qos_test.h" - -DurabilityServicePolicyTest::DurabilityServicePolicyTest () -{ -} - -bool -DurabilityServicePolicyTest::check (const ::DDS_DurabilityServiceQosPolicy & dds_qos, - const ::DDS::DurabilityServiceQosPolicy & qos) -{ - return dds_qos.service_cleanup_delay.sec == qos.service_cleanup_delay.sec && - dds_qos.history_kind == static_cast (qos.history_kind) && - dds_qos.history_depth == qos.history_depth && - dds_qos.max_samples == qos.max_samples && - dds_qos.max_instances == qos.max_instances && - dds_qos.max_samples_per_instance == qos.max_samples_per_instance; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h deleted file mode 100644 index 5fde21bca60..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DURABILITY_SERVICE_QOS_TEST_H_ -#define DURABILITY_SERVICE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h" - -class DurabilityServicePolicyTest -{ -public: - DurabilityServicePolicyTest (); - - static bool check (const ::DDS_DurabilityServiceQosPolicy & dds_qos, - const ::DDS::DurabilityServiceQosPolicy & qos); -}; - -#endif /* DURABILITY_SERVICE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp deleted file mode 100644 index a7d652b93c7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "duration.h" - -Duration::Duration () -{ -} - - -bool -Duration::check (const ::DDS_Duration_t & dds_dur, - const ::DDS::Duration_t & dur) -{ - return dds_dur.sec == dur.sec && - dds_dur.nanosec == dur.nanosec; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h deleted file mode 100644 index abf2962c1a2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DURATION_H_ -#define DURATION_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/Duration_t.h" - -class Duration -{ -public: - Duration (); - - static bool check (const ::DDS_Duration_t & dds_dur, - const ::DDS::Duration_t & dur); -}; - -#endif /* DURATION_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp deleted file mode 100644 index f3b05feb0b3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp +++ /dev/null @@ -1,162 +0,0 @@ -#include "dw_qos_test.h" - -#include "dur_qos_test.h" -#include "dur_service_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "transport_prio_qos_test.h" -#include "lifespan_qos_test.h" -#include "user_data_qos_test.h" -#include "ownership_qos_test.h" -#include "ownership_strength_qos_test.h" -#include "wr_lifecycle_qos_test.h" - -DatawriterPolicyTest::DatawriterPolicyTest () -{ -} - -int -DatawriterPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DataWriterQos policy; - DDS_DataWriterQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_DATAWRITER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DurabilityServicePolicyTest::check (dds_policy.durability_service, - policy.durability_service)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DurabilityServiceQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority, - policy.transport_priority)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in TransportPriorityQosPolicy.\n")); - ++ret; - } - - if (!LifespanPolicyTest::check (dds_policy.lifespan, - policy.lifespan)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LifespanQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - - if (!OwnershipStrengthPolicyTest::check (dds_policy.ownership_strength, - policy.ownership_strength)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in OwnershipStrengthQosPolicy.\n")); - ++ret; - } - - if (!WriterDataLifecyclePolicyTest::check (dds_policy.writer_data_lifecycle, - policy.writer_data_lifecycle)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in WriterDataLifecycleQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h deleted file mode 100644 index 3e85b37d06c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef DATAWRITER_QOS_TEST_H_ -#define DATAWRITER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h" - -class DatawriterPolicyTest -{ -public: - DatawriterPolicyTest (); - - int run (); -}; - -#endif /* DATAWRITER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp deleted file mode 100644 index c5fecf7a4a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "entity_factory_qos_test.h" - -EntityFactoryPolicyTest::EntityFactoryPolicyTest () -{ -} - -bool -EntityFactoryPolicyTest::check (const ::DDS_EntityFactoryQosPolicy & dds_qos, - const ::DDS::EntityFactoryQosPolicy & qos) -{ - return dds_qos.autoenable_created_entities == - static_cast (qos.autoenable_created_entities); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h deleted file mode 100644 index 30b4aaaa7f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef ENTITY_FACTORY_QOS_TEST_H_ -#define ENTITY_FACTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h" - -class EntityFactoryPolicyTest -{ -public: - EntityFactoryPolicyTest (); - - static bool check (const ::DDS_EntityFactoryQosPolicy & dds_qos, - const ::DDS::EntityFactoryQosPolicy & qos); -}; - -#endif /* ENTITY_FACTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp deleted file mode 100644 index 3e2120c601d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "group_data_qos_test.h" - -#include "octet_seq.h" - -GroupDataPolicyTest::GroupDataPolicyTest () -{ -} - -bool -GroupDataPolicyTest::check (const ::DDS_GroupDataQosPolicy & dds_qos, - const ::DDS::GroupDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "GroupDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h deleted file mode 100644 index 2aa822bf935..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef GROUP_DATA_QOS_TEST_H_ -#define GROUP_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h" - -class GroupDataPolicyTest -{ -public: - GroupDataPolicyTest (); - - static bool check (const ::DDS_GroupDataQosPolicy & dds_qos, - const ::DDS::GroupDataQosPolicy & qos); -}; - -#endif /* GROUP_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp deleted file mode 100644 index d769ec1bc7d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "hist_qos_test.h" - -HistoryPolicyTest::HistoryPolicyTest () -{ -} - -bool -HistoryPolicyTest::check (const ::DDS_HistoryQosPolicy & dds_qos, - const ::DDS::HistoryQosPolicy & qos) -{ - - return dds_qos.kind == static_cast (qos.kind) && - dds_qos.depth == qos.depth; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h deleted file mode 100644 index 5776a879e7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef HISTORY_QOS_TEST_H_ -#define HISTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h" - -class HistoryPolicyTest -{ -public: - HistoryPolicyTest (); - - static bool check (const ::DDS_HistoryQosPolicy & dds_qos, - const ::DDS::HistoryQosPolicy & qos); -}; - -#endif /* HISTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp deleted file mode 100644 index 26a7527d447..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "lat_budget_qos_test.h" - -#include "duration.h" - -LatencyBudgetPolicyTest::LatencyBudgetPolicyTest () -{ -} - -bool -LatencyBudgetPolicyTest::check (const ::DDS_LatencyBudgetQosPolicy & dds_qos, - const ::DDS::LatencyBudgetQosPolicy & qos) -{ - return Duration::check (dds_qos.duration, qos.duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h deleted file mode 100644 index 968011fc581..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef LATENCY_BUDGET_QOS_TEST_H_ -#define LATENCY_BUDGET_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h" - -class LatencyBudgetPolicyTest -{ -public: - LatencyBudgetPolicyTest (); - - static bool check (const ::DDS_LatencyBudgetQosPolicy & dds_qos, - const ::DDS::LatencyBudgetQosPolicy & qos); -}; - -#endif /* LATENCY_BUDGET_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp deleted file mode 100644 index fa1be610bd3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "lifespan_qos_test.h" - -#include "duration.h" - -LifespanPolicyTest::LifespanPolicyTest () -{ -} - -bool -LifespanPolicyTest::check (const ::DDS_LifespanQosPolicy & dds_qos, - const ::DDS::LifespanQosPolicy & qos) -{ - return Duration::check (dds_qos.duration, qos.duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h deleted file mode 100644 index 0977e58ccdc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef LIFESPAN_QOS_TEST_H_ -#define LIFESPAN_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h" - -class LifespanPolicyTest -{ -public: - LifespanPolicyTest (); - - static bool check (const ::DDS_LifespanQosPolicy & dds_qos, - const ::DDS::LifespanQosPolicy & qos); -}; - -#endif /* LIFESPAN_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp deleted file mode 100644 index 0064c309716..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "liveliness_qos_test.h" - -#include "duration.h" - -LivelinessPolicyTest::LivelinessPolicyTest () -{ -} - -bool -LivelinessPolicyTest::check (const ::DDS_LivelinessQosPolicy & dds_qos, - const ::DDS::LivelinessQosPolicy & qos) -{ - return dds_qos.kind == static_cast (qos.kind) && - Duration::check (dds_qos.lease_duration, qos.lease_duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h deleted file mode 100644 index 7fea05b6670..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef LIVELINESS_QOS_TEST_H_ -#define LIVELINESS_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h" - -class LivelinessPolicyTest -{ -public: - LivelinessPolicyTest (); - - static bool check (const ::DDS_LivelinessQosPolicy & dds_qos, - const ::DDS::LivelinessQosPolicy & qos); -}; - -#endif /* LIVELINESS_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp deleted file mode 100644 index e5072f852f8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "ace/OS_main.h" -#include "ace/Log_Msg.h" - -#include "pub_qos_test.h" -#include "sub_qos_test.h" -#include "dw_qos_test.h" -#include "dr_qos_test.h" -#include "tp_qos_test.h" -#include "dp_qos_test.h" -#include "states_test.h" -#include "string_seq.h" - -int handle_result (const int & result, - const char * test) -{ - int ret = 0; - if (result == -1) - { - ACE_ERROR ((LM_ERROR, "ERROR POLICIES : " - "Exception caught while testing " - "%C QoS\n", - test)); - } - else if (result > 0) - { - ret = result; - ACE_ERROR ((LM_ERROR, "ERROR POLICIES : " - "<%d> errors found while testing " - "%C QoS\n", - result, test)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "%C QoS test passed!\n", - test)); - } - return ret; -} - -bool -test_string_seq () -{ - DDS::StringSeq foo (2); - foo.length (2); - foo[0] = CORBA::string_dup ("bar"); - foo[1] = CORBA::string_dup ("foo"); - DDS_StringSeq rti_foo; - rti_foo <<= foo; - DDS::StringSeq tao_foo; - tao_foo <<= rti_foo; - return StringSequence::check (rti_foo, tao_foo, "StringSeq"); -} - -int -ACE_TMAIN (int , ACE_TCHAR **) -{ - PublisherPolicyTest publisher; - SubscriberPolicyTest subscriber; - DatawriterPolicyTest datawriter; - DatareaderPolicyTest datareader; - TopicPolicyTest topic; - StatesTest states; - DomainParticipantPolicyTest domainparticipant; - - int ret = 0; - int test = 0; - try - { - test = publisher.run (); - ret += handle_result (test, "Publisher"); - test = subscriber.run (); - ret += handle_result (test, "Subscriber"); - test = datawriter.run (); - ret += handle_result (test, "Datawriter"); - test = datareader.run (); - ret += handle_result (test, "DataReader"); - test = topic.run (); - ret += handle_result (test, "Topic"); - test = domainparticipant.run (); - ret += handle_result (test, "DomainParticipant"); - test = states.run (); - ret += handle_result (test, "States"); - ret += test_string_seq (); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unexpected exception caught.")); - return -1; - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp deleted file mode 100644 index a3399da99d1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "octet_seq.h" - -OctetSequence::OctetSequence () -{ -} - -bool -OctetSequence::check (const ::DDS_OctetSeq & dds_seq, - const ::DDS::OctetSeq & seq, - const char * test) -{ - if (static_cast < ::CORBA::ULong> (dds_seq.length ()) != - seq.length ()) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Length group_data is not equal to original length.\n", - test)); - return false; - } - - for (::DDS_Long i = 0; i < dds_seq.length (); ++i) - { - if (seq[i] != dds_seq[i]) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Item %d of group_data is not equal to original.\n", - test, i)); - return false; - } - } - return true; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h deleted file mode 100644 index f17bf8e0aab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef OCTET_SEQ_H_ -#define OCTET_SEQ_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/OctetSeq.h" - -class OctetSequence -{ -public: - OctetSequence (); - - static bool check (const ::DDS_OctetSeq & dds_seq, - const ::DDS::OctetSeq & seq, - const char * test); -}; - -#endif /* OCTET_SEQ_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp deleted file mode 100644 index eb36fc8dfca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "ownership_qos_test.h" - -OwnershipPolicyTest::OwnershipPolicyTest () -{ -} - -bool -OwnershipPolicyTest::check (const ::DDS_OwnershipQosPolicy & dds_qos, - const ::DDS::OwnershipQosPolicy & qos) -{ - return dds_qos.kind == - static_cast (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h deleted file mode 100644 index f1deb5aa63f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OWNERSHIP_QOS_TEST_H_ -#define OWNERSHIP_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h" - -class OwnershipPolicyTest -{ -public: - OwnershipPolicyTest (); - - static bool check (const ::DDS_OwnershipQosPolicy & dds_qos, - const ::DDS::OwnershipQosPolicy & qos); -}; - -#endif /* OWNERSHIP_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp deleted file mode 100644 index a4e43c33972..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "ownership_strength_qos_test.h" - -OwnershipStrengthPolicyTest::OwnershipStrengthPolicyTest () -{ -} - -bool -OwnershipStrengthPolicyTest::check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos, - const ::DDS::OwnershipStrengthQosPolicy & qos) -{ - return dds_qos.value == qos.value; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h deleted file mode 100644 index fe46ea19f39..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_ -#define OWNERSHIP_STRENGTH_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h" - -class OwnershipStrengthPolicyTest -{ -public: - OwnershipStrengthPolicyTest (); - - static bool check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos, - const ::DDS::OwnershipStrengthQosPolicy & qos); -}; - -#endif /* OWNERSHIP_STRENGTH_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp deleted file mode 100644 index f092096fc6c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "partition_qos_test.h" - -PartitionPolicyTest::PartitionPolicyTest () -{ -} - -bool -PartitionPolicyTest::check (const ::DDS_PartitionQosPolicy & dds_qos, - const ::DDS::PartitionQosPolicy & qos) -{ - if (static_cast (dds_qos.name.length ()) != - qos.name.length ()) - { - ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : " - "Length name sequence is not equal " - "to original length.\n")); - return false; - } - for (DDS_Long i = 0; i < dds_qos.name.length (); ++i) - { - if (ACE_OS::strcmp (dds_qos.name[i], qos.name[i]) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : " - "Item %d of name sequence is not equal " - "to original.\n", - i)); - return false; - } - } - return true; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h deleted file mode 100644 index 329348a6d72..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PARTITION_QOS_TEST_H_ -#define PARTITION_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h" - -class PartitionPolicyTest -{ -public: - PartitionPolicyTest (); - - static bool check (const ::DDS_PartitionQosPolicy & dds_qos, - const ::DDS::PartitionQosPolicy & qos); -}; - -#endif /* PARTITION_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc deleted file mode 100644 index 88a5ac62309..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc +++ /dev/null @@ -1,47 +0,0 @@ -project(DDS_Policies_Test) : taoexe, typecode, dds4ccm_base { - includes += $(CIAO_ROOT) - exename = policies_test - requires += dds4ccm_ndds - - Source_Files { - deadline_qos_test.cpp - dest_order_qos_test.cpp - dp_factory_qos_test.cpp - dp_qos_test.cpp - dr_qos_test.cpp - dur_qos_test.cpp - dur_service_qos_test.cpp - dw_qos_test.cpp - entity_factory_qos_test.cpp - group_data_qos_test.cpp - hist_qos_test.cpp - lat_budget_qos_test.cpp - lifespan_qos_test.cpp - liveliness_qos_test.cpp - main.cpp - ownership_qos_test.cpp - partition_qos_test.cpp - presentation_qos_test.cpp - pub_qos_test.cpp - reliability_qos_test.cpp - resource_limits_qos_test.cpp - sub_qos_test.cpp - tp_data_qos_test.cpp - tp_qos_test.cpp - transport_prio_qos_test.cpp - user_data_qos_test.cpp - rd_lifecycle_qos_test.cpp - tbf_qos_test.cpp - typeconsistencyenforcement_qos_test.cpp - ownership_strength_qos_test.cpp - wr_lifecycle_qos_test.cpp - duration.cpp - octet_seq.cpp - string_seq.cpp - states_test.cpp - } - - Header_Files { - *.h - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp deleted file mode 100644 index 661fe7a0421..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "presentation_qos_test.h" - -PresentationPolicyTest::PresentationPolicyTest () -{ -} - -bool -PresentationPolicyTest::check (const ::DDS_PresentationQosPolicy & dds_qos, - const ::DDS::PresentationQosPolicy & qos) -{ - return dds_qos.access_scope == - static_cast (qos.access_scope) && - dds_qos.coherent_access == - static_cast (qos.coherent_access) && - dds_qos.ordered_access == - static_cast (qos.ordered_access); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h deleted file mode 100644 index 6acfd5da5b2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PRESENTATION_QOS_TEST_H_ -#define PRESENTATION_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h" - -class PresentationPolicyTest -{ -public: - PresentationPolicyTest (); - - static bool check (const ::DDS_PresentationQosPolicy & dds_qos, - const ::DDS::PresentationQosPolicy & qos); -}; - -#endif /* PRESENTATION_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp deleted file mode 100644 index 8fe67e4728a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "pub_qos_test.h" -#include "group_data_qos_test.h" -#include "entity_factory_qos_test.h" -#include "presentation_qos_test.h" -#include "partition_qos_test.h" - -PublisherPolicyTest::PublisherPolicyTest () -{ -} - -int -PublisherPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::PublisherQos policy; - DDS_PublisherQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_PUBLISHER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in PresentationQosPolicy.\n")); - ++ret; - } - if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in PartitionQosPolicy.\n")); - ++ret; - } - if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in GroupDataQosPolicy.\n")); - ++ret; - } - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h deleted file mode 100644 index 069c63f051a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef PUBLISHER_QOS_TEST_H_ -#define PUBLISHER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/PublisherQos.h" - -class PublisherPolicyTest -{ -public: - PublisherPolicyTest (); - - int run (); -}; - -#endif /* PUBLISHER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp deleted file mode 100644 index ae419b62f8e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "rd_lifecycle_qos_test.h" - -#include "duration.h" - -ReaderDataLifecyclePolicyTest::ReaderDataLifecyclePolicyTest () -{ -} - -bool -ReaderDataLifecyclePolicyTest::check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos, - const ::DDS::ReaderDataLifecycleQosPolicy & qos) -{ - return Duration::check (dds_qos.autopurge_nowriter_samples_delay, - qos.autopurge_nowriter_samples_delay) && - Duration::check (dds_qos.autopurge_disposed_samples_delay, - qos.autopurge_disposed_samples_delay); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h deleted file mode 100644 index 6eff701402b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_ -#define READER_DATA_LIFECYCLE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h" - -class ReaderDataLifecyclePolicyTest -{ -public: - ReaderDataLifecyclePolicyTest (); - - static bool check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos, - const ::DDS::ReaderDataLifecycleQosPolicy & qos); -}; - -#endif /* READER_DATA_LIFECYCLE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp deleted file mode 100644 index 9d006a10d68..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "reliability_qos_test.h" - -#include "duration.h" - -ReliabilityPolicyTest::ReliabilityPolicyTest () -{ -} - -bool -ReliabilityPolicyTest::check (const ::DDS_ReliabilityQosPolicy & dds_qos, - const ::DDS::ReliabilityQosPolicy & qos) -{ - return dds_qos.kind == static_cast (qos.kind) && - Duration::check (dds_qos.max_blocking_time, qos.max_blocking_time); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h deleted file mode 100644 index 45887016444..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef RELIABILITY_QOS_TEST_H_ -#define RELIABILITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h" - -class ReliabilityPolicyTest -{ -public: - ReliabilityPolicyTest (); - - static bool check (const ::DDS_ReliabilityQosPolicy & dds_qos, - const ::DDS::ReliabilityQosPolicy & qos); -}; - -#endif /* RELIABILITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp deleted file mode 100644 index 60cbdf49797..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "resource_limits_qos_test.h" - -ResourceLimitsPolicyTest::ResourceLimitsPolicyTest () -{ -} - - -bool -ResourceLimitsPolicyTest::check (const ::DDS_ResourceLimitsQosPolicy & dds_qos, - const ::DDS::ResourceLimitsQosPolicy & qos) -{ - return dds_qos.max_samples == qos.max_samples && - dds_qos.max_instances == qos.max_instances && - dds_qos.max_samples_per_instance == qos.max_samples_per_instance; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h deleted file mode 100644 index 51d1bf84240..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef RESOURCE_LIMITS_QOS_TEST_H_ -#define RESOURCE_LIMITS_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h" - -class ResourceLimitsPolicyTest -{ -public: - ResourceLimitsPolicyTest (); - - static bool check (const ::DDS_ResourceLimitsQosPolicy & dds_qos, - const ::DDS::ResourceLimitsQosPolicy & qos); -}; - -#endif /* RESOURCE_LIMITS_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl b/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl deleted file mode 100755 index 6b2a3cbf722..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl +++ /dev/null @@ -1,27 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; - -$PROG = $program->CreateProcess ("policies_test", ""); -$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval()); - -if ($program_status != 0) { - print STDERR "ERROR: policies_test returned $program_status\n"; - exit 1; -} - -$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval()); - -if ($exit_status != 0) { - print STDERR "ERROR: policies_test returned $server_status\n"; - $status = 1; -} - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp deleted file mode 100644 index 7232d3cfc1f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp +++ /dev/null @@ -1,130 +0,0 @@ -#include "states_test.h" - -StatesTest::StatesTest() -{ - -} - -int -StatesTest::run () -{ - int ret = 0; - try - { - // SAMPLE STATES - if (DDS_READ_SAMPLE_STATE != ::DDS::READ_SAMPLE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : READ_SAMPLE_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_READ_SAMPLE_STATE, - ::DDS::READ_SAMPLE_STATE)); - ++ret; - } - if (DDS_NOT_READ_SAMPLE_STATE != ::DDS::NOT_READ_SAMPLE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NOT_READ_SAMPLE_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NOT_READ_SAMPLE_STATE, - ::DDS::NOT_READ_SAMPLE_STATE)); - ++ret; - } - if (DDS_ANY_SAMPLE_STATE != ::DDS::ANY_SAMPLE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : ANY_SAMPLE_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_ANY_SAMPLE_STATE, - ::DDS::ANY_SAMPLE_STATE)); - ++ret; - } - // VIEW STATES - if (DDS_NEW_VIEW_STATE != ::DDS::NEW_VIEW_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NEW_VIEW_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NEW_VIEW_STATE, - ::DDS::NEW_VIEW_STATE)); - ++ret; - } - if (DDS_NOT_NEW_VIEW_STATE != ::DDS::NOT_NEW_VIEW_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NOT_NEW_VIEW_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NOT_NEW_VIEW_STATE, - ::DDS::NOT_NEW_VIEW_STATE)); - ++ret; - } - if (DDS_ANY_VIEW_STATE != ::DDS::ANY_VIEW_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : ANY_VIEW_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_ANY_VIEW_STATE, - ::DDS::ANY_VIEW_STATE)); - ++ret; - } - // VIEW STATES - if (DDS_ALIVE_INSTANCE_STATE != ::DDS::ALIVE_INSTANCE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : ALIVE_INSTANCE_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_ALIVE_INSTANCE_STATE, - ::DDS::ALIVE_INSTANCE_STATE)); - ++ret; - } - if (DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE != - ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NOT_ALIVE_DISPOSED_INSTANCE_STATE states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE, - ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)); - ++ret; - } - if (DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE != - ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NOT_ALIVE_NO_WRITERS_INSTANCE_STATE " - "states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE, - ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)); - ++ret; - } - if (DDS_ANY_INSTANCE_STATE != - ::DDS::ANY_INSTANCE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : ANY_INSTANCE_STATE " - "states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_ANY_INSTANCE_STATE, - ::DDS::ANY_INSTANCE_STATE)); - ++ret; - } - if (DDS_NOT_ALIVE_INSTANCE_STATE != - ::DDS::NOT_ALIVE_INSTANCE_STATE) - { - ACE_ERROR ((LM_ERROR, "StatesTest::run - " - "ERROR : NOT_ALIVE_INSTANCE_STATE " - "states seem " - "unequal: DDS4CCM <%u> - RTI <%u>\n", - DDS_NOT_ALIVE_INSTANCE_STATE, - ::DDS::NOT_ALIVE_INSTANCE_STATE)); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR STATES: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h b/CIAO/connectors/dds4ccm/tests/Policies/states_test.h deleted file mode 100644 index 1e9b3324248..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef STATES_TEST_H_ -#define STATES_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" - -class StatesTest -{ -public: - StatesTest (); - - int run (); -}; - -#endif /* STATES_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp deleted file mode 100644 index 78aeaad0098..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "string_seq.h" - -StringSequence::StringSequence () -{ -} - -bool -StringSequence::check (const ::DDS_StringSeq & dds_seq, - const ::DDS::StringSeq & seq, - const char * test) -{ - if (static_cast < ::CORBA::ULong> (dds_seq.length ()) != - seq.length ()) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Length group_data is not equal to original length.\n", - test)); - return false; - } - - for (::DDS_Long i = 0; i < dds_seq.length (); ++i) - { - if (ACE_OS::strcmp (seq[i], dds_seq[i]) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Item %d of group_data is not equal to original <%C>:<%C>.\n", - test, i, seq[i].in (), dds_seq[i])); - return false; - } - } - return true; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h deleted file mode 100644 index 17d7e9419a2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef STRING_SEQ_H_ -#define STRING_SEQ_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/StringSeq.h" - -class StringSequence -{ -public: - StringSequence (); - - static bool check (const ::DDS_StringSeq & dds_seq, - const ::DDS::StringSeq & seq, - const char * test); -}; - -#endif /* STRING_SEQ_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp deleted file mode 100644 index 4c2cb845842..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "sub_qos_test.h" - -#include "group_data_qos_test.h" -#include "entity_factory_qos_test.h" -#include "presentation_qos_test.h" -#include "partition_qos_test.h" - -SubscriberPolicyTest::SubscriberPolicyTest () -{ -} - -int -SubscriberPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::SubscriberQos policy; - DDS_SubscriberQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_SUBSCRIBER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in PresentationQosPolicy.\n")); - ++ret; - } - if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in PartitionQosPolicy.\n")); - ++ret; - } - if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in GroupDataQosPolicy.\n")); - ++ret; - } - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h deleted file mode 100644 index ab88b9b099c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef SUBSCRIBER_QOS_TEST_H_ -#define SUBSCRIBER_QOS_TEST_H_ - - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h" - -class SubscriberPolicyTest -{ -public: - SubscriberPolicyTest (); - - int run (); -}; - -#endif /* SUBSCRIBER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp deleted file mode 100644 index 95fe1f566ec..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "tbf_qos_test.h" -#include "duration.h" - -TimeBasedFilterPolicyTest::TimeBasedFilterPolicyTest () -{ -} - -bool -TimeBasedFilterPolicyTest::check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos, - const ::DDS::TimeBasedFilterQosPolicy & qos) -{ - return Duration::check (dds_qos.minimum_separation, qos.minimum_separation); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h deleted file mode 100644 index 832aa73a055..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TIME_BASED_FILTER_QOS_TEST_H_ -#define TIME_BASED_FILTER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h" - -class TimeBasedFilterPolicyTest -{ -public: - TimeBasedFilterPolicyTest (); - - static bool check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos, - const ::DDS::TimeBasedFilterQosPolicy & qos); -}; - -#endif /* TIME_BASED_FILTER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp deleted file mode 100644 index 154d4fa44e2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "tp_data_qos_test.h" - -#include "octet_seq.h" - -TopicDataPolicyTest::TopicDataPolicyTest () -{ -} - -bool -TopicDataPolicyTest::check (const ::DDS_TopicDataQosPolicy & dds_qos, - const ::DDS::TopicDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "TopicDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h deleted file mode 100644 index 94707413a0a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TOPIC_DATA_QOS_TEST_H_ -#define TOPIC_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h" - -class TopicDataPolicyTest -{ -public: - TopicDataPolicyTest (); - - static bool check (const ::DDS_TopicDataQosPolicy & dds_qos, - const ::DDS::TopicDataQosPolicy & qos); -}; - -#endif /* TOPIC_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp deleted file mode 100644 index 65520b44e56..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "tp_qos_test.h" - -#include "tp_data_qos_test.h" -#include "dur_qos_test.h" -#include "dur_service_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "transport_prio_qos_test.h" -#include "lifespan_qos_test.h" -#include "ownership_qos_test.h" - -TopicPolicyTest::TopicPolicyTest () -{ -} - -int -TopicPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::TopicQos policy; - DDS_TopicQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_TOPIC_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - - if (!TopicDataPolicyTest::check (dds_policy.topic_data, - policy.topic_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in TopicDataQosPolicy.\n")); - ++ret; - } - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DurabilityServicePolicyTest::check (dds_policy.durability_service, - policy.durability_service)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DurabilityServiceQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority, - policy.transport_priority)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in TransportPriorityQosPolicy.\n")); - ++ret; - } - - if (!LifespanPolicyTest::check (dds_policy.lifespan, - policy.lifespan)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LifespanQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h deleted file mode 100644 index 9f5c6fc5357..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef TOPIC_QOS_TEST_H_ -#define TOPIC_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/TopicQos.h" - -class TopicPolicyTest -{ -public: - TopicPolicyTest (); - - int run (); -}; - -#endif /* TOPIC_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp deleted file mode 100644 index e776b9f132a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "transport_prio_qos_test.h" - -TransportPriorityPolicyTest::TransportPriorityPolicyTest () -{ -} - -bool -TransportPriorityPolicyTest::check (const ::DDS_TransportPriorityQosPolicy & dds_qos, - const ::DDS::TransportPriorityQosPolicy & qos) -{ - return dds_qos.value == qos.value; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h deleted file mode 100644 index fdc5ccf6155..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TRANSPORT_PRIORITY_QOS_TEST_H_ -#define TRANSPORT_PRIORITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h" - -class TransportPriorityPolicyTest -{ -public: - TransportPriorityPolicyTest (); - - static bool check (const ::DDS_TransportPriorityQosPolicy & dds_qos, - const ::DDS::TransportPriorityQosPolicy & qos); -}; - -#endif /* TRANSPORT_PRIORITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp deleted file mode 100644 index 6f7ab19f9b7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "typeconsistencyenforcement_qos_test.h" - -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - -TypeConsistencyEnforcementPolicyPolicyTest::TypeConsistencyEnforcementPolicyPolicyTest () -{ -} - -bool -TypeConsistencyEnforcementPolicyPolicyTest::check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos, - const ::DDS::TypeConsistencyEnforcementQosPolicy & qos) -{ - return dds_qos.kind == static_cast (qos.kind); -} - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h deleted file mode 100644 index ba06c6420cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_ -#define TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h" - -#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5) - -class TypeConsistencyEnforcementPolicyPolicyTest -{ -public: - TypeConsistencyEnforcementPolicyPolicyTest (); - - static bool check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos, - const ::DDS::TypeConsistencyEnforcementQosPolicy & qos); -}; - -#endif - -#endif /* TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp deleted file mode 100644 index 6658311fcf3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "user_data_qos_test.h" - -#include "octet_seq.h" - -UserDataPolicyTest::UserDataPolicyTest () -{ -} - -bool -UserDataPolicyTest::check (const ::DDS_UserDataQosPolicy & dds_qos, - const ::DDS::UserDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "UserDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h deleted file mode 100644 index e0ce81b4159..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef USER_DATA_QOS_TEST_H_ -#define USER_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h" - -class UserDataPolicyTest -{ -public: - UserDataPolicyTest (); - - static bool check (const ::DDS_UserDataQosPolicy & dds_qos, - const ::DDS::UserDataQosPolicy & qos); -}; - -#endif /* USER_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp deleted file mode 100644 index cdc29b90cae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "wr_lifecycle_qos_test.h" - -WriterDataLifecyclePolicyTest::WriterDataLifecyclePolicyTest () -{ -} - -bool -WriterDataLifecyclePolicyTest::check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos, - const ::DDS::WriterDataLifecycleQosPolicy & qos) -{ - return dds_qos.autodispose_unregistered_instances == - static_cast (qos.autodispose_unregistered_instances); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h deleted file mode 100644 index 05536fc3dcd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_ -#define WRITER_DATA_LIFECYCLE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h" - -class WriterDataLifecyclePolicyTest -{ -public: - WriterDataLifecyclePolicyTest (); - - static bool check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos, - const ::DDS::WriterDataLifecycleQosPolicy & qos); -}; - -#endif /* WRITER_DATA_LIFECYCLE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore b/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl deleted file mode 100644 index a5a6295900c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file PortUsage_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PORTUSAGE_EVENT_TEST_BASE_IDL -#define PORTUSAGE_EVENT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/PortUsage_Test_BaseSupport.h" -#pragma opendds typesupport "Base/PortUsage_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "PortUsageTest" -#pragma DCPS_DATA_KEY "PortUsageTest symbol" - -struct PortUsageTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence PortUsageTestSeq; -#endif - -enum PORT_USAGE_ASSIGNMENT { - //event ports - PORTUSAGE_ASSIGNMENT_WRITE, - //event and state ports - PORTUSAGE_ASSIGNMENT_GET, - PORTUSAGE_ASSIGNMENT_LISTEN, - //state ports - PORTUSAGE_ASSIGNMENT_UPDATE, - PORTUSAGE_ASSIGNMENT_READ, - PORTUSAGE_ASSIGNMENT_STATELISTEN -}; - - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc deleted file mode 100644 index b541c285f2a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { - sharedname = PortUsage_Test_Base_stub - dynamicflags += PORTUSAGE_EVENT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=PortUsage_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - PortUsage_Test_Base.idl - } - - opendds_ts_flags += --export=PORTUSAGE_EVENT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - PortUsage_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl deleted file mode 100644 index 04e0340f5a6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef EVENT_COMPONENT_IDL -#define EVENT_COMPONENT_IDL - -#include "EventConnector/PortUsageEvent_Connector.idl" - -module PortUsageEvent_Test -{ - component PortUsageEventComponent - { - port PortUsageTestConnector::DDS_Write write_port; - port PortUsageTestConnector::DDS_Get get_port; - port PortUsageTestConnector::DDS_Listen listen_port; - - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute PORT_USAGE_ASSIGNMENT portusage_assignment; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc deleted file mode 100644 index 19ccda457ed..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(PortUsageEvent_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += PortUsageEvent_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - PortUsageEvent_Component.idl - } -} - -project(PortUsageEvent_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += PortUsageEvent_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PortUsageEvent_ComponentE.idl - } -} - -project(PortUsageEvent_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += PortUsageEvent_Component_lem_gen PortUsageEvent_Component_stub \ - PortUsageEvent_Connector_stub PortUsage_Test_Base_stub - libs += EventComponent_stub PortUsageEvent_Connector_stub \ - PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = EventComponent_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ComponentEC.cpp - } - - Header_Files { - PortUsageEvent_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - PortUsageEvent_ComponentEC.inl - } -} - -project(PortUsageEvent_Component_stub) : ccm_stub, dds4ccm_base { - after += PortUsageEvent_Component_idl_gen PortUsageEvent_Connector_stub \ - PortUsage_Test_Base_stub PortUsageEvent_Connector_lem_gen - libs += PortUsageEvent_Connector_stub PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = EventComponent_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ComponentC.cpp - } - - Header_Files { - PortUsageEvent_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - PortUsageEvent_ComponentC.inl - } -} - -project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += PortUsageEvent_Component_lem_stub PortUsageEvent_Component_stub \ - PortUsage_Test_Base_stub PortUsageEvent_Connector_stub \ - PortUsageEvent_Connector_lem_stub - sharedname = EventComponent_exec - libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_Component_exec.cpp - } - - Header_Files { - PortUsageEvent_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += PortUsageEvent_Component_lem_stub PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \ - PortUsageEvent_Component_exec PortUsageEvent_Connector_lem_stub - sharedname = EventComponent_svnt - libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \ - EventComponent_exec PortUsageEvent_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ComponentS.cpp - PortUsageEvent_Component_svnt.cpp - } - - Header_Files { - PortUsageEvent_ComponentS.h - PortUsageEvent_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp deleted file mode 100644 index c932d5dd6bf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp +++ /dev/null @@ -1,291 +0,0 @@ -// -*- C++ -*- -#include "PortUsageEvent_Component_exec.h" - -#include "ace/OS_NS_unistd.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_ULong& datareaders_count, - Atomic_ULong& datawriters_count) - : datareaders_count_ (datareaders_count), - datawriters_count_ (datawriters_count) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - ACE_DEBUG ((LM_DEBUG, - "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n", - CIAO::DDS4CCM::translate_statuskind (status_kind))); - if (status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity); - if (! ::CORBA::is_nil (dw.in ())) - { - ++this->datawriters_count_; - ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n", - this->datawriters_count_.value ())); - } - else - { - DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity); - if (! ::CORBA::is_nil (dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an " - "on_publication_matched status\n")); - } - } - } - if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) - { - DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity); - if (! ::CORBA::is_nil (dw.in ())) - { - ++this->datareaders_count_; - ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n", - this->datareaders_count_.value ())); - } - DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity); - if (! ::CORBA::is_nil (dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an " - "on_subscription_matched status\n")); - } - } - } - - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE), - datareaders_count_ (0), - datawriters_count_ (0) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Supported operations and attributes. - void - Component_exec_i::check_writer () - { - if (this->datawriters_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - " - "ERROR : Unexpected number of DataWriters detected - " - "expected <1> - detected <%u>\n", - this->datawriters_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - " - "OK : Detected the expected number of DataWriters - " - "expected <1> - detected <%u>\n", - this->datawriters_count_.value ())); - } - } - - void - Component_exec_i::check_getter () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - void - Component_exec_i::check_listener () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - // Component attributes. - PORT_USAGE_ASSIGNMENT - Component_exec_i::portusage_assignment() - { - return this->assignment_; - } - - void - Component_exec_i::portusage_assignment(PORT_USAGE_ASSIGNMENT assignment) - { - switch (assignment) - { - case PORTUSAGE_ASSIGNMENT_WRITE: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check writer port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_GET: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_LISTEN: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n")); - break; - default: - ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - " - "ERROR : Unknown assignment\n")); - break; - - } - this->assignment_ = assignment; - } - - // Port operations. - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_get_port_status() - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr - Component_exec_i::get_listen_port_data_listener() - { - return PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener::_nil (); - } - - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_listen_port_status() - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - CCM_DDS::CCM_ConnectorStatusListener_ptr - Component_exec_i::get_connector_status () - { - return new ConnectorStatusListener_exec_i ( - this->datareaders_count_, - this->datawriters_count_); - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - switch (this->assignment_) - { - case PORTUSAGE_ASSIGNMENT_WRITE: - this->check_writer (); - break; - case PORTUSAGE_ASSIGNMENT_GET: - this->check_getter (); - break; - case PORTUSAGE_ASSIGNMENT_LISTEN: - this->check_listener (); - break; - default: - ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - " - "ERROR : Unknown assignment\n")); - break; - } - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PortUsageEvent_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h deleted file mode 100644 index e1e605e05a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h +++ /dev/null @@ -1,117 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "PortUsageEvent_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_ULong&, - Atomic_ULong&); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_ULong& datareaders_count_; - Atomic_ULong& datawriters_count_; - }; - - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual PortUsageEventComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Component attributes. - virtual PORT_USAGE_ASSIGNMENT - portusage_assignment (void); - - virtual void - portusage_assignment (PORT_USAGE_ASSIGNMENT assignment); - - // Port operations. - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr - get_listen_port_data_listener (void); - - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_listen_port_status (void); - - virtual CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context_var context_; - - PORT_USAGE_ASSIGNMENT assignment_; - - Atomic_ULong datareaders_count_; - Atomic_ULong datawriters_count_; - - // Supported operations and attributes. - void check_writer (void); - - void check_getter (void); - - void check_listener (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PortUsageEvent_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl deleted file mode 100644 index 0ef5034d5d1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file PortUsageEvent_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ -#define PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/PortUsage_Test_Base.idl" - -#pragma ciao lem "EventConnector/PortUsageEvent_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/PortUsage_Test_BaseTypeSupport.idl" -#endif - -module PortUsageEvent_Test -{ - module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector; -}; - -#endif /* PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc deleted file mode 100644 index 90cad48d622..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageEvent_Connector" - -project(PortUsageEvent_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen PortUsage_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=PortUsageEvent_Connector_stub_export.h \ - -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=PortUsageEvent_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=PortUsageEvent_Connector_svnt_export.h \ - -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=PortUsageEvent_Connector_conn_export.h \ - -I .. - - IDL_Files { - PortUsageEvent_Connector.idl - } -} - -project(PortUsageEvent_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += PortUsageEvent_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=PortUsageEvent_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - PortUsageEvent_ConnectorE.idl - } -} - -project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub - libs += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = PortUsageEvent_Connector_lem_stub - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ConnectorEC.cpp - } - - Header_Files { - PortUsageEvent_ConnectorEC.h - PortUsageEvent_Connector_lem_stub_export.h - } - - Inline_Files { - PortUsageEvent_ConnectorEC.inl - } -} - -project(PortUsageEvent_Connector_stub) : ccm_stub, dds4ccm_base { - after += PortUsageEvent_Connector_idl_gen PortUsage_Test_Base_stub - libs += PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = PortUsageEvent_Connector_stub - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ConnectorC.cpp - } - - Header_Files { - PortUsageEvent_ConnectorC.h - PortUsageEvent_Connector_stub_export.h - } - - Inline_Files { - PortUsageEvent_ConnectorC.inl - } -} - -project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl { - after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_stub PortUsage_Test_Base_stub - sharedname = PortUsageEvent_Connector_exec - libs += PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_Connector_conn.cpp - } - - Header_Files { - PortUsageEvent_Connector_conn.h - PortUsageEvent_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub - sharedname = PortUsageEvent_Connector_svnt - libs += PortUsageEvent_Connector_stub \ - PortUsageEvent_Connector_lem_stub \ - PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageEvent_ConnectorS.cpp - PortUsageEvent_Connector_svnt.cpp - } - - Header_Files { - PortUsageEvent_ConnectorS.h - PortUsageEvent_Connector_svnt.h - PortUsageEvent_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl deleted file mode 100644 index 67ee29bb7b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef STATE_COMPONENT_IDL -#define STATE_COMPONENT_IDL - -#include "StateConnector/PortUsageState_Connector.idl" - -module PortUsageState_Test -{ - component PortUsageStateComponent - { - 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; - - attribute PORT_USAGE_ASSIGNMENT portusage_assignment; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc deleted file mode 100644 index 81252c6c330..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(PortUsageState_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += PortUsageState_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - PortUsageState_Component.idl - } -} - -project(PortUsageState_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += PortUsageState_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - PortUsageState_ComponentE.idl - } -} - -project(PortUsageState_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += PortUsageState_Component_lem_gen PortUsageState_Component_stub \ - PortUsageState_Connector_stub PortUsage_Test_Base_stub - libs += StateComponent_stub PortUsageState_Connector_stub \ - PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = StateComponent_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ComponentEC.cpp - } - - Header_Files { - PortUsageState_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - PortUsageState_ComponentEC.inl - } -} - -project(PortUsageState_Component_stub) : ccm_stub, dds4ccm_base { - after += PortUsageState_Component_idl_gen PortUsageState_Connector_stub \ - PortUsage_Test_Base_stub PortUsageState_Connector_lem_gen - libs += PortUsageState_Connector_stub PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = StateComponent_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ComponentC.cpp - } - - Header_Files { - PortUsageState_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - PortUsageState_ComponentC.inl - } -} - -project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += PortUsageState_Component_lem_stub PortUsageState_Component_stub \ - PortUsage_Test_Base_stub PortUsageState_Connector_stub \ - PortUsageState_Connector_lem_stub - sharedname = StateComponent_exec - libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageState_Connector_stub PortUsageState_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_Component_exec.cpp - } - - Header_Files { - PortUsageState_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += PortUsageState_Component_lem_stub PortUsage_Test_Base_stub \ - PortUsageState_Connector_stub PortUsageState_Connector_svnt \ - PortUsageState_Component_exec PortUsageState_Connector_lem_stub - sharedname = StateComponent_svnt - libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageState_Connector_stub PortUsageState_Connector_svnt \ - StateComponent_exec PortUsageState_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ComponentS.cpp - PortUsageState_Component_svnt.cpp - } - - Header_Files { - PortUsageState_ComponentS.h - PortUsageState_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp deleted file mode 100644 index f53643b0832..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp +++ /dev/null @@ -1,360 +0,0 @@ -// -*- C++ -*- -#include "PortUsageState_Component_exec.h" - -#include "ace/OS_NS_unistd.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_ULong& datareaders_count, - Atomic_ULong& datawriters_count) - : datareaders_count_ (datareaders_count), - datawriters_count_ (datawriters_count) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - ACE_DEBUG ((LM_DEBUG, - "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n", - CIAO::DDS4CCM::translate_statuskind (status_kind))); - if (status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity); - if (! ::CORBA::is_nil (dw.in ())) - { - ++this->datawriters_count_; - ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n", - this->datawriters_count_.value ())); - } - else - { - DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity); - if (! ::CORBA::is_nil (dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an " - "on_publication_matched status\n")); - } - } - } - if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) - { - DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity); - if (! ::CORBA::is_nil (dw.in ())) - { - ++this->datareaders_count_; - ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n", - this->datareaders_count_.value ())); - } - DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity); - if (! ::CORBA::is_nil (dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an " - "on_subscription_matched status\n")); - } - } - } - - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE), - datareaders_count_ (0), - datawriters_count_ (0) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Supported operations and attributes. - void - Component_exec_i::check_updater () - { - if (this->datawriters_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - " - "ERROR : Unexpected number of DataWriters detected - " - "expected <1> - detected <%u>\n", - this->datawriters_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - " - "OK : Detected the expect number of DataWriters - " - "expected <1> - detected <%u>\n", - this->datawriters_count_.value ())); - } - } - - void - Component_exec_i::check_getter () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - void - Component_exec_i::check_listener () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - void - Component_exec_i::check_reader () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_reader - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_reader - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - void - Component_exec_i::check_state_listen () - { - if (this->datareaders_count_.value () != 1) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_state_listen - " - "ERROR : Unexpected number of DataReaders detected - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_state_listen - " - "OK : Detected the expected number of DataReaders - " - "expected <1> - detected <%u>\n", - this->datareaders_count_.value ())); - } - } - - // Component attributes. - PORT_USAGE_ASSIGNMENT - Component_exec_i::portusage_assignment() - { - return this->assignment_; - } - - void - Component_exec_i::portusage_assignment (PORT_USAGE_ASSIGNMENT assignment) - { - switch (assignment) - { - case PORTUSAGE_ASSIGNMENT_UPDATE: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check updater port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_GET: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_LISTEN: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_READ: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check reader port'\n")); - break; - case PORTUSAGE_ASSIGNMENT_STATELISTEN: - ACE_DEBUG ((LM_DEBUG, "New assigment: 'check state listen port'\n")); - break; - default: - ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - " - "ERROR : Unknown assignment\n")); - break; - - } - this->assignment_ = assignment; - } - - // Port operations. - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_read_port_status() - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr - Component_exec_i::get_state_listen_port_data_listener() - { - return PortUsageState_Test::PortUsageTestConnector::CCM_StateListener::_nil (); - } - - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_state_listen_port_status() - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - CCM_DDS::CCM_ConnectorStatusListener_ptr - Component_exec_i::get_connector_status () - { - return new ConnectorStatusListener_exec_i ( - this->datareaders_count_, - this->datawriters_count_); - } - - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_get_port_status (void) - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr - Component_exec_i::get_listen_port_data_listener (void) - { - return PortUsageState_Test::PortUsageTestConnector::CCM_Listener::_nil (); - } - - CCM_DDS::CCM_PortStatusListener_ptr - Component_exec_i::get_listen_port_status (void) - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::PortUsageState_Test::CCM_PortUsageStateComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - switch (this->assignment_) - { - case PORTUSAGE_ASSIGNMENT_UPDATE: - this->check_updater (); - break; - case PORTUSAGE_ASSIGNMENT_GET: - this->check_getter (); - break; - case PORTUSAGE_ASSIGNMENT_LISTEN: - this->check_listener (); - break; - case PORTUSAGE_ASSIGNMENT_READ: - this->check_reader (); - break; - case PORTUSAGE_ASSIGNMENT_STATELISTEN: - this->check_state_listen (); - break; - default: - ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - " - "ERROR : Unknown assignment\n")); - break; - } - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PortUsageState_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h deleted file mode 100644 index 04a8547e334..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h +++ /dev/null @@ -1,130 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "PortUsageState_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_ULong&, - Atomic_ULong&); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_ULong& datareaders_count_; - Atomic_ULong& datawriters_count_; - }; - - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual PortUsageStateComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Component attributes. - virtual PORT_USAGE_ASSIGNMENT - portusage_assignment (void); - - virtual void - portusage_assignment (PORT_USAGE_ASSIGNMENT assignment); - - // Port operations. - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_read_port_status (void); - - virtual PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr - get_state_listen_port_data_listener (void); - - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_state_listen_port_status (void); - - virtual CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (); - - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr - get_listen_port_data_listener (void); - - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_listen_port_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::PortUsageState_Test::CCM_PortUsageStateComponent_Context_var context_; - - PORT_USAGE_ASSIGNMENT assignment_; - - Atomic_ULong datareaders_count_; - Atomic_ULong datawriters_count_; - - // Supported operations and attributes. - void check_updater (void); - - void check_getter (void); - - void check_listener (void); - - void check_reader (void); - - void check_state_listen (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_PortUsageState_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl deleted file mode 100644 index 742b2087ac3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file PortUsageState_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PORTUSAGE_STATE_CONNECTOR_IDL_ -#define PORTUSAGE_STATE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/PortUsage_Test_Base.idl" - -#pragma ciao lem "StateConnector/PortUsageState_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/PortUsage_Test_BaseTypeSupport.idl" -#endif - -module PortUsageState_Test -{ - module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector; -}; - -#endif /* PORTUSAGE_STATE_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc deleted file mode 100644 index c9dcc39fdb5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageState_Connector" - -project(PortUsageState_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen PortUsage_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=PortUsageState_Connector_stub_export.h \ - -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=PortUsageState_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=PortUsageState_Connector_svnt_export.h \ - -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=PortUsageState_Connector_conn_export.h \ - -I .. - - IDL_Files { - PortUsageState_Connector.idl - } -} - -project(PortUsageState_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += PortUsageState_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=PortUsageState_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - PortUsageState_ConnectorE.idl - } -} - -project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub - libs += PortUsage_Test_Base_stub PortUsageState_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = PortUsageState_Connector_lem_stub - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ConnectorEC.cpp - } - - Header_Files { - PortUsageState_ConnectorEC.h - PortUsageState_Connector_lem_stub_export.h - } - - Inline_Files { - PortUsageState_ConnectorEC.inl - } -} - -project(PortUsageState_Connector_stub) : ccm_stub, dds4ccm_base { - after += PortUsageState_Connector_idl_gen PortUsage_Test_Base_stub - libs += PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = PortUsageState_Connector_stub - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ConnectorC.cpp - } - - Header_Files { - PortUsageState_ConnectorC.h - PortUsageState_Connector_stub_export.h - } - - Inline_Files { - PortUsageState_ConnectorC.inl - } -} - -project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl { - after += PortUsageState_Connector_lem_stub PortUsageState_Connector_stub PortUsage_Test_Base_stub - sharedname = PortUsageState_Connector_exec - libs += PortUsageState_Connector_stub PortUsageState_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_Connector_conn.cpp - } - - Header_Files { - PortUsageState_Connector_conn.h - PortUsageState_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub - sharedname = PortUsageState_Connector_svnt - libs += PortUsageState_Connector_stub \ - PortUsageState_Connector_lem_stub \ - PortUsage_Test_Base_stub \ - PortUsageState_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PortUsageState_ConnectorS.cpp - PortUsageState_Connector_svnt.cpp - } - - Header_Files { - PortUsageState_ConnectorS.h - PortUsageState_Connector_svnt.h - PortUsageState_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp deleted file mode 100644 index 999db538fa5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageEventComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - EventComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - EventComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageEvent_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageEvent_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_GET - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - write_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_port_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_stub - - - PortUsageEvent_Connector_stub - - - EventComponent_exec - - - EventComponent_exec - - - EventComponent_svnt - - - EventComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp deleted file mode 100644 index 49954dfeee5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageEventComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - EventComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - EventComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageEvent_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageEvent_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_LISTEN - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - write_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_port_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - listen_port_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_stub - - - PortUsageEvent_Connector_stub - - - EventComponent_exec - - - EventComponent_exec - - - EventComponent_svnt - - - EventComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp deleted file mode 100644 index ce71a0f288c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageEventComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - EventComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - EventComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageEvent_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageEvent_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_WRITE - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - write_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write_port_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - listen_port_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_exec - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_svnt - - - PortUsageEvent_Connector_stub - - - PortUsageEvent_Connector_stub - - - EventComponent_exec - - - EventComponent_exec - - - EventComponent_svnt - - - EventComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp deleted file mode 100644 index 14df33ab775..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageStateComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - StateComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - StateComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageState_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageState_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_GET - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - update_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - update_port_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - get_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_stub - - - PortUsageState_Connector_stub - - - StateComponent_exec - - - StateComponent_exec - - - StateComponent_svnt - - - StateComponent_svnt - - - StateComponent_stub - - - StateComponent_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp deleted file mode 100644 index b32f7add651..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageStateComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - StateComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - StateComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageState_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageState_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_LISTEN - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - update_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - update_port_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - listen_port_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_stub - - - PortUsageState_Connector_stub - - - StateComponent_exec - - - StateComponent_exec - - - StateComponent_svnt - - - StateComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp deleted file mode 100644 index 71c98f743d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp +++ /dev/null @@ -1,247 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageStateComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - StateComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - StateComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageState_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageState_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_READ - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - update_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - update_port_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - read_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_svnt - - - StateComponent_exec - - - StateComponent_exec - - - StateComponent_svnt - - - StateComponent_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp deleted file mode 100644 index 8dd0fcd2878..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageStateComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - StateComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - StateComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageState_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageState_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - - update_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - update_port_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - state_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - state_listen_port_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_stub - - - PortUsageState_Connector_stub - - - StateComponent_exec - - - StateComponent_exec - - - StateComponent_svnt - - - StateComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp deleted file mode 100644 index da83275473d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp +++ /dev/null @@ -1,259 +0,0 @@ - - - - PortUsage_Test_Depl - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageStateComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - StateComponent_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - StateComponent_exec - - - - - - - ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - PortUsageState_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - PortUsageState_Connector_exec - - - - - - - ComponentInstance - ComponentNode - - - - - portusage_assignment - - - tk_enum - - PORT_USAGE_ASSIGNMENT - IDL:PORT_USAGE_ASSIGNMENT:1.0 - PORTUSAGE_ASSIGNMENT_WRITE - PORTUSAGE_ASSIGNMENT_GET - PORTUSAGE_ASSIGNMENT_LISTEN - PORTUSAGE_ASSIGNMENT_UPDATE - PORTUSAGE_ASSIGNMENT_READ - PORTUSAGE_ASSIGNMENT_STATELISTEN - - - - PORTUSAGE_ASSIGNMENT_UPDATE - - - - - - - ConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - PortUsage_Test - - - - - - - update_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - update_port_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - - read_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - connector_status - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_exec - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_svnt - - - PortUsageState_Connector_stub - - - PortUsageState_Connector_stub - - - StateComponent_exec - - - StateComponent_exec - - - StateComponent_svnt - - - StateComponent_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl deleted file mode 100755 index 2fe18b6d1d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl +++ /dev/null @@ -1,216 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# 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; - -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 daemon $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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - - print "Sleeping 60 seconds to allow task to complete\n"; - sleep (60); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Executor finished.\n"; - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl deleted file mode 100644 index 8f0e65bbb1a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Proxy_RW_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PROXY_RW_TEST_BASE_IDL -#define PROXY_RW_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Proxy_RW_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Proxy_RW_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ProxyReadWriteTest" -#pragma DCPS_DATA_KEY "ProxyReadWriteTest key" - -struct ProxyReadWriteTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ProxyReadWriteTestSeq; -#endif - -#endif /* PROXY_RW_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc deleted file mode 100644 index d399d3e68b1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (Proxy_RW_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = Proxy_RW_Test_Base_stub - dynamicflags += PROXY_RW_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=PROXY_RW_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Proxy_RW_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Proxy_RW_Test_Base.idl - } - - opendds_ts_flags += --export=PROXY_RW_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Proxy_RW_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl deleted file mode 100644 index d2af2883d1f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_STARTER_IDL -#define READER_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface ReaderStarter -{ - enum assignment { - READ_USING_IDL_PROXY, - TAKE_USING_IDL_PROXY, - READ_USING_CPP_PROXY, - TAKE_USING_CPP_PROXY - }; - void start_read (in assignment task); - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); -}; - -interface WriterRestarter -{ - void restart_write (in ReaderStarter::assignment task); -}; - -#endif /* SAMPLE_INFO_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc deleted file mode 100644 index f5d4f9fb784..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc +++ /dev/null @@ -1,110 +0,0 @@ -project(RW_RW_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(RW_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += RW_RW_Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=RW_Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(RW_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += RW_Reader_Starter_lem_gen RW_Reader_Starter_stub - libs += RW_Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RW_Reader_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(RW_Reader_Starter_stub) : ccm_stub, dds4ccm_base { - after += RW_RW_Reader_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RW_Reader_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(RW_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += RW_Reader_Starter_lem_stub RW_Reader_Starter_stub - sharedname = RW_Reader_Starter_svnt - libs += RW_Reader_Starter_stub RW_Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl deleted file mode 100644 index 57ce9775dcf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Proxy_RW_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PROXY_RW_TEST_CONNECTOR_IDL_ -#define PROXY_RW_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Proxy_RW_Test_Base.idl" - -#pragma ciao lem "Connector/Proxy_RW_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Proxy_RW_Test_BaseTypeSupport.idl" -#endif - -module Proxy_RW_Test -{ - module ::CCM_DDS::Typed < ::ProxyReadWriteTest, ::ProxyReadWriteTestSeq> ProxyReadWriteTestConnector; -}; - -#endif /* Reader_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc deleted file mode 100644 index e29d85dabe9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l .. -o ../lib -u DDS Proxy_RW_Test_Connector" - -project(Proxy_RW_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Proxy_RW_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Proxy_RW_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Proxy_RW_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Proxy_RW_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=PROXY_RW_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Proxy_RW_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Proxy_RW_Test_Connector.idl - } -} - -project(Proxy_RW_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += Proxy_RW_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Proxy_RW_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Proxy_RW_Test_ConnectorE.idl - } -} - -project(Proxy_RW_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Proxy_RW_Test_Connector_lem_gen Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub - libs += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Proxy_RW_Test_Connector_lem_stub - dynamicflags += PROXY_RW_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ConnectorEC.cpp - } - - Header_Files { - Proxy_RW_Test_ConnectorEC.h - Proxy_RW_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_ConnectorEC.inl - } -} - -project(Proxy_RW_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += Proxy_RW_Test_Connector_idl_gen Proxy_RW_Test_Base_stub - libs += Proxy_RW_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Proxy_RW_Test_Connector_stub - dynamicflags += PROXY_RW_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ConnectorC.cpp - } - - Header_Files { - Proxy_RW_Test_ConnectorC.h - Proxy_RW_Test_Connector_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_ConnectorC.inl - } -} - -project(Proxy_RW_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub - sharedname = Proxy_RW_Test_Connector_exec - libs += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Base_stub Proxy_RW_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PROXY_RW_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_Connector_conn.cpp - } - - Header_Files { - Proxy_RW_Test_Connector_conn.h - Proxy_RW_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(Proxy_RW_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_exec Proxy_RW_Test_Connector_stub - sharedname = Proxy_RW_Test_Connector_svnt - libs += Proxy_RW_Test_Connector_stub \ - Proxy_RW_Test_Connector_lem_stub \ - Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += PROXY_RW_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ConnectorS.cpp - Proxy_RW_Test_Connector_svnt.cpp - } - - Header_Files { - Proxy_RW_Test_ConnectorS.h - Proxy_RW_Test_Connector_svnt.h - Proxy_RW_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl deleted file mode 100644 index 0a8fab4e505..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Proxy_RW_Test_Receiver.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Proxy_RW_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module Proxy_RW_Test -{ - component Receiver - { - port ProxyReadWriteTestConnector::DDS_Listen info_out; - - provides ReaderStarter reader_start; - uses WriterRestarter writer_restart; - }; -}; - -#endif /* RECEIVER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc deleted file mode 100644 index 7fb6136a015..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(Proxy_RW_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += Proxy_RW_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Proxy_RW_Test_Receiver.idl - } -} - -project(Proxy_RW_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += Proxy_RW_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Proxy_RW_Test_ReceiverE.idl - } -} - -project(Proxy_RW_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += Proxy_RW_Test_Receiver_lem_gen Proxy_RW_Test_Receiver_stub \ - Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \ - RW_Reader_Starter_stub - libs += Receiver_stub Proxy_RW_Test_Connector_stub \ - Proxy_RW_Test_Base_stub RW_Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ReceiverEC.cpp - } - - Header_Files { - Proxy_RW_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_ReceiverEC.inl - } -} - -project(Proxy_RW_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += Proxy_RW_Test_Receiver_idl_gen Proxy_RW_Test_Connector_stub \ - Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_lem_gen \ - RW_Reader_Starter_stub RW_Reader_Starter_lem_stub - libs += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \ - RW_Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ReceiverC.cpp - } - - Header_Files { - Proxy_RW_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_ReceiverC.inl - } -} - -project(Proxy_RW_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl { - after += Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Receiver_stub \ - Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \ - Proxy_RW_Test_Connector_lem_stub \ - RW_Reader_Starter_lem_stub RW_Reader_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub \ - RW_Reader_Starter_lem_stub RW_Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_Receiver_exec.cpp - } - - Header_Files { - Proxy_RW_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(Proxy_RW_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \ - Proxy_RW_Test_Receiver_exec Proxy_RW_Test_Connector_lem_stub \ - RW_Reader_Starter_stub \ - RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \ - Receiver_exec Proxy_RW_Test_Connector_lem_stub \ - RW_Reader_Starter_stub RW_Reader_Starter_svnt \ - RW_Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_ReceiverS.cpp - Proxy_RW_Test_Receiver_svnt.cpp - } - - Header_Files { - Proxy_RW_Test_ReceiverS.h - Proxy_RW_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp deleted file mode 100644 index 51430bbe7c4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp +++ /dev/null @@ -1,584 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Proxy_RW_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "Connector/Proxy_RW_Test_Connector_conn.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_Proxy_RW_Test_Receiver_Impl -{ - /** - * Start Handler using IDL Proxy to Read - */ - - StartHandlerIdlProxyRead::StartHandlerIdlProxyRead (Receiver_exec_i &callback) - : callback_ (callback) - { - } - - int - StartHandlerIdlProxyRead::handle_exception (ACE_HANDLE) - { - this->callback_.start_read_using_idl_proxy (); - return 0; - } - - /** - * Start Handler using CPP Proxy to Take - */ - - StartHandlerIdlProxyTake::StartHandlerIdlProxyTake (Receiver_exec_i &callback) - : callback_ (callback) - { - } - - int - StartHandlerIdlProxyTake::handle_exception (ACE_HANDLE) - { - this->callback_.start_take_using_idl_proxy (); - return 0; - } - - /** - * Check last - */ - LastSampleChecker::LastSampleChecker (Receiver_exec_i &callback, - const ::ReaderStarter::assignment &task, - const ::CORBA::UShort &iterations) - : callback_ (callback) - , task_ (task) - , iterations_ (iterations) - { - } - - LastSampleChecker::~LastSampleChecker () - { - } - - int - LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last (this->iterations_ + (this->iterations_ * this->task_))) - { - this->callback_.start_task (this->task_); - } - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Proxy_RW_Test::ProxyReadWriteTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ProxyReadWriteTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ProxyReadWriteTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::ReaderStarter - - void - reader_start_exec_i::start_read (::ReaderStarter::assignment task) - { - this->callback_.start_read (task); - } - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (0) - , keys_ (0) - , checker_ (0) - { - ACE_NEW_THROW_EX (this->rh_idl_read_, - StartHandlerIdlProxyRead (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->rh_idl_take_, - StartHandlerIdlProxyTake (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->rh_idl_read_; - delete this->rh_idl_take_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last (const ::CORBA::UShort &iteration_to_check) - { - ::Proxy_RW_Test::ProxyReadWriteTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - try - { - ProxyReadWriteTest datum; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - datum.key = CORBA::string_dup (key); - reader->read_one_last ( - datum, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d>\n", - datum.iteration, - iteration_to_check)); - return datum.iteration >= iteration_to_check; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - void - Receiver_exec_i::check_samples (const ProxyReadWriteTestSeq & data, - ::ReaderStarter::assignment task) - { - for (::CORBA::ULong i = 0; i < data.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - " - "Received sample: key <%C> - iteration <%u>\n", - data[i].key.in (), - data[i].iteration)); - //TODO Check for invalid iterataions - } - WriterRestarter_var restarter = - this->ciao_context_->get_connection_writer_restart (); - if (!::CORBA::is_nil (restarter.in ())) - { - if (task == ::ReaderStarter::READ_USING_IDL_PROXY) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - " - "Inform the Sender that is should write the next bunch.\n")); - restarter->restart_write (::ReaderStarter::TAKE_USING_IDL_PROXY); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_samples - " - "ERROR: Restarter is nil\n")); - } - } - - void - Receiver_exec_i::start_read (::ReaderStarter::assignment task) - { - if (this->checker_) - { - this->reactor ()->cancel_timer (this->checker_); - delete this->checker_; - this->checker_ = 0; - } - ACE_NEW_THROW_EX (this->checker_, - LastSampleChecker (*this, - task, - this->iterations_), - ::CORBA::NO_MEMORY ()); - this->schedule_timer (); - } - - void - Receiver_exec_i::start_task (::ReaderStarter::assignment task) - { - if (this->checker_) - { - this->reactor ()->cancel_timer (this->checker_); - delete this->checker_; - this->checker_ = 0; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_task - " - "Timer canceled and deleted.\n")); - } - if (task == ::ReaderStarter::READ_USING_IDL_PROXY) - { - this->reactor ()->notify (this->rh_idl_read_); - } - else if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY) - { - this->reactor ()->notify (this->rh_idl_take_); - } - } - - void - Receiver_exec_i::schedule_timer (void) - { - if (this->reactor ()->schedule_timer (this->checker_, - 0, - ACE_Time_Value (1, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - " - "ERROR: Error while starting LastSampleChecker\n")); - } - } - - Receiver_exec_i::TypedDataReader::_ptr_type - Receiver_exec_i::get_typed_idl_reader (void) - { - TypedDataReader::_var_type idl_reader; - ::DDS::DataReader_var dds_dr = - this->ciao_context_->get_connection_info_out_dds_entity (); - - if (::CORBA::is_nil (dds_dr.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::get_typed_idl_reader - " - "DataReader connection is NIL.\n")); - return TypedDataReader::_nil (); - } - - ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader * > (dds_dr.in ()); - - if (ccm_dr) - { - ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - idl_reader = - ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl - ::ProxyReadWriteTest_DDS_Traits::typed_reader_type::_narrow (tmp.in ()); - return idl_reader._retn (); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - " - "ERROR: CCM DataReader returned NIL as DDS entity\n")); - return TypedDataReader::_nil (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - " - "ERROR: Unable to cast to CCM DataReader\n")); - return TypedDataReader::_nil (); - } - } - - void - Receiver_exec_i::start_read_using_idl_proxy (void) - { - TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader (); - - if (!::CORBA::is_nil (idl_reader.in ())) - { - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_read_using_idl_proxy - " - "Start reading.")); - // Start to read - ProxyReadWriteTestSeq data; - ::DDS::SampleInfoSeq info; - - ::DDS::ReturnCode_t retcode = idl_reader->read (data, - info, - ::DDS::LENGTH_UNLIMITED, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::ANY_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE); - if (retcode == ::DDS::RETCODE_OK) - { - this->check_samples (data, - ::ReaderStarter::READ_USING_IDL_PROXY); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - " - "ERROR: Error during read: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - } - } - } - - void - Receiver_exec_i::start_take_using_idl_proxy (void) - { - TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader (); - - if (!::CORBA::is_nil (idl_reader.in ())) - { - // Start to read - ProxyReadWriteTestSeq data; - ::DDS::SampleInfoSeq info; - - ::DDS::ReturnCode_t retcode = idl_reader->take (data, - info, - ::DDS::LENGTH_UNLIMITED, - ::DDS::NOT_READ_SAMPLE_STATE, - ::DDS::ANY_VIEW_STATE, - ::DDS::ALIVE_INSTANCE_STATE); - if (retcode == ::DDS::RETCODE_OK) - { - this->check_samples (data, - ::ReaderStarter::TAKE_USING_IDL_PROXY); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - " - "ERROR: Error during read: <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode))); - } - } - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - // Component attributes and port operations. - - ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_ReaderStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReaderStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_ReaderStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Proxy_RW_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Proxy_RW_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h deleted file mode 100644 index d6d49b11553..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h +++ /dev/null @@ -1,280 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_ -#define CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_ - -#include /**/ "ace/pre.h" - -#include "Proxy_RW_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -#include "Connector/Proxy_RW_Test_Connector_conn.h" - -namespace CIAO_Proxy_RW_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * LastSampleChecker - */ - class LastSampleChecker - : public ACE_Event_Handler - { - public: - LastSampleChecker (Receiver_exec_i &callback, - const ::ReaderStarter::assignment &task, - const ::CORBA::UShort &iterations); - - virtual ~LastSampleChecker (void); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - const ::ReaderStarter::assignment task_; - const ::CORBA::UShort iterations_; - - }; - - /** - * Start Handler using IDL Proxy to Read - */ - - class StartHandlerIdlProxyRead : - public ACE_Event_Handler - { - public: - StartHandlerIdlProxyRead (Receiver_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Receiver_exec_i &callback_; - }; - - /** - * Start Handler using IDL Proxy to Take - */ - - class StartHandlerIdlProxyTake : - public ACE_Event_Handler - { - public: - StartHandlerIdlProxyTake (Receiver_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Receiver_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */ - - virtual - void on_one_data (const ::ProxyReadWriteTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ProxyReadWriteTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_ReaderStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from ReaderStarter. */ - - virtual - void start_read (::ReaderStarter::assignment task); - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - //@} - - private: - ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl - ::ProxyReadWriteTest_DDS_Traits::typed_reader_type - TypedDataReader; - - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_ReaderStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void keys (::CORBA::UShort keys); - void iterations (::CORBA::UShort iterations); - - bool check_last (const ::CORBA::UShort &iteration_to_check); - - void start_task (::ReaderStarter::assignment task); - void start_read (::ReaderStarter::assignment task); - void start_read_using_idl_proxy (void); - void start_take_using_idl_proxy (void); - - //@} - - private: - ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_ReaderStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - - StartHandlerIdlProxyRead *rh_idl_read_; - StartHandlerIdlProxyTake *rh_idl_take_; - - LastSampleChecker * checker_; - //@} - - //@{ - /** User defined private operations. */ - void check_samples (const ProxyReadWriteTestSeq & data, - ::ReaderStarter::assignment task); - - void schedule_timer (void); - TypedDataReader::_ptr_type get_typed_idl_reader (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Proxy_RW_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl deleted file mode 100644 index f70bb9808a4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef PROXY_RW_TEST_SENDER_IDL -#define PROXY_RW_TEST_SENDER_IDL - -#include "Connector/Proxy_RW_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module Proxy_RW_Test -{ - component Sender - { - port ProxyReadWriteTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - - uses ReaderStarter start_reader; - provides WriterRestarter restart_writer; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif /* PROXY_RW_TEST_SENDER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc deleted file mode 100644 index 1a975f1dfa9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc +++ /dev/null @@ -1,151 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(Proxy_RW_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += Proxy_RW_Test_Connector_idl_gen RW_Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Proxy_RW_Test_Sender.idl - } -} - -project(Proxy_RW_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += Proxy_RW_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Proxy_RW_Test_SenderE.idl - } -} - -project(Proxy_RW_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += Proxy_RW_Test_Sender_lem_gen Proxy_RW_Test_Sender_stub \ - Proxy_RW_Test_Base_stub RW_Reader_Starter_stub - libs += Proxy_RW_Test_Base_stub Sender_stub RW_Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_SenderEC.cpp - } - - Header_Files { - Proxy_RW_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_SenderEC.inl - } -} - -project(Proxy_RW_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += Proxy_RW_Test_Sender_idl_gen Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_stub RW_Reader_Starter_stub \ - RW_Reader_Starter_lem_stub - libs += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \ - RW_Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_SenderC.cpp - } - - Header_Files { - Proxy_RW_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Proxy_RW_Test_SenderC.inl - } -} - -project(Proxy_RW_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl { - after += Proxy_RW_Test_Sender_lem_stub Proxy_RW_Test_Sender_stub \ - Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \ - RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \ - RW_Reader_Starter_stub RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_Sender_exec.cpp - } - - Header_Files { - Proxy_RW_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(Proxy_RW_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Proxy_RW_Test_Base_stub Proxy_RW_Test_Sender_lem_stub \ - Proxy_RW_Test_Connector_stub \ - Proxy_RW_Test_Connector_svnt Proxy_RW_Test_Connector_lem_stub \ - RW_Reader_Starter_stub RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \ - Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \ - Proxy_RW_Test_Connector_lem_stub RW_Reader_Starter_stub \ - RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Proxy_RW_Test_SenderS.cpp - Proxy_RW_Test_Sender_svnt.cpp - } - - Header_Files { - Proxy_RW_Test_SenderS.h - Proxy_RW_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp deleted file mode 100644 index e895270cd84..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp +++ /dev/null @@ -1,420 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Proxy_RW_Test_Sender_exec.h" - -namespace CIAO_Proxy_RW_Test_Sender_Impl -{ - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::ReadGetRestarter - - void - restart_writer_exec_i::restart_write (::ReaderStarter::assignment task) - { - this->callback_.restart_write (task); - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - this->callback_.start (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (0) - , iterations_ (0) - , done_ (false) - , ccm_activated_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - Sender_exec_i::TypedDataWriter::_ptr_type - Sender_exec_i::get_typed_idl_writer (void) - { - TypedDataWriter::_var_type idl_writer; - ::DDS::DataWriter_var dds_dw = - this->ciao_context_->get_connection_info_write_dds_entity (); - - if (::CORBA::is_nil (dds_dw.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::get_typed_idl_writer - " - "Datawriter connection is NIL.\n")); - return TypedDataWriter::_nil (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ()); - - if (ccm_dw) - { - ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - idl_writer = - ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl - ::ProxyReadWriteTest_DDS_Traits::typed_writer_type::_narrow (tmp.in ()); - return idl_writer._retn (); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - " - "ERROR: CCM DataWriter returned NIL as DDS entity\n")); - return TypedDataWriter::_nil (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - " - "ERROR: Unable to cast to CCM DataWriter\n")); - return TypedDataWriter::_nil (); - } - } - - void - Sender_exec_i::write_using_idl_proxy_for_read (void) - { - TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer (); - - if (!::CORBA::is_nil (idl_writer.in ())) - { - ReaderStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n"))); - return; - } - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - ProxyReadWriteTest *new_key = new ProxyReadWriteTest; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key->key = CORBA::string_dup(key); - - const ::CORBA::UShort offset = - ::ReaderStarter::READ_USING_IDL_PROXY * this->iterations_ + 1; - for (CORBA::UShort iter = offset; - iter < offset + this->iterations_; - ++iter) - { - new_key->iteration = iter; - idl_writer->write (*new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - " - "Written key <%C> with <%d>\n", - key, iter)); - } - delete new_key; - } - starter->start_read (::ReaderStarter::READ_USING_IDL_PROXY); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_read - " - "ERROR: Error retrieving IDL DataWriter\n")); - } - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - " - "Finished writing sample for read.\n")); - } - - void - Sender_exec_i::write_using_idl_proxy_for_take (void) - { - TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer (); - - if (!::CORBA::is_nil (idl_writer.in ())) - { - ReaderStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n"))); - return; - } - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - ProxyReadWriteTest *new_key = new ProxyReadWriteTest; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key->key = CORBA::string_dup(key); - - const ::CORBA::UShort offset = - ::ReaderStarter::TAKE_USING_IDL_PROXY * this->iterations_ + 1; - for (CORBA::UShort iter = offset; - iter < offset + this->iterations_; - ++iter) - { - new_key->iteration = iter; - idl_writer->write (*new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_take - " - "Written key <%C> with <%d>\n", - key, iter)); - } - delete new_key; - } - starter->start_read (::ReaderStarter::TAKE_USING_IDL_PROXY); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_take - " - "ERROR: Error retrieving IDL DataWriter\n")); - } - } - - void - Sender_exec_i::start (void) - { - if (!this->done_ && this->ccm_activated_) - { - this->done_ = true; - this->write_using_idl_proxy_for_read (); - } - } - - void - Sender_exec_i::restart_write (::ReaderStarter::assignment task) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::restart_write - " - "New assignment received <%d>", task)); - if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY) - { - this->write_using_idl_proxy_for_take (); - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CCM_WriterRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_WriterRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_WriterRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Proxy_RW_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->ccm_activated_ = true; - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Proxy_RW_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h deleted file mode 100644 index fc357c79cd0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h +++ /dev/null @@ -1,207 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_ -#define CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_ - -#include /**/ "ace/pre.h" - -#include "Proxy_RW_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include "Connector/Proxy_RW_Test_Connector_conn.h" - -namespace CIAO_Proxy_RW_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_WriterRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from ReadGetRestarter. */ - - virtual - void restart_write (::ReaderStarter::assignment task); - //@} - - private: - ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl - ::ProxyReadWriteTest_DDS_Traits::typed_writer_type - TypedDataWriter; - - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CCM_WriterRestarter_ptr - get_restart_writer (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void restart_write (::ReaderStarter::assignment task); - //@} - - private: - ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - ::CCM_WriterRestarter_var ciao_restart_writer_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - bool done_; - bool ccm_activated_; - - //@} - - //@{ - /** User defined private operations. */ - void write_using_idl_proxy_for_read (void); - void write_using_idl_proxy_for_take (void); - - TypedDataWriter::_ptr_type get_typed_idl_writer (void); - //@} - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Proxy_RW_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp deleted file mode 100644 index af3d89f4e2b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp +++ /dev/null @@ -1,425 +0,0 @@ - - - - Proxy_RW_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Proxy_RW_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Proxy_RW_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Proxy_RW_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Proxy_RW_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Proxy_RW_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Proxy_RW_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Proxy_RW_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Proxy_RW_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - Proxy_RW_Library#ProxyRWProfile - - - - - topic_name - - - tk_string - - - Proxy_RW_Test - - - - - - Proxy_RW_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - Proxy_RW_Library#ProxyRWProfile - - - - - topic_name - - - tk_string - - - Proxy_RW_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_out_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_dds_entity - false - SimplexReceptacle - - - - push_consumer_dds_entity - true - Facet - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_out_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Proxy_RW_Test_Connector_exec - - - Proxy_RW_Test_Connector_exec - - - Proxy_RW_Test_Connector_svnt - - - Proxy_RW_Test_Connector_svnt - - - Proxy_RW_Test_Connector_stub - - - Proxy_RW_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml deleted file mode 100644 index 3ef510066e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index ffc32755202..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl deleted file mode 100755 index c5b1964e047..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore b/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl deleted file mode 100644 index 9813ce3d75a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QosProfile_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QOSPROFILE_TEST_BASE_IDL -#define QOSPROFILE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QosProfile_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QosProfile_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QosProfileTest" -#pragma DCPS_DATA_KEY "QosProfileTest symbol" - -struct QosProfileTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QosProfileTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc deleted file mode 100644 index da6d3f3b7d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = QosProfile_Test_Base_stub - dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QosProfile_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QosProfile_Test_Base.idl - } - - opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QosProfile_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl deleted file mode 100644 index 5aec5157741..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/QosProfile_Test_Connector.idl" - -module QosProfile_Test -{ - component QosProfileComponent - { - port QosProfileTestConnector::DDS_Write info_write; - }; -}; - -#endif /* COMPONENT_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc deleted file mode 100644 index 20004d702df..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(QosProfile_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += QosProfile_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - QosProfile_Test_Component.idl - } -} - -project(QosProfile_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += QosProfile_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QosProfile_Test_ComponentE.idl - } -} - -project(QosProfile_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += QosProfile_Test_Component_lem_gen QosProfile_Test_Component_stub \ - QosProfile_Test_Connector_stub QosProfile_Test_Base_stub - libs += Component_stub QosProfile_Test_Connector_stub \ - QosProfile_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ComponentEC.cpp - } - - Header_Files { - QosProfile_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - QosProfile_Test_ComponentEC.inl - } -} - -project(QosProfile_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += QosProfile_Test_Component_idl_gen QosProfile_Test_Connector_stub \ - QosProfile_Test_Base_stub QosProfile_Test_Connector_lem_gen - libs += QosProfile_Test_Connector_stub QosProfile_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ComponentC.cpp - } - - Header_Files { - QosProfile_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - QosProfile_Test_ComponentC.inl - } -} - -project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += QosProfile_Test_Component_lem_stub QosProfile_Test_Component_stub \ - QosProfile_Test_Base_stub QosProfile_Test_Connector_stub \ - QosProfile_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_Component_exec.cpp - } - - Header_Files { - QosProfile_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QosProfile_Test_Component_lem_stub QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \ - QosProfile_Test_Component_exec QosProfile_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \ - Component_exec QosProfile_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ComponentS.cpp - QosProfile_Test_Component_svnt.cpp - } - - Header_Files { - QosProfile_Test_ComponentS.h - QosProfile_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp deleted file mode 100644 index 868450365c9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// -*- C++ -*- -#include "QosProfile_Test_Component_exec.h" - -namespace CIAO_QosProfile_Test_QosProfileComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::QosProfile_Test::CCM_QosProfileComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QosProfile_Test_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h deleted file mode 100644 index 0c5b8442e0c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "QosProfile_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_QosProfile_Test_QosProfileComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual QosProfileComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::QosProfile_Test::CCM_QosProfileComponent_Context_var context_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QosProfile_Test_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl deleted file mode 100644 index d0ddb1d9a6c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QosProfile_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_ -#define QOS_PROFILE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QosProfile_Test_Base.idl" - -#pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QosProfile_Test_BaseTypeSupport.idl" -#endif - -module QosProfile_Test -{ - module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConnector; -}; - -#endif /* QOS_PROFILE_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc deleted file mode 100644 index 8f32d311e41..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p QosProfile_Test_Base -l .. -o ../lib -u DDS QosProfile_Test_Connector" - -project(QosProfile_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen QosProfile_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QosProfile_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QosProfile_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QosProfile_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QosProfile_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QosProfile_Test_Connector.idl - } -} - -project(QosProfile_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += QosProfile_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QosProfile_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QosProfile_Test_ConnectorE.idl - } -} - -project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub - libs += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QosProfile_Test_Connector_lem_stub - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ConnectorEC.cpp - } - - Header_Files { - QosProfile_Test_ConnectorEC.h - QosProfile_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QosProfile_Test_ConnectorEC.inl - } -} - -project(QosProfile_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += QosProfile_Test_Connector_idl_gen QosProfile_Test_Base_stub - libs += QosProfile_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QosProfile_Test_Connector_stub - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ConnectorC.cpp - } - - Header_Files { - QosProfile_Test_ConnectorC.h - QosProfile_Test_Connector_stub_export.h - } - - Inline_Files { - QosProfile_Test_ConnectorC.inl - } -} - -project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_stub QosProfile_Test_Base_stub - sharedname = QosProfile_Test_Connector_exec - libs += QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub QosProfile_Test_Base_stub QosProfile_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_Connector_conn.cpp - } - - Header_Files { - QosProfile_Test_Connector_conn.h - QosProfile_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub - sharedname = QosProfile_Test_Connector_svnt - libs += QosProfile_Test_Connector_stub \ - QosProfile_Test_Connector_lem_stub \ - QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QosProfile_Test_ConnectorS.cpp - QosProfile_Test_Connector_svnt.cpp - } - - Header_Files { - QosProfile_Test_ConnectorS.h - QosProfile_Test_Connector_svnt.h - QosProfile_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp deleted file mode 100644 index c3d16970d98..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp +++ /dev/null @@ -1,206 +0,0 @@ - - - - QosProfile_Test_Depl_1 - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - QosProfile_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QosProfile_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QosProfile_Test_Connector_exec - - - - - - ComponentComponent - ComponentNode - - - - - - QosProfile_Test_ConnectorComponent - ComponentNode - - - - - qos_profile - - - tk_string - - - QosProfile_Library#QosProfile_Profile#TooMany - - - - - topic_name - - - tk_string - - - QosProfile_Test - - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_stub - - - QosProfile_Test_Connector_stub - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp deleted file mode 100644 index 8bef833b7bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp +++ /dev/null @@ -1,206 +0,0 @@ - - - - QosProfile_Test_Depl_1 - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - QosProfile_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QosProfile_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QosProfile_Test_Connector_exec - - - - - - ComponentComponent - ComponentNode - - - - - - QosProfile_Test_ConnectorComponent - ComponentNode - - - - - qos_profile - - - tk_string - - - QosProfile_Library::QosProfileProfile - - - - - topic_name - - - tk_string - - - QosProfile_Test - - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_stub - - - QosProfile_Test_Connector_stub - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp deleted file mode 100644 index b8525348547..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp +++ /dev/null @@ -1,206 +0,0 @@ - - - - QosProfile_Test_Depl_1 - - - ComponentComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - QosProfile_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QosProfile_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QosProfile_Test_Connector_exec - - - - - - ComponentComponent - ComponentNode - - - - - - QosProfile_Test_ConnectorComponent - ComponentNode - - - - - qos_profile - - - tk_string - - - Wrong_Library#WrongProfile - - - - - topic_name - - - tk_string - - - QosProfile_Test - - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_exec - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_svnt - - - QosProfile_Test_Connector_stub - - - QosProfile_Test_Connector_stub - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml deleted file mode 100644 index f6b2c3c06d5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 7652e49300c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl deleted file mode 100755 index d23862e4e88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl +++ /dev/null @@ -1,229 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# 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; - -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 daemon $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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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 $file -k file://$ior_emfile -q"); - $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); - - if ($pl_status != 0) { - print STDERR "OK: dance_plan_launcher returned an error status ($pl_status)\n"; - kill_open_processes (); - } - else { - print "ERROR : dance_plan_launcher didn't return with an error.\n"; - $status=$pl_status; - } - - - 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; - } - } - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl deleted file mode 100644 index de514308408..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @file Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef BASE_IDL_ -#define BASE_IDL_ - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc deleted file mode 100644 index 351304a0a57..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc +++ /dev/null @@ -1,13 +0,0 @@ -project(QC_Base_stub) : ndds_ts_defaults, nddslib { - sharedname = QC_Base_stub - dynamicflags += NDDS_USER_DLL_EXPORT - libout = ../descriptors - - NDDSTypeSupport_Files { - Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc deleted file mode 100644 index 7a9b9e20b27..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc +++ /dev/null @@ -1,19 +0,0 @@ -project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults { - exename = DDS_receiver - after += QC_Base_stub - - includes += ../Base - - libs += QC_Base_stub - libpaths += ../descriptors - - exeout += ../descriptors - - Source_Files { - QC_Receiver.cpp - } - - Header_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp deleted file mode 100644 index 72620a0ce0f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp +++ /dev/null @@ -1,418 +0,0 @@ -#include -#include - -using namespace std; - -#include "Base.h" -#include "BaseSupport.h" - -#include "ace/OS_main.h" -#include "ace/OS_NS_stdlib.h" - -#define LIBRARY_NAME "QueryCondition_Library" -#define PROFILE_NAME "QueryConditionProfile" - -bool shutdown_flag = false; -long num_samples = 0; -long received_samples = 0; -long expected_samples_run1 = 1 * 2; //only sample 2 should be received of 2 keys -long expected_samples_run2 = 1 * 2; //only sample 5 should be received o 2 keys -long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys. - -DDSWaitSet* ws_ = new DDSWaitSet (); -DDS_Duration_t dur_ = {9, 0}; - -void sleep_now (int sleeptime) -{ -#ifdef RTI_WIN32 - Sleep(sleeptime * 1000); -#else - sleep(sleeptime); -#endif -} - -void check_iter (const QueryConditionTest & sample, - const DDS_SampleInfo & readinfo, - const int & run) -{ - bool error = false; - if (run == 1) - { - //only sample 2 should be received - error = sample.iteration <= 1 && sample.iteration >= 3; - } - else if (run == 2) - { - //only samples 8 should be received - error = sample.iteration <= 4 && sample.iteration >= 6; - } - else if (run == 3) - { - //all other unread samples. - error = sample.iteration == 2; - error |= sample.iteration ==5; - } - - error - ? - cerr << "ERROR Received: key <" - << sample.symbol - << "> - iteration <" - << sample.iteration - << ">" - << endl - : - cout << "Received: key <" - << sample.symbol - << "> - iteration <" - << sample.iteration - << "> - instance status <" - << readinfo.instance_state - << "> - view status <" - << readinfo.view_state - << "> - sample status <" - << readinfo.sample_state - << ">" - << endl; -} - - -void read (DDSDataReader * dr, - DDSQueryCondition * qc, - DDSReadCondition * rc, - const int & run) -{ - QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr); - - DDSConditionSeq cond; - - if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT) - { - cerr << "ERROR: wait timed out" << endl; - } - else - { - //wait a moment to allow DDS to write all samples we need here... - QueryConditionTestSeq data; - DDS_SampleInfoSeq info_seq; - sleep_now (3); - for (DDS_Long i = 0; i < cond.length (); ++i) - { - if (run == 3) - { - sleep_now (10); - if (cond[i] == rc) - { - received_samples = 0; - - // ************** read all in one - cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl; - typed_dr->read_w_condition (data, - info_seq, - DDS_LENGTH_UNLIMITED, - rc); - for (DDS_Long y = 0; y < data.length (); ++y) - { - if (info_seq[y].valid_data) - { - check_iter (data[y], info_seq[y], run); - received_samples ++; - } - } - typed_dr->return_loan (data, info_seq); - if (received_samples != expected_samples_run3) - { - cerr << "ERROR: run 3 unexpected number of samples received : " - << "expected < " - << expected_samples_run3 << "> - received <" - << received_samples << ">" << endl; - } - // end read all in one - - } - else - { - cerr << "ERROR: Should be woken up on ReadCondition" << endl; - } - } - else // run 1 and 2 - { - if (cond[i] == qc) - { - received_samples = 0; - cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl; - typed_dr->read_w_condition (data, - info_seq, - DDS_LENGTH_UNLIMITED, - qc); - for (DDS_Long i = 0; i < data.length (); ++i) - { - if (info_seq[i].valid_data) - { - check_iter (data[i], info_seq[i], run); - received_samples ++; - } - } - typed_dr->return_loan (data, info_seq); - - if (run == 1) - { - if (received_samples != expected_samples_run1) - { - cerr << "ERROR: run 1 unexpected number of samples received : " - << "expected < " - << expected_samples_run1 << "> - received <" - << received_samples << ">" << endl; - } - } - else - { - if (received_samples != expected_samples_run2) - { - cerr << "ERROR: run 2 unexpected number of samples received : " - << "expected < " - << expected_samples_run2 << "> - received <" - << received_samples << ">" << endl; - } - } - } - else - { - cerr << "ERROR: Should be woken up on QueryCondition" << endl; - } - } - } - if (run != 3) - { - } - - } - - //check if all samples are still available. - if (run == 3) - { - QueryConditionTestSeq data; - DDS_SampleInfoSeq info_seq; - sleep_now (3); - typed_dr->read (data, - info_seq, - DDS_LENGTH_UNLIMITED); - cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <" - << data.length () - << ">" - << endl; - for (DDS_Long i = 0; i < data.length (); ++i) - { - cout << "Received: key <" - << data[i].symbol - << "> - iteration <" - << data[i].iteration - << "> - instance status <" - << info_seq[i].instance_state - << "> - view status <" - << info_seq[i].view_state - << "> - sample status <" - << info_seq[i].sample_state - << ">" - << endl; - } - if (data.length () != 18) - { - cerr << "ERROR: unexpected number of samples received : " - << "expected <18> - received <" - << data.length () << ">" << endl; - } - typed_dr->return_loan (data, info_seq); - } - sleep_now (5); -} - -int clean_up (DDSDomainParticipant * participant) -{ - DDS_ReturnCode_t retcode = DDS_RETCODE_OK; - int main_result = 0; - - cout << "RECEIVER: Exiting ..." << endl; - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - } - delete ws_; - DDSDomainParticipantFactory::finalize_instance (); - return main_result; -} - -int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - DDSTopic* topic = 0; - DDSDataReader* data_reader = 0; - DDSSubscriber* sub = 0; - DDS_ReturnCode_t retcode = DDS_RETCODE_OK; - QueryConditionTestDataReader* typed_dr = 0; - DDSQueryCondition* qc = 0; - DDSReadCondition* rc = 0; - int run = 0; - -// NDDS_Config_LogVerbosity n_verbosity = -// static_cast (3); -// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); - - const ACE_TCHAR * env_domain_id = 0; - if (argc > 1) - { - env_domain_id = argv[1]; - } - if (!env_domain_id) - { - printf ("Environment variable DEFAULT_DOMAIN_ID not set " - "=> setting it to 2\n"); - env_domain_id = "2"; - } - else - printf ("Domain ID set to %s\n", env_domain_id); - - const int domain_id = ACE_OS::atoi (env_domain_id); - /* Create the domain participant on domain ID 0 */ - DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile (domain_id, /* Domain ID */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - cerr << "RECEIVER: Error creating participant" << endl; - return 1; - } - - retcode = QueryConditionTestTypeSupport::register_type( - participant, QueryConditionTestTypeSupport::get_type_name ()); - - if (retcode != DDS_RETCODE_OK) { - cerr << "RECEIVER: Error registering type" << endl; - return clean_up (participant); - } - - topic = participant->create_topic_with_profile ( - "QC", /* Topic name*/ - QueryConditionTestTypeSupport::get_type_name (), /* Type name */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - cerr << "RECEIVER: Error creating topic" << endl; - return clean_up (participant); - } - - sub = participant->create_subscriber_with_profile (LIBRARY_NAME, - PROFILE_NAME, - 0, - 0); - if (!sub) { - cerr << "RECEIVER: Error creating subscriber" << endl; - return clean_up (participant); - } - - data_reader = sub->create_datareader_with_profile ( - topic, - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_reader) { - cerr << "RECEIVER: Error creating data reader" << endl; - return clean_up (participant); - } - - typed_dr = QueryConditionTestDataReader::narrow (data_reader); - - if (!typed_dr) { - cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl; - return clean_up (participant); - } - - const char* PARAMS_RUN_1[] = {"1", "3"}; - DDS_StringSeq parameters_run_1; - parameters_run_1.from_array (PARAMS_RUN_1, 2); - - qc = typed_dr->create_querycondition ( - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE, - "iteration > %0 AND iteration < %1", - parameters_run_1); - if (!qc) { - cerr << "RECEIVER: Error creating query condition" << endl; - return clean_up (participant); - } - else - cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl; - - ws_->attach_condition (qc); - - cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 3." <set_query_parameters (parameters_run_2) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl; - return clean_up (participant); - } - } - cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl; - - cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <detach_condition (qc) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Error detaching query condition" << endl; - return clean_up (participant); - } - cout << "RECEIVER: query condition deleted" << endl; - cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE," - << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE," - << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl; - - // Delete the query condition from the data reader - typed_dr->delete_readcondition (qc); - sleep_now(10); - - rc = typed_dr->create_readcondition ( - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE); - if (!rc) { - cerr << "RECEIVER: Error creating read condition" << endl; - return clean_up (participant); - } - - if (ws_->attach_condition (rc) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Error attaching read condition" << endl; - return clean_up (participant); - } - - cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" < -#include - -using namespace std; - -#include "Base.h" -#include "BaseSupport.h" - -#include "ace/OS_main.h" -#include "ace/OS_NS_stdlib.h" - -#define LIBRARY_NAME "QueryCondition_Library" -#define PROFILE_NAME "QueryConditionProfile" - -const int number_of_iterations_ = 3; - -const int number_of_keys_ = 2; - -int last_iteration_ = 0; -int run_ = 0; - -void sleep_now (int sleeptime) -{ -#ifdef RTI_WIN32 - Sleep(sleeptime * 1000); -#else - sleep(sleeptime); -#endif -} - -void write (DDSDataWriter * writer) -{ - QueryConditionTestDataWriter* typed_writer = 0; - typed_writer = QueryConditionTestDataWriter::narrow (writer); - for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - sprintf (key, "KEY_%d", iter_key); - new_key.symbol = key; - for (int iter = 1; - iter < number_of_iterations_ + 1; - ++iter) - { - new_key.iteration = iter + last_iteration_; - DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL); - if (retcode != DDS_RETCODE_OK) - { - cout << "ERROR writing symbol <" - << key - << "> - iteration <" - << new_key.iteration - << ">" - << endl; - } - } - cout << "Sender: Written samples with symbol <" - << key - << "> and iteration <" - << last_iteration_ + 1 - << "> through <" - << new_key.iteration - << ">" - << endl; - } - ++run_; - last_iteration_ = number_of_iterations_ * run_; -} - -int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - DDS_ReturnCode_t retcode; - DDSTopic* topic = 0; - DDSDataWriter* data_writer = 0; - DDSPublisher* publisher = 0; - int main_result = 1; /* error by default */ - -// NDDS_Config_LogVerbosity n_verbosity = -// static_cast (3); -// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); - const ACE_TCHAR * env_domain_id = 0; - if (argc > 1) - { - env_domain_id = argv[1]; - } - if (!env_domain_id) - { - printf ("Environment variable DEFAULT_DOMAIN_ID not set " - "=> setting it to 2\n"); - env_domain_id = "2"; - } - else - printf ("Domain ID set to %s\n", env_domain_id); - - const int domain_id = ACE_OS::atoi (env_domain_id); - - DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile (domain_id, /* Domain ID */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - cerr << "SENDER: Error creating participant" << endl; - goto clean_exit; - } - - retcode = QueryConditionTestTypeSupport::register_type( - participant, QueryConditionTestTypeSupport::get_type_name ()); - - if (retcode != DDS_RETCODE_OK) { - cerr << "SENDER: Error registering type" << endl; - goto clean_exit; - } - - topic = participant->create_topic_with_profile ( - "QC", /* Topic name*/ - QueryConditionTestTypeSupport::get_type_name (), /* Type name */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - cerr << "SENDER: Error creating topic" << endl; - goto clean_exit; - } - - publisher = participant->create_publisher_with_profile (LIBRARY_NAME, - PROFILE_NAME, - 0, - 0); - if (!publisher) { - cerr << "SENDER: Error creating publisher" << endl; - goto clean_exit; - } - - data_writer = publisher->create_datawriter_with_profile ( - topic, - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_writer) { - cerr << "SENDER: Error creating data writer" << endl; - goto clean_exit; - } - - write (data_writer); - sleep_now (8); - write (data_writer); - sleep_now (8); - write (data_writer); - sleep_now (30); - - main_result = 0; -clean_exit: - cout << "SENDER: Exiting ..." << endl; - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - } - DDSDomainParticipantFactory::finalize_instance (); - return main_result; -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README deleted file mode 100644 index b276b44a76f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README +++ /dev/null @@ -1,40 +0,0 @@ - - -This is a plain DDS test, which test the use of 2 different query conditions, followed through a -readcondition. - -Use a sample with { - string symbol; //@key - long iteration; -} - -The sender writes samples with symbol and and iteration <1> through <3> -The receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a -read_w_condition with this querycondition. - -What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2. - -Next, the sender writes samples with symbol and and iteration <4> through <6> -The receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a -read_w_condition with this querycondition. - -What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5. - -Next, the sender writes samples with symbol and and iteration <7> through <9> -The receiver deletes the query condition and creates the next readcondition: - "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" -and uses a read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED. - -(This test (QueryCondition/DDS) differs with the test QueryCondition/DDS_OneByOne that the DDS_OneByOne test does use a loop with -read_w_condition with this readcondition and number of samples = 1.) - - -What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which -are already received before. - -Next we check the number of samples in DDS with a plain read. -What we expect is that the receiver receives all 18 samples. - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index d061e075aae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl deleted file mode 100755 index a24f5ff02ac..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl +++ /dev/null @@ -1,31 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - -$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}"; - -print "Start receiver\n"; -$R = $tg_receiver->CreateProcess ("./DDS_receiver", "$domain_id"); -$R->Spawn(); - -sleep (1); - -print "Start sender\n"; -$S = $tg_sender->CreateProcess ("./DDS_Sender", "$domain_id"); -$S->Spawn (); - - -sleep (90); - -$R->Kill (); -$S->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl deleted file mode 100644 index 57e69fd440c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @file Base_ObO.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef BASE_OBO_IDL_ -#define BASE_OBO_IDL_ - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc deleted file mode 100644 index 89919baf0de..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc +++ /dev/null @@ -1,13 +0,0 @@ -project(Base_obo_stub) : ndds_ts_defaults, nddslib { - sharedname = Base_obo_stub - dynamicflags += NDDS_USER_DLL_EXPORT - libout = ../descriptors - - NDDSTypeSupport_Files { - Base_ObO.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc deleted file mode 100644 index e42dd1dad99..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc +++ /dev/null @@ -1,19 +0,0 @@ -project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults { - exename = DDS_ObO_receiver - after += Base_obo_stub - - includes += ../Base - - libs += Base_obo_stub - libpaths += ../descriptors - - exeout += ../descriptors - - Source_Files { - ObO_Receiver.cpp - } - - Header_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp deleted file mode 100644 index e2e21d90d6b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp +++ /dev/null @@ -1,432 +0,0 @@ -#include -#include - -using namespace std; - -#include "ace/OS_main.h" -#include "ace/OS_NS_stdlib.h" - -#include "Base_ObO.h" -#include "Base_ObOSupport.h" - -#define LIBRARY_NAME "QueryCondition_Library" -#define PROFILE_NAME "QueryConditionProfile" - -bool shutdown_flag = false; -long num_samples = 0; -long received_samples = 0; -long expected_samples_run1 = 1 * 2; //only sample 2 should be received of 2 keys -long expected_samples_run2 = 1 * 2; //only sample 5 should be received o 2 keys -long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys. - -DDSWaitSet* ws_ = new DDSWaitSet (); -DDS_Duration_t dur_ = {9, 0}; - -void sleep_now (int sleeptime) -{ -#ifdef RTI_WIN32 - Sleep(sleeptime * 1000); -#else - sleep(sleeptime); -#endif -} - - -void check_iter (const QueryConditionTest & sample, - const DDS_SampleInfo & readinfo, - const int & run) -{ - bool error = false; - if (run == 1) - { - //only sample 2 should be received - error = sample.iteration <= 1 && sample.iteration >= 3; - } - else if (run == 2) - { - //only samples 5 should be received - error = sample.iteration <= 4 && sample.iteration >= 6; - } - else if (run == 3) - { - //all other unread samples. - error = sample.iteration == 2; - error |= sample.iteration ==5; - } - - error - ? - cerr << "ERROR Received: key <" - << sample.symbol - << "> - iteration <" - << sample.iteration - << ">" - << endl - : - cout << "Received: key <" - << sample.symbol - << "> - iteration <" - << sample.iteration - << "> - instance status <" - << readinfo.instance_state - << "> - view status <" - << readinfo.view_state - << "> - sample status <" - << readinfo.sample_state - << ">" - << endl; -} - - -void read (DDSDataReader * dr, - DDSQueryCondition * qc, - DDSReadCondition * rc, - const int & run) -{ - QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr); - - DDSConditionSeq cond; - - if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT) - { - cerr << "ERROR: wait timed out" << endl; - } - else - { - //wait a moment to allow DDS to write all samples we need here... - QueryConditionTestSeq data; - DDS_SampleInfoSeq info_seq; - sleep_now (3); - for (DDS_Long i = 0; i < cond.length (); ++i) - { - if (run == 3) - { - sleep_now (10); - if (cond[i] == rc) - { - - // *************** read one by one : max_number of samples = 1 ************ - int loop = 0; - cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl; - - received_samples = 0; - - while (loop < 30) - { - DDS_ReturnCode_t retcode = typed_dr->read_w_condition (data, - info_seq, - 1, - rc); - loop ++; - if (retcode == 0) - { - for (DDS_Long y = 0; y < data.length (); ++y) - { - if (info_seq[y].valid_data) - { - check_iter (data[y], info_seq[y], run); - received_samples ++; - } - } - } - typed_dr->return_loan (data, info_seq); - - } - // *************** end read one by one - if (received_samples != expected_samples_run3) - { - cerr << "ERROR: RUN 3 UNEXPECTED NUMBER OF SAMPLES RECEIVED : " - << "with read_w_condition and read condition, expected < " - << expected_samples_run3 << "> - received <" - << received_samples << ">" << endl; - } - // check readcondition - //DDS_SampleStateMask sample = rc->get_sample_state_mask (); - //DDS_ViewStateMask view = rc->get_view_state_mask (); - //DDS_InstanceStateMask instance = rc->get_instance_state_mask (); - //::printf("************sample_state %ld, view_state %ld instance_state %ld\n", - // (long)sample, (long)view, (long)instance); - } - else - { - cerr << "ERROR: Should be woken up on ReadCondition" << endl; - } - } - else // run 1 and 2 - { - if (cond[i] == qc) - { - cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl; - received_samples = 0; - typed_dr->read_w_condition (data, - info_seq, - DDS_LENGTH_UNLIMITED, - qc); - - for (DDS_Long i = 0; i < data.length (); ++i) - { - if (info_seq[i].valid_data) - { - check_iter (data[i], info_seq[i], run); - received_samples ++; - } - } - typed_dr->return_loan (data, info_seq); - if (run == 1) - { - if (received_samples != expected_samples_run1) - { - cerr << "ERROR: run 1 unexpected number of samples received : " - << "expected < " - << expected_samples_run1 << "> - received <" - << received_samples << ">" << endl; - } - } - else - { - if (received_samples != expected_samples_run2) - { - cerr << "ERROR: run 2 unexpected number of samples received : " - << "expected < " - << expected_samples_run2 << "> - received <" - << received_samples << ">" << endl; - } - } - } - else - { - cerr << "ERROR: Should be woken up on QueryCondition" << endl; - } - } - } - } - - - //check after run 3 if all samples are still available. - if (run == 3) - { - QueryConditionTestSeq data; - DDS_SampleInfoSeq info_seq; - sleep_now (3); - typed_dr->read (data, - info_seq, - DDS_LENGTH_UNLIMITED); - cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <" - << data.length () - << ">" - << endl; - for (DDS_Long i = 0; i < data.length (); ++i) - { - cout << "Received: key <" - << data[i].symbol - << "> - iteration <" - << data[i].iteration - << "> - instance status <" - << info_seq[i].instance_state - << "> - view status <" - << info_seq[i].view_state - << "> - sample status <" - << info_seq[i].sample_state - << ">" - << endl; - } - if (data.length () != 18) - { - cerr << "ERROR: unexpected number of samples received : " - << "expected <18> - received <" - << data.length () << ">" << endl; - } - typed_dr->return_loan (data, info_seq); - } - sleep_now (5); -} - -int clean_up (DDSDomainParticipant * participant) -{ - DDS_ReturnCode_t retcode = DDS_RETCODE_OK; - int main_result = 0; - - cout << "RECEIVER: Exiting ..." << endl; - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - } - delete ws_; - DDSDomainParticipantFactory::finalize_instance (); - return main_result; -} - -int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - DDSTopic* topic = 0; - DDSDataReader* data_reader = 0; - DDSSubscriber* sub = 0; - DDS_ReturnCode_t retcode = DDS_RETCODE_OK; - QueryConditionTestDataReader* typed_dr = 0; - DDSQueryCondition* qc = 0; - DDSReadCondition* rc = 0; - int run = 0; - -// NDDS_Config_LogVerbosity n_verbosity = -// static_cast (3); -// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); - - const ACE_TCHAR * env_domain_id = 0; - if (argc > 1) - { - env_domain_id = argv[1]; - } - if (!env_domain_id) - { - printf ("Environment variable DEFAULT_DOMAIN_ID not set " - "=> setting it to 2\n"); - env_domain_id = "2"; - } - else - printf ("Domain ID set to %s\n", env_domain_id); - - const int domain_id = ACE_OS::atoi (env_domain_id); - - DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile (domain_id, /* Domain ID */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - cerr << "RECEIVER: Error creating participant" << endl; - return 1; - } - - retcode = QueryConditionTestTypeSupport::register_type( - participant, QueryConditionTestTypeSupport::get_type_name ()); - - if (retcode != DDS_RETCODE_OK) { - cerr << "RECEIVER: Error registering type" << endl; - return clean_up (participant); - } - - topic = participant->create_topic_with_profile ( - "QC", /* Topic name*/ - QueryConditionTestTypeSupport::get_type_name (), /* Type name */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - cerr << "RECEIVER: Error creating topic" << endl; - return clean_up (participant); - } - - sub = participant->create_subscriber_with_profile (LIBRARY_NAME, - PROFILE_NAME, - 0, - 0); - if (!sub) { - cerr << "RECEIVER: Error creating subscriber" << endl; - return clean_up (participant); - } - - data_reader = sub->create_datareader_with_profile ( - topic, - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_reader) { - cerr << "RECEIVER: Error creating data reader" << endl; - return clean_up (participant); - } - - typed_dr = QueryConditionTestDataReader::narrow (data_reader); - - if (!typed_dr) { - cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl; - return clean_up (participant); - } - - const char* PARAMS_RUN_1[] = {"1", "3"}; - DDS_StringSeq parameters_run_1; - parameters_run_1.from_array (PARAMS_RUN_1, 2); - - qc = typed_dr->create_querycondition ( - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE, - "iteration > %0 AND iteration < %1", - parameters_run_1); - if (!qc) { - cerr << "RECEIVER: Error creating query condition" << endl; - return clean_up (participant); - } - else - cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl; - - ws_->attach_condition (qc); - - cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 2." <set_query_parameters (parameters_run_2) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl; - return clean_up (participant); - } - } - cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl; - - cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <detach_condition (qc) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Error detaching query condition" << endl; - return clean_up (participant); - } - // Delete the query condition from the data reader - typed_dr->delete_readcondition (qc); - cout << "RECEIVER: query condition deleted" << endl; - cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE," - << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE," - << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl; - - sleep_now(10); - - rc = typed_dr->create_readcondition ( - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE); - if (!rc) { - cerr << "RECEIVER: Error creating read condition" << endl; - return clean_up (participant); - } - - if (ws_->attach_condition (rc) != DDS_RETCODE_OK) - { - cerr << "RECEIVER: Error attaching read condition" << endl; - return clean_up (participant); - } - - cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" < -#include - -using namespace std; - -#include "ace/OS_main.h" -#include "ace/OS_NS_stdlib.h" - -#include "Base_ObO.h" -#include "Base_ObOSupport.h" - -#define LIBRARY_NAME "QueryCondition_Library" -#define PROFILE_NAME "QueryConditionProfile" - -const int number_of_iterations_ = 3; - -const int number_of_keys_ = 2; - -int last_iteration_ = 0; -int run_ = 0; - -void sleep_now (int sleeptime) -{ -#ifdef RTI_WIN32 - Sleep(sleeptime * 1000); -#else - sleep(sleeptime); -#endif -} - -void write (DDSDataWriter * writer) -{ - QueryConditionTestDataWriter* typed_writer = 0; - typed_writer = QueryConditionTestDataWriter::narrow (writer); - for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - sprintf (key, "KEY_%d", iter_key); - new_key.symbol = key; - for (int iter = 1; - iter < number_of_iterations_ + 1; - ++iter) - { - new_key.iteration = iter + last_iteration_; - DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL); - if (retcode != DDS_RETCODE_OK) - { - cout << "ERROR writing symbol <" - << key - << "> - iteration <" - << new_key.iteration - << ">" - << endl; - } - } - cout << "Sender: Written samples with symbol <" - << key - << "> and iteration <" - << last_iteration_ + 1 - << "> through <" - << new_key.iteration - << ">" - << endl; - } - ++run_; - last_iteration_ = number_of_iterations_ * run_; -} - -int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - DDS_ReturnCode_t retcode; - DDSTopic* topic = 0; - DDSDataWriter* data_writer = 0; - DDSPublisher* publisher = 0; - int main_result = 1; /* error by default */ - -// NDDS_Config_LogVerbosity n_verbosity = -// static_cast (3); -// NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); - const ACE_TCHAR * env_domain_id = 0; - if (argc > 1) - { - env_domain_id = argv[1]; - } - if (!env_domain_id) - { - printf ("Environment variable DEFAULT_DOMAIN_ID not set " - "=> setting it to 2\n"); - env_domain_id = "2"; - } - else - printf ("Domain ID set to %s\n", env_domain_id); - - const int domain_id = ACE_OS::atoi (env_domain_id); - - DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile (domain_id, /* Domain ID */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - cerr << "SENDER: Error creating participant" << endl; - goto clean_exit; - } - - retcode = QueryConditionTestTypeSupport::register_type( - participant, QueryConditionTestTypeSupport::get_type_name ()); - - if (retcode != DDS_RETCODE_OK) { - cerr << "SENDER: Error registering type" << endl; - goto clean_exit; - } - - topic = participant->create_topic_with_profile ( - "QC", /* Topic name*/ - QueryConditionTestTypeSupport::get_type_name (), /* Type name */ - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) { - cerr << "SENDER: Error creating topic" << endl; - goto clean_exit; - } - - publisher = participant->create_publisher_with_profile (LIBRARY_NAME, - PROFILE_NAME, - 0, - 0); - if (!publisher) { - cerr << "SENDER: Error creating publisher" << endl; - goto clean_exit; - } - - data_writer = publisher->create_datawriter_with_profile ( - topic, - LIBRARY_NAME, /* QoS */ - PROFILE_NAME, - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_writer) { - cerr << "SENDER: Error creating data writer" << endl; - goto clean_exit; - } - - write (data_writer); - sleep_now (8); - write (data_writer); - sleep_now (8); - write (data_writer); - sleep_now (30); - - main_result = 0; -clean_exit: - cout << "SENDER: Exiting ..." << endl; - if (participant) { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) { - main_result = 1; - } - } - DDSDomainParticipantFactory::finalize_instance (); - return main_result; -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README deleted file mode 100644 index ff6cdedb542..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README +++ /dev/null @@ -1,40 +0,0 @@ - - -This is a plain DDS test, which test the use of 2 different query conditions, followed through a -readcondition. - -Use a sample with { - string symbol; //@key - long iteration; -} - -The sender writes samples with symbol and and iteration <1> through <3> -The receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a -read_w_condition with this querycondition. - -What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2. - -Next, the sender writes samples with symbol and and iteration <4> through <6> -The receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a -read_w_condition with this querycondition. - -What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5. - -Next, the sender writes samples with symbol and and iteration <7> through <9> -The receiver deletes the query condition and creates the next readcondition: - "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" -and uses, in a loop, a read_w_condition with this readcondition and number of samples = 1. - -(This test (QueryCondition/DDS_OneByOne) differs with the test QueryCondition/DDS that the DDS test doesn't use a loop, but a -read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.) - - -What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which -are already received before. - -Next we check the number of samples in DDS with a plain read. -What we expect is that the receiver receives all 18 samples. - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index d061e075aae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl deleted file mode 100755 index 10b65e2a7e6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl +++ /dev/null @@ -1,31 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; -$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - -$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}"; - -print "Start receiver\n"; -$R = $tg_receiver->CreateProcess ("./DDS_ObO_receiver", "$domain_id"); -$R->Spawn(); - -sleep (1); - -print "Start sender\n"; -$S = $tg_sender->CreateProcess ("./DDS_ObO_Sender", "$domain_id"); -$S->Spawn (); - - -sleep (90); - -$R->Kill (); -$S->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl deleted file mode 100644 index fd242249ca4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Different_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DIFFERENT_TEST_BASE_IDL -#define DIFFERENT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Different_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Different_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTest" -#pragma DCPS_DATA_KEY "QueryConditionTest symbol" - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc deleted file mode 100644 index e547afe5044..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project(QC_Different_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = QC_Different_Test_Base_stub - dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Different_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Different_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Different_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl deleted file mode 100644 index ac2292fbeff..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Different_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Different_Test_Base.idl" - -#pragma ciao lem "Connector/Different_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Different_Test_BaseTypeSupport.idl" -#endif - -module Different_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; -}; - -#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc deleted file mode 100644 index 9ec837bc806..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l .. -o ../lib -u DDS Different_Test_Connector" - -project(QC_Different_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen QC_Different_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Different_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Different_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Different_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Different_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Different_Test_Connector.idl - } -} - -project(QC_Different_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += QC_Different_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Different_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Different_Test_ConnectorE.idl - } -} - -project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += QC_Different_Test_Connector_lem_gen QC_Different_Test_Connector_stub \ - QC_Different_Test_Base_stub - libs += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_Different_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ConnectorEC.cpp - } - - Header_Files { - Different_Test_ConnectorEC.h - Different_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Different_Test_ConnectorEC.inl - } -} - -project(QC_Different_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += QC_Different_Test_Connector_idl_gen QC_Different_Test_Base_stub - libs += QC_Different_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_Different_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ConnectorC.cpp - } - - Header_Files { - Different_Test_ConnectorC.h - Different_Test_Connector_stub_export.h - } - - Inline_Files { - Different_Test_ConnectorC.inl - } -} - -project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \ - QC_Different_Test_Base_stub - sharedname = QC_Different_Test_Connector_exec - libs += QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub \ - QC_Different_Test_Base_stub QC_Different_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_Connector_conn.cpp - } - - Header_Files { - Different_Test_Connector_conn.h - Different_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_exec \ - QC_Different_Test_Connector_stub - sharedname = QC_Different_Test_Connector_svnt - libs += QC_Different_Test_Connector_stub \ - QC_Different_Test_Connector_lem_stub \ - QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ConnectorS.cpp - Different_Test_Connector_svnt.cpp - } - - Header_Files { - Different_Test_ConnectorS.h - Different_Test_Connector_svnt.h - Different_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README deleted file mode 100644 index 7fb894432cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README +++ /dev/null @@ -1,20 +0,0 @@ - - -Test whether Querycondition are NOT shared between two extended ports. - -The receiver uses two extend ports of the DDS4CCM State connector: -1. the DDS_Get port -2. the DDS_Read port - -The Queryfilter on the reader interface of the DDS_Get extended port is different -from the Queryfilter on the reader interface of the DDS_Read extended port. -This test checks whether that's the case by checking the query filter expressions. -Besides that, it verifies that the received data is correct according to the filter -expression and parameters. - -The sender sends 15 samples which are kept in DDS (KEEP_ALL Qos) with iteration 1 to 15. -The Getter extended port should receive iterations between 6 and 9 -(thus samples with iteration 7 and 8). -The Reader should receive the other samples (and not samples with iteration 7 and 8). - -There's one DDS4CCM connector instance connected to the Receiver. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl deleted file mode 100644 index 3c2cac4f3dd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Different_Test_Connector.idl" - -module Different_Test -{ - component Receiver - { - port QueryConditionTestConnector::DDS_Get get_port; - port QueryConditionTestConnector::DDS_Read read_port; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc deleted file mode 100644 index 263e0419596..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(QC_Different_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += QC_Different_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Different_Test_Receiver.idl - } -} - -project(QC_Different_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_Different_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Different_Test_ReceiverE.idl - } -} - -project(QC_Different_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_Different_Test_Receiver_lem_gen QC_Different_Test_Receiver_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Base_stub - libs += Receiver_stub QC_Different_Test_Connector_stub \ - QC_Different_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ReceiverEC.cpp - } - - Header_Files { - Different_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Different_Test_ReceiverEC.inl - } -} - -project(QC_Different_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += QC_Different_Test_Receiver_idl_gen QC_Different_Test_Connector_stub \ - QC_Different_Test_Base_stub QC_Different_Test_Connector_lem_gen - libs += QC_Different_Test_Connector_stub QC_Different_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ReceiverC.cpp - } - - Header_Files { - Different_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Different_Test_ReceiverC.inl - } -} - -project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Receiver_stub \ - QC_Different_Test_Base_stub QC_Different_Test_Connector_stub \ - QC_Different_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_Receiver_exec.cpp - } - - Header_Files { - Different_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ - QC_Different_Test_Receiver_exec QC_Different_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ - Receiver_exec QC_Different_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_ReceiverS.cpp - Different_Test_Receiver_svnt.cpp - } - - Header_Files { - Different_Test_ReceiverS.h - Different_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp deleted file mode 100644 index 78b7c696c59..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp +++ /dev/null @@ -1,661 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Different_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY_GETTER "( (iteration > %0) AND (iteration < %1) )" -#define QUERY_READER "( (iteration < %0) OR (iteration > %1) )" - -#define MIN_ITERATION "6" -#define MAX_ITERATION "9" - -namespace CIAO_Different_Test_Receiver_Impl -{ - /** - * Read action Generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - { - this->callback_.run (); - } - return 0; - } - - /** - * Facet Executor Implementation Class: get_port_status_exec_i - */ - - get_port_status_exec_i::get_port_status_exec_i ( - ::Different_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Different_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - get_port_status_exec_i::~get_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: read_port_status_exec_i - */ - - read_port_status_exec_i::read_port_status_exec_i ( - ::Different_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Different_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - read_port_status_exec_i::~read_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (15) - , keys_ (5) - , ticker_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last () - { - ::Different_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - QueryConditionTest queryfiltertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - queryfiltertest_info.symbol = CORBA::string_dup (key); - reader->read_one_last ( - queryfiltertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%d> - <%d>\n", - queryfiltertest_info.iteration, - this->iterations_)); - return queryfiltertest_info.iteration == this->iterations_; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - void - Receiver_exec_i::check_iter_reader (const QueryConditionTest & sample) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL : ") - ACE_TEXT ("sample received for <%C>: iteration <%u>\n"), - sample.symbol.in (), - sample.iteration)); - if (sample.iteration > ACE_OS::atoi (MIN_ITERATION) && - sample.iteration < ACE_OS::atoi (MAX_ITERATION)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL : ") - ACE_TEXT ("Didn't expect samples between ") - ACE_TEXT ("%C and %C\n"), - MIN_ITERATION, - MAX_ITERATION)); - } - } - - bool - Receiver_exec_i::check_iter_getter (const QueryConditionTest & sample) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ") - ACE_TEXT ("sample received for <%C>: iteration <%u>\n"), - sample.symbol.in (), - sample.iteration)); - if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION)) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iteration %C " - "<= %C\n", sample.iteration, - MIN_ITERATION)); - return false; - } - if (sample.iteration > ACE_OS::atoi (MAX_ITERATION)) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iteration %C" - "> %C\n", sample.iteration, - MAX_ITERATION)); - return false; - } - return true; - } - - - void - Receiver_exec_i::read_all (void) - { - ::Different_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_read_port_data (); - - QueryConditionTestSeq queryfiltertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (queryfiltertest_info_seq, readinfo_seq); - if (queryfiltertest_info_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : " - "No samples available in Reader!\n")); - } - for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) - { - this->check_iter_reader (queryfiltertest_info_seq[it]); - } - } - - void - Receiver_exec_i::get_all (void) - { - ::Different_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: No Getter\n")); - } - QueryConditionTest_var qf_info; - ::CCM_DDS::ReadInfo readinfo; - CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo); - if (result) - { - if (!this->check_iter_getter (qf_info.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: got unexpected " - "sample, bailing out\n")); - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: time out when retrieving " - "first sample.\n")); - } - while (result) - { - result = getter->get_one (qf_info.out (), readinfo); - if (result) - { - if (!this->check_iter_getter (qf_info.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: got unexpected " - "sample, bailing out\n")); - break; - } - } - } - } - - void - Receiver_exec_i::test_all () - { - const char * test = "GET ALL"; - try - { - get_all (); - test = "READ ALL"; - read_all (); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - test, - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - test, - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception (test); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::check_filters (void) - { - ::Different_Test::QueryConditionTestConnector::Reader_var get_reader = - this->ciao_context_->get_connection_get_port_data (); - if (! ::CORBA::is_nil (get_reader.in ())) - { - this->check_filter (get_reader.in (), true); - } - else - { - ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n")); - } - - ::Different_Test::QueryConditionTestConnector::Reader_var read_reader = - this->ciao_context_->get_connection_read_port_data (); - if (! ::CORBA::is_nil (read_reader.in ())) - { - this->check_filter (read_reader.in (), false); - } - else - { - ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n")); - } - } - - void - Receiver_exec_i::check_filter ( - ::Different_Test::QueryConditionTestConnector::Reader_ptr reader, - bool check_getter) - { - ::CCM_DDS::QueryFilter_var filter; - try - { - filter = reader->query (); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "caught InternalError exception: retval <%u>\n", - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Exception caught\n")); - return; - } - - //check query - bool error = false; - - const char * query = ""; - const char * port = ""; - if (check_getter) - { - query = QUERY_GETTER; - port = "GETTER"; - } - else - { - query = QUERY_READER; - port = "READER"; - } - - if (ACE_OS::strcmp (filter->expression, query) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - port, query, filter->expression.in ())); - error = true; - } - else - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - " - "Query expression seems correct : " - "expected <%C> - received <%C>\n", - port, query, filter->expression.in ())); - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - " - "Unexpected number of parameters: " - "expected <%d> - received <%d>\n", - port, 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - if (ACE_OS::atoi (filter->parameters[0]) != ACE_OS::atoi(MIN_ITERATION)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - port, - MIN_ITERATION, - filter->parameters[0].in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - if (ACE_OS::atoi (filter->parameters[1]) != ACE_OS::atoi (MAX_ITERATION)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - " - "Unexpected query when retrieving filter: " - "expected <%d> - received <%C>\n", - port, - MAX_ITERATION, - filter->parameters[1].in ())); - error = true; - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - " - "Passed check_filter test.\n", - port)); - } - } - - void - Receiver_exec_i::set_filters () - { - ACE_DEBUG ((LM_DEBUG, "Set filters\n")); - - try - { - ::Different_Test::QueryConditionTestConnector::Reader_var get_reader = - this->ciao_context_->get_connection_get_port_data (); - - ::Different_Test::QueryConditionTestConnector::Reader_var read_reader = - this->ciao_context_->get_connection_read_port_data (); - - ::CCM_DDS::QueryFilter get_filter; - get_filter.expression = CORBA::string_dup (QUERY_GETTER); - get_filter.parameters.length (2); - get_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION); - get_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION); - get_reader->query (get_filter); - ACE_DEBUG ((LM_DEBUG, "Filter set for the getter.\n")); - - - ::CCM_DDS::QueryFilter read_filter; - read_filter.expression = CORBA::string_dup (QUERY_READER); - read_filter.parameters.length (2); - read_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION); - read_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION); - read_reader->query (read_filter); - ACE_DEBUG ((LM_DEBUG, "Filter set for the reader.\n")); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_filters () - " - "Unexpected exception caught.\n")); - } - } - - void - Receiver_exec_i::start_read (void) - { - ACE_DEBUG ((LM_DEBUG, "Start reading by starting a timer.\n")); - - this->ticker_ = new read_action_Generator (*this); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - this->test_all (); - } - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_get_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ())) - { - get_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - get_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_get_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_get_port_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_read_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ())) - { - read_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - read_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_read_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_read_port_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Different_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::Different_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - if (! ::CORBA::is_nil (getter)) - { - getter->time_out (to); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n")); - } - - this->set_filters (); - this->check_filters (); - this->start_read (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Different_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h deleted file mode 100644 index 2f38be10194..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h +++ /dev/null @@ -1,212 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_ -#define CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_ - -#include /**/ "ace/pre.h" - -#include "Different_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Different_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: get_port_status_exec_i - */ - - class get_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - get_port_status_exec_i ( - ::Different_Test::CCM_Receiver_Context_ptr ctx); - virtual ~get_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Different_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: read_port_status_exec_i - */ - - class read_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - read_port_status_exec_i ( - ::Different_Test::CCM_Receiver_Context_ptr ctx); - virtual ~read_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Different_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_read_port_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - bool check_last (void); - void start_read (void); - void run (void); - - void iterations (::CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - //@} - - private: - ::Different_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort keys_; - - read_action_Generator *ticker_; - - //@} - - //@{ - /** User defined private operations. */ - void test_all (void); - void read_all (void); - void get_all (void); - - void check_iter_reader (const QueryConditionTest & sample); - bool check_iter_getter (const QueryConditionTest & sample); - - void check_filters (void); - void check_filter ( - ::Different_Test::QueryConditionTestConnector::Reader_ptr reader, - bool check_getter); - - void set_filters (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Different_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl deleted file mode 100644 index 9fcd7823e7b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TEST_SENDER_IDL - -#include "Connector/Different_Test_Connector.idl" - -module Different_Test -{ - component Sender - { - port Different_Test::QueryConditionTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc deleted file mode 100644 index 618c9190c21..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(QC_Different_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += QC_Different_Test_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Different_Test_Sender.idl - } -} - -project(QC_Different_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_Different_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Different_Test_SenderE.idl - } -} - -project(QC_Different_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_Different_Test_Sender_lem_gen QC_Different_Test_Sender_stub \ - QC_Different_Test_Base_stub - libs += QC_Different_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_SenderEC.cpp - } - - Header_Files { - Different_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Different_Test_SenderEC.inl - } -} - -project(QC_Different_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += QC_Different_Test_Sender_idl_gen QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub - libs += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_SenderC.cpp - } - - Header_Files { - Different_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Different_Test_SenderC.inl - } -} - -project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_Different_Test_Sender_lem_stub QC_Different_Test_Sender_stub \ - QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_Sender_exec.cpp - } - - Header_Files { - Different_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_Different_Test_Base_stub QC_Different_Test_Sender_lem_stub \ - QC_Different_Test_Connector_stub \ - QC_Different_Test_Connector_svnt QC_Different_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ - QC_Different_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Different_Test_SenderS.cpp - Different_Test_Sender_svnt.cpp - } - - Header_Files { - Different_Test_SenderS.h - Different_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp deleted file mode 100644 index f9b4abe9103..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp +++ /dev/null @@ -1,262 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Different_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define ITERATIONS 15 - -namespace CIAO_Different_Test_Sender_Impl -{ - - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * WriteHandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (ITERATIONS) - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->wh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::get_started (void) - { - try - { - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key.symbol = CORBA::string_dup(key); - for (CORBA::UShort iter = 1; - iter < this->iterations_ + 1; - ++iter) - { - new_key.iteration = iter; - ::Different_Test::QueryConditionTestConnector::Writer_var writer - = this->ciao_context_->get_connection_info_write_data (); - writer->write_one (new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - key, iter)); - } - } - ACE_OS::sleep (1); - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Different_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Different_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h deleted file mode 100644 index 547e17478ab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_ -#define CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_ - -#include /**/ "ace/pre.h" - -#include "Different_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Different_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * WriteHandler - */ - - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void get_started (void); - //@} - - private: - ::Different_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Different_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp deleted file mode 100644 index a6cc92082b6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp +++ /dev/null @@ -1,458 +0,0 @@ - - - - Different_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Different_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Different_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Different_Test_ReceiverConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Different_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Different_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_Different_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_Different_Test_Connector_exec - - - - - - - Different_Test_SenderConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Different_Test_QueryConditionTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Different_Test_QueryConditionTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_Different_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_Different_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Different_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Different_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Different_Test_SenderConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - Different_Test - - - - - - - Different_Test_ReceiverConnectorComponentInstance - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - Different_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - - - read_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - get_port_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - - get_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QC_Different_Test_Connector_exec - - - QC_Different_Test_Connector_exec - - - QC_Different_Test_Connector_svnt - - - QC_Different_Test_Connector_svnt - - - QC_Different_Test_Connector_stub - - - QC_Different_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml deleted file mode 100644 index b9cba6277a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 37e7ff8dec9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 -s\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/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl deleted file mode 100644 index f0bfd6bcc95..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QCLE_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL -#define QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QCLE_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QCLE_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionListenEventTest" -#pragma DCPS_DATA_KEY "QueryConditionListenEventTest key" - -struct QueryConditionListenEventTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionListenEventTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc deleted file mode 100644 index e9918ebd97a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_QCLE_Test_Base_stub - dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QCLE_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QCLE_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QCLE_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl deleted file mode 100644 index 8224dd82403..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QCLE_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QCLE_Test_Base.idl" - -#pragma ciao lem "Connector/QCLE_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QCLE_Test_BaseTypeSupport.idl" -#endif - -module QCLE_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionListenEventTest, ::QueryConditionListenEventTestSeq> QueryConditionListenEventTestConnector; -}; - -#endif /* QCLE_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc deleted file mode 100644 index da83149c589..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l .. -o ../lib -u DDS QCLE_Test_Connector" - -project(DDS_QCLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_QCLE_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QCLE_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QCLE_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QCLE_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QCLE_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QCLE_Test_Connector.idl - } -} - -project(DDS_QCLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCLE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QCLE_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QCLE_Test_ConnectorE.idl - } -} - -project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub - libs += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCLE_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ConnectorEC.cpp - } - - Header_Files { - QCLE_Test_ConnectorEC.h - QCLE_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QCLE_Test_ConnectorEC.inl - } -} - -project(DDS_QCLE_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLE_Test_Connector_idl_gen DDS_QCLE_Test_Base_stub - libs += DDS_QCLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCLE_Test_Connector_stub - dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ConnectorC.cpp - } - - Header_Files { - QCLE_Test_ConnectorC.h - QCLE_Test_Connector_stub_export.h - } - - Inline_Files { - QCLE_Test_ConnectorC.inl - } -} - -project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub - sharedname = DDS_QCLE_Test_Connector_exec - libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_Connector_conn.cpp - } - - Header_Files { - QCLE_Test_Connector_conn.h - QCLE_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub - sharedname = DDS_QCLE_Test_Connector_svnt - libs += DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Connector_lem_stub \ - DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ConnectorS.cpp - QCLE_Test_Connector_svnt.cpp - } - - Header_Files { - QCLE_Test_ConnectorS.h - QCLE_Test_Connector_svnt.h - QCLE_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl deleted file mode 100644 index 613ef825f4c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/QCLE_Test_Connector.idl" - -module QCLE_Test -{ - component Receiver - { - port QueryConditionListenEventTestConnector::DDS_Listen info_listen; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc deleted file mode 100644 index df60dc7545c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_QCLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCLE_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - QCLE_Test_Receiver.idl - } -} - -project(DDS_QCLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCLE_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCLE_Test_ReceiverE.idl - } -} - -project(DDS_QCLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLE_Test_Receiver_lem_gen DDS_QCLE_Test_Receiver_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub - libs += Receiver_stub DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ReceiverEC.cpp - } - - Header_Files { - QCLE_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - QCLE_Test_ReceiverEC.inl - } -} - -project(DDS_QCLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLE_Test_Receiver_idl_gen DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_lem_gen - libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ReceiverC.cpp - } - - Header_Files { - QCLE_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - QCLE_Test_ReceiverC.inl - } -} - -project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Receiver_stub \ - DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_Receiver_exec.cpp - } - - Header_Files { - QCLE_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ - DDS_QCLE_Test_Receiver_exec DDS_QCLE_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ - Receiver_exec DDS_QCLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_ReceiverS.cpp - QCLE_Test_Receiver_svnt.cpp - } - - Header_Files { - QCLE_Test_ReceiverS.h - QCLE_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp deleted file mode 100644 index 189a1b08bf8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp +++ /dev/null @@ -1,364 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCLE_Test_Receiver_exec.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" - -#define MIN_ITERATION "2" -#define MAX_ITERATION "5" - -#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in.... - -namespace CIAO_QCLE_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_data_listener_exec_i - */ - - info_listen_data_listener_exec_i::info_listen_data_listener_exec_i ( - ::QCLE_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : ciao_context_ ( - ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_ (thread_id) - , samples_received_ (samples_received) - { - } - - info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void) - { - } - - // Operations from ::QCLE_Test::QueryConditionListenEventTestConnector::Listener - - void - info_listen_data_listener_exec_i::on_one_data (const ::QueryConditionListenEventTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - ++this->samples_received_; - - ACE_DEBUG ((LM_DEBUG, "QueryConditionListenEventTest_Listener::on_one_data: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (info.instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) || - datum.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "QueryConditionListenEventTest_Listener::on_one_data: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_listen_data_listener_exec_i::on_many_data (const ::QueryConditionListenEventTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_listen_status_exec_i - */ - - info_listen_status_exec_i::info_listen_status_exec_i ( - ::QCLE_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_listen_status_exec_i::~info_listen_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : keys_ (5) - , iterations_ (10) - , thread_id_listener_ (0, 0) - , samples_expected_ (keys_ * SAMPLES_PER_KEY) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_listen_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - // Component attributes and port operations. - - ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ())) - { - info_listen_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_, - this->samples_received_), - ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_listen_data_listener_ = tmp; - } - - return - ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_listen_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ())) - { - info_listen_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_listen_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_listen_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCLE_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Set filter.\n")); - - CCM_DDS::QueryFilter filter; - filter.expression = CORBA::string_dup (QUERY); - filter.parameters.length (2); - filter.parameters[0] = CORBA::string_dup (MIN_ITERATION); - filter.parameters[1] = CORBA::string_dup (MAX_ITERATION); - - ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_listen_data (); - - reader->query (filter); - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Start listening.\n")); - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "QF_EVENT: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLE_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h deleted file mode 100644 index 00745c85c30..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h +++ /dev/null @@ -1,191 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_ -#define CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_ - -#include /**/ "ace/pre.h" - -#include "QCLE_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCLE_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_Long; - - /** - * Provider Executor Implementation Class: info_listen_data_listener_exec_i - */ - - class info_listen_data_listener_exec_i - : public virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_data_listener_exec_i ( - ::QCLE_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - virtual ~info_listen_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from QCLE_Test::QueryConditionListenEventTestConnector::Listener. */ - - virtual - void on_one_data (const ::QueryConditionListenEventTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::QueryConditionListenEventTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::QCLE_Test::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_; - Atomic_Long &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_listen_status_exec_i - */ - - class info_listen_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_status_exec_i ( - ::QCLE_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_listen_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCLE_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr - get_info_listen_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - - //@} - - private: - ::QCLE_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - ACE_Thread_ID thread_id_listener_; - - CORBA::Long samples_expected_; - Atomic_Long samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLE_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl deleted file mode 100644 index 174c6d68a69..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL - -#include "Connector/QCLE_Test_Connector.idl" - -module QCLE_Test -{ - component Sender - { - port QueryConditionListenEventTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc deleted file mode 100644 index 6db4c023bf0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_QCLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_QCLE_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - QCLE_Test_Sender.idl - } -} - -project(DDS_QCLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCLE_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - QCLE_Test_SenderE.idl - } -} - -project(DDS_QCLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLE_Test_Sender_lem_gen DDS_QCLE_Test_Sender_stub \ - DDS_QCLE_Test_Base_stub - libs += DDS_QCLE_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_SenderEC.cpp - } - - Header_Files { - QCLE_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - QCLE_Test_SenderEC.inl - } -} - -project(DDS_QCLE_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLE_Test_Sender_idl_gen DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub - libs += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_SenderC.cpp - } - - Header_Files { - QCLE_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - QCLE_Test_SenderC.inl - } -} - -project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCLE_Test_Sender_lem_stub DDS_QCLE_Test_Sender_stub \ - DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_Sender_exec.cpp - } - - Header_Files { - QCLE_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Sender_lem_stub \ - DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Connector_svnt DDS_QCLE_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ - DDS_QCLE_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLE_Test_SenderS.cpp - QCLE_Test_Sender_svnt.cpp - } - - Header_Files { - QCLE_Test_SenderS.h - QCLE_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp deleted file mode 100644 index 4da701e33f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp +++ /dev/null @@ -1,323 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCLE_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_QCLE_Test_Sender_Impl -{ - /** - * Write ticker - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Write ticker - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - this->ticker_ = new WriteTicker (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write_one (void) - { - if (this->last_key_ != this->samples_.end ()) - { - try - { - ::QCLE_Test::QueryConditionListenEventTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - ++this->last_key_->second->iteration; - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n", - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - //onto the next iteration - this->last_key_ = this->samples_.begin (); - while (this->last_key_ != this->samples_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - //next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->samples_.end ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - } - - void - Sender_exec_i::get_started (void) - { - try - { - this->start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - QueryConditionListenEventTest* new_key = new QueryConditionListenEventTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCLE_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLE_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h deleted file mode 100644 index 63db4bc3888..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_ -#define CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_ - -#include /**/ "ace/pre.h" - -#include "QCLE_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_QCLE_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Write ticker - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void write_one (void); - - //@} - - private: - ::QCLE_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - WriteTicker *ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table samples_; - - Writer_Table::iterator last_key_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLE_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp deleted file mode 100644 index e3b0bb0a926..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp +++ /dev/null @@ -1,413 +0,0 @@ - - - - QCLE_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLE_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLE_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - QCLE_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QCLE_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QCLE_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLE_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLE_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - QCLE_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - QCLE_Test - - - - - - QCLE_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - QCLE_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_reader_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_listen_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QCLE_Test_Connector_exec - - - DDS_QCLE_Test_Connector_exec - - - QCLE_Test_Connector_svnt - - - DDS_QCLE_Test_Connector_svnt - - - QCLE_Test_Connector_stub - - - DDS_QCLE_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl deleted file mode 100644 index b61d30c7687..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file ReadGet_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERYCONDITION_STARTER_IDL -#define QUERYCONDITION_STARTER_IDL - -#pragma ciao lem "Base/ReadGet_StarterE.idl" - -interface ReadGetStarter -{ - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface ReadGetRestarter -{ - void restart_write (); -}; - -#endif /* QUERYCONDITION_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc deleted file mode 100644 index 4c41bda9f0c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(QC_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=ReadGet_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I.. - - IDL_Files { - ReadGet_Starter.idl - } -} - -project(QC_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_ReadGet_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ReadGet_StarterE.idl - } -} - -project(QC_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_ReadGet_Starter_lem_gen QC_ReadGet_Starter_stub - libs += QC_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_ReadGet_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterEC.cpp - } - - Header_Files { - ReadGet_StarterEC.h - ReadGet_Starter_lem_stub_export.h - } - - Inline_Files { - ReadGet_StarterEC.inl - } -} - -project(QC_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base { - after += QC_ReadGet_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_ReadGet_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterC.cpp - } - - Header_Files { - ReadGet_StarterC.h - ReadGet_Starter_stub_export.h - } - - Inline_Files { - ReadGet_StarterC.inl - } -} - - -project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub - sharedname = QC_ReadGet_Starter_svnt - libs += QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_StarterS.cpp - ReadGet_Starter_svnt.cpp - } - - Header_Files { - ReadGet_StarterS.h - ReadGet_Starter_svnt.h - ReadGet_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl deleted file mode 100644 index 7fadf380e9f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file ReadGet_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_BASE_IDL -#define QUERY_CONDITION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h" -#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTest" -#pragma DCPS_DATA_KEY "QueryConditionTest symbol" - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc deleted file mode 100644 index ee8127d2cb3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = QC_ReadGet_Test_Base_stub - dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - ReadGet_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - ReadGet_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl deleted file mode 100644 index 7a280e41771..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file ReadGet_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/ReadGet_Test_Base.idl" - -#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/ReadGet_Test_BaseTypeSupport.idl" -#endif - -module ReadGet_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; -}; - -#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc deleted file mode 100644 index bf66a086bcf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector" - -project(QC_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen QC_ReadGet_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - ReadGet_Test_Connector.idl - } -} - -project(QC_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += QC_ReadGet_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - ReadGet_Test_ConnectorE.idl - } -} - -project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += QC_ReadGet_Test_Connector_lem_gen QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Base_stub - libs += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_ReadGet_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorEC.cpp - } - - Header_Files { - ReadGet_Test_ConnectorEC.h - ReadGet_Test_Connector_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_ConnectorEC.inl - } -} - -project(QC_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_Test_Base_stub - libs += QC_ReadGet_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_ReadGet_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorC.cpp - } - - Header_Files { - ReadGet_Test_ConnectorC.h - ReadGet_Test_Connector_stub_export.h - } - - Inline_Files { - ReadGet_Test_ConnectorC.inl - } -} - -project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Base_stub - sharedname = QC_ReadGet_Test_Connector_exec - libs += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Connector_conn.cpp - } - - Header_Files { - ReadGet_Test_Connector_conn.h - ReadGet_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_exec \ - QC_ReadGet_Test_Connector_stub - sharedname = QC_ReadGet_Test_Connector_svnt - libs += QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ConnectorS.cpp - ReadGet_Test_Connector_svnt.cpp - } - - Header_Files { - ReadGet_Test_ConnectorS.h - ReadGet_Test_Connector_svnt.h - ReadGet_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl deleted file mode 100644 index d77408ba757..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/ReadGet_Test_Connector.idl" -#include "Base/ReadGet_Starter.idl" - -module ReadGet_Test -{ - component Receiver - { - port QueryConditionTestConnector::DDS_Get get_port; - port QueryConditionTestConnector::DDS_Read check_port; - - provides ReadGetStarter reader_start; - uses ReadGetRestarter writer_restart; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc deleted file mode 100644 index ff25d209f83..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(QC_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += QC_ReadGet_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - ReadGet_Test_Receiver.idl - } -} - -project(QC_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_ReadGet_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - ReadGet_Test_ReceiverE.idl - } -} - -project(QC_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_ReadGet_Test_Receiver_lem_gen QC_ReadGet_Test_Receiver_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Starter_stub - libs += Receiver_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverEC.cpp - } - - Header_Files { - ReadGet_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_ReceiverEC.inl - } -} - -project(QC_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += QC_ReadGet_Test_Receiver_idl_gen QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_lem_gen \ - QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub - libs += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverC.cpp - } - - Header_Files { - ReadGet_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - ReadGet_Test_ReceiverC.inl - } -} - -project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Receiver_stub \ - QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Receiver_exec.cpp - } - - Header_Files { - ReadGet_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ - QC_ReadGet_Test_Receiver_exec QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Starter_stub \ - QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ - Receiver_exec QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \ - QC_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_ReceiverS.cpp - ReadGet_Test_Receiver_svnt.cpp - } - - Header_Files { - ReadGet_Test_ReceiverS.h - ReadGet_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp deleted file mode 100644 index cc2da4b2fb7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ /dev/null @@ -1,823 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ReadGet_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/dds4ccm_utils.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" - -#define MIN_ITERATION_1 "2" -#define MAX_ITERATION_1 "5" - -// First run filtered in : 2 (iteration 3 and 4) - -// Since QueryCondition contains a bug, we've changed -// the iterations of the second run in order for this test -// to succeed. There's a different tests which reproduces -// the bug. -// #define MIN_ITERATION_2 "22" -// #define MAX_ITERATION_2 "34" - -#define MIN_ITERATION_2 "7" -#define MAX_ITERATION_2 "9" - -// Should be : Second run filtered in : 11 (iterations between 22 and 34) -// Is now : Second run filtered in : 1 (only iteration 8) - -#define SAMPLES_PER_KEY_GETTER (2 + 1) - -// Reader also reads already read samples. -#define SAMPLES_PER_KEY_READER (2 + 1) - -namespace CIAO_ReadGet_Test_Receiver_Impl -{ - /** - * Read Action Generator - */ - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, - int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->run_ == 1 || this->callback_.check_last ()) - { - this->callback_.run (this->run_); - } - return 0; - } - - /** - * Facet Executor Implementation Class: get_port_status_exec_i - */ - - get_port_status_exec_i::get_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - get_port_status_exec_i::~get_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: check_port_status_exec_i - */ - - check_port_status_exec_i::check_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - check_port_status_exec_i::~check_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - check_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - check_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::ReadGetStarter - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read (::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (20) - , keys_ (5) - , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1)) - , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1)) - , ticker_ (0) - , samples_expected_getter_ (0) - , samples_received_getter_ (0) - , samples_expected_reader_ (0) - , samples_received_reader_ (0) - - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last () - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - QueryConditionTest queryfiltertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - queryfiltertest_info.symbol = CORBA::string_dup (key); - reader->read_one_last ( - queryfiltertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d>\n", - queryfiltertest_info.iteration, - this->current_max_iteration_ - 1)); - return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - void - Receiver_exec_i::check_iter (const QueryConditionTest & sample, - const char * test) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL : ") - ACE_TEXT ("sample received for <%C>: iteration <%02u>\n"), - test, - sample.symbol.in (), - sample.iteration)); - if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION_1)) - { - ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: " - "Didn't expect samples with iterations " - "<= %02d\n", - test, - this->current_min_iteration_)); - } - if (sample.iteration > this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: " - "Didn't expect samples with iterations " - "> %02d\n", - test, - this->current_max_iteration_)); - } - } - - - void - Receiver_exec_i::read_all (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - QueryConditionTestSeq queryfiltertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (queryfiltertest_info_seq, readinfo_seq); - if (queryfiltertest_info_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : " - "No samples available in Reader!\n")); - } - for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) - { - this->check_iter (queryfiltertest_info_seq[it], "READ"); - } - this->samples_received_reader_ += queryfiltertest_info_seq.length (); - } - - void - Receiver_exec_i::get_all (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: No Getter\n")); - } - QueryConditionTest_var qf_info; - ::CCM_DDS::ReadInfo readinfo; - CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo); - if (ACE_OS::strlen (qf_info->symbol.in ()) == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ") - ACE_TEXT ("Name of key seems to be empty-> bailing out\n"))); - return; - } - if (result) - { - this->check_iter (qf_info.in (), "GET"); - ++this->samples_received_getter_; - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: time out when retrieving " - "first sample.\n")); - } - while (result) - { - result = getter->get_one (qf_info.out (), readinfo); - if (result) - { - this->check_iter (qf_info.in (), "GET"); - ++this->samples_received_getter_; - } - } - } - - void - Receiver_exec_i::check_all (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_check_port_data (); - - QueryConditionTestSeq queryfiltertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (queryfiltertest_info_seq, readinfo_seq); - - for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t\tCHECK ALL : ") - ACE_TEXT ("sample received for <%C>: iteration <%02u> - ") - ACE_TEXT ("access_status <%C> - instance_status <%d>\n"), - queryfiltertest_info_seq[it].symbol.in (), - queryfiltertest_info_seq[it].iteration, - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfo_seq[it].access_status), - readinfo_seq[it].instance_status)); - } - CORBA::ULong expected = 0; - if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_1)) - { - expected = this->iterations_ * this->keys_; - } - else if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_2)) - { - expected = this->iterations_ * this->keys_ * 2; - } - if (queryfiltertest_info_seq.length () == expected) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_all - " - "OK : All samples received on the DDS_Read port: " - "expected <%02u> - received <%02u>\n", - expected, - queryfiltertest_info_seq.length ())); - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_all - " - "ERROR: Unexpected number of samples received " - "on the DDS_Read port: " - "expected <%u> - received <%u>\n", - expected, - queryfiltertest_info_seq.length ())); - } - } - - void - Receiver_exec_i::test_all () - { - const char * test = "GET ALL"; - try - { - get_all (); - test = "READ ALL"; - read_all (); - // reading all samples on a different port. - check_all (); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - test, - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - test, - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception (test); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::test_exception () - { - ::CCM_DDS::QueryFilter_var query; - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - query = reader->query (); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_excep - " - "Expected InternalErr excep caught : retval <%u>\n", - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::test_exception: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - " - "Unexpected exception caught\n")); - return; - } - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - " - "No exception caught while retrieving unset filter.\n")); - } - - void - Receiver_exec_i::check_filter () - { - ::CCM_DDS::QueryFilter_var filter; - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - try - { - filter = reader->query (); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "caught InternalError exception: retval <%u>\n", - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Exception caught\n")); - return; - } - - //check query - bool error = false; - if (ACE_OS::strcmp (filter->expression, QUERY) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - QUERY, filter->expression.in ())); - error = true; - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected number of parameters: " - "expected <%d> - received <%d>\n", - 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_min_iteration_, - filter->parameters[0].in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_max_iteration_, - filter->parameters[1].in ())); - error = true; - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - " - "Passed check_filter test.\n")); - } - } - - void - Receiver_exec_i::test_set_query_parameters () - { - try - { - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - ::CCM_DDS::QueryFilter filter; - filter.expression = CORBA::string_dup (QUERY); - filter.parameters.length (2); - filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_2); - filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_2); - reader->query (filter); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2); - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - " - "New query parameters set (<%C> - <%C>)!\n", - MIN_ITERATION_2, MAX_ITERATION_2)); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " - "caught InternalError exception: retval <%u>\n", - ex.error_code)); - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " - "Exception caught\n")); - return; - } - } - - void - Receiver_exec_i::set_filter () - { - ACE_DEBUG ((LM_DEBUG, "Set filter\n")); - ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - ::CCM_DDS::QueryFilter filter; - filter.expression = CORBA::string_dup (QUERY); - filter.parameters.length (2); - filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_1); - filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_1); - reader->query (filter); - } - - void - Receiver_exec_i::start_read (CORBA::UShort run) - { - this->ticker_ = new read_action_Generator (*this, run); - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - switch (run) - { - case 1: - { - this->test_exception (); - this->set_filter (); - this->restarter_->restart_write (); - } - break; - case 2: - { - this->test_all (); - check_filter (); - this->test_set_query_parameters (); - this->restarter_->restart_write (); - } - break; - case 3: - { - this->test_all (); - this->check_filter (); - } - break; - } - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - - this->samples_expected_getter_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER; - this->samples_expected_reader_ = (this->keys_) * SAMPLES_PER_KEY_READER; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_get_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ())) - { - get_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - get_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_get_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_get_port_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_check_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_check_port_status_.in ())) - { - check_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - check_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_check_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_check_port_status_.in ()); - } - - ::CCM_ReadGetStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReadGetStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_ReadGetStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - DDS::Duration_t to; - to.sec = 5; - to.nanosec = 0; - if (! ::CORBA::is_nil (getter)) - { - getter->time_out (to); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n")); - } - this->restarter_ = this->ciao_context_->get_connection_writer_restart (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_getter_ != this->samples_expected_getter_) - { - ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER : " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_getter_, - this->samples_received_getter_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "READGET : GETTER : " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_getter_, - this->samples_received_getter_)); - } - if (this->samples_received_reader_ != this->samples_expected_reader_) - { - ACE_ERROR ((LM_ERROR, "ERROR: READGET READER : " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_reader_, - this->samples_received_reader_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "READGET : READER : " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_reader_, - this->samples_received_reader_)); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h deleted file mode 100644 index 9411f74f4b6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ /dev/null @@ -1,253 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_ -#define CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_ - -#include /**/ "ace/pre.h" - -#include "ReadGet_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ReadGet_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Read action generator - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - - }; - - - /** - * Provider Executor Implementation Class: get_port_status_exec_i - */ - - class get_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - get_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx); - virtual ~get_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: check_port_status_exec_i - */ - - class check_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - check_port_status_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx); - virtual ~check_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_ReadGetStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::ReadGet_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from ReadGetStarter. */ - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - - virtual - void start_read (::CORBA::UShort run); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_check_port_status (void); - - virtual ::CCM_ReadGetStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void iterations (CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - bool check_last (void); - void start_read (::CORBA::UShort run); - void run (::CORBA::UShort run); - //@} - - private: - ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_check_port_status_; - ::CCM_ReadGetStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - ReadGetRestarter_var restarter_; - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - - int current_min_iteration_; - int current_max_iteration_; - - read_action_Generator *ticker_; - - ::CORBA::ULong samples_expected_getter_; - ::CORBA::ULong samples_received_getter_; - ::CORBA::ULong samples_expected_reader_; - ::CORBA::ULong samples_received_reader_; - //@} - - //@{ - /** User defined private operations. */ - void test_all (void); - void read_all (void); - void get_all (void); - void check_all (void); - void check_iter (const QueryConditionTest & sample, - const char * test); - void check_filter (void); - void test_exception (void); - void test_set_query_parameters (void); - void set_filter (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl deleted file mode 100644 index fa2aa12902b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TEST_SENDER_IDL - -#include "Connector/ReadGet_Test_Connector.idl" -#include "Base/ReadGet_Starter.idl" - -module ReadGet_Test -{ - component Sender - { - port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - uses ReadGetStarter start_reader; - provides ReadGetRestarter restart_writer; - - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc deleted file mode 100644 index 324b3be379a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(QC_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - ReadGet_Test_Sender.idl - } -} - -project(QC_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_ReadGet_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - ReadGet_Test_SenderE.idl - } -} - -project(QC_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_ReadGet_Test_Sender_lem_gen QC_ReadGet_Test_Sender_stub \ - QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub - libs += QC_ReadGet_Test_Base_stub Sender_stub QC_ReadGet_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderEC.cpp - } - - Header_Files { - ReadGet_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - ReadGet_Test_SenderEC.inl - } -} - -project(QC_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += QC_ReadGet_Test_Sender_idl_gen QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Starter_stub \ - QC_ReadGet_Starter_lem_stub - libs += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderC.cpp - } - - Header_Files { - ReadGet_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - ReadGet_Test_SenderC.inl - } -} - -project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_ReadGet_Test_Sender_lem_stub QC_ReadGet_Test_Sender_stub \ - QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub \ - QC_ReadGet_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_Sender_exec.cpp - } - - Header_Files { - ReadGet_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Sender_lem_stub \ - QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Connector_svnt QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \ - QC_ReadGet_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ - QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Starter_stub \ - QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ReadGet_Test_SenderS.cpp - ReadGet_Test_Sender_svnt.cpp - } - - Header_Files { - ReadGet_Test_SenderS.h - ReadGet_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp deleted file mode 100644 index 65ef479b4dc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp +++ /dev/null @@ -1,345 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "ReadGet_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define ITERATIONS 20 - -namespace CIAO_ReadGet_Test_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - , started_ (false) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->started_ = true; - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Writehandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::ReadGet_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::ReadGetRestarter - - void - restart_writer_exec_i::restart_write (void) - { - this->callback_.restart (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (ITERATIONS) - , run_ (1) - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->wh_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - if (this->wh_) - { - delete this->wh_; - this->wh_ = 0; - } - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - this->reactor ()->notify (this->wh_); - } - - void - Sender_exec_i::get_started (void) - { - try - { - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ReadGetStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - return; - } - if (this->run_ > 1) - { - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key.symbol = CORBA::string_dup(key); - CORBA::UShort iter = 1; - if (this->run_ == 3) - { - iter = this->iterations_ + 1; - } - while (iter < (this->run_ - 1) * this->iterations_ + 1) - { - new_key.iteration = iter; - writer->write_one (new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - key, iter)); - ++iter; - } - } - ACE_OS::sleep (1); - } - starter->start_read (this->run_); - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CCM_ReadGetRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReadGetRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_ReadGetRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h deleted file mode 100644 index f0e764a708b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ /dev/null @@ -1,195 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_ -#define CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_ - -#include /**/ "ace/pre.h" - -#include "ReadGet_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_ReadGet_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - bool started_; - }; - - /** - * Write Handler - */ - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_ReadGetRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::ReadGet_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from ReadGetRestarter. */ - - virtual - void restart_write (void); - //@} - - private: - ::ReadGet_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CCM_ReadGetRestarter_ptr - get_restart_writer (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void start (void); - void restart (void); - - //@} - - private: - ::ReadGet_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_ReadGetRestarter_var ciao_restart_writer_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - ::CORBA::UShort iterations_; - ::CORBA::UShort run_; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_ReadGet_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp deleted file mode 100644 index 49eda282c3c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp +++ /dev/null @@ -1,516 +0,0 @@ - - - - ReadGet_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ReadGet_Test_EventConnectorImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_ReadGet_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_ReadGet_Test_Connector_exec - - - - - - ReadGet_Test_StateConnectorImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_ReadGet_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_ReadGet_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_ReadGet_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_ReadGet_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - ReadGet_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - - - ReadGet_Test_EventConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - - ReadGet_Test_ConnectorComponent3 - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - ReadGet_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - - - get_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - check_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - check_port_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - - get_port_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QC_ReadGet_Test_Connector_exec - - - QC_ReadGet_Test_Connector_exec - - - QC_ReadGet_Test_Connector_svnt - - - QC_ReadGet_Test_Connector_svnt - - - QC_ReadGet_Test_Connector_stub - - - QC_ReadGet_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml deleted file mode 100644 index b9cba6277a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 37e7ff8dec9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 -s\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/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl deleted file mode 100644 index 2f470af6d24..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QCLS_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL -#define QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QCLS_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QCLS_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionListenStateTest" -#pragma DCPS_DATA_KEY "QueryConditionListenStateTest key" - -struct QueryConditionListenStateTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionListenStateTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc deleted file mode 100644 index 99a8da1826c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_QCLS_Test_Base_stub - dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QCLS_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QCLS_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QCLS_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl deleted file mode 100644 index 02f87bf8135..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QCLS_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QCLS_Test_Base.idl" - -#pragma ciao lem "Connector/QCLS_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QCLS_Test_BaseTypeSupport.idl" -#endif - -module QCLS_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionListenStateTest, ::QueryConditionListenStateTestSeq> QueryConditionListenStateTestConnector; -}; - -#endif /* QCLS_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc deleted file mode 100644 index 345969c2e1d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l .. -o ../lib -u DDS QCLS_Test_Connector" - -project(DDS_QCLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_QCLS_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QCLS_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QCLS_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QCLS_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QCLS_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QCLS_Test_Connector.idl - } -} - -project(DDS_QCLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCLS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QCLS_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QCLS_Test_ConnectorE.idl - } -} - -project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub - libs += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCLS_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ConnectorEC.cpp - } - - Header_Files { - QCLS_Test_ConnectorEC.h - QCLS_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QCLS_Test_ConnectorEC.inl - } -} - -project(DDS_QCLS_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLS_Test_Connector_idl_gen DDS_QCLS_Test_Base_stub - libs += DDS_QCLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCLS_Test_Connector_stub - dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ConnectorC.cpp - } - - Header_Files { - QCLS_Test_ConnectorC.h - QCLS_Test_Connector_stub_export.h - } - - Inline_Files { - QCLS_Test_ConnectorC.inl - } -} - -project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub - sharedname = DDS_QCLS_Test_Connector_exec - libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_Connector_conn.cpp - } - - Header_Files { - QCLS_Test_Connector_conn.h - QCLS_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub - sharedname = DDS_QCLS_Test_Connector_svnt - libs += DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Connector_lem_stub \ - DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ConnectorS.cpp - QCLS_Test_Connector_svnt.cpp - } - - Header_Files { - QCLS_Test_ConnectorS.h - QCLS_Test_Connector_svnt.h - QCLS_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl deleted file mode 100644 index 6aaeda5aab0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/QCLS_Test_Connector.idl" - -module QCLS_Test -{ - component Receiver - { - port QueryConditionListenStateTestConnector::DDS_StateListen info_state; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc deleted file mode 100644 index d5fb10e8472..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_QCLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCLS_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - QCLS_Test_Receiver.idl - } -} - -project(DDS_QCLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCLS_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCLS_Test_ReceiverE.idl - } -} - -project(DDS_QCLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLS_Test_Receiver_lem_gen DDS_QCLS_Test_Receiver_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub - libs += Receiver_stub DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ReceiverEC.cpp - } - - Header_Files { - QCLS_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - QCLS_Test_ReceiverEC.inl - } -} - -project(DDS_QCLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLS_Test_Receiver_idl_gen DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_lem_gen - libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ReceiverC.cpp - } - - Header_Files { - QCLS_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - QCLS_Test_ReceiverC.inl - } -} - -project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Receiver_stub \ - DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_Receiver_exec.cpp - } - - Header_Files { - QCLS_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ - DDS_QCLS_Test_Receiver_exec DDS_QCLS_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ - Receiver_exec DDS_QCLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_ReceiverS.cpp - QCLS_Test_Receiver_svnt.cpp - } - - Header_Files { - QCLS_Test_ReceiverS.h - QCLS_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp deleted file mode 100644 index 86b3ac813d2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp +++ /dev/null @@ -1,371 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCLS_Test_Receiver_exec.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" - -#define MIN_ITERATION "2" -#define MAX_ITERATION "5" - -#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in.... - -namespace CIAO_QCLS_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_state_data_listener_exec_i - */ - - info_state_data_listener_exec_i::info_state_data_listener_exec_i ( - ::QCLS_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : ciao_context_ ( - ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_ (thread_id) - , samples_received_ (samples_received) - { - } - - info_state_data_listener_exec_i::~info_state_data_listener_exec_i (void) - { - } - - // Operations from ::QCLS_Test::QueryConditionListenStateTestConnector::StateListener - - void - info_state_data_listener_exec_i::on_creation (const ::QueryConditionListenStateTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->samples_received_; - - ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_creation: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) || - datum.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_creation: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_state_data_listener_exec_i::on_one_update (const ::QueryConditionListenStateTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - ++this->samples_received_; - - ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_one_update: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) || - datum.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_one_update: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_state_data_listener_exec_i::on_many_updates (const ::QueryConditionListenStateTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - void - info_state_data_listener_exec_i::on_deletion (const ::QueryConditionListenStateTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_state_status_exec_i - */ - - info_state_status_exec_i::info_state_status_exec_i ( - ::QCLS_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_state_status_exec_i::~info_state_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : keys_ (5) - , iterations_ (10) - , thread_id_listener_ (0, 0) - , samples_expected_ (keys_ * SAMPLES_PER_KEY) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_state_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - // Component attributes and port operations. - - ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_state_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_state_data_listener_.in ())) - { - info_state_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_state_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_, - this->samples_received_), - ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_nil ()); - - this->ciao_info_state_data_listener_ = tmp; - } - - return - ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_duplicate ( - this->ciao_info_state_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_state_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_state_status_.in ())) - { - info_state_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_state_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_state_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_state_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - this->samples_expected_ = SAMPLES_PER_KEY * this->keys_; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCLS_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Set filter.\n")); - ::CCM_DDS::QueryFilter filter; - filter.expression = CORBA::string_dup (QUERY); - filter.parameters.length (2); - filter.parameters[0] = CORBA::string_dup (MIN_ITERATION); - filter.parameters[1] = CORBA::string_dup (MAX_ITERATION); - ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_state_data (); - - reader->query (filter); - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Start listening.\n")); - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "QF_STATE: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLS_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h deleted file mode 100644 index d6667fb3fda..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h +++ /dev/null @@ -1,198 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_ -#define CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_ - -#include /**/ "ace/pre.h" - -#include "QCLS_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCLS_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_Long; - - /** - * Provider Executor Implementation Class: info_state_data_listener_exec_i - */ - - class info_state_data_listener_exec_i - : public virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_state_data_listener_exec_i ( - ::QCLS_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - virtual ~info_state_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */ - - virtual - void on_creation (const ::QueryConditionListenStateTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update (const ::QueryConditionListenStateTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates (const ::QueryConditionListenStateTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion (const ::QueryConditionListenStateTest & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::QCLS_Test::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_; - Atomic_Long &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_state_status_exec_i - */ - - class info_state_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_state_status_exec_i ( - ::QCLS_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_state_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCLS_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr - get_info_state_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_state_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::QCLS_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_var ciao_info_state_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_state_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - ACE_Thread_ID thread_id_listener_; - - CORBA::Long samples_expected_; - Atomic_Long samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLS_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl deleted file mode 100644 index c82196ec2cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL - -#include "Connector/QCLS_Test_Connector.idl" - -module QCLS_Test -{ - component Sender - { - port QueryConditionListenStateTestConnector::DDS_Update info_update; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc deleted file mode 100644 index 78a9a56c2a8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_QCLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_QCLS_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - QCLS_Test_Sender.idl - } -} - -project(DDS_QCLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCLS_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - QCLS_Test_SenderE.idl - } -} - -project(DDS_QCLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLS_Test_Sender_lem_gen DDS_QCLS_Test_Sender_stub \ - DDS_QCLS_Test_Base_stub - libs += DDS_QCLS_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_SenderEC.cpp - } - - Header_Files { - QCLS_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - QCLS_Test_SenderEC.inl - } -} - -project(DDS_QCLS_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCLS_Test_Sender_idl_gen DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub - libs += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_SenderC.cpp - } - - Header_Files { - QCLS_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - QCLS_Test_SenderC.inl - } -} - -project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCLS_Test_Sender_lem_stub DDS_QCLS_Test_Sender_stub \ - DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_Sender_exec.cpp - } - - Header_Files { - QCLS_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Sender_lem_stub \ - DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Connector_svnt DDS_QCLS_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ - DDS_QCLS_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCLS_Test_SenderS.cpp - QCLS_Test_Sender_svnt.cpp - } - - Header_Files { - QCLS_Test_SenderS.h - QCLS_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp deleted file mode 100644 index 7189daaa26b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp +++ /dev/null @@ -1,311 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCLS_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_QCLS_Test_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.start (); - } - } - - /** - * Start Handler - */ - - StartHandler::StartHandler(Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - StartHandler::handle_exception (ACE_HANDLE) - { - this->callback_.run (); - return 0; - } - - /** - * Update Ticker - */ - - UpdateTicker::UpdateTicker (Sender_exec_i &callback) - : callback_ (callback), - last_iter_ (0) - { - } - - int - UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.update_one (++this->last_iter_); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - this->ticker_ = new UpdateTicker (*this); - this->rh_ = new StartHandler (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->rh_; - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::update_one (CORBA::UShort iter) - { - ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var - updater = this->ciao_context_->get_connection_info_update_data (); - - if (! ::CORBA::is_nil (updater.in ()) && - iter <= this->iterations ()) - { - for (CORBA::UShort i = 1; i < this->keys () + 1; ++i) - { - char key[7]; - ACE_OS::sprintf (key, "KEY_%d", i); - QueryConditionListenStateTest update_key; - update_key.key = CORBA::string_dup (key); - update_key.iteration = iter; - updater->update_one (update_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n", - key, iter)); - - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - " - "Finished updating. Cancel Timer.\n")); - this->reactor ()->cancel_timer (this->ticker_); - } - } - - void - Sender_exec_i::run () - { - ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var - updater = this->ciao_context_->get_connection_info_update_data (); - // First create the instances for consecutive updating. - for (::CORBA::UShort i = 1; - i < this->keys () + 1 && !::CORBA::is_nil (updater.in ()); - ++i) - { - char key[7]; - ACE_OS::sprintf (key, "KEY_%d", i); - QueryConditionListenStateTest new_key; - new_key.key = CORBA::string_dup(key); - new_key.iteration = 0; - updater->create_one (new_key); - } - - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::start (void) - { - this->reactor ()->notify (this->rh_); - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCLS_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLS_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h deleted file mode 100644 index a30ac6593d5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_ -#define CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_ - -#include /**/ "ace/pre.h" - -#include "QCLS_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCLS_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Start Handler - */ - - class StartHandler : - public ACE_Event_Handler - { - public: - StartHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Update Ticker - */ - - class UpdateTicker : - public ACE_Event_Handler - { - public: - UpdateTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - Sender_exec_i &callback_; - CORBA::UShort last_iter_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void run (void); - void update_one (CORBA::UShort iter); - - //@} - - private: - ::QCLS_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - UpdateTicker *ticker_; - StartHandler *rh_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCLS_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp deleted file mode 100644 index 77795d9c1e3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp +++ /dev/null @@ -1,413 +0,0 @@ - - - - QCLS_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLS_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLS_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - QCLS_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QCLS_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QCLS_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCLS_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCLS_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - QCLS_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - QCLS_Test - - - - - - QCLS_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - QCLS_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_state_rdr - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - - info_state_dl - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - - info_state_dc - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_state_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QCLS_Test_Connector_exec - - - DDS_QCLS_Test_Connector_exec - - - QCLS_Test_Connector_svnt - - - DDS_QCLS_Test_Connector_svnt - - - QCLS_Test_Connector_stub - - - DDS_QCLS_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl deleted file mode 100644 index 9d99e5b6378..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QCTL_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL -#define QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QCTL_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QCTL_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTwoListenersTest" -#pragma DCPS_DATA_KEY "QueryConditionTwoListenersTest key" - -struct QueryConditionTwoListenersTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTwoListenersTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc deleted file mode 100644 index d15827ffb44..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_QCTL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_QCTL_Test_Base_stub - dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QCTL_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QCTL_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QCTL_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl deleted file mode 100644 index b58d65550e9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QCTL_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QCTL_Test_Base.idl" - -#pragma ciao lem "Connector/QCTL_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QCTL_Test_BaseTypeSupport.idl" -#endif - -module QCTL_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTwoListenersTest, ::QueryConditionTwoListenersTestSeq> QueryConditionTwoListenersTestConnector; -}; - -#endif /* QCTL_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc deleted file mode 100644 index 0a40f94e8c0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l .. -o ../lib -u DDS QCTL_Test_Connector" - -project(DDS_QCTL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_QCTL_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QCTL_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QCTL_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QCTL_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QCTL_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QCTL_Test_Connector.idl - } -} - -project(DDS_QCTL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCTL_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QCTL_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QCTL_Test_ConnectorE.idl - } -} - -project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub - libs += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCTL_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ConnectorEC.cpp - } - - Header_Files { - QCTL_Test_ConnectorEC.h - QCTL_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QCTL_Test_ConnectorEC.inl - } -} - -project(DDS_QCTL_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCTL_Test_Connector_idl_gen DDS_QCTL_Test_Base_stub - libs += DDS_QCTL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_QCTL_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ConnectorC.cpp - } - - Header_Files { - QCTL_Test_ConnectorC.h - QCTL_Test_Connector_stub_export.h - } - - Inline_Files { - QCTL_Test_ConnectorC.inl - } -} - -project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub - sharedname = DDS_QCTL_Test_Connector_exec - libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_Connector_conn.cpp - } - - Header_Files { - QCTL_Test_Connector_conn.h - QCTL_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub - sharedname = DDS_QCTL_Test_Connector_svnt - libs += DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Connector_lem_stub \ - DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ConnectorS.cpp - QCTL_Test_Connector_svnt.cpp - } - - Header_Files { - QCTL_Test_ConnectorS.h - QCTL_Test_Connector_svnt.h - QCTL_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl deleted file mode 100644 index 38fc0004b02..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/QCTL_Test_Connector.idl" - -module QCTL_Test -{ - component Receiver - { - port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_1; - port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_2; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc deleted file mode 100644 index 916535d17c6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(DDS_QCTL_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_QCTL_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - QCTL_Test_Receiver.idl - } -} - -project(DDS_QCTL_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCTL_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCTL_Test_ReceiverE.idl - } -} - -project(DDS_QCTL_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCTL_Test_Receiver_lem_gen DDS_QCTL_Test_Receiver_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub - libs += Receiver_stub DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ReceiverEC.cpp - } - - Header_Files { - QCTL_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - QCTL_Test_ReceiverEC.inl - } -} - -project(DDS_QCTL_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCTL_Test_Receiver_idl_gen DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_lem_gen - libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ReceiverC.cpp - } - - Header_Files { - QCTL_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - QCTL_Test_ReceiverC.inl - } -} - -project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Receiver_stub \ - DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_Receiver_exec.cpp - } - - Header_Files { - QCTL_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ - DDS_QCTL_Test_Receiver_exec DDS_QCTL_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ - Receiver_exec DDS_QCTL_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_ReceiverS.cpp - QCTL_Test_Receiver_svnt.cpp - } - - Header_Files { - QCTL_Test_ReceiverS.h - QCTL_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp deleted file mode 100644 index 2dd12cfab1e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp +++ /dev/null @@ -1,593 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTL_Test_Receiver_exec.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define QUERY_1 "( (iteration > %0) AND (iteration < %1) )" -#define QUERY_2 "( (iteration < %0) OR (iteration > %1) )" - -#define MIN_ITERATION "2" -#define MAX_ITERATION "5" - -#define SAMPLES_PER_KEY_1 2 - -namespace CIAO_QCTL_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_listen_1_data_listener_exec_i - */ - - info_listen_1_data_listener_exec_i::info_listen_1_data_listener_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : ciao_context_ ( - ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_1_ (thread_id) - , samples_received_1_ (samples_received) - { - } - - info_listen_1_data_listener_exec_i::~info_listen_1_data_listener_exec_i (void) - { - } - - // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener - - void - info_listen_1_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_1_ = t_id; - ++this->samples_received_1_; - - ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_1::on_one_data: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (::DDS::HANDLE_NIL == info.instance_handle) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) || - datum.iteration > ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_1::on_one_data: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_listen_1_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_listen_1_status_exec_i - */ - - info_listen_1_status_exec_i::info_listen_1_status_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_listen_1_status_exec_i::~info_listen_1_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_listen_1_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_listen_1_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_listen_2_data_listener_exec_i - */ - - info_listen_2_data_listener_exec_i::info_listen_2_data_listener_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received) - : ciao_context_ ( - ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_2_ (thread_id) - , samples_received_2_ (samples_received) - { - } - - info_listen_2_data_listener_exec_i::~info_listen_2_data_listener_exec_i (void) - { - } - - // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener - - void - info_listen_2_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_2_ = t_id; - - ++this->samples_received_2_; - - ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_2::on_one_data: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - if (::DDS::HANDLE_NIL == info.instance_handle) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - if (datum.iteration > ACE_OS::atoi (MIN_ITERATION) && - datum.iteration < ACE_OS::atoi (MAX_ITERATION) ) - { - ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_2::on_one_data: " - "ERROR: Unexpected iteration received.\n")); - } - } - - void - info_listen_2_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_listen_2_status_exec_i - */ - - info_listen_2_status_exec_i::info_listen_2_status_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_listen_2_status_exec_i::~info_listen_2_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_listen_2_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_listen_2_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : keys_ (5) - , iterations_ (10) - , thread_id_listener_1_ (0, 0) - , thread_id_listener_2_ (0, 0) - , samples_expected_1_ (keys_ * SAMPLES_PER_KEY_1) - , samples_received_1_ (0) - , samples_expected_2_ (keys_ * (this->iterations_ - 4)) - , samples_received_2_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::start () - { - ::CCM_DDS::DataListenerControl_var dlc1 = - this->ciao_context_->get_connection_info_listen_1_data_control (); - dlc1->mode (::CCM_DDS::ONE_BY_ONE); - - ::CCM_DDS::DataListenerControl_var dlc2 = - this->ciao_context_->get_connection_info_listen_2_data_control (); - dlc2->mode (::CCM_DDS::ONE_BY_ONE); - } - - // Component attributes and port operations. - - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_1_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_1_data_listener_.in ())) - { - info_listen_1_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_1_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_1_, - this->samples_received_1_), - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_listen_1_data_listener_ = tmp; - } - - return - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_listen_1_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_1_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_1_status_.in ())) - { - info_listen_1_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_1_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_listen_1_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_listen_1_status_.in ()); - } - - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_2_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_2_data_listener_.in ())) - { - info_listen_2_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_2_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_2_, - this->samples_received_2_), - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_listen_2_data_listener_ = tmp; - } - - return - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_listen_2_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_2_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_listen_2_status_.in ())) - { - info_listen_2_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_listen_2_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_listen_2_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_listen_2_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - // Iterations between min and max (including min and max) are not received. - this->samples_expected_2_ = keys_ * (this->iterations_ - 4); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTL_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Set filter 1.\n")); - - CCM_DDS::QueryFilter filter_1; - filter_1.expression = CORBA::string_dup (QUERY_1); - filter_1.parameters.length (2); - filter_1.parameters[0] = CORBA::string_dup (MIN_ITERATION); - filter_1.parameters[1] = CORBA::string_dup (MAX_ITERATION); - - ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_1 = - this->ciao_context_->get_connection_info_listen_1_data (); - - reader_1->query (filter_1); - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Set filter 2.\n")); - - CCM_DDS::QueryFilter filter_2; - filter_2.expression = CORBA::string_dup (QUERY_2); - filter_2.parameters.length (2); - filter_2.parameters[0] = CORBA::string_dup (MIN_ITERATION); - filter_2.parameters[1] = CORBA::string_dup (MAX_ITERATION); - - ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_2 = - this->ciao_context_->get_connection_info_listen_2_data (); - - reader_2->query (filter_2); - - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " - "Start listening on both listeners.\n")); - start (); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - // get current thread - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf_1 [65]; - this->thread_id_listener_1_.to_string (list_buf_1); - - if (this->thread_id_listener_1_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_1_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #else - else if (this->thread_id_listener_1_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_1, - ccm_buf)); - } - #endif - char list_buf_2 [65]; - this->thread_id_listener_2_.to_string (list_buf_2); - if (this->thread_id_listener_2_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_2_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #else - else if (this->thread_id_listener_2_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf_2, - ccm_buf)); - } - #endif - //first listener - if (this->samples_received_1_ != this->samples_expected_1_) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: " - "Unexpected number of samples received " - "on first listener : " - "expected <%d> - received <%d>\n", - this->samples_expected_1_, - this->samples_received_1_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: " - "Expected number of samples received " - "on first listener : " - "expected <%d> - received <%d>\n", - this->samples_expected_1_, - this->samples_received_1_.value ())); - } - //Second listener - if (this->samples_received_2_ != this->samples_expected_2_) - { - ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: " - "Unexpected number of samples received` " - "on second listener : " - "expected <%d> - received <%d>\n", - this->samples_expected_2_, - this->samples_received_2_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: " - "Expected number of samples received " - "on second listener : " - "expected <%d> - received <%d>\n", - this->samples_expected_2_, - this->samples_received_2_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTL_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h deleted file mode 100644 index 58165f75751..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h +++ /dev/null @@ -1,265 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_ -#define CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_ - -#include /**/ "ace/pre.h" - -#include "QCTL_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCTL_Test_Receiver_Impl -{ - class Receiver_exec_i; - - typedef ACE_Atomic_Op Atomic_Long; - - /** - * Provider Executor Implementation Class: info_listen_1_data_listener_exec_i - */ - - class info_listen_1_data_listener_exec_i - : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_1_data_listener_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - - virtual ~info_listen_1_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ - - virtual - void on_one_data (const ::QueryConditionTwoListenersTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::QueryConditionTwoListenersTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::QCTL_Test::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_1_; - Atomic_Long &samples_received_1_; - }; - - /** - * Provider Executor Implementation Class: info_listen_1_status_exec_i - */ - - class info_listen_1_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_1_status_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_listen_1_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCTL_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_listen_2_data_listener_exec_i - */ - - class info_listen_2_data_listener_exec_i - : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_2_data_listener_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id, - Atomic_Long &samples_received); - virtual ~info_listen_2_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ - - virtual - void on_one_data (const ::QueryConditionTwoListenersTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::QueryConditionTwoListenersTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::QCTL_Test::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_2_; - Atomic_Long &samples_received_2_; - }; - - /** - * Provider Executor Implementation Class: info_listen_2_status_exec_i - */ - - class info_listen_2_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_listen_2_status_exec_i ( - ::QCTL_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_listen_2_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCTL_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr - get_info_listen_1_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_1_status (void); - - virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr - get_info_listen_2_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_listen_2_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - - //@} - - private: - ::QCTL_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_1_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_1_status_; - ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_2_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_2_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - ACE_Thread_ID thread_id_listener_1_; - ACE_Thread_ID thread_id_listener_2_; - - CORBA::Long samples_expected_1_; - Atomic_Long samples_received_1_; - - CORBA::Long samples_expected_2_; - Atomic_Long samples_received_2_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTL_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl deleted file mode 100644 index c91392633f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL - -#include "Connector/QCTL_Test_Connector.idl" - -module QCTL_Test -{ - component Sender - { - port QueryConditionTwoListenersTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc deleted file mode 100644 index ffe3bb76dcc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_QCTL_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_QCTL_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - QCTL_Test_Sender.idl - } -} - -project(DDS_QCTL_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_QCTL_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - QCTL_Test_SenderE.idl - } -} - -project(DDS_QCTL_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCTL_Test_Sender_lem_gen DDS_QCTL_Test_Sender_stub \ - DDS_QCTL_Test_Base_stub - libs += DDS_QCTL_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_SenderEC.cpp - } - - Header_Files { - QCTL_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - QCTL_Test_SenderEC.inl - } -} - -project(DDS_QCTL_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_QCTL_Test_Sender_idl_gen DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub - libs += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_SenderC.cpp - } - - Header_Files { - QCTL_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - QCTL_Test_SenderC.inl - } -} - -project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_QCTL_Test_Sender_lem_stub DDS_QCTL_Test_Sender_stub \ - DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_Sender_exec.cpp - } - - Header_Files { - QCTL_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Sender_lem_stub \ - DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Connector_svnt DDS_QCTL_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ - DDS_QCTL_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTL_Test_SenderS.cpp - QCTL_Test_Sender_svnt.cpp - } - - Header_Files { - QCTL_Test_SenderS.h - QCTL_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp deleted file mode 100644 index ed9a7139adc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp +++ /dev/null @@ -1,306 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTL_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_QCTL_Test_Sender_Impl -{ - - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.start (); - } - } - - - /** - * Write ticker - */ - - WriteTicker::WriteTicker (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.write_one (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - { - this->ticker_ = new WriteTicker (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::write_one (void) - { - if (this->last_key_ != this->samples_.end ()) - { - try - { - ::QCTL_Test::QueryConditionTwoListenersTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - ++this->last_key_->second->iteration; - writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n", - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key_->first.c_str ())); - } - ++this->last_key_; - } - else - { - //onto the next iteration - this->last_key_ = this->samples_.begin (); - while (this->last_key_ != this->samples_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - //next key - ++this->last_key_; - } - else - { - break; - } - } - if (this->last_key_ == this->samples_.end ()) - { - this->reactor ()->cancel_timer (this->ticker_); - } - } - } - - - void - Sender_exec_i::start (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - QueryConditionTwoListenersTest* new_key = new QueryConditionTwoListenersTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->samples_[key] = new_key; - } - this->last_key_ = this->samples_.begin (); - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (5, 50000), - ACE_Time_Value (0, 50000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTL_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTL_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h deleted file mode 100644 index 8782e933fc1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h +++ /dev/null @@ -1,177 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_ -#define CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_ - -#include /**/ "ace/pre.h" - -#include "QCTL_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_QCTL_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Write ticker - */ - - class WriteTicker : - public ACE_Event_Handler - { - public: - WriteTicker (Sender_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status ( - void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - void write_one (void); - - //@} - - private: - ::QCTL_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - WriteTicker *ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table samples_; - - Writer_Table::iterator last_key_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTL_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp deleted file mode 100644 index 1360f42e586..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp +++ /dev/null @@ -1,492 +0,0 @@ - - - - QCTL_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTL_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTL_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - QCTL_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QCTL_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QCTL_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTL_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTL_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - QCTL_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - QCTL_Test - - - - - - QCTL_Test_ReceiverConnectorInstance_1 - ReceiverNode - - - - - topic_name - - - tk_string - - - QCTL_Test - - - - - - QCTL_Test_ReceiverConnectorInstance_2 - ReceiverNode - - - - - topic_name - - - tk_string - - - QCTL_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - info_listen_1_reader_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_1_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_listen_1_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_1_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_1_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_1_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - info_listen_2_reader_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_2_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_listen_2_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_2_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - info_listen_2_data_control - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_2_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QCTL_Test_Connector_exec - - - DDS_QCTL_Test_Connector_exec - - - QCTL_Test_Connector_svnt - - - DDS_QCTL_Test_Connector_svnt - - - QCTL_Test_Connector_stub - - - DDS_QCTL_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl deleted file mode 100755 index d8b4eca445d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl deleted file mode 100644 index 55aafc4a95c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file QCTQ_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERYCONDITION_STARTER_IDL -#define QUERYCONDITION_STARTER_IDL - -#pragma ciao lem "Base/QCTQ_StarterE.idl" - -interface TwoQueriesStarter -{ - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface TwoQueriesRestarter -{ - void restart_write (); -}; - -#endif /* QUERYCONDITION_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc deleted file mode 100644 index 6928a4e4c83..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(QC_QCTQ_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=QCTQ_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=QCTQ_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=QCTQ_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=QCTQ_Starter_exec_export.h -I.. - - IDL_Files { - QCTQ_Starter.idl - } -} - -project(QC_QCTQ_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQ_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=QCTQ_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCTQ_StarterE.idl - } -} - -project(QC_QCTQ_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQ_Starter_lem_gen QC_QCTQ_Starter_stub - libs += QC_QCTQ_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQ_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_StarterEC.cpp - } - - Header_Files { - QCTQ_StarterEC.h - QCTQ_Starter_lem_stub_export.h - } - - Inline_Files { - QCTQ_StarterEC.inl - } -} - -project(QC_QCTQ_Starter_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQ_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQ_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_StarterC.cpp - } - - Header_Files { - QCTQ_StarterC.h - QCTQ_Starter_stub_export.h - } - - Inline_Files { - QCTQ_StarterC.inl - } -} - - -project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub - sharedname = QC_QCTQ_Starter_svnt - libs += QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_StarterS.cpp - QCTQ_Starter_svnt.cpp - } - - Header_Files { - QCTQ_StarterS.h - QCTQ_Starter_svnt.h - QCTQ_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl deleted file mode 100644 index ef66771bb8f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QCTQ_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_BASE_IDL -#define QUERY_CONDITION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QCTQ_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QCTQ_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTest" -#pragma DCPS_DATA_KEY "QueryConditionTest symbol" - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc deleted file mode 100644 index f959ec8a225..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project(QC_QCTQ_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = QC_QCTQ_Test_Base_stub - dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QCTQ_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QCTQ_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QCTQ_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl deleted file mode 100644 index 069d2eda9b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QCTQ_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QCTQ_Test_Base.idl" - -#pragma ciao lem "Connector/QCTQ_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QCTQ_Test_BaseTypeSupport.idl" -#endif - -module QCTQ_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; -}; - -#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc deleted file mode 100644 index 091cfc4ba36..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l .. -o ../lib -u DDS QCTQ_Test_Connector" - -project(QC_QCTQ_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen QC_QCTQ_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QCTQ_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QCTQ_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QCTQ_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QCTQ_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QCTQ_Test_Connector.idl - } -} - -project(QC_QCTQ_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += QC_QCTQ_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QCTQ_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QCTQ_Test_ConnectorE.idl - } -} - -project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += QC_QCTQ_Test_Connector_lem_gen QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Base_stub - libs += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQ_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ConnectorEC.cpp - } - - Header_Files { - QCTQ_Test_ConnectorEC.h - QCTQ_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QCTQ_Test_ConnectorEC.inl - } -} - -project(QC_QCTQ_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_Test_Base_stub - libs += QC_QCTQ_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQ_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ConnectorC.cpp - } - - Header_Files { - QCTQ_Test_ConnectorC.h - QCTQ_Test_Connector_stub_export.h - } - - Inline_Files { - QCTQ_Test_ConnectorC.inl - } -} - -project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Base_stub - sharedname = QC_QCTQ_Test_Connector_exec - libs += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_Connector_conn.cpp - } - - Header_Files { - QCTQ_Test_Connector_conn.h - QCTQ_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_exec \ - QC_QCTQ_Test_Connector_stub - sharedname = QC_QCTQ_Test_Connector_svnt - libs += QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ConnectorS.cpp - QCTQ_Test_Connector_svnt.cpp - } - - Header_Files { - QCTQ_Test_ConnectorS.h - QCTQ_Test_Connector_svnt.h - QCTQ_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README deleted file mode 100644 index f2d19fb4eff..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README +++ /dev/null @@ -1,39 +0,0 @@ - - -The TwoQueries exists of 4 runs. During each run the Sender writes 20 samples to DDS. -After that it informs the receiver that the samples were written. The receiver -in turn sets a filter and starts to pull the samples from DDS, using the Getter. -Once the receiver has received all samples, it informs the Sender that the next -run can be started. -Since the getter only receives non-read samples, an extra check is build in. The -receiver also performs a read on a different port in order to check whether the -right samples are available in DDS. This Reader should always receive ALL samples -since the QueryFilter only applies to the Getter. - -The following query expression is defined: - ( (iteration > %0) AND (iteration < %1) ) - -The following runs are defined: - -1. Sender writes iterations 1-20 to DDS for a certain number of keys, - defined in the deployment plan. The receiver sets the filter and filter - parameters and starts receiving the samples one by one, using get_one. - After that it changes the filter parameters and informs the Sender that a - new run can be started. -2. Sender writes iterations 21-40 to DDS for the defined number of keys. After - that it informs the receiver which starts to get the samples from DDS. After - that, the receiver reset the QueryFilter (by setting the expression to an - empty string) and informs the Sender that a new run can be started. -3. Sender writes iterations 41-60 to DDS for the defined number of keys. After - that it informs the receiver which should receive all samples with iterations - 1-60 without the ones it read during run 1, 2 and 3. - The receiver then creates a new filter, using the same expression as used during - runs 1, 2 and 3 but with different parameters. Again the receiver informs the - Sender that a new run can be started. -4. Sender writes iterations 61-80 to DDS for the defined number of keys. Again it - informs the receiver about this action. The receiver should only get the samples - according to the query expression and its parameters. - -After each get-action, the receiver reads the data from DDS. During this read action, -the receiver should read all samples the Sender has written up to that moment. Since -there's no filter applied to this reader, all sample states should be 'FRESH_INFO'. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl deleted file mode 100644 index 80d9f1fb76e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/QCTQ_Test_Connector.idl" -#include "Base/QCTQ_Starter.idl" - -module QCTQ_Test -{ - component Receiver - { - port QueryConditionTestConnector::DDS_Get get_port; - port QueryConditionTestConnector::DDS_Read read_port; - - provides TwoQueriesStarter reader_start; - uses TwoQueriesRestarter writer_restart; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc deleted file mode 100644 index f38fa33da42..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(QC_QCTQ_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += QC_QCTQ_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - QCTQ_Test_Receiver.idl - } -} - -project(QC_QCTQ_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQ_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCTQ_Test_ReceiverE.idl - } -} - -project(QC_QCTQ_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQ_Test_Receiver_lem_gen QC_QCTQ_Test_Receiver_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Starter_stub - libs += Receiver_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ReceiverEC.cpp - } - - Header_Files { - QCTQ_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - QCTQ_Test_ReceiverEC.inl - } -} - -project(QC_QCTQ_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQ_Test_Receiver_idl_gen QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_lem_gen \ - QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub - libs += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ReceiverC.cpp - } - - Header_Files { - QCTQ_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - QCTQ_Test_ReceiverC.inl - } -} - -project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Receiver_stub \ - QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_Receiver_exec.cpp - } - - Header_Files { - QCTQ_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ - QC_QCTQ_Test_Receiver_exec QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Starter_stub \ - QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ - Receiver_exec QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \ - QC_QCTQ_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_ReceiverS.cpp - QCTQ_Test_Receiver_svnt.cpp - } - - Header_Files { - QCTQ_Test_ReceiverS.h - QCTQ_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp deleted file mode 100644 index 5982d0f880f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp +++ /dev/null @@ -1,806 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTQ_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/dds4ccm_utils.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" -// #define QUERY_2 "( (iteration > %0) AND (iteration < %1) )" - -#define MIN_ITERATION_1 "2" -#define MAX_ITERATION_1 "5" - -#define MIN_ITERATION_2 "22" -#define MAX_ITERATION_2 "34" - -#define MIN_ITERATION_3 "68" -#define MAX_ITERATION_3 "77" - -// Reader also reads already read samples. -// The getter receives the following iterations: -// During run 1: 2 (iterations 3 and 4) -// During run 2: 11 (iterations between 22 and 34) -// During run 3: 2 (all unread samples, meaning iterations 1-60 -// without iteration 3, 4 and iterations between 22 and 34) -// During run 4: 8 (iterations between 68 and 77) - -#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8) - -namespace CIAO_QCTQ_Test_Receiver_Impl -{ - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - { - this->callback_.run (this->run_); - } - return 0; - } - - /** - * Facet Executor Implementation Class: get_port_status_exec_i - */ - - get_port_status_exec_i::get_port_status_exec_i ( - ::QCTQ_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - get_port_status_exec_i::~get_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::QCTQ_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::TwoQueriesStarter - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read (::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (20) - , keys_ (5) - , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1)) - , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1)) - , ticker_ (0) - , samples_expected_ (0) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last () - { - ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - QueryConditionTest queryfiltertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - queryfiltertest_info.symbol = ::CORBA::string_dup (key); - reader->read_one_last ( - queryfiltertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d>\n", - queryfiltertest_info.iteration, - this->current_max_iteration_ - 1)); - return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - bool - Receiver_exec_i::check_iter (const QueryConditionTest & sample, - ::CORBA::UShort run, - ::CCM_DDS::ReadInfo * info) - { - if (!info) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ") - ACE_TEXT ("sample received for <%C>: iteration <%d>\n"), - sample.symbol.in (), - sample.iteration)); - } - if (run == 3) - { - // We need to receive all UNread samples. Therefor we should - // receive all samples except the ones between - // MIN_ITERATION_1 and MAX_ITERATION_1 and between - // MIN_ITERATION_2 and MAX_ITERATION_2 - if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1) && - sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) || - (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2) && - sample.iteration < ACE_OS::atoi (MAX_ITERATION_2))) - { - // Read supplies info. There check the sample status mask - // as well - if (info != 0) - { // access mask should be "ALREADY_SEEN" since the getter should - // already have seen this sample. - if (info->access_status != ::CCM_DDS::ALREADY_SEEN) - { - // READ ALL since this check is only performed - // during a read. - ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: " - "Unexpected sample access mask - " - "expected <%C> - " - "received <%C>\n", - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status) - )); - return false; - } - } - else - { - // Getter functionality - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't except samples between " - "<%02d> and <%02d> and between " - "<%02d> and <%02d>\n", - ACE_OS::atoi (MIN_ITERATION_1), - ACE_OS::atoi (MAX_ITERATION_1), - ACE_OS::atoi (MIN_ITERATION_2), - ACE_OS::atoi (MAX_ITERATION_2))); - return false; - } - } - } - else if (!info) - { - if (sample.iteration <= current_min_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iteration %d " - "<= %d\n", sample.iteration, - this->current_min_iteration_)); - return false; - } - if (sample.iteration > this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iteration %d " - "> %2d\n", sample.iteration, - this->current_max_iteration_)); - return false; - } - } - if (info != 0) - { // access mask should be "FRESH_INFO" since the getter has not - // "seen" this sample but the reader has seen the samples - // of the previous runs. - if (sample.iteration > this->current_min_iteration_) - { - if (info->access_status != ::CCM_DDS::FRESH_INFO) - { - // READ ALL since this check is only performed - // during a read. - ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: " - "Unexpected sample access mask - " - "expected <%C> - " - "received <%C>\n", - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status))); - return false; - } - } - } - return true; - } - - - void - Receiver_exec_i::read_all (::CORBA::UShort run) - { - ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_read_port_data (); - - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "ERROR: No Reader\n")); - return; - } - QueryConditionTestSeq qf_info; - ::CCM_DDS::ReadInfoSeq readinfos; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - " - "Start checking samples in DDS\n")); - reader->read_all (qf_info, readinfos); - ::CORBA::ULong expected = - static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_); - if (qf_info.length () != expected) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unexpected number of samples received: " - "expected <%d> - received <%u>\n", - expected, qf_info.length ())); - } - for (::CORBA::ULong i = 0; i < qf_info.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - " - "Sample received: key <%C> - iteration <%d> - " - "sample_read_state <%C>\n", - qf_info[i].symbol.in (), - qf_info[i].iteration, - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status))); - if (!this->check_iter (qf_info[i], run, &readinfos[i])) - break; - } - } - - - ::CORBA::ULong - Receiver_exec_i::get_all (::CORBA::UShort run) - { - ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - ::CORBA::ULong samples_received = 0; - - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: No Getter\n")); - return 0; - } - QueryConditionTest_var qf_info; - ::CCM_DDS::ReadInfo readinfo; - ::CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo); - if (result) - { - this->check_iter (qf_info.in (), run); - ++samples_received; - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: time out when retrieving " - "first sample.\n")); - } - while (result) - { - result = getter->get_one (qf_info.out (), readinfo); - if (result) - { - if (!this->check_iter (qf_info.in (), run)) - break; - ++samples_received; - } - } - return samples_received; - } - - ::CORBA::ULong - Receiver_exec_i::test_all (::CORBA::UShort run) - { - try - { - return get_all (run); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - run, - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - run, - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("test_all"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"), - run)); - } - return 0; - } - - void - Receiver_exec_i::check_filter (::CORBA::UShort run) - { - ::CCM_DDS::QueryFilter_var filter; - ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - try - { - filter = reader->query (); - } - catch (const CCM_DDS::InternalError& ex) - { - if (run == 3) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - " - "caught expected InternalEr excep: retval <%u>\n", - ex.error_code)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "caught InternalError exception: retval <%u>\n", - ex.error_code)); - } - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Exception caught\n")); - return; - } - - //check query - bool error = false; - - if (ACE_OS::strcmp (filter->expression, QUERY) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - QUERY, filter->expression.in ())); - error = true; - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected number of parameters: " - "expected <%d> - received <%d>\n", - 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_min_iteration_, - filter->parameters[0].in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_max_iteration_, - filter->parameters[1].in ())); - error = true; - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - " - "Passed check_filter test for run <%d>.\n", - run)); - } - } - - void - Receiver_exec_i::set_filter (::CORBA::UShort run) - { - ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run)); - ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - ::CCM_DDS::QueryFilter filter; - run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) : - filter.expression = ::CORBA::string_dup (""); - filter.parameters.length (2); - if (run == 1) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1); - } - else if (run == 2) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2); - } - else if (run == 3) - { - filter.parameters[0] = ::CORBA::string_dup ("0"); - filter.parameters[1] = ::CORBA::string_dup ("0"); - this->current_min_iteration_ = (run - 1) * this->iterations_; - this->current_max_iteration_ = run * this->iterations_; - } - else if (run == 4) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3); - } - ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n", - filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ())); - reader->query (filter); - } - catch (const ::CCM_DDS::InternalError &ex) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - " - "ERROR: Unexpected InternalError exception caught " - "with <%C> as error\n.", - ::CIAO::DDS4CCM::translate_retcode (ex.error_code))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - " - "ERROR: Unexpected exception caught.\n")); - } - } - - void - Receiver_exec_i::start_read (::CORBA::UShort run) - { - this->ticker_ = new read_action_Generator (*this, run); - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (::CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - TwoQueriesRestarter_var restarter = - this->ciao_context_->get_connection_writer_restart (); - if (!::CORBA::is_nil (restarter.in ())) - { - switch (run) - { - case 1: - { - this->samples_received_ += this->test_all (run); - this->check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 2: - { - this->samples_received_ += this->test_all (run); - check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 3: - { - this->samples_received_ += this->test_all (run); - this->check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 4: - { - this->samples_received_ += this->test_all (run); - this->read_all (run); - } - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - " - "ERROR: Reference to Restarter not found\n")); - } - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - - this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_get_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ())) - { - get_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - get_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_get_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_get_port_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_read_port_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_TwoQueriesStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_TwoQueriesStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_TwoQueriesStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTQ_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - DDS::Duration_t to; - to.sec = 5; to.nanosec = 0; - getter->time_out (to); - // Set filter for the first run - this->set_filter (1); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GETTER : " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GETTER : " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_)); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQ_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h deleted file mode 100644 index de5c32eda55..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h +++ /dev/null @@ -1,221 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_ -#define CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_ - -#include /**/ "ace/pre.h" - -#include "QCTQ_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCTQ_Test_Receiver_Impl -{ - - class Receiver_exec_i; - - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - - }; - - /** - * Provider Executor Implementation Class: get_port_status_exec_i - */ - - class get_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - get_port_status_exec_i ( - ::QCTQ_Test::CCM_Receiver_Context_ptr ctx); - virtual ~get_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_TwoQueriesStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::QCTQ_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from TwoQueriesStarter. */ - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - - virtual - void start_read (::CORBA::UShort run); - //@} - - private: - ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i & callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_read_port_status (void); - - - virtual ::CCM_TwoQueriesStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void iterations (CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - bool check_last (void); - void start_read (::CORBA::UShort run); - void run (::CORBA::UShort run); - //@} - - private: - ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_; - ::CCM_TwoQueriesStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - - int current_min_iteration_; - int current_max_iteration_; - - read_action_Generator *ticker_; - - ::CORBA::ULong samples_expected_; - ::CORBA::ULong samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - ::CORBA::ULong test_all (::CORBA::UShort run); - ::CORBA::ULong get_all (::CORBA::UShort run); - void read_all (::CORBA::UShort run); - bool check_iter (const QueryConditionTest & sample, - ::CORBA::UShort run, - ::CCM_DDS::ReadInfo * info = 0); - void check_filter (::CORBA::UShort run); - void set_filter (::CORBA::UShort run); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQ_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl deleted file mode 100644 index 0b691cb570e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TEST_SENDER_IDL - -#include "Connector/QCTQ_Test_Connector.idl" -#include "Base/QCTQ_Starter.idl" - -module QCTQ_Test -{ - component Sender - { - port QCTQ_Test::QueryConditionTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - uses TwoQueriesStarter start_reader; - provides TwoQueriesRestarter restart_writer; - - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc deleted file mode 100644 index 22fb33b6792..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(QC_QCTQ_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - QCTQ_Test_Sender.idl - } -} - -project(QC_QCTQ_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQ_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - QCTQ_Test_SenderE.idl - } -} - -project(QC_QCTQ_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQ_Test_Sender_lem_gen QC_QCTQ_Test_Sender_stub \ - QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub - libs += QC_QCTQ_Test_Base_stub Sender_stub QC_QCTQ_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_SenderEC.cpp - } - - Header_Files { - QCTQ_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - QCTQ_Test_SenderEC.inl - } -} - -project(QC_QCTQ_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQ_Test_Sender_idl_gen QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Starter_stub \ - QC_QCTQ_Starter_lem_stub - libs += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_SenderC.cpp - } - - Header_Files { - QCTQ_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - QCTQ_Test_SenderC.inl - } -} - -project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_QCTQ_Test_Sender_lem_stub QC_QCTQ_Test_Sender_stub \ - QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub \ - QC_QCTQ_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_Sender_exec.cpp - } - - Header_Files { - QCTQ_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Sender_lem_stub \ - QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Connector_svnt QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \ - QC_QCTQ_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ - QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Starter_stub \ - QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQ_Test_SenderS.cpp - QCTQ_Test_Sender_svnt.cpp - } - - Header_Files { - QCTQ_Test_SenderS.h - QCTQ_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp deleted file mode 100644 index 6f3213ead99..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp +++ /dev/null @@ -1,349 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTQ_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define ITERATIONS 20 - -namespace CIAO_QCTQ_Test_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - , started_ (false) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->started_ = true; - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * WriteHandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::QCTQ_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback) - : ciao_context_ ( - ::QCTQ_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::TwoQueriesRestarter - - void - restart_writer_exec_i::restart_write (void) - { - this->callback_.restart (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (0) - , iterations_ (ITERATIONS) - , run_ (1) - , wh_ (0) - - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - if (this->wh_) - { - delete this->wh_; - } - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - if (this->wh_) - { - delete this->wh_; - this->wh_ = 0; - } - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - this->reactor ()->notify (this->wh_); - } - - - void - Sender_exec_i::get_started (void) - { - try - { - if (this->wh_) - { - delete this->wh_; - this->wh_ = 0; - } - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ::QCTQ_Test::QueryConditionTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - TwoQueriesStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - return; - } - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key.symbol = CORBA::string_dup(key); - CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1; - while (iter < this->run_ * this->iterations_ + 1) - { - new_key.iteration = iter; - writer->write_one (new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - key, iter)); - ++iter; - } - } - ACE_OS::sleep (2); - starter->start_read (this->run_); - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CCM_TwoQueriesRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_TwoQueriesRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_TwoQueriesRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTQ_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQ_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h deleted file mode 100644 index 37b8f265fb3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h +++ /dev/null @@ -1,196 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_ -#define CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_ - -#include /**/ "ace/pre.h" - -#include "QCTQ_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCTQ_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - bool started_; - }; - - /** - * WriteHandler - */ - - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_TwoQueriesRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::QCTQ_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from TwoQueriesRestarter. */ - - virtual - void restart_write (void); - //@} - - private: - ::QCTQ_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CCM_TwoQueriesRestarter_ptr - get_restart_writer (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void start (void); - void restart (void); - - //@} - - private: - ::QCTQ_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_TwoQueriesRestarter_var ciao_restart_writer_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort run_; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQ_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp deleted file mode 100644 index 8349f74fcb1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp +++ /dev/null @@ -1,520 +0,0 @@ - - - - QCTQ_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTQ_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQ_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - QCTQ_Test_EventConnectorImplementation - - - - - - component factory - - - tk_string - - - create_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_QCTQ_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_QCTQ_Test_Connector_exec - - - - - - - QCTQ_Test_StateConnectorImplementation - - - - - - component factory - - - tk_string - - - create_QCTQ_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQ_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_QCTQ_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_QCTQ_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTQ_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQ_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - QCTQ_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQ_Test - - - - - - - QCTQ_Test_EventConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQ_Test - - - - - - - QCTQ_Test_StateConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQ_Test - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - - - read_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - get_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - get_port_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QC_QCTQ_Test_Connector_exec - - - QC_QCTQ_Test_Connector_exec - - - QC_QCTQ_Test_Connector_svnt - - - QC_QCTQ_Test_Connector_svnt - - - QC_QCTQ_Test_Connector_stub - - - QC_QCTQ_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml deleted file mode 100644 index b9cba6277a3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 37e7ff8dec9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl deleted file mode 100755 index b87434bef7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl deleted file mode 100644 index d9b7dc87807..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file QCTQM_Starter.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef QUERYCONDITION_STARTER_IDL -#define QUERYCONDITION_STARTER_IDL - -#pragma ciao lem "Base/QCTQM_StarterE.idl" - -interface TwoQueriesStarter -{ - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface TwoQueriesRestarter -{ - void restart_write (); -}; - -#endif /* QUERYCONDITION_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc deleted file mode 100644 index d5696898dd6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc +++ /dev/null @@ -1,109 +0,0 @@ -project(QC_QCTQM_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=QCTQM_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=QCTQM_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=QCTQM_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=QCTQM_Starter_exec_export.h -I.. - - IDL_Files { - QCTQM_Starter.idl - } -} - -project(QC_QCTQM_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQM_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=QCTQM_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCTQM_StarterE.idl - } -} - -project(QC_QCTQM_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQM_Starter_lem_gen QC_QCTQM_Starter_stub - libs += QC_QCTQM_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQM_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_StarterEC.cpp - } - - Header_Files { - QCTQM_StarterEC.h - QCTQM_Starter_lem_stub_export.h - } - - Inline_Files { - QCTQM_StarterEC.inl - } -} - -project(QC_QCTQM_Starter_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQM_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQM_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_StarterC.cpp - } - - Header_Files { - QCTQM_StarterC.h - QCTQM_Starter_stub_export.h - } - - Inline_Files { - QCTQM_StarterC.inl - } -} - - -project(QC_QCTQM_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub - sharedname = QC_QCTQM_Starter_svnt - libs += QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_StarterS.cpp - QCTQM_Starter_svnt.cpp - } - - Header_Files { - QCTQM_StarterS.h - QCTQM_Starter_svnt.h - QCTQM_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl deleted file mode 100644 index 71a086999ce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file QCTQM_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_BASE_IDL -#define QUERY_CONDITION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/QCTQM_Test_BaseSupport.h" -#pragma opendds typesupport "Base/QCTQM_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "QueryConditionTest" -#pragma DCPS_DATA_KEY "QueryConditionTest symbol" - -struct QueryConditionTest { - string symbol; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence QueryConditionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc deleted file mode 100644 index 148f7d99637..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project(QC_QCTQM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = QC_QCTQM_Test_Base_stub - dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=QCTQM_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - QCTQM_Test_Base.idl - } - - opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - QCTQM_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl deleted file mode 100644 index a390ca52507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file QCTQM_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ -#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/QCTQM_Test_Base.idl" - -#pragma ciao lem "Connector/QCTQM_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/QCTQM_Test_BaseTypeSupport.idl" -#endif - -module QCTQM_Test -{ - module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; -}; - -#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc deleted file mode 100644 index cbbeffe6a03..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l .. -o ../lib -u DDS QCTQM_Test_Connector" - -project(QC_QCTQM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen QC_QCTQM_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=QCTQM_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=QCTQM_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=QCTQM_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=QCTQM_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - QCTQM_Test_Connector.idl - } -} - -project(QC_QCTQM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += QC_QCTQM_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=QCTQM_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - QCTQM_Test_ConnectorE.idl - } -} - -project(QC_QCTQM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += QC_QCTQM_Test_Connector_lem_gen QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Base_stub - libs += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQM_Test_Connector_lem_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ConnectorEC.cpp - } - - Header_Files { - QCTQM_Test_ConnectorEC.h - QCTQM_Test_Connector_lem_stub_export.h - } - - Inline_Files { - QCTQM_Test_ConnectorEC.inl - } -} - -project(QC_QCTQM_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_Test_Base_stub - libs += QC_QCTQM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = QC_QCTQM_Test_Connector_stub - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ConnectorC.cpp - } - - Header_Files { - QCTQM_Test_ConnectorC.h - QCTQM_Test_Connector_stub_export.h - } - - Inline_Files { - QCTQM_Test_ConnectorC.inl - } -} - -project(QC_QCTQM_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Base_stub - sharedname = QC_QCTQM_Test_Connector_exec - libs += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_Connector_conn.cpp - } - - Header_Files { - QCTQM_Test_Connector_conn.h - QCTQM_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_exec \ - QC_QCTQM_Test_Connector_stub - sharedname = QC_QCTQM_Test_Connector_svnt - libs += QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ConnectorS.cpp - QCTQM_Test_Connector_svnt.cpp - } - - Header_Files { - QCTQM_Test_ConnectorS.h - QCTQM_Test_Connector_svnt.h - QCTQM_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README deleted file mode 100644 index 81b1c73a9cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README +++ /dev/null @@ -1,39 +0,0 @@ - - -The TwoQueriesMany exists of 4 runs. During each run the Sender writes 20 samples to DDS. -After that it informs the receiver that the samples were written. The receiver -in turn sets a filter and starts to pull the samples from DDS, using the Getter. -Once the receiver has received all samples, it informs the Sender that the next -run can be started. -Since the getter only receives non-read samples, an extra check is build in. The -receiver also performs a read on a different port in order to check whether the -right samples are available in DDS. This Reader should always receive ALL samples -since the QueryFilter only applies to the Getter. - -The following query expression is defined: - ( (iteration > %0) AND (iteration < %1) ) - -The following runs are defined: - -1. Sender writes iterations 1-20 to DDS for a certain number of keys, - defined in the deployment plan. The receiver sets the filter and filter - parameters and starts receiving the samples at once, using get_many. - After that it changes the filter parameters and informs the Sender that a - new run can be started. -2. Sender writes iterations 21-40 to DDS for the defined number of keys. After - that it informs the receiver which starts to get the samples from DDS. After - that, the receiver reset the QueryFilter (by setting the expression to an - empty string) and informs the Sender that a new run can be started. -3. Sender writes iterations 41-60 to DDS for the defined number of keys. After - that it informs the receiver which should receive with a get_many all samples - with iterations 1-60 without the ones it read during run 1 and 2. - The receiver then creates a new filter, using the same expression as used during - runs 1 and 2 but with different parameters. Again the receiver informs the - Sender that a new run can be started. -4. Sender writes iterations 61-80 to DDS for the defined number of keys. Again it - informs the receiver about this action. The receiver should only get the samples - according to the query expression and its parameters. - -After each get-action, the receiver reads the data from DDS. During this read action, -the receiver should read all samples the Sender has written up to that moment. Since -there's no filter applied to this reader, all sample states should be 'FRESH_INFO'. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl deleted file mode 100644 index 5b6a79bf452..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/QCTQM_Test_Connector.idl" -#include "Base/QCTQM_Starter.idl" - -module QCTQM_Test -{ - component Receiver - { - port QueryConditionTestConnector::DDS_Get get_port; - port QueryConditionTestConnector::DDS_Read read_port; - - provides TwoQueriesStarter reader_start; - uses TwoQueriesRestarter writer_restart; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc deleted file mode 100644 index d81eac6889b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(QC_QCTQM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += QC_QCTQM_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - QCTQM_Test_Receiver.idl - } -} - -project(QC_QCTQM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQM_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - QCTQM_Test_ReceiverE.idl - } -} - -project(QC_QCTQM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQM_Test_Receiver_lem_gen QC_QCTQM_Test_Receiver_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Starter_stub - libs += Receiver_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ReceiverEC.cpp - } - - Header_Files { - QCTQM_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - QCTQM_Test_ReceiverEC.inl - } -} - -project(QC_QCTQM_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQM_Test_Receiver_idl_gen QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_lem_gen \ - QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub - libs += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ReceiverC.cpp - } - - Header_Files { - QCTQM_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - QCTQM_Test_ReceiverC.inl - } -} - -project(QC_QCTQM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Receiver_stub \ - QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_Receiver_exec.cpp - } - - Header_Files { - QCTQM_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \ - QC_QCTQM_Test_Receiver_exec QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Starter_stub \ - QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \ - Receiver_exec QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \ - QC_QCTQM_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_ReceiverS.cpp - QCTQM_Test_Receiver_svnt.cpp - } - - Header_Files { - QCTQM_Test_ReceiverS.h - QCTQM_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp deleted file mode 100644 index 58bd8cc763f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp +++ /dev/null @@ -1,831 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTQM_Test_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ace/OS_NS_unistd.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/dds4ccm_utils.h" - -#define QUERY "( (iteration > %0) AND (iteration < %1) )" - -//run 1 -#define MIN_ITERATION_1 "2" -#define MAX_ITERATION_1 "5" -//run 2 -#define MIN_ITERATION_2 "22" -#define MAX_ITERATION_2 "34" -//run 4 -#define MIN_ITERATION_3 "68" -#define MAX_ITERATION_3 "77" - -// Reader also reads already read samples. -// The getter receives the following iterations: -// During run 1: 2 (iterations 3 and 4) -// During run 2: 11 (iterations between 22 and 34) -// During run 3: 47 (all unread samples, meaning iterations 1-60 -// without iteration 3, 4 and iterations between 22 and 34) -// During run 4: 8 (iterations between 68 and 77) - -#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8) - -namespace CIAO_QCTQM_Test_Receiver_Impl -{ - /** - * Read action generator - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - { - this->callback_.run (this->run_); - } - return 0; - } - - /** - * Facet Executor Implementation Class: get_port_status_exec_i - */ - - get_port_status_exec_i::get_port_status_exec_i ( - ::QCTQM_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - get_port_status_exec_i::~get_port_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::QCTQM_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback) - : ciao_context_ ( - ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::TwoQueriesStarter - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - ACE_DEBUG ((LM_DEBUG, "Set reader propeties nr_keys %u, nr_iterations %u\n", - nr_keys, nr_iterations)); - - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - void - reader_start_exec_i::start_read (::CORBA::UShort run) - { - this->callback_.start_read (run); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (20) - , keys_ (5) - , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1)) - , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1)) - , ticker_ (0) - , samples_expected_ (0) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - // check if last key is received, if so we can assume - // that other key's are arrived too in Receiver. - bool - Receiver_exec_i::check_last () - { - ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - QueryConditionTest queryfiltertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - - queryfiltertest_info.symbol = ::CORBA::string_dup (key); - reader->read_one_last ( - queryfiltertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d> this->keys_ %s\n", - queryfiltertest_info.iteration, - this->current_max_iteration_ - 1, key)); - return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1; - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - - // Check for correct iteration belonging to a run. - // If info == 0, check iteration after a get, - // else check iteration after a read - void - Receiver_exec_i::check_iter (const QueryConditionTest & sample, - ::CORBA::UShort run, - ::CCM_DDS::ReadInfo * info) - { - if (run == 3) - { - // We need to receive all UNread samples. Therefore we should - // receive all samples except the ones between - // MIN_ITERATION_1 and MAX_ITERATION_1 and between - // MIN_ITERATION_2 and MAX_ITERATION_2 - if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1) && - sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) || - (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2) && - sample.iteration < ACE_OS::atoi (MAX_ITERATION_2))) - { - // Read supplies info. There check the sample status mask - // as well - if (info != 0) - { // access mask should be "ALREADY_SEEN" since the getter should - // already have seen this sample. - if (info->access_status != ::CCM_DDS::ALREADY_SEEN) - { - // READ ALL since this check is only performed - // during a read. - ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: " - "Unexpected sample access mask - " - "expected <%C> - " - "received <%C>\n", - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status) - )); - } - } - else - { - // Getter functionality - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't except samples between " - "<%02d> and <%02d> and between " - "<%02d> and <%02d>\n", - ACE_OS::atoi (MIN_ITERATION_1), - ACE_OS::atoi (MAX_ITERATION_1), - ACE_OS::atoi (MIN_ITERATION_2), - ACE_OS::atoi (MAX_ITERATION_2))); - } - } - } - else //run 1,2, and 4 - { - //after get - if (!info) - { - if (sample.iteration <= current_min_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iterations " - "<= %02d\n", - this->current_min_iteration_)); - } - if (sample.iteration > this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iterations " - "> %02d\n", - this->current_max_iteration_)); - } - } - // after read - else if (info != 0) - { // access mask should be "FRESH_INFO" since the getter has not - // "seen" this sample. - if (sample.iteration > this->current_min_iteration_) - { - if (info->access_status != ::CCM_DDS::FRESH_INFO) - { - // READ ALL since this check is only performed - // during a read. - ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: " - "Unexpected sample access mask - " - "expected <%C> - " - "received <%C>\n", - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO), - CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status) - )); - } - } - } - } - } - - - void - Receiver_exec_i::read_all (::CORBA::UShort run) - { - ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_read_port_data (); - - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "ERROR: No Reader\n")); - return; - } - QueryConditionTestSeq qf_info; - ::CCM_DDS::ReadInfoSeq readinfos; - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - " - "Start checking samples in DDS\n")); - reader->read_all (qf_info, readinfos); - if (qf_info.length () != - static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - " - "Unexpected number of samples received: " - "expected <%d> - received <%u>\n", - run * this->iterations_, qf_info.length ())); - } - for (::CORBA::ULong i = 0; i < qf_info.length (); ++i) - { - /* ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - " - "Sample received: key <%C> - iteration <%d> - " - "sample_read_state <%d>\n", - qf_info[i].symbol.in (), - qf_info[i].iteration, - readinfos[i].access_status)); - */ - this->check_iter (qf_info[i], run, &readinfos[i]); - } - } - - - ::CORBA::ULong - Receiver_exec_i::get_all (::CORBA::UShort run) - { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL run %d: \n"), run)); - ACE_OS::sleep (3); - - ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - ::CORBA::ULong samples_received = 0; - - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " - "ERROR: No Getter\n")); - return 0; - } - DDS::Duration_t to; - to.sec = 10; - to.nanosec = 0; - - getter->time_out (to); - getter->max_delivered_data (0); - QueryConditionTestSeq gettertest_seq; - ::CCM_DDS::ReadInfoSeq readinfo; - bool const res = getter->get_many (gettertest_seq, readinfo); - if (res) - { - if (gettertest_seq.length () == 0) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: " - "No data returned. " - "number of samples: " - "expected at least one - received <0>, res = %u\n", res)); - } - for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: " - "Returned data : key <%C> - iteration <%d>," - "instance status <%u> - access status <%C>\n", - gettertest_seq[i].symbol.in (), - gettertest_seq[i].iteration, - readinfo[i].instance_status, - CIAO::DDS4CCM::translate_ccm_dds_accessstatus(readinfo[i].access_status))); - this->check_iter (gettertest_seq[i], run); - ++samples_received; - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: " - "Time out occurred\n")); - } - return samples_received; - } - - ::CORBA::ULong - Receiver_exec_i::test_all (::CORBA::UShort run) - { - try - { - return get_all (run); - } - catch (const CCM_DDS::NonExistent& ex) - { - for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - run, - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - run, - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("test_all"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"), - run)); - } - return 0; - } - - void - Receiver_exec_i::check_filter (::CORBA::UShort run) - { - ::CCM_DDS::QueryFilter_var filter; - ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - try - { - filter = reader->query (); - } - catch (const CCM_DDS::InternalError& ex) - { - if (run == 3) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - " - "caught expected InternalEr excep: retval <%u>\n", - ex.error_code)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "caught InternalError exception: retval <%u>\n", - ex.error_code)); - } - return; - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Exception caught\n")); - return; - } - - //check query - bool error = false; - - if (run != 3) - { - if (ACE_OS::strcmp (filter->expression, QUERY) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - QUERY, filter->expression.in ())); - error = true; - } - //check current parameters. - if (filter->parameters.length () != 2) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected number of parameters: " - "expected <%d> - received <%d>\n", - 2, filter->parameters.length ())); - error = true; - } - - if (filter->parameters.length () >= 1) - { - if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_min_iteration_, - filter->parameters[0].in ())); - error = true; - } - } - if (filter->parameters.length () >= 2) - { - if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected param value: " - "expected <%d> - received <%C>\n", - this->current_max_iteration_, - filter->parameters[1].in ())); - error = true; - } - } - } - if (!error) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - " - "Passed check_filter test for run <%d>.\n", - run)); - } - } - - void - Receiver_exec_i::set_filter (::CORBA::UShort run) - { - ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run)); - ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader = - this->ciao_context_->get_connection_get_port_data (); - - try - { - ::CCM_DDS::QueryFilter filter; - run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) : - filter.expression = ::CORBA::string_dup (""); - - filter.parameters.length (2); - if (run == 1) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1); - } - else if (run == 2) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2); - } - else if (run == 3) - { - // get all not yet seen by the getter samples of run 1, 2 and 3. - this->current_min_iteration_ = 1; - this->current_max_iteration_ = run * this->iterations_; - filter.parameters[0] = ::CORBA::string_dup (0); - filter.parameters[1] = ::CORBA::string_dup (0); - } - else if (run == 4) - { - filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3); - filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3); - this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3); - this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3); - } - ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n", - filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ())); - reader->query (filter); - } - catch (const ::CCM_DDS::InternalError &ex) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - " - "ERROR: Unexpected InternalError exception caught " - "with <%C> as error\n.", - ::CIAO::DDS4CCM::translate_retcode (ex.error_code))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - " - "ERROR: Unexpected exception caught.\n")); - } - } - - void - Receiver_exec_i::start_read (::CORBA::UShort run) - { - this->ticker_ = new read_action_Generator (*this, run); - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (::CORBA::UShort run) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - TwoQueriesRestarter_var restarter = - this->ciao_context_->get_connection_writer_restart (); - if (!::CORBA::is_nil (restarter.in ())) - { - switch (run) - { - case 1: - { - this->samples_received_ += this->test_all (run); - this->check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 2: - { - this->samples_received_ += this->test_all (run); - check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 3: - { - this->samples_received_ += this->test_all (run); - this->check_filter (run); - this->read_all (run); - //set filter for the next run - this->set_filter (run + 1); - // inform the sender that it may start the next run - restarter->restart_write (); - } - break; - case 4: - { - this->samples_received_ += this->test_all (run); - this->read_all (run); - } - } - } - else - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - " - "ERROR: Reference to Restarter not found\n")); - } - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - - //the last key is used for checking if all samples are received and therefore - //get access status 1. So these samples are not read by following - //get_all method. - this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER; - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_get_port_status (void) - { - if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ())) - { - get_port_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - get_port_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_get_port_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_get_port_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_read_port_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_TwoQueriesStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_TwoQueriesStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_TwoQueriesStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTQM_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter = - this->ciao_context_->get_connection_get_port_fresh_data (); - DDS::Duration_t to; - to.sec = 5; to.nanosec = 0; - getter->time_out (to); - //set filter for the first run - this->set_filter (1); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - if (this->ticker_) - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_ != this->samples_expected_) - { - ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GET_MANY : " - "Unexpected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GET_MANY : " - "Expected number of samples received: " - "expected <%d> - received <%d>\n", - this->samples_expected_, - this->samples_received_)); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQM_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h deleted file mode 100644 index 43cec44cf93..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h +++ /dev/null @@ -1,221 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_ -#define CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_ - -#include /**/ "ace/pre.h" - -#include "QCTQM_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCTQM_Test_Receiver_Impl -{ - - class Receiver_exec_i; - - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - - }; - - /** - * Provider Executor Implementation Class: get_port_status_exec_i - */ - - class get_port_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - get_port_status_exec_i ( - ::QCTQM_Test::CCM_Receiver_Context_ptr ctx); - virtual ~get_port_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_TwoQueriesStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::QCTQM_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from TwoQueriesStarter. */ - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - - virtual - void start_read (::CORBA::UShort run); - //@} - - private: - ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i & callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_get_port_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_read_port_status (void); - - - virtual ::CCM_TwoQueriesStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void iterations (CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - bool check_last (void); - void start_read (::CORBA::UShort run); - void run (::CORBA::UShort run); - //@} - - private: - ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_; - ::CCM_TwoQueriesStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - - int current_min_iteration_; - int current_max_iteration_; - - read_action_Generator *ticker_; - - ::CORBA::ULong samples_expected_; - ::CORBA::ULong samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - ::CORBA::ULong test_all (::CORBA::UShort run); - ::CORBA::ULong get_all (::CORBA::UShort run); - void read_all (::CORBA::UShort run); - void check_iter (const QueryConditionTest & sample, - ::CORBA::UShort run, - ::CCM_DDS::ReadInfo * info = 0); - void check_filter (::CORBA::UShort run); - void set_filter (::CORBA::UShort run); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQM_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl deleted file mode 100644 index 90894c16c64..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL -#define DDS_QUERY_CONDITION_TEST_SENDER_IDL - -#include "Connector/QCTQM_Test_Connector.idl" -#include "Base/QCTQM_Starter.idl" - -module QCTQM_Test -{ - component Sender - { - port QCTQM_Test::QueryConditionTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - uses TwoQueriesStarter start_reader; - provides TwoQueriesRestarter restart_writer; - - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc deleted file mode 100644 index 07f150ee5b1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc +++ /dev/null @@ -1,153 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(QC_QCTQM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - QCTQM_Test_Sender.idl - } -} - -project(QC_QCTQM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += QC_QCTQM_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - QCTQM_Test_SenderE.idl - } -} - -project(QC_QCTQM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += QC_QCTQM_Test_Sender_lem_gen QC_QCTQM_Test_Sender_stub \ - QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub - libs += QC_QCTQM_Test_Base_stub Sender_stub QC_QCTQM_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_SenderEC.cpp - } - - Header_Files { - QCTQM_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - QCTQM_Test_SenderEC.inl - } -} - -project(QC_QCTQM_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += QC_QCTQM_Test_Sender_idl_gen QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Starter_stub \ - QC_QCTQM_Starter_lem_stub - libs += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_SenderC.cpp - } - - Header_Files { - QCTQM_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - QCTQM_Test_SenderC.inl - } -} - -project(QC_QCTQM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += QC_QCTQM_Test_Sender_lem_stub QC_QCTQM_Test_Sender_stub \ - QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub \ - QC_QCTQM_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_Sender_exec.cpp - } - - Header_Files { - QCTQM_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(QC_QCTQM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Sender_lem_stub \ - QC_QCTQM_Test_Connector_stub \ - QC_QCTQM_Test_Connector_svnt QC_QCTQM_Test_Connector_lem_stub \ - QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \ - QC_QCTQM_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \ - QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \ - QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Starter_stub \ - QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QCTQM_Test_SenderS.cpp - QCTQM_Test_Sender_svnt.cpp - } - - Header_Files { - QCTQM_Test_SenderS.h - QCTQM_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp deleted file mode 100644 index 214e6d60e30..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp +++ /dev/null @@ -1,348 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "QCTQM_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define ITERATIONS 20 - - -namespace CIAO_QCTQM_Test_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - , started_ (false) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->started_ = true; - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * WriteHandler - */ - - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - /** - * Facet Executor Implementation Class: restart_writer_exec_i - */ - - restart_writer_exec_i::restart_writer_exec_i ( - ::QCTQM_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback) - : ciao_context_ ( - ::QCTQM_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - restart_writer_exec_i::~restart_writer_exec_i (void) - { - } - - // Operations from ::TwoQueriesRestarter - - void - restart_writer_exec_i::restart_write (void) - { - this->callback_.restart (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (ITERATIONS) - , run_ (1) - , wh_ (0) - - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - if (this->wh_) - { - delete this->wh_; - } - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - this->reactor ()->notify (this->wh_); - } - - void - Sender_exec_i::get_started (void) - { - try - { - if (this->wh_) - { - delete this->wh_; - this->wh_ = 0; - } - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - ::CORBA::NO_MEMORY ()); - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: get_started : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::start (void) - { - ::QCTQM_Test::QueryConditionTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - TwoQueriesStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - return; - } - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - QueryConditionTest new_key; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - - new_key.symbol = CORBA::string_dup(key); - CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Write key <%C> with iterations <%d> to <%d>\n"), - key, iter, (iter + this->iterations_))); - - while (iter < this->run_ * this->iterations_ + 1) - { - new_key.iteration = iter; - writer->write_one (new_key, ::DDS::HANDLE_NIL); - ++iter; - } - } - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sender call start read with run_ = <%u>\n"), - this->run_)); - - ACE_OS::sleep (2); - starter->start_read (this->run_); - } - - // Component attributes and port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CCM_TwoQueriesRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ())) - { - restart_writer_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - restart_writer_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_TwoQueriesRestarter::_nil ()); - - this->ciao_restart_writer_ = tmp; - } - - return - ::CCM_TwoQueriesRestarter::_duplicate ( - this->ciao_restart_writer_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::QCTQM_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQM_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h deleted file mode 100644 index 2a991d94156..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h +++ /dev/null @@ -1,196 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_ -#define CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_ - -#include /**/ "ace/pre.h" - -#include "QCTQM_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_QCTQM_Test_Sender_Impl -{ - class Sender_exec_i; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - bool started_; - }; - - /** - * WriteHandler - */ - - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - /** - * Provider Executor Implementation Class: restart_writer_exec_i - */ - - class restart_writer_exec_i - : public virtual ::CCM_TwoQueriesRestarter, - public virtual ::CORBA::LocalObject - { - public: - restart_writer_exec_i ( - ::QCTQM_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i & callback); - virtual ~restart_writer_exec_i (void); - - //@{ - /** Operations and attributes from TwoQueriesRestarter. */ - - virtual - void restart_write (void); - //@} - - private: - ::QCTQM_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CCM_TwoQueriesRestarter_ptr - get_restart_writer (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void start (void); - void restart (void); - - //@} - - private: - ::QCTQM_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_TwoQueriesRestarter_var ciao_restart_writer_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort run_; - WriteHandler *wh_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_QCTQM_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp deleted file mode 100644 index 12808211107..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp +++ /dev/null @@ -1,520 +0,0 @@ - - - - QCTQM_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTQM_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQM_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - QCTQM_Test_EventConnectorImplementation - - - - - - component factory - - - tk_string - - - create_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_QCTQM_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_QCTQM_Test_Connector_exec - - - - - - - QCTQM_Test_StateConnectorImplementation - - - - - - component factory - - - tk_string - - - create_QCTQM_Test_QueryConditionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQM_Test_QueryConditionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - QC_QCTQM_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - QC_QCTQM_Test_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_QCTQM_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_QCTQM_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - QCTQM_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQM_Test - - - - - - - QCTQM_Test_EventConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQM_Test - - - - - - - QCTQM_Test_StateConnector - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryCondition_Library#QueryConditionProfile - - - - - topic_name - - - tk_string - - - QCTQM_Test - - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - - - read_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - read_port_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - get_port_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_data - false - SimplexReceptacle - - - - pull_consumer_data - true - Facet - - - - - - get_port_fresh_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - get_port_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - QC_QCTQM_Test_Connector_exec - - - QC_QCTQM_Test_Connector_exec - - - QC_QCTQM_Test_Connector_svnt - - - QC_QCTQM_Test_Connector_svnt - - - QC_QCTQM_Test_Connector_stub - - - QC_QCTQM_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml deleted file mode 100644 index a422b34b272..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index b475d554b4d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl deleted file mode 100755 index b87434bef7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/Reader/.gitignore b/CIAO/connectors/dds4ccm/tests/Reader/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl deleted file mode 100644 index 80dd04aac89..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_STARTER_IDL -#define READER_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface ReaderStarter -{ - void start_read (); - void read_no_data (); - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); -}; - -#endif /* SAMPLE_INFO_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc deleted file mode 100644 index b14b7d49e69..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc +++ /dev/null @@ -1,110 +0,0 @@ -project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Reader_Starter_lem_gen DDS_Reader_Starter_stub - libs += Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base { - after += DDS_Reader_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub - sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl deleted file mode 100644 index 38fec9c5a26..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Reader_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_TEST_BASE_IDL -#define READER_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Reader_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Reader_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ReaderTest" -#pragma DCPS_DATA_KEY "ReaderTest key" - -struct ReaderTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ReaderTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc deleted file mode 100644 index 3132fa2a690..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc +++ /dev/null @@ -1,25 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -u DDS -d -o../lib Reader_Test_Base - -project(DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Reader_Test_Base_stub - dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Reader_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Reader_Test_Base.idl - } - - opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Reader_Test_Base.idl - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl deleted file mode 100644 index 3dc092c453c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Reader_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_TEST_CONNECTOR_IDL_ -#define READER_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Reader_Test_Base.idl" - -#pragma ciao lem "Connector/Reader_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Reader_Test_BaseTypeSupport.idl" -#endif - -module Reader_Test -{ - module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTestConnector; -}; - -#endif /* Reader_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc deleted file mode 100644 index a3c97e4c97b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector" - -project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Reader_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Reader_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=READER_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Reader_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=READER_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Reader_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=READER_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Reader_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Reader_Test_Connector.idl - } -} - -project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Reader_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Reader_Test_ConnectorE.idl - } -} - -project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub - libs += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Reader_Test_Connector_lem_stub - dynamicflags += READER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ConnectorEC.cpp - } - - Header_Files { - Reader_Test_ConnectorEC.h - Reader_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Reader_Test_ConnectorEC.inl - } -} - -project(DDS_Reader_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Reader_Test_Connector_idl_gen DDS_Reader_Test_Base_stub - libs += DDS_Reader_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Reader_Test_Connector_stub - dynamicflags += READER_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ConnectorC.cpp - } - - Header_Files { - Reader_Test_ConnectorC.h - Reader_Test_Connector_stub_export.h - } - - Inline_Files { - Reader_Test_ConnectorC.inl - } -} - -project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub - sharedname = DDS_Reader_Test_Connector_exec - libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS_Reader_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_Connector_conn.cpp - } - - Header_Files { - Reader_Test_Connector_conn.h - Reader_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub - sharedname = DDS_Reader_Test_Connector_svnt - libs += DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Connector_lem_stub \ - DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ConnectorS.cpp - Reader_Test_Connector_svnt.cpp - } - - Header_Files { - Reader_Test_ConnectorS.h - Reader_Test_Connector_svnt.h - Reader_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/README b/CIAO/connectors/dds4ccm/tests/Reader/README deleted file mode 100644 index fb55be4e5c7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/README +++ /dev/null @@ -1,22 +0,0 @@ - - -This test tests the reader. - -The following methods of the reader are tested: - -* read_one -* read_all -* read_one_last -* read_one_all - -First of all, the Sender writes a known number of samples to DDS. -After that the Sender informs the Receiver which test is about -to run and how many samples should be read from DDS. Before the -Receiver starts reading, he must find out that all samples resides -in DDS on the receiving side. He does that by calling read_last every -time a DATA_ON_READERS_STATUS comes in on the ConnectorStatusListener. -Once the very last sample is in DDS on the receiving side, the Receiver -starts to read the samples. Afterwards he checks wether all samples are -avaiable (thus are read correctly from DDS). - -The Receiver also test whether the correct exceptions are thrown. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl deleted file mode 100644 index c01b0c91d90..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Reader_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module Reader_Test -{ - component Receiver - { - port ReaderTestConnector::DDS_Listen info_out; - - provides ReaderStarter reader_start; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc deleted file mode 100644 index 3bba5085b7b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Reader_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Reader_Test_Receiver.idl - } -} - -project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Reader_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_Test_ReceiverE.idl - } -} - -project(DDS_Reader_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Reader_Test_Receiver_lem_gen DDS_Reader_Test_Receiver_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Starter_stub - libs += Receiver_stub DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Base_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ReceiverEC.cpp - } - - Header_Files { - Reader_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Reader_Test_ReceiverEC.inl - } -} - -project(DDS_Reader_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Reader_Test_Receiver_idl_gen DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_lem_gen \ - DDS_Reader_Starter_stub DDS_Reader_Starter_lem_stub - libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ReceiverC.cpp - } - - Header_Files { - Reader_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Reader_Test_ReceiverC.inl - } -} - -project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Receiver_stub \ - DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Connector_lem_stub \ - DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub \ - Reader_Starter_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_Receiver_exec.cpp - } - - Header_Files { - Reader_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ - DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \ - DDS_Reader_Starter_stub \ - DDS_Reader_Starter_svnt DDS_Reader_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ - Receiver_exec DDS_Reader_Test_Connector_lem_stub \ - Reader_Starter_stub Reader_Starter_svnt \ - Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_ReceiverS.cpp - Reader_Test_Receiver_svnt.cpp - } - - Header_Files { - Reader_Test_ReceiverS.h - Reader_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp deleted file mode 100644 index 3816c2e5a09..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp +++ /dev/null @@ -1,816 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Reader_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_unistd.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Reader_Test_Receiver_Impl -{ - /** * Read action generator - */ - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - this->callback_.run (); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Reader_Test::ReaderTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ReaderTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ReaderTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: reader_start_exec_i - */ - - reader_start_exec_i::reader_start_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - reader_start_exec_i::~reader_start_exec_i (void) - { - } - - // Operations from ::ReaderStarter - - void - reader_start_exec_i::start_read (void) - { - this->callback_.start_read (); - } - - void - reader_start_exec_i::read_no_data (void) - { - this->callback_.read_no_data (); - } - - void - reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) : - iterations_ (0), - keys_ (0), - has_run_ (false), - ticker_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - bool - Receiver_exec_i::check_last () - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - if (! ::CORBA::is_nil (reader.in ())) - { - ReaderTest readertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - readertest_info.key = CORBA::string_dup (key); - reader->read_one_last ( - readertest_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last: " - "key <%C> - iteration <%d>\n", - readertest_info.key.in (), - readertest_info.iteration)); - return readertest_info.iteration == this->iterations_; - } - } - catch (const ::CCM_DDS::InternalError &) - { - } - catch (const ::CCM_DDS::NonExistent &) - { - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - // Supported operations and attributes. - void - Receiver_exec_i::read_one_last (bool test_handles) - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - ReaderTest readertest_info; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", i); - readertest_info.key = CORBA::string_dup (key); - DDS::InstanceHandle_t hnd = test_handles - ? this->handles_[key] - : ::DDS::HANDLE_NIL; - reader->read_one_last (readertest_info, readinfo, hnd); - if (readertest_info.iteration == this->iterations_) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE LAST: ") - ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"), - readertest_info.key.in (), - readertest_info.iteration)); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ") - ACE_TEXT ("Didn't receive last iteration for <%C>: ") - ACE_TEXT ("expected <%u> - received <%u>\n"), - readertest_info.key.in (), - this->iterations_, - readertest_info.iteration)); - } - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("READ ONE LAST: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ONE LAST:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_one_last : Exception caught\n"))); - } - } - - void - Receiver_exec_i::read_one_all (bool test_handles) - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - ReaderTest readertest_info; - ReaderTestSeq readertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", i); - readertest_info.key = CORBA::string_dup (key); - DDS::InstanceHandle_t hnd = test_handles - ? this->handles_[key] - : ::DDS::HANDLE_NIL; - reader->read_one_all ( - readertest_info, - readertest_info_seq, - readinfo_seq, - hnd); - - if (readertest_info_seq.length () != this->iterations_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("samples for <%C>: expected <%u> - received <%u>\n"), - key, - this->iterations_, - readertest_info_seq.length ())); - } - else - { - this->handles_[key] = readinfo_seq[0].instance_handle; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ") - ACE_TEXT ("All iterations received for <%C>: number of iterations <%u>\n"), - key, - readertest_info_seq.length ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ") - ACE_TEXT ("Handle created for <%C>: ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), - key, - DDS_INSTANCE_HANDLE_LOG(readinfo_seq[0].instance_handle))); - } - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - if (ex.error_code == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ") - ACE_TEXT ("caught InternalError exception: handles differ\n"))); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ONE ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_one_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::read_last (void) - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - ReaderTestSeq readertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_last (readertest_info_seq, readinfo_seq); - - if (readertest_info_seq.length () != this->keys_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("instances : expected <%u> - received <%u>\n"), - this->keys_, - readertest_info_seq.length ())); - } - for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST : ") - ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"), - readertest_info_seq[it].key.in (), - readertest_info_seq[it].iteration)); - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ LAST: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_last : Exception caught\n"))); - } - } - - void - Receiver_exec_i::read_all (void) - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - ReaderTestSeq readertest_info_seq; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (readertest_info_seq, readinfo_seq); - - CORBA::ULong const nr_samples = this->keys_ * this->iterations_; - if (readertest_info_seq.length () != nr_samples) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("samples : expected <%u> - received <%u>\n"), - nr_samples, - readertest_info_seq.length ())); - } - if (readertest_info_seq.length () > 0) - { - CORBA::UShort nr_keys_changed = 1; - CORBA::String_var last_key (readertest_info_seq[0].key.in ()); - CORBA::UShort iterations = 0; - for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it) - { - if (ACE_OS::strcmp (last_key, readertest_info_seq[it].key.in ()) != 0) - { - ACE_OS::strcpy (last_key, readertest_info_seq[it].key.in ()); - ++nr_keys_changed; - } - // check readinfo struct. - if (::DDS::HANDLE_NIL == readinfo_seq[it].instance_handle) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("received instance handle should be valid ") - ACE_TEXT ("for keyed data: ") - ACE_TEXT ("key <%C> - iteration <%u>\n"), - readertest_info_seq[it].key.in (), - readertest_info_seq[it].iteration)); - } - if (readinfo_seq[it].source_timestamp.sec == 0 && - readinfo_seq[it].source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - readertest_info_seq[it].key.in (), - readertest_info_seq[it].iteration)); - } - ++iterations; - } - if (nr_keys_changed != this->keys_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("instances : expected <%u> - received <%u>\n"), - this->keys_, - nr_keys_changed)); - } - if (iterations != (this->keys_ * this->iterations_)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("samples : expected <%u> - received <%u>\n"), - nr_samples, - iterations)); - } - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::test_exception () - { - // test exception handling - bool except_caught = false; - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - ReaderTest readertest_info; - readertest_info.key = CORBA::string_dup ("KEY_0"); - ::CCM_DDS::ReadInfo readinfo; - reader->read_one_last (readertest_info, readinfo, ::DDS::HANDLE_NIL); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ") - ACE_TEXT ("Wrong exception caught while reading non existent instance\n"))); - } - catch (const CCM_DDS::NonExistent& ) - { - except_caught = true; - } - if (!except_caught) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ") - ACE_TEXT ("no excep caught while reading non existent instance\n"))); - } - } - - void - Receiver_exec_i::test_exception_with_handles () - { - // test exception handling - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - bool except_caught = false; - try - { - ReaderTest readertest_info; - readertest_info.key = CORBA::string_dup ("KEY_1"); - ::CCM_DDS::ReadInfo readinfo; - DDS::InstanceHandle_t hnd = this->handles_["KEY_2"]; - reader->read_one_last (readertest_info, readinfo, hnd); - } - catch (const CCM_DDS::InternalError& ) - { - except_caught = true; - ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_exception_with_handles: ") - ACE_TEXT ("Expected exception caught while reading non existent instance\n"))); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ") - ACE_TEXT ("Wrong exception caught while reading non existent instance\n"))); - } - if (!except_caught) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ") - ACE_TEXT ("no excep caught while reading non existent instance\n"))); - } - } - - void - Receiver_exec_i::read_no_data () - { - ::Reader_Test::ReaderTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data(); - - try - { - ReaderTestSeq readertest_info_seq ; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (readertest_info_seq, readinfo_seq); - - if (readertest_info_seq.length () > 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ") - ACE_TEXT ("Didn't receive the expected number of ") - ACE_TEXT ("samples : expected <%u> - received <%u>\n"), - 0, - readertest_info_seq.length ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ NO DATA: ") - ACE_TEXT ("No data available.\n"))); - } - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR: READ NO DATA: ") - ACE_TEXT ("Caught NonExistent exception"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ NO DATA: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_no_data : Exception caught\n"))); - } - } - - void - Receiver_exec_i::run () - { - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - - this->has_run_ = true; - read_all (); - read_last (); - read_one_all (); - read_one_last (); - test_exception (); - //now test with collected handles - read_one_all (true); - read_one_last (true); - test_exception_with_handles (); - } - - void - Receiver_exec_i::start_read () - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - // Component attributes and port operations. - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys (::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Reader_Test::ReaderTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Reader_Test::ReaderTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_ReaderStarter_ptr - Receiver_exec_i::get_reader_start (void) - { - if ( ::CORBA::is_nil (this->ciao_reader_start_.in ())) - { - reader_start_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - reader_start_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReaderStarter::_nil ()); - - this->ciao_reader_start_ = tmp; - } - - return - ::CCM_ReaderStarter::_duplicate ( - this->ciao_reader_start_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Reader_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->ticker_) - { - ACE_ERROR ((LM_ERROR, "Still checking DDS upon exit\n")); - this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - - if (!this->has_run_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("Test did not run: Didn't receive ") - ACE_TEXT ("the expected number of samples\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Reader_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h deleted file mode 100644 index 29eac6dee2b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h +++ /dev/null @@ -1,251 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_ -#define CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_ - -#include /**/ "ace/pre.h" - -#include "Reader_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Reader_Test_Receiver_Impl -{ - class Receiver_exec_i; - - /** - * Read Action Generator - */ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); - private: - Receiver_exec_i &callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Reader_Test::ReaderTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Reader_Test::ReaderTestConnector::Listener. */ - - virtual - void on_one_data (const ::ReaderTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::ReaderTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Reader_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Reader_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: reader_start_exec_i - */ - - class reader_start_exec_i - : public virtual ::CCM_ReaderStarter, - public virtual ::CORBA::LocalObject - { - public: - reader_start_exec_i ( - ::Reader_Test::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i & callback); - virtual ~reader_start_exec_i (void); - - //@{ - /** Operations and attributes from ReaderStarter. */ - - virtual - void start_read (void); - - virtual - void read_no_data (void); - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - //@} - - private: - ::Reader_Test::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_ReaderStarter_ptr - get_reader_start (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_no_data (); - void start_read (); - bool check_last (); - void run (void); - - ::CORBA::UShort iterations (void); - - void iterations (::CORBA::UShort iterations); - - ::CORBA::UShort keys (void); - - void keys (::CORBA::UShort keys); - //@} - - private: - ::Reader_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Reader_Test::ReaderTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_ReaderStarter_var ciao_reader_start_; - //@} - - //@{ - /** User defined members. */ - CORBA::UShort iterations_; - CORBA::UShort keys_; - CORBA::Boolean has_run_; - - read_action_Generator *ticker_; - - typedef std::map Handle_Table; - Handle_Table handles_; - //@} - - //@{ - /** User defined private operations. */ - void read_all (); - void read_last (); - void read_one_all (bool test_handles = false); - void read_one_last (bool test_handles = false); - void test_exception (); - void test_exception_with_handles (); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Reader_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl deleted file mode 100644 index 17ffb36be5c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_READER_TEST_SENDER_IDL -#define DDS_READER_TEST_SENDER_IDL - -#include "Connector/Reader_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module Reader_Test -{ - component Sender - { - port ReaderTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - - uses ReaderStarter start_reader; - - attribute unsigned short keys; - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc deleted file mode 100644 index a9fc0641804..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc +++ /dev/null @@ -1,149 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Reader_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Reader_Test_Sender.idl - } -} - -project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Reader_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Reader_Test_SenderE.idl - } -} - -project(DDS_Reader_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Reader_Test_Sender_lem_gen DDS_Reader_Test_Sender_stub \ - DDS_Reader_Test_Base_stub DDS_Reader_Starter_stub - libs += DDS_Reader_Test_Base_stub Sender_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_SenderEC.cpp - } - - Header_Files { - Reader_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Reader_Test_SenderEC.inl - } -} - -project(DDS_Reader_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Reader_Test_Sender_idl_gen DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Starter_stub \ - DDS_Reader_Starter_lem_stub - libs += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \ - Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_SenderC.cpp - } - - Header_Files { - Reader_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Reader_Test_SenderC.inl - } -} - -project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Reader_Test_Sender_lem_stub DDS_Reader_Test_Sender_stub \ - DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub \ - Reader_Starter_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_Sender_exec.cpp - } - - Header_Files { - Reader_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Reader_Test_Base_stub DDS_Reader_Test_Sender_lem_stub \ - DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_stub \ - DDS_Reader_Starter_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ - DDS_Reader_Test_Connector_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_SenderS.cpp - Reader_Test_Sender_svnt.cpp - } - - Header_Files { - Reader_Test_SenderS.h - Reader_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp deleted file mode 100644 index 5fa4dbac125..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp +++ /dev/null @@ -1,255 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Reader_Test_Sender_exec.h" - -namespace CIAO_Reader_Test_Sender_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Reader_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback) - : ciao_context_ ( - ::Reader_Test::CCM_Sender_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - this->callback_.start (); - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : keys_ (5) - , iterations_ (10) - , done_ (false) - , ccm_activated_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - void - Sender_exec_i::start (void) - { - ::Reader_Test::ReaderTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - ReaderStarter_var starter = - this->ciao_context_->get_connection_start_reader (); - - // Start can be called more than once... - if (!this->done_ && this->ccm_activated_) - { - this->done_ = true; - if (! ::CORBA::is_nil (starter.in ())) - { - starter->set_reader_properties (this->keys_, this->iterations_); - starter->read_no_data (); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n"))); - return; - } - for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) - { - char key[7]; - ReaderTest *new_key = new ReaderTest; - ACE_OS::sprintf (key, "KEY_%d", iter_key); - new_key->key = CORBA::string_dup(key); - for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - new_key->iteration = iter; - writer->write_one (*new_key, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - key, iter)); - } - delete new_key; - } - starter->start_read (); - } - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Reader_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->ccm_activated_ = true; - } - - void - Sender_exec_i::ccm_passivate (void) - { - if (!this->done_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender didn't receive a " - "DDS::PUBLICATION_MATCHED_STATUS event!\n"))); - } - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Reader_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h deleted file mode 100644 index 0e900f1a7fb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h +++ /dev/null @@ -1,167 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_ -#define CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_ - -#include /**/ "ace/pre.h" - -#include "Reader_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Reader_Test_Sender_Impl -{ - - class Sender_exec_i; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Reader_Test::CCM_Sender_Context_ptr ctx, - Sender_exec_i &callback); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Reader_Test::CCM_Sender_Context_var ciao_context_; - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start (void); - //@} - - private: - ::Reader_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - - ::CORBA::UShort keys_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - bool done_; - bool ccm_activated_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Reader_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp deleted file mode 100644 index 3b1136ca8c0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp +++ /dev/null @@ -1,389 +0,0 @@ - - - - Reader_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Reader_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Reader_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Reader_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Reader_Test_ReaderTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Reader_Test_ReaderTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Reader_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Reader_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Reader_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Reader_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - Reader_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - Reader_Library#ReaderProfile - - - - - topic_name - - - tk_string - - - Reader_Test - - - - - - Reader_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - Reader_Library#ReaderProfile - - - - - topic_name - - - tk_string - - - Reader_Test - - - - - - SenderComponent - SenderNode - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 50 - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_out_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Reader_Test_Connector_exec - - - DDS_Reader_Test_Connector_exec - - - Reader_Test_Connector_svnt - - - DDS_Reader_Test_Connector_svnt - - - Reader_Test_Connector_stub - - - DDS_Reader_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml deleted file mode 100644 index a92a127aa86..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 62fcc57eeae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl deleted file mode 100755 index c5b1964e047..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/ResetTopic/README b/CIAO/connectors/dds4ccm/tests/ResetTopic/README deleted file mode 100644 index e6e28715ebe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/README +++ /dev/null @@ -1,32 +0,0 @@ -In the early days of the DDS4CCM specification a topic name was not changable. -When it was set (doesn't matter if it was a late binded topic), the user was not -allowed to change it, otherwise a NonChangeable exception was thrown. - -The requirement from the field dictates that a topic name should be changeable. -When the topic name will be set a second time, the connector should shut down -DDS and start it again, using the new topic name. The connector does not tear -down the proxies. This means that the connector doesn't change on the outside. - -The ReadGet test has the following sequence: -1. Sender starts writing samples for TopicI -2. Sender informs the Receiver that samples has been written for TopicI -3. Receiver sets this topic name on his connector (late binding), and starts to - collect the samples. -4. Sender resets the topic name to TopicII and informs the receiver about this. -5. Receiver resets the topic name on his connector and starts collecting the - samples belonging to TopicII. - -Both listeners tests (UpdateListen and WriteListen) have about the same sequence: -1. Sender and Receiver start, writing and listening to the same topic. -2. After 10 second, the perl script starts two small executables; one to inform - the receiver to switch to topic II and one to inform the sender to switch to - topic II. The executables are spawned in this order. -3. Step one is repeated. -4. Step two will be repeated. - -The ToEmpty test will initially start writing samples for TopicI. After a while, -the topic name will be cleared. This means that the connector internally stops DDS. -After another while, the sender will start writing samples again, -but now for TopicII. This sequence repeats. - -TooLong will test whether an exception is thrown when an invalid topic name is applied. diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl deleted file mode 100644 index e2c585fc01a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file RG_ResetTopic_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_RESETTOPIC_BASE_IDL -#define RG_RESETTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/RG_ResetTopic_BaseSupport.h" -#pragma opendds typesupport "Base/RG_ResetTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "RG_ResetTopicSample" -#pragma DCPS_DATA_KEY "RG_ResetTopicSample key" - -struct RG_ResetTopicSample { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence RG_ResetTopicSampleSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc deleted file mode 100644 index 4a603838df6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = RG_ResetTopicBase_stub - dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=RG_RESETTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=LateBinding_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - RG_ResetTopic_Base.idl - } - - opendds_ts_flags += --export=RG_RESETTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - RG_ResetTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl deleted file mode 100644 index b237220bed5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file Reader_Starter.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef READER_STARTER_IDL -#define READER_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface ReaderStarter -{ - void start_read (in string topic_name); - void set_reader_properties (in unsigned short nr_keys, - in unsigned short nr_iterations); -}; - -#endif /* READER_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc deleted file mode 100644 index f557cee43cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc +++ /dev/null @@ -1,110 +0,0 @@ -project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=reader_starter_rt_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=reader_starter_rt_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=reader_starter_rt_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(reader_starter_rt_lem_gen) : ciaoidldefaults, dds4ccm { - after += reader_starter_rt_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=reader_starter_rt_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(reader_starter_rt_lem_stub) : ccm_svnt, dds4ccm_base { - after += reader_starter_rt_lem_gen reader_starter_rt_stub - libs += reader_starter_rt_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = reader_starter_rt_lem_stub - dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - reader_starter_rt_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(reader_starter_rt_stub) : ccm_stub, dds4ccm_base { - after += reader_starter_rt_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = reader_starter_rt_stub - dynamicflags += READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - reader_starter_rt_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += reader_starter_rt_lem_stub reader_starter_rt_stub - sharedname = reader_starter_rt_svnt - libs += reader_starter_rt_stub reader_starter_rt_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - reader_starter_rt_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl deleted file mode 100644 index a7551c9de29..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file RG_ResetTopic_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_RESETTOPIC_CONNECTOR_IDL_ -#define RG_RESETTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/RG_ResetTopic_Base.idl" - -#pragma ciao lem "Connector/RG_ResetTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/RG_ResetTopic_BaseTypeSupport.idl" -#endif - -module RG_ResetTopic -{ - module ::CCM_DDS::Typed < ::RG_ResetTopicSample, ::RG_ResetTopicSampleSeq> RG_ResetTopicSampleConnector; -}; - -#endif /* RG_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc deleted file mode 100644 index 8aac6031d88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector" - -project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen RG_ResetTopicBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=LateBinding_Connector_stub_export.h \ - -Wb,skel_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,svnt_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \ - -Wb,conn_export_macro=RG_RESETTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=LateBinding_Connector_conn_export.h \ - -I .. - - IDL_Files { - RG_ResetTopic_Connector.idl - } -} - -project (RG_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += RG_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=RG_ResetTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - RG_ResetTopic_ConnectorE.idl - } -} - -project (RG_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += RG_ResetTopicConnector_lem_gen RG_ResetTopicConnector_stub \ - RG_ResetTopicBase_stub - libs += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RG_ResetTopicConnector_lem_stub - dynamicflags += RG_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ConnectorEC.cpp - } - - Header_Files { - RG_ResetTopic_ConnectorEC.h - RG_ResetTopic_Connector_lem_stub_export.h - } - - Inline_Files { - RG_ResetTopic_ConnectorEC.inl - } -} - -project (RG_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { - after += RG_ResetTopicConnector_idl_gen RG_ResetTopicBase_stub - libs += RG_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = RG_ResetTopicConnector_stub - dynamicflags += RG_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ConnectorC.cpp - } - - Header_Files { - RG_ResetTopic_ConnectorC.h - RG_ResetTopic_Connector_stub_export.h - } - - Inline_Files { - RG_ResetTopic_ConnectorC.inl - } -} - -project (RG_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { - after += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ - RG_ResetTopicBase_stub - sharedname = RG_ResetTopicConnector_exec - libs += RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \ - RG_ResetTopicBase_stub RG_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RG_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_Connector_conn.cpp - } - - Header_Files { - RG_ResetTopic_Connector_conn.h - RG_ResetTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { - after += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_exec \ - RG_ResetTopicConnector_stub - sharedname = RG_ResetTopicConnector_svnt - libs += RG_ResetTopicConnector_stub \ - RG_ResetTopicConnector_lem_stub \ - RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RG_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ConnectorS.cpp - RG_ResetTopic_Connector_svnt.cpp - } - - Header_Files { - RG_ResetTopic_ConnectorS.h - RG_ResetTopic_Connector_svnt.h - RG_ResetTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl deleted file mode 100644 index 4322dffca5d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/RG_ResetTopic_Connector.idl" -#include "Base/Reader_Starter.idl" - -module RG_ResetTopic -{ - component Receiver - { - port RG_ResetTopicSampleConnector::DDS_Get info_get; - port RG_ResetTopicSampleConnector::DDS_Read info_read; - - provides ReaderStarter start_reading; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc deleted file mode 100644 index 2d24cf4f6a5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc +++ /dev/null @@ -1,155 +0,0 @@ -project (RG_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += RG_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - IDL_Files { - RG_ResetTopic_Receiver.idl - } -} - -project (RG_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += RG_ResetTopicReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - RG_ResetTopic_ReceiverE.idl - } -} - -project (RG_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += RG_ResetTopicReceiver_lem_gen RG_ResetTopicReceiver_stub RG_ResetTopicConnector_stub \ - RG_ResetTopicBase_stub reader_starter_rt_stub - libs += Receiver_stub RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \ - reader_starter_rt_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ReceiverEC.cpp - } - - Header_Files { - RG_ResetTopic_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - RG_ResetTopic_ReceiverEC.inl - } -} - -project (RG_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { - after += RG_ResetTopicReceiver_idl_gen RG_ResetTopicConnector_stub \ - RG_ResetTopicBase_stub RG_ResetTopicConnector_lem_gen \ - reader_starter_rt_stub reader_starter_rt_lem_stub - libs += RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \ - reader_starter_rt_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ReceiverC.cpp - } - - Header_Files { - RG_ResetTopic_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - RG_ResetTopic_ReceiverC.inl - } -} - -project (RG_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += RG_ResetTopicReceiver_lem_stub RG_ResetTopicReceiver_stub \ - RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \ - RG_ResetTopicConnector_lem_stub \ - reader_starter_rt_lem_stub reader_starter_rt_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \ - reader_starter_rt_lem_stub reader_starter_rt_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_Receiver_exec.cpp - RG_ResetTopic_Receiver_impl.cpp - } - - Header_Files { - RG_ResetTopic_Receiver_exec.h - RG_ResetTopic_Receiver_impl.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += RG_ResetTopicReceiver_lem_stub RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ - RG_ResetTopicReceiver_exec RG_ResetTopicConnector_lem_stub \ - reader_starter_rt_stub \ - reader_starter_rt_svnt reader_starter_rt_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ - Receiver_exec RG_ResetTopicConnector_lem_stub \ - reader_starter_rt_stub reader_starter_rt_svnt \ - reader_starter_rt_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_ReceiverS.cpp - RG_ResetTopic_Receiver_svnt.cpp - } - - Header_Files { - RG_ResetTopic_ReceiverS.h - RG_ResetTopic_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp deleted file mode 100644 index 885a5ef4cb0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp +++ /dev/null @@ -1,281 +0,0 @@ -// -*- C++ -*- -#include "RG_ResetTopic_Receiver_exec.h" -#include "RG_ResetTopic_Receiver_impl.h" - -namespace CIAO_RG_ResetTopic_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_get_status_exec_i - */ - - info_get_status_exec_i::info_get_status_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_get_status_exec_i::~info_get_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_read_status_exec_i - */ - - info_read_status_exec_i::info_read_status_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_read_status_exec_i::~info_read_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: start_reading_exec_i - */ - - start_reading_exec_i::start_reading_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback) - : ciao_context_ ( - ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - , callback_ (callback) - { - } - - start_reading_exec_i::~start_reading_exec_i (void) - { - } - - // Operations from ::ReaderStarter - - void - start_reading_exec_i::start_read (const char * topic_name) - { - this->callback_.start_read (topic_name); - } - - void - start_reading_exec_i::set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations) - { - this->callback_.keys (nr_keys); - this->callback_.iterations (nr_iterations); - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (10) - , keys_ (5) - , impl_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->impl_; - } - - // Supported operations and attributes. - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - if (this->impl_) - { - this->impl_->iterations (iterations); - } - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - if (this->impl_) - { - this->impl_->keys (keys); - } - } - - void - Receiver_exec_i::start_read (const char * topic_name) - { - if (!this->impl_) - ACE_NEW_THROW_EX (this->impl_, - RG_ResetTopic_Receiver_impl ( - this->ciao_context_.in (), - this->iterations_, - this->keys_), - ::CORBA::INTERNAL ()); - this->impl_->start (topic_name); - } - - // Component attributes and port operations. - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) - { - info_get_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_get_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_get_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_get_status_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_read_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ())) - { - info_read_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_read_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_read_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_read_status_.in ()); - } - - ::CCM_ReaderStarter_ptr - Receiver_exec_i::get_start_reading (void) - { - if ( ::CORBA::is_nil (this->ciao_start_reading_.in ())) - { - start_reading_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - start_reading_exec_i ( - this->ciao_context_.in (), - *this), - ::CCM_ReaderStarter::_nil ()); - - this->ciao_start_reading_ = tmp; - } - - return - ::CCM_ReaderStarter::_duplicate ( - this->ciao_start_reading_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::RG_ResetTopic::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_ResetTopic_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h deleted file mode 100644 index c079a0b39af..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h +++ /dev/null @@ -1,192 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_ -#define CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_ - -#include /**/ "ace/pre.h" - -#include "RG_ResetTopic_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_RG_ResetTopic_Receiver_Impl -{ - class Receiver_exec_i; - class RG_ResetTopic_Receiver_impl; - /** - * Provider Executor Implementation Class: info_get1_status_exec_i - */ - - class info_get_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_get_status_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx); - virtual ~info_get_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_read1_status_exec_i - */ - - class info_read_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_read_status_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx); - virtual ~info_read_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: start_reading_exec_i - */ - - class start_reading_exec_i - : public virtual ::CCM_ReaderStarter, - public virtual ::CORBA::LocalObject - { - public: - start_reading_exec_i ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, - Receiver_exec_i &callback_); - virtual ~start_reading_exec_i (void); - - /** @name Operations and attributes from ReaderStarter */ - //@{ - - virtual - void start_read (const char * topic_name); - - virtual - void set_reader_properties (::CORBA::UShort nr_keys, - ::CORBA::UShort nr_iterations); - //@} - - private: - ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; - Receiver_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_read_status (void); - - virtual ::CCM_ReaderStarter_ptr - get_start_reading (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - void - start_read (const char * topic_name); - //@} - - private: - ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_; - ::CCM_ReaderStarter_var ciao_start_reading_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - /** @name User defined members. */ - //@{ - RG_ResetTopic_Receiver_impl *impl_; - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_ResetTopic_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp deleted file mode 100644 index 79686951697..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp +++ /dev/null @@ -1,394 +0,0 @@ -#include "RG_ResetTopic_Receiver_impl.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_RG_ResetTopic_Receiver_Impl -{ - - /** - * Check last - */ - LastSampleChecker::LastSampleChecker (RG_ResetTopic_Receiver_impl &callback, - const ::CORBA::UShort &iterations) - : callback_ (callback) - , iterations_ (iterations) - { - } - - LastSampleChecker::~LastSampleChecker () - { - } - - int - LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - this->callback_.start_read (); - return 0; - } - - /** - * RG_ResetTopic_Receiver_impl - */ - RG_ResetTopic_Receiver_impl::RG_ResetTopic_Receiver_impl ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort & iterations, - const ::CORBA::UShort & keys) - : ciao_context_ ( - ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - , iterations_ (iterations) - , keys_ (keys) - , expected_per_run_ (keys * iterations) - , checker_ (0) - , topic_name_("") - { - } - - RG_ResetTopic_Receiver_impl::~RG_ResetTopic_Receiver_impl () - { - delete this->checker_; - } - - ACE_Reactor* - RG_ResetTopic_Receiver_impl::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - RG_ResetTopic_Receiver_impl::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - void - RG_ResetTopic_Receiver_impl::keys (::CORBA::UShort keys) - { - this->keys_= keys; - } - - bool - RG_ResetTopic_Receiver_impl::check_last (void) - { - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - try - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration should be <%02d>\n", - this->iterations_)); - RG_ResetTopicSample datum; - ::CCM_DDS::ReadInfo readinfo; - char key[10]; - ACE_OS::sprintf (key, "KEY_%d", this->keys_); - datum.key = CORBA::string_dup (key); - reader->read_one_last ( - datum, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%02d> - <%02d>\n", - datum.iteration, - this->iterations_)); - return datum.iteration >= this->iterations_; - } - catch (const ::CCM_DDS::InternalError &) - { - ACE_DEBUG ((LM_DEBUG, "INTERNAL ERROR\n")); - } - catch (const ::CCM_DDS::NonExistent &) - { - ACE_DEBUG ((LM_DEBUG, "NONEXISTENT\n")); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " - "ERROR: Unexpected exception caught\n")); - } - return false; - } - - void - RG_ResetTopic_Receiver_impl::start (const char * topic_name) - { - this->topic_name_ = topic_name; - //only the first time... - if (!this->checker_) - this->test_exception (); - this->set_topic_name_reader (topic_name); - - if (!this->checker_) - ACE_NEW_THROW_EX (this->checker_, - LastSampleChecker (*this, - this->iterations_), - ::CORBA::NO_MEMORY ()); - if (this->reactor ()->schedule_timer (this->checker_, - 0, - ACE_Time_Value (1, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - " - "ERROR: Error while starting LastSampleChecker\n")); - } - } - - void - RG_ResetTopic_Receiver_impl::start_read (void) - { - if (this->checker_) - { - this->reactor ()->cancel_timer (this->checker_); - } - this->start_reading (); - this->set_topic_name_getter (this->topic_name_.c_str()); - this->start_getting (); - } - - void - RG_ResetTopic_Receiver_impl::check_samples ( - const char * test, - const RG_ResetTopicSampleSeq& samples, - const ::CORBA::UShort& expected) - { - bool error = samples.length () != expected; - if (ACE_OS::strcmp (test, "get") == 0) - { - error = !(samples.length () > 0); - } - if (error) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::check_samples - " - "ERROR: Unexpected number of %C samples received: " - "expected <%d> - received <%u>\n", - test, - expected, - samples.length ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - " - "%C Samples found: <%u>\n", - test, - samples.length ())); - } - for (::CORBA::ULong i = 0; - i < samples.length (); - ++i) - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - " - "Sample %C: sample <%d> - key <%C> - iteration <%d>\n", - test, - i, - samples[i].key.in (), - samples[i].iteration)); - } - } - - void - RG_ResetTopic_Receiver_impl::test_exception (void) - { - try - { - if (! ::CORBA::is_nil (this->ciao_context_.in ())) - { - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " - "ERROR: Unable to get reader interface from the " - "CIAO context\n")); - return; - } - - RG_ResetTopicSample sample; - ::CCM_DDS::ReadInfo readinfo; - sample.key = CORBA::string_dup ("KEY_1"); - reader->read_one_last (sample, - readinfo, - ::DDS::HANDLE_NIL); - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " - "ERROR: No exception caught before topic name has been set\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " - "ERROR: CIAO context seems to be NIL\n")); - } - } - catch (const ::CORBA::BAD_INV_ORDER &) - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::test_exception - " - "Expected BAD_INV_ORDER thrown.\n")); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_ResetTopic_Receiver_impl::test_exception - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " - "ERROR: expected and unknown exception caught\n")); - } - } - - void - RG_ResetTopic_Receiver_impl::start_reading (void) - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_reading - " - "Start reading\n")); - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - try - { - RG_ResetTopicSampleSeq samples; - ::CCM_DDS::ReadInfoSeq readinfo_seq; - reader->read_all (samples, readinfo_seq); - - this->check_samples ("read", samples, this->expected_per_run_); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_reading - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_reading - " - "ERROR: Caught unknow exception\n")); - } - } - - void - RG_ResetTopic_Receiver_impl::start_getting (void) - { - try - { - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (::CORBA::is_nil (getter.in ())) - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_getting - " - "ERROR: Unable to get writer interface from the " - "CIAO context\n")); - return; - } - DDS::Duration_t to; - to.sec = 1; - to.nanosec = 0; - getter->time_out (to); - - RG_ResetTopicSampleSeq samples; - ::CCM_DDS::ReadInfoSeq readinfos; - getter->get_many (samples, readinfos); - this->check_samples ("get", samples); - } - catch (const CORBA::Exception &e) - { - e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_getting - " - "ERROR: Unexpected exception"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_getting - " - "ERROR: expected and unknown exception caught\n")); - } - } - - void - RG_ResetTopic_Receiver_impl::set_topic_name_reader (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_reader - " - "Setting topic name to <%C>\n", topic_name)); - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = - this->ciao_context_->get_connection_info_read_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " - "Unable to get reader interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = reader->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State_var conn = - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - - conn->topic_name (topic_name); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " - "Caught NonChangeable exception.\n")); - } - } - - void - RG_ResetTopic_Receiver_impl::set_topic_name_getter (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - " - "Setting topic name to <%C>\n", topic_name)); - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter = - this->ciao_context_->get_connection_info_get_fresh_data (); - if (::CORBA::is_nil (getter.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " - "Unable to get getter interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = getter->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn = - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name (topic_name); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - " - "ERROR: Caught NonChangeable exception.\n")); - } - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h deleted file mode 100644 index f60d7b058a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef RG_RESETTOPIC_RECEIVER_IMPL_H_ -#define RG_RESETTOPIC_RECEIVER_IMPL_H_ - -#include "RG_ResetTopic_ReceiverEC.h" - -namespace CIAO_RG_ResetTopic_Receiver_Impl -{ - class RG_ResetTopic_Receiver_impl; - - /** - * LastSampleChecker - */ - class LastSampleChecker - : public ACE_Event_Handler - { - public: - LastSampleChecker (RG_ResetTopic_Receiver_impl &callback, - const ::CORBA::UShort &iterations); - - virtual ~LastSampleChecker (void); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - RG_ResetTopic_Receiver_impl &callback_; - const ::CORBA::UShort iterations_; - }; - - /** - * RG_ResetTopic_Receiver_impl - */ - class RG_ResetTopic_Receiver_impl - { - public: - RG_ResetTopic_Receiver_impl ( - ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort & iterations, - const ::CORBA::UShort & keys); - ~RG_ResetTopic_Receiver_impl (void); - - void start (const char * topic_name); - bool check_last (void); - void start_read (void); - - - void iterations (::CORBA::UShort iterations); - void keys (::CORBA::UShort keys); - - private: - ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; - ::CORBA::UShort iterations_; - ::CORBA::UShort keys_; - ::CORBA::UShort expected_per_run_; - - LastSampleChecker * checker_; - - ACE_CString topic_name_; - - void set_topic_name_reader (const char * topic_name); - void set_topic_name_getter (const char * topic_name); - - void start_reading (void); - void start_getting (void); - void test_exception (void); - - void check_samples ( - const char * test, - const RG_ResetTopicSampleSeq& samples, - const ::CORBA::UShort& expected=0); - - ACE_Reactor* reactor (void); - }; -}; - -#endif /* RG_RESETTOPIC_RECEIVER_IMPL_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl deleted file mode 100644 index f9fdc5723f4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RG_RESETTOPIC_SENDER_IDL -#define RG_RESETTOPIC_SENDER_IDL - -#include "Connector/RG_ResetTopic_Connector.idl" -#include "Base/Reader_Starter.idl" - -module RG_ResetTopic -{ - component Sender - { - port RG_ResetTopicSampleConnector::DDS_Write info_write; - - attribute unsigned short iterations; - attribute unsigned short keys; - - uses ReaderStarter reader_start; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc deleted file mode 100644 index 1df6ea4d45d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc +++ /dev/null @@ -1,150 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (RG_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { - after += RG_ResetTopicConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - RG_ResetTopic_Sender.idl - } -} - -project (RG_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += RG_ResetTopicSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - RG_ResetTopic_SenderE.idl - } -} - -project (RG_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += RG_ResetTopicSender_lem_gen RG_ResetTopicSender_stub \ - RG_ResetTopicBase_stub reader_starter_rt_stub - libs += RG_ResetTopicBase_stub Sender_stub reader_starter_rt_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_SenderEC.cpp - } - - Header_Files { - RG_ResetTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - RG_ResetTopic_SenderEC.inl - } -} - -project (RG_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { - after += RG_ResetTopicSender_idl_gen RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_stub reader_starter_rt_stub \ - reader_starter_rt_lem_stub - libs += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \ - reader_starter_rt_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_SenderC.cpp - } - - Header_Files { - RG_ResetTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - RG_ResetTopic_SenderC.inl - } -} - -project (RG_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += RG_ResetTopicSender_lem_stub RG_ResetTopicSender_stub \ - RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ - reader_starter_rt_svnt reader_starter_rt_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub RG_ResetTopicBase_stub \ - RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ - reader_starter_rt_stub reader_starter_rt_svnt reader_starter_rt_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_Sender_exec.cpp - } - - Header_Files { - RG_ResetTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += RG_ResetTopicBase_stub RG_ResetTopicSender_lem_stub RG_ResetTopicConnector_stub \ - RG_ResetTopicConnector_svnt RG_ResetTopicConnector_lem_stub \ - reader_starter_rt_stub reader_starter_rt_lem_stub reader_starter_rt_svnt - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - RG_ResetTopicBase_stub RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ - RG_ResetTopicConnector_lem_stub reader_starter_rt_stub \ - reader_starter_rt_lem_stub reader_starter_rt_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - RG_ResetTopic_SenderS.cpp - RG_ResetTopic_Sender_svnt.cpp - } - - Header_Files { - RG_ResetTopic_SenderS.h - RG_ResetTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp deleted file mode 100644 index d4a54cded17..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp +++ /dev/null @@ -1,256 +0,0 @@ -// -*- C++ -*- -#include "RG_ResetTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define TOPIC_1 "ResetTopic1" -#define TOPIC_2 "ResetTopic2" - - -namespace CIAO_RG_ResetTopic_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - this->callback_.start_write (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - , topic_name_ (TOPIC_2) - , run_(0) - , start_key_ (1) - , start_iteration_ (1) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::start_write (void) - { - try - { - if (++this->run_ > 4) - return; - if (ACE_OS::strcmp (this->topic_name_.c_str(), TOPIC_1) == 0) - this->topic_name_ = TOPIC_2; - else - this->topic_name_ = TOPIC_1; - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_write - " - "Setting topic name to <%C>\n", this->topic_name_.c_str())); - - ::RG_ResetTopic::RG_ResetTopicSampleConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " - "Unable to get writer interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn = - ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - - conn->topic_name (this->topic_name_.c_str()); - - ::CORBA::UShort key = 0; - ::CORBA::UShort iter = 0; - for (key = this->start_key_; key < this->run_ * this->keys_ + 1; ++key) - { - RG_ResetTopicSample sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (iter = this->start_iteration_; iter < this->run_ * this->iterations_ + 1; ++iter) - { - sample.iteration = iter; - writer->write_one (sample, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample written : key <%C> - iteration <%d>\n", - tmp, iter)); - } - } - this->start_key_ = key; - this->start_iteration_ = iter; - ACE_Time_Value tv (2, 0); - ACE_OS::sleep (tv); - ReaderStarter_var starter = - this->ciao_context_->get_connection_reader_start (); - if (!::CORBA::is_nil (starter.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Inform the receiver that all samples were written\n")); - starter->set_reader_properties (this->start_key_ - 1, this->start_iteration_ - 1); - - starter->start_read (this->topic_name_.c_str()); - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: unable to get connection to the ReaderStarter\n")); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Caught NonChangeable exception.\n")); - } - catch (const ::CORBA::Exception & e) - { - e._tao_print_exception("Sender_exec_i::start_event_test - ERROR"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::RG_ResetTopic::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (1, 0), - ACE_Time_Value (10, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->to_handler_); - } - - void - Sender_exec_i::ccm_remove (void) - { - delete this->to_handler_; - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_ResetTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h deleted file mode 100644 index 1c2bad99935..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "RG_ResetTopic_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_RG_ResetTopic_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void start_write (void); - //@} - - private: - ::RG_ResetTopic::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - ACE_CString topic_name_; - ::CORBA::UShort run_; - ::CORBA::UShort start_key_; - ::CORBA::UShort start_iteration_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_RG_ResetTopic_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp deleted file mode 100644 index 4fb7f92d5af..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp +++ /dev/null @@ -1,461 +0,0 @@ - - - - ResetTopic_Depl_1 - - - ReceiverComponentImplementation - - - - - component factory - - - tk_string - - - create_RG_ResetTopic_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_ResetTopic_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ResetTopic_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - RG_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - RG_ResetTopic_Connector_exec - - - - - - - ResetTopic_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - RG_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - RG_ResetTopic_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_RG_ResetTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_RG_ResetTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - ResetTopic_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - ResetTopic1 - - - - - qos_profile - - - tk_string - - - ResetTopic_Library#ResetTopicProfile - - - - - - - ResetTopic_ReceiverEventConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - - - - - - qos_profile - - - tk_string - - - ResetTopic_Library#ResetTopicProfile - - - - - - - ResetTopic_ReceiverStateConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - - - - - - qos_profile - - - tk_string - - - ResetTopic_Library#ResetTopicProfile - - - - - - - SenderComponent - SenderNode - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - reader_starter - - reader_start - false - SimplexReceptacle - - - - start_reading - true - Facet - - - - - - reader_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - - getter_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_consumer_fresh_data - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - RG_ResetTopic_Connector_exec - - - RG_ResetTopicConnector_exec - - - RG_ResetTopic_Connector_svnt - - - RG_ResetTopicConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml deleted file mode 100644 index 9bf40140294..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index e3268d2c621..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl deleted file mode 100644 index 6d757cd12fd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file TE_ResetTopic_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TE_RESETTOPIC_BASE_IDL -#define TE_RESETTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/TE_ResetTopic_BaseSupport.h" -#pragma opendds typesupport "Base/TE_ResetTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TE_ResetTopicTest" -#pragma DCPS_DATA_KEY "TE_ResetTopicTest key" - -struct TE_ResetTopicTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TE_ResetTopicTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc deleted file mode 100644 index 61e2f2252cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (TE_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = TE_ResetTopicBase_stub - dynamicflags += TE_RESETTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=TE_RESETTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - TE_ResetTopic_Base.idl - } - - opendds_ts_flags += --export=TE_RESETTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - TE_ResetTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl deleted file mode 100644 index c3fd7df6416..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file TE_ResetTopic_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TE_RESETTOPIC_CONNECTOR_IDL_ -#define TE_RESETTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/TE_ResetTopic_Base.idl" - -#pragma ciao lem "Connector/TE_ResetTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/TE_ResetTopic_BaseTypeSupport.idl" -#endif - -module TE_ResetTopic -{ - module ::CCM_DDS::Typed < ::TE_ResetTopicTest, ::TE_ResetTopicTestSeq> TE_ResetTopicTestConnector; -}; - -#endif /* TE_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc deleted file mode 100644 index dfbb50208a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector" - -project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen TE_ResetTopicBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=TE_RESETTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - TE_ResetTopic_Connector.idl - } -} - -project (TE_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += TE_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=TE_ResetTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - TE_ResetTopic_ConnectorE.idl - } -} - -project (TE_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += TE_ResetTopicConnector_lem_gen TE_ResetTopicConnector_stub \ - TE_ResetTopicBase_stub - libs += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TE_ResetTopicConnector_lem_stub - dynamicflags += TE_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_ConnectorEC.cpp - } - - Header_Files { - TE_ResetTopic_ConnectorEC.h - TE_ResetTopic_Connector_lem_stub_export.h - } - - Inline_Files { - TE_ResetTopic_ConnectorEC.inl - } -} - -project (TE_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { - after += TE_ResetTopicConnector_idl_gen TE_ResetTopicBase_stub - libs += TE_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TE_ResetTopicConnector_stub - dynamicflags += TE_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_ConnectorC.cpp - } - - Header_Files { - TE_ResetTopic_ConnectorC.h - TE_ResetTopic_Connector_stub_export.h - } - - Inline_Files { - TE_ResetTopic_ConnectorC.inl - } -} - -project (TE_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { - after += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub \ - TE_ResetTopicBase_stub - sharedname = TE_ResetTopicConnector_exec - libs += TE_ResetTopicConnector_stub TE_ResetTopicConnector_lem_stub \ - TE_ResetTopicBase_stub TE_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TE_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_Connector_conn.cpp - } - - Header_Files { - TE_ResetTopic_Connector_conn.h - TE_ResetTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { - after += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_exec \ - TE_ResetTopicConnector_stub - sharedname = TE_ResetTopicConnector_svnt - libs += TE_ResetTopicConnector_stub \ - TE_ResetTopicConnector_lem_stub \ - TE_ResetTopicBase_stub \ - TE_ResetTopicConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TE_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_ConnectorS.cpp - TE_ResetTopic_Connector_svnt.cpp - } - - Header_Files { - TE_ResetTopic_ConnectorS.h - TE_ResetTopic_Connector_svnt.h - TE_ResetTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp deleted file mode 100644 index fe3281faba3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @file SenderDriver.cpp - * - * @author Marcel Smit - */ - - -#include "TE_ResetTopic_SenderC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - sender_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case 'e': - topic_name = ""; - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Sender.ior)\n" - "-n \n" - "-e \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var sender_obj = - orb->string_to_object (sender_ior); - - // downcast the object reference to the appropriate type - ::TE_ResetTopic::Sender_var sender = - ::TE_ResetTopic::Sender::_narrow (sender_obj.in ()); - - if (CORBA::is_nil (sender.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Sender' objref\n"), - -1); - } - sender->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl deleted file mode 100644 index 91e45c7c88c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TE_RESETTOPIC_SENDER_IDL -#define TE_RESETTOPIC_SENDER_IDL - -#include "Connector/TE_ResetTopic_Connector.idl" - -module TE_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Sender supports ChangeTopicInterface - { - port TE_ResetTopicTestConnector::DDS_Write info_write; - port TE_ResetTopicTestConnector::DDS_Update info_update; - - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc deleted file mode 100644 index 4a4b30c044b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc +++ /dev/null @@ -1,164 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (TE_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { - after += TE_ResetTopicConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - TE_ResetTopic_Sender.idl - } -} - -project (TE_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += TE_ResetTopicSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - TE_ResetTopic_SenderE.idl - } -} - -project (TE_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += TE_ResetTopicSender_lem_gen TE_ResetTopicSender_stub TE_ResetTopicBase_stub - libs += TE_ResetTopicBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_SenderEC.cpp - } - - Header_Files { - TE_ResetTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - TE_ResetTopic_SenderEC.inl - } -} - -project (TE_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { - after += TE_ResetTopicSender_idl_gen TE_ResetTopicBase_stub TE_ResetTopicConnector_stub - libs += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_SenderC.cpp - } - - Header_Files { - TE_ResetTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - TE_ResetTopic_SenderC.inl - } -} - -project (TE_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += TE_ResetTopicSender_lem_stub TE_ResetTopicSender_stub \ - TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub TE_ResetTopicBase_stub \ - TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_Sender_exec.cpp - } - - Header_Files { - TE_ResetTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += TE_ResetTopicBase_stub TE_ResetTopicSender_lem_stub TE_ResetTopicConnector_stub \ - TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - TE_ResetTopicBase_stub TE_ResetTopicConnector_stub TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TE_ResetTopic_SenderS.cpp - TE_ResetTopic_Sender_svnt.cpp - } - - Header_Files { - TE_ResetTopic_SenderS.h - TE_ResetTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - -project (TE_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = SenderDriver - after += TE_ResetTopicSender_stub TE_ResetTopicConnector_stub - libs += Sender_stub TE_ResetTopicBase_stub TE_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - SenderDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp deleted file mode 100644 index c132f64a7ef..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp +++ /dev/null @@ -1,385 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "TE_ResetTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_TE_ResetTopic_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.start_event_test (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - , topic_name_ ("TopicI") - , old_topic_name_ ("TopicI") - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->to_handler_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void Sender_exec_i::set_new_topic (const char * topic_name) - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - - this->old_topic_name_ = this->topic_name_; - this->topic_name_ = topic_name; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " - "New topic name set <%C>\n", - topic_name)); - } - - void - Sender_exec_i::create_samples (void) - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - TE_ResetTopicTest *new_key = new TE_ResetTopicTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - this->tests_[key] = new_key; - - ::TE_ResetTopic::TE_ResetTopicTestConnector::Updater_var updater = - this->ciao_context_->get_connection_info_update_data(); - - updater->create_one (*new_key); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " - "Sample <%C> created\n", - key)); - } - } - - void - Sender_exec_i::set_topic_name (const char * topic_name) - { - if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) - { - this->old_topic_name_ = topic_name; - this->set_topic_name_writer (topic_name); - this->set_topic_name_updater (topic_name); - } - } - - void - Sender_exec_i::set_topic_name_writer (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " - "Setting topic to <%C>\n", - topic_name)); - ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get writer interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event_var conn = - ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - conn->topic_name (topic_name); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - } - - void - Sender_exec_i::set_topic_name_updater (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " - "Setting topic to <%C>\n", - topic_name)); - ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get updater interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = updater->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State_var conn = - ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - conn->topic_name (topic_name); - } - this->create_samples (); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught NonChangeable exception.\n")); - } - } - - void - Sender_exec_i::start_event_test (void) - { - // Set the topic name on the connector first. Therefor we need to - // get to the connector first. - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); - - try - { - for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - TE_ResetTopicTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - this->set_topic_name (this->topic_name_.c_str ()); - ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - sample.iteration = iter; - writer->write_one (sample, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample for topic <%C> written : key <%C> - iteration <%d>\n", - this->topic_name_.c_str (), tmp, iter)); - - ACE_Time_Value tv (0, 5000); - ACE_OS::sleep (tv); - } - } - for (Sample_Table::iterator iter = this->tests_.begin (); - iter != this->tests_.end (); - ++iter) - { - for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i) - { - this->set_topic_name (this->topic_name_.c_str ()); - ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - iter->second->iteration = i; - updater->update_one (iter->second, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample for topic <%C> updated : key <%C> - iteration <%d>\n", - this->topic_name_.c_str (), - iter->second->key.in (), - i)); - - ACE_Time_Value tv (0, 5000); - ACE_OS::sleep (tv); - } - } - } - catch (const ::CORBA::BAD_INV_ORDER & ex) - { - if (this->topic_name_.empty()) - ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n")); - else - ex._tao_print_exception("ERROR:"); - } - catch (const ::CORBA::Exception & ex) - { - ex._tao_print_exception("ERROR:"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::TE_ResetTopic::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->create_samples (); - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (5, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->to_handler_); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TE_ResetTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h deleted file mode 100644 index f7152f8cdb5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h +++ /dev/null @@ -1,145 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "TE_ResetTopic_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_TE_ResetTopic_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void set_new_topic (const char * topic_name); - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void set_topic_name (const char * topic_name); - void set_topic_name_writer (const char * topic_name); - void set_topic_name_updater (const char * topic_name); - void start_event_test (void); - //@} - - private: - ::TE_ResetTopic::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - ACE_CString topic_name_, old_topic_name_; - - TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; - - typedef std::map Sample_Table; - - Sample_Table tests_; - //@} - - //@{ - /** User defined private operations. */ - void create_samples (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TE_ResetTopic_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp deleted file mode 100644 index 6c3375f91f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp +++ /dev/null @@ -1,338 +0,0 @@ - - - - ResetTopic_Depl_1 - - - ResetTopic_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TE_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TE_ResetTopic_Connector_exec - - - - - - - ResetTopic_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TE_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TE_ResetTopic_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_TE_ResetTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TE_ResetTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ResetTopic_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - ResetTopic_SenderStateConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - SenderComponent - SenderNode - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - TE_ResetTopic_Connector_exec - - - TE_ResetTopicConnector_exec - - - TE_ResetTopic_Connector_svnt - - - TE_ResetTopicConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl deleted file mode 100755 index 54d573aae7b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl +++ /dev/null @@ -1,264 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "SenderNode.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds before clearing the topic name\n"; -sleep (10); - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before setting the topic name again\n"; -sleep (10); - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before stopping\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl deleted file mode 100644 index 03570b30e51..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file TL_ResetTopic_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TL_RESETTOPIC_BASE_IDL -#define TL_RESETTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/TL_ResetTopic_BaseSupport.h" -#pragma opendds typesupport "Base/TL_ResetTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TL_ResetTopicTest" -#pragma DCPS_DATA_KEY "TL_ResetTopicTest key" - -struct TL_ResetTopicTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TL_ResetTopicTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc deleted file mode 100644 index 39c3065fb40..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (TL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = TL_ResetTopicBase_stub - dynamicflags += TL_RESETTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=TL_RESETTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - TL_ResetTopic_Base.idl - } - - opendds_ts_flags += --export=TL_RESETTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - TL_ResetTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl deleted file mode 100644 index aa04ebb5c4f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file TL_ResetTopic_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TL_RESETTOPIC_CONNECTOR_IDL_ -#define TL_RESETTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/TL_ResetTopic_Base.idl" - -#pragma ciao lem "Connector/TL_ResetTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/TL_ResetTopic_BaseTypeSupport.idl" -#endif - -module TL_ResetTopic -{ - module ::CCM_DDS::Typed < ::TL_ResetTopicTest, ::TL_ResetTopicTestSeq> TL_ResetTopicTestConnector; -}; - -#endif /* TL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc deleted file mode 100644 index c8da3fd3e86..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector" - -project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen TL_ResetTopicBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=TL_RESETTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - TL_ResetTopic_Connector.idl - } -} - -project (TL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += TL_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=TL_ResetTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - TL_ResetTopic_ConnectorE.idl - } -} - -project (TL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += TL_ResetTopicConnector_lem_gen TL_ResetTopicConnector_stub \ - TL_ResetTopicBase_stub - libs += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TL_ResetTopicConnector_lem_stub - dynamicflags += TL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_ConnectorEC.cpp - } - - Header_Files { - TL_ResetTopic_ConnectorEC.h - TL_ResetTopic_Connector_lem_stub_export.h - } - - Inline_Files { - TL_ResetTopic_ConnectorEC.inl - } -} - -project (TL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { - after += TL_ResetTopicConnector_idl_gen TL_ResetTopicBase_stub - libs += TL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TL_ResetTopicConnector_stub - dynamicflags += TL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_ConnectorC.cpp - } - - Header_Files { - TL_ResetTopic_ConnectorC.h - TL_ResetTopic_Connector_stub_export.h - } - - Inline_Files { - TL_ResetTopic_ConnectorC.inl - } -} - -project (TL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { - after += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub \ - TL_ResetTopicBase_stub - sharedname = TL_ResetTopicConnector_exec - libs += TL_ResetTopicConnector_stub TL_ResetTopicConnector_lem_stub \ - TL_ResetTopicBase_stub TL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_Connector_conn.cpp - } - - Header_Files { - TL_ResetTopic_Connector_conn.h - TL_ResetTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { - after += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_exec \ - TL_ResetTopicConnector_stub - sharedname = TL_ResetTopicConnector_svnt - libs += TL_ResetTopicConnector_stub \ - TL_ResetTopicConnector_lem_stub \ - TL_ResetTopicBase_stub \ - TL_ResetTopicConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_ConnectorS.cpp - TL_ResetTopic_Connector_svnt.cpp - } - - Header_Files { - TL_ResetTopic_ConnectorS.h - TL_ResetTopic_Connector_svnt.h - TL_ResetTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp deleted file mode 100644 index e60e2bb678c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @file SenderDriver.cpp - * - * @author Marcel Smit - */ - - -#include "TL_ResetTopic_SenderC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - sender_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case 'e': - topic_name = ""; - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Sender.ior)\n" - "-n \n" - "-e \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var sender_obj = - orb->string_to_object (sender_ior); - - // downcast the object reference to the appropriate type - ::TL_ResetTopic::Sender_var sender = - ::TL_ResetTopic::Sender::_narrow (sender_obj.in ()); - - if (CORBA::is_nil (sender.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Sender' objref\n"), - -1); - } - sender->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl deleted file mode 100644 index 0e5fe02ca5d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TL_RESETTOPIC_SENDER_IDL -#define TL_RESETTOPIC_SENDER_IDL - -#include "Connector/TL_ResetTopic_Connector.idl" - -module TL_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Sender supports ChangeTopicInterface - { - port TL_ResetTopicTestConnector::DDS_Write info_write; - port TL_ResetTopicTestConnector::DDS_Update info_update; - - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc deleted file mode 100644 index 8e2b8189b89..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc +++ /dev/null @@ -1,164 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (TL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { - after += TL_ResetTopicConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - TL_ResetTopic_Sender.idl - } -} - -project (TL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += TL_ResetTopicSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - TL_ResetTopic_SenderE.idl - } -} - -project (TL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += TL_ResetTopicSender_lem_gen TL_ResetTopicSender_stub TL_ResetTopicBase_stub - libs += TL_ResetTopicBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_SenderEC.cpp - } - - Header_Files { - TL_ResetTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - TL_ResetTopic_SenderEC.inl - } -} - -project (TL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { - after += TL_ResetTopicSender_idl_gen TL_ResetTopicBase_stub TL_ResetTopicConnector_stub - libs += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_SenderC.cpp - } - - Header_Files { - TL_ResetTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - TL_ResetTopic_SenderC.inl - } -} - -project (TL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += TL_ResetTopicSender_lem_stub TL_ResetTopicSender_stub \ - TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub TL_ResetTopicBase_stub \ - TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_Sender_exec.cpp - } - - Header_Files { - TL_ResetTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += TL_ResetTopicBase_stub TL_ResetTopicSender_lem_stub TL_ResetTopicConnector_stub \ - TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - TL_ResetTopicBase_stub TL_ResetTopicConnector_stub TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TL_ResetTopic_SenderS.cpp - TL_ResetTopic_Sender_svnt.cpp - } - - Header_Files { - TL_ResetTopic_SenderS.h - TL_ResetTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - -project (TL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = SenderDriver - after += TL_ResetTopicSender_stub TL_ResetTopicConnector_stub - libs += Sender_stub TL_ResetTopicBase_stub TL_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - SenderDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp deleted file mode 100644 index 41f3ba0cdd9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp +++ /dev/null @@ -1,426 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "TL_ResetTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_TL_ResetTopic_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.start_event_test (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - , topic_name_ ("TopicI") - , old_topic_name_ ("TopicI") - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->to_handler_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void Sender_exec_i::set_new_topic (const char * topic_name) - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - - this->old_topic_name_ = this->topic_name_; - this->topic_name_ = topic_name; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " - "New topic name set <%C>\n", - topic_name)); - } - - void - Sender_exec_i::create_samples (void) - { - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - TL_ResetTopicTest *new_key = new TL_ResetTopicTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - this->tests_[key] = new_key; - - ::TL_ResetTopic::TL_ResetTopicTestConnector::Updater_var updater = - this->ciao_context_->get_connection_info_update_data(); - - updater->create_one (*new_key); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " - "Sample <%C> created\n", - key)); - } - } - - bool - Sender_exec_i::set_topic_name (const char * topic_name) - { - if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) - { - this->old_topic_name_ = topic_name; - bool ret = this->set_topic_name_writer (topic_name); - ret |= this->set_topic_name_updater (topic_name); - return ret; - } - if (ACE_OS::strlen (this->topic_name_.c_str()) > 256) - return false; - return true; - } - - bool - Sender_exec_i::set_topic_name_writer (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " - "Setting topic to <%C>\n", - topic_name)); - ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get writer interface\n")); - return false; - } - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - return false; - } - ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event_var conn = - ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - return false; - } - { - ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false); - conn->topic_name (topic_name); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - return false; - } - catch (const ::CCM_DDS::InternalError &) - { - if (ACE_OS::strlen (topic_name) > 256) - { - ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - " - "Expected InternalErr exception caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught InternalError exception.\n")); - } - return false; - } - return true; - } - - bool - Sender_exec_i::set_topic_name_updater (const char * topic_name) - { - try - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " - "Setting topic to <%C>\n", - topic_name)); - ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get updater interface\n")); - return false; - } - ::CORBA::Object_var cmp = updater->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get component interface\n")); - return false; - } - ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State_var conn = - ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to narrow connector interface\n")); - return false; - } - { - ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false); - conn->topic_name (topic_name); - } - this->create_samples (); - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught NonChangeable exception.\n")); - return false; - } - catch (const ::CCM_DDS::InternalError &) - { - if (ACE_OS::strlen (topic_name) > 256) - { - ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - " - "Expected InternalErr exception caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught InternalError exception.\n")); - } - return false; - } - return true; - } - - void - Sender_exec_i::start_event_test (void) - { - // Set the topic name on the connector first. Therefor we need to - // get to the connector first. - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); - - try - { - for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - TL_ResetTopicTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - if (this->set_topic_name (this->topic_name_.c_str ())) - { - ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - sample.iteration = iter; - - writer->write_one (sample, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample for topic <%C> written : key <%C> - iteration <%d>\n", - this->topic_name_.c_str (), tmp, iter)); - } - - ACE_Time_Value tv (0, 5000); - ACE_OS::sleep (tv); - } - } - for (Sample_Table::iterator iter = this->tests_.begin (); - iter != this->tests_.end (); - ++iter) - { - for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i) - { - if (this->set_topic_name (this->topic_name_.c_str ())) - { - ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - iter->second->iteration = i; - updater->update_one (iter->second, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample for topic <%C> updated : key <%C> - iteration <%d>\n", - this->topic_name_.c_str (), - iter->second->key.in (), - i)); - } - - ACE_Time_Value tv (0, 5000); - ACE_OS::sleep (tv); - } - } - } - catch (const ::CORBA::BAD_INV_ORDER & ex) - { - if (this->topic_name_.empty()) - ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n")); - else - ex._tao_print_exception("ERROR:"); - } - catch (const ::CORBA::Exception & ex) - { - ex._tao_print_exception("ERROR:"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::TL_ResetTopic::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->create_samples (); - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (5, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->to_handler_); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TL_ResetTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h deleted file mode 100644 index 7d738c58864..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h +++ /dev/null @@ -1,145 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "TL_ResetTopic_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_TL_ResetTopic_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void set_new_topic (const char * topic_name); - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - bool set_topic_name (const char * topic_name); - bool set_topic_name_writer (const char * topic_name); - bool set_topic_name_updater (const char * topic_name); - void start_event_test (void); - //@} - - private: - ::TL_ResetTopic::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - ACE_CString topic_name_, old_topic_name_; - - TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; - - typedef std::map Sample_Table; - - Sample_Table tests_; - //@} - - //@{ - /** User defined private operations. */ - void create_samples (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TL_ResetTopic_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp deleted file mode 100644 index df3801d2d1e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp +++ /dev/null @@ -1,338 +0,0 @@ - - - - ResetTopic_Depl_1 - - - ResetTopic_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TL_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TL_ResetTopic_Connector_exec - - - - - - - ResetTopic_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TL_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TL_ResetTopic_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_TL_ResetTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TL_ResetTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ResetTopic_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - ResetTopic_SenderStateConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - SenderComponent - SenderNode - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - TL_ResetTopic_Connector_exec - - - TL_ResetTopicConnector_exec - - - TL_ResetTopic_Connector_svnt - - - TL_ResetTopicConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl deleted file mode 100755 index 4bc6525e238..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl +++ /dev/null @@ -1,264 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "SenderNode.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds before clearing the topic name\n"; -sleep (10); - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before setting the topic name again\n"; -sleep (10); - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 30 seconds before stopping\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\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/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl deleted file mode 100644 index 03998e8d565..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file UL_ResetTopic_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UL_RESETTOPIC_BASE_IDL -#define UL_RESETTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/UL_ResetTopic_BaseSupport.h" -#pragma opendds typesupport "Base/UL_ResetTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "UL_ResetTopicTest" -#pragma DCPS_DATA_KEY "UL_ResetTopicTest key" - -struct UL_ResetTopicTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence UL_ResetTopicTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc deleted file mode 100644 index 7fb1ef387eb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (UL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = UL_ResetTopicBase_stub - dynamicflags += UL_RESETTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=UL_RESETTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - UL_ResetTopic_Base.idl - } - - opendds_ts_flags += --export=UL_RESETTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - UL_ResetTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl deleted file mode 100644 index 0ecc3800915..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file UL_ResetTopic_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UL_RESETTOPIC_CONNECTOR_IDL_ -#define UL_RESETTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/UL_ResetTopic_Base.idl" - -#pragma ciao lem "Connector/UL_ResetTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/UL_ResetTopic_BaseTypeSupport.idl" -#endif - -module UL_ResetTopic -{ - module ::CCM_DDS::Typed < ::UL_ResetTopicTest, ::UL_ResetTopicTestSeq> UL_ResetTopicTestConnector; -}; - -#endif /* UL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc deleted file mode 100644 index b6886bbcf53..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector" - -project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen UL_ResetTopicBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=UL_RESETTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - UL_ResetTopic_Connector.idl - } -} - -project (UL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += UL_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=UL_ResetTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - UL_ResetTopic_ConnectorE.idl - } -} - -project (UL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += UL_ResetTopicConnector_lem_gen UL_ResetTopicConnector_stub \ - UL_ResetTopicBase_stub - libs += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = UL_ResetTopicConnector_lem_stub - dynamicflags += UL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ConnectorEC.cpp - } - - Header_Files { - UL_ResetTopic_ConnectorEC.h - UL_ResetTopic_Connector_lem_stub_export.h - } - - Inline_Files { - UL_ResetTopic_ConnectorEC.inl - } -} - -project (UL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { - after += UL_ResetTopicConnector_idl_gen UL_ResetTopicBase_stub - libs += UL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = UL_ResetTopicConnector_stub - dynamicflags += UL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ConnectorC.cpp - } - - Header_Files { - UL_ResetTopic_ConnectorC.h - UL_ResetTopic_Connector_stub_export.h - } - - Inline_Files { - UL_ResetTopic_ConnectorC.inl - } -} - -project (UL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { - after += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub \ - UL_ResetTopicBase_stub - sharedname = UL_ResetTopicConnector_exec - libs += UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub \ - UL_ResetTopicBase_stub UL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_Connector_conn.cpp - } - - Header_Files { - UL_ResetTopic_Connector_conn.h - UL_ResetTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { - after += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_exec \ - UL_ResetTopicConnector_stub - sharedname = UL_ResetTopicConnector_svnt - libs += UL_ResetTopicConnector_stub \ - UL_ResetTopicConnector_lem_stub \ - UL_ResetTopicBase_stub \ - UL_ResetTopicConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ConnectorS.cpp - UL_ResetTopic_Connector_svnt.cpp - } - - Header_Files { - UL_ResetTopic_ConnectorS.h - UL_ResetTopic_Connector_svnt.h - UL_ResetTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp deleted file mode 100644 index a73c5ac6764..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * @file ReceiverDriver.cpp - * - * @author Marcel Smit - */ - - -#include "UL_ResetTopic_ReceiverC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - receiver_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Receiver.ior)\n" - "-n \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var receiver_obj = - orb->string_to_object (receiver_ior); - - // downcast the object reference to the appropriate type - ::UL_ResetTopic::Receiver_var receiver = - ::UL_ResetTopic::Receiver::_narrow (receiver_obj.in ()); - - if (CORBA::is_nil (receiver.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Receiver' objref\n"), - -1); - } - receiver->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl deleted file mode 100644 index 425e76bcf0c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/UL_ResetTopic_Connector.idl" - -module UL_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Receiver supports ChangeTopicInterface - { - port UL_ResetTopicTestConnector::DDS_StateListen info_out_state; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc deleted file mode 100644 index 355adcd4f08..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc +++ /dev/null @@ -1,160 +0,0 @@ -project (UL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += UL_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - IDL_Files { - UL_ResetTopic_Receiver.idl - } -} - -project (UL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += UL_ResetTopicReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UL_ResetTopic_ReceiverE.idl - } -} - -project (UL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += UL_ResetTopicReceiver_lem_gen UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub - libs += Receiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ReceiverEC.cpp - } - - Header_Files { - UL_ResetTopic_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - UL_ResetTopic_ReceiverEC.inl - } -} - -project (UL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { - after += UL_ResetTopicReceiver_idl_gen UL_ResetTopicConnector_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_lem_gen - libs += UL_ResetTopicConnector_stub UL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ReceiverC.cpp - } - - Header_Files { - UL_ResetTopic_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - UL_ResetTopic_ReceiverC.inl - } -} - -project (UL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += UL_ResetTopicReceiver_lem_stub UL_ResetTopicReceiver_stub \ - UL_ResetTopicBase_stub UL_ResetTopicConnector_stub \ - UL_ResetTopicConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub \ - UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_Receiver_exec.cpp - } - - Header_Files { - UL_ResetTopic_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += UL_ResetTopicReceiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicReceiver_exec UL_ResetTopicConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt Receiver_exec UL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_ReceiverS.cpp - UL_ResetTopic_Receiver_svnt.cpp - } - - Header_Files { - UL_ResetTopic_ReceiverS.h - UL_ResetTopic_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - -project (UL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = ReceiverDriver - after += UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub - libs += Receiver_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - ReceiverDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp deleted file mode 100644 index 0bc5cdedc51..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp +++ /dev/null @@ -1,328 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UL_ResetTopic_Receiver_exec.h" - -namespace CIAO_UL_ResetTopic_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_state_data_listener_exec_i - */ - - info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i ( - ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &samples_received) - : ciao_context_ ( - ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - , samples_received_(samples_received) - { - } - - info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void) - { - } - - // Operations from ::UL_ResetTopic::UL_ResetTopicTestConnector::StateListener - - void - info_out_state_data_listener_exec_i::on_creation ( - const ::UL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_creation - " - "Sample <%C> created\n", - datum.key.in ())); - } - - void - info_out_state_data_listener_exec_i::on_one_update ( - const ::UL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - this->samples_received_ = true; - ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_one_update - " - "Sample <%C> updated: <%u>\n", - datum.key.in (), - datum.iteration)); - } - - void - info_out_state_data_listener_exec_i::on_many_updates ( - const ::UL_ResetTopicTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - void - info_out_state_data_listener_exec_i::on_deletion ( - const ::UL_ResetTopicTest & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_state_status_exec_i - */ - - info_out_state_status_exec_i::info_out_state_status_exec_i ( - ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_state_status_exec_i::~info_out_state_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_state_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_state_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (0) - , samples_received_(false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp, - const char * topic_name) - { - if (::CORBA::is_nil (cmp)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn = - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name (topic_name); - -// ::CCM_DDS::DataListenerControl_var dlc = -// this->ciao_context_->get_connection_info_out_event_data_control (); -// dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::set_new_topic (const char * topic_name) - { - // The ReceiverDriver invokes this method. Therefor first check wether - // samples were received during last run - - if (this->samples_received_.value()) - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "OK, samples received during last run\n")); - else - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - " - "ERROR: No samples received during last run\n")); - - this->samples_received_ = false; - - ::CORBA::Object_var cmp; - try - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "Setting topic to <%C>\n", - topic_name)); - //First listener - ::UL_ResetTopic::UL_ResetTopicTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_state_data(); - - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - " - "ciao_info_out_event_data_listener_ seems nil\n")); - throw ::CORBA::INTERNAL (); - } - cmp = reader->_get_component (); - this->set_new_topic (cmp.in (), topic_name); - - //next listener - if (::CORBA::is_nil (this->ciao_info_out_state_status_.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "ciao_info_out_event_status_ seems nil\n")); - } - else - { - cmp = this->ciao_info_out_state_status_->_get_component (); - this->set_new_topic (cmp.in (), topic_name); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - } - - // Component attributes and port operations. - - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_state_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ())) - { - info_out_state_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_state_data_listener_exec_i ( - this->ciao_context_.in (), - this->samples_received_), - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_nil ()); - - this->ciao_info_out_state_data_listener_ = tmp; - } - - return - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_duplicate ( - this->ciao_info_out_state_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_state_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ())) - { - info_out_state_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_state_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_state_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_state_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UL_ResetTopic::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - ::CCM_DDS::StateListenerControl_var dlc = - this->ciao_context_->get_connection_info_out_state_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_.value()) - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - " - "OK, samples received during last run\n")); - else - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " - "ERROR: No samples received during last run\n")); - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UL_ResetTopic_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h deleted file mode 100644 index 34eae95bef7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h +++ /dev/null @@ -1,197 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_ -#define CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_ - -#include /**/ "ace/pre.h" - -#include "UL_ResetTopic_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_UL_ResetTopic_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - /** - * Provider Executor Implementation Class: info_out_state_data_listener_exec_i - */ - - class info_out_state_data_listener_exec_i - : public virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_state_data_listener_exec_i ( - ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &samples_received); - virtual ~info_out_state_data_listener_exec_i (void); - - /** @name Operations and attributes from UL_ResetTopic::UL_ResetTopicTestConnector::StateListener */ - //@{ - - virtual - void on_creation ( - const ::UL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update ( - const ::UL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates ( - const ::UL_ResetTopicTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion ( - const ::UL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_out_state_status_exec_i - */ - - class info_out_state_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_state_status_exec_i ( - ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_state_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - virtual void set_new_topic ( - const char * topic_name); - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr - get_info_out_state_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_state_status (void); - - virtual ::CORBA::UShort iterations ( - void); - - virtual void iterations ( - ::CORBA::UShort iterations); - //@} - - /** @name Operations from Components::SessionComponent. */ - //@{ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - - //@} - - private: - ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_; - - ::CORBA::UShort iterations_; - //@} - - /** @name User defined members. */ - //@{ - Atomic_Boolean samples_received_; - //@} - - /** @name User defined private operations. */ - //@{ - void set_new_topic (::CORBA::Object_ptr cmp, - const char * topic_name); - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UL_ResetTopic_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp deleted file mode 100644 index 3002014b755..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * @file SenderDriver.cpp - * - * @author Marcel Smit - */ - - -#include "UL_ResetTopic_SenderC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - sender_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Sender.ior)\n" - "-n \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var sender_obj = - orb->string_to_object (sender_ior); - - // downcast the object reference to the appropriate type - ::UL_ResetTopic::Sender_var sender = - ::UL_ResetTopic::Sender::_narrow (sender_obj.in ()); - - if (CORBA::is_nil (sender.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Sender' objref\n"), - -1); - } - sender->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl deleted file mode 100644 index 75d64b30c42..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UL_RESETTOPIC_SENDER_IDL -#define UL_RESETTOPIC_SENDER_IDL - -#include "Connector/UL_ResetTopic_Connector.idl" - -module UL_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Sender supports ChangeTopicInterface - { - port UL_ResetTopicTestConnector::DDS_Update info_update; - - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc deleted file mode 100644 index 075fc8ad784..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc +++ /dev/null @@ -1,164 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (UL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { - after += UL_ResetTopicConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - UL_ResetTopic_Sender.idl - } -} - -project (UL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += UL_ResetTopicSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - UL_ResetTopic_SenderE.idl - } -} - -project (UL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += UL_ResetTopicSender_lem_gen UL_ResetTopicSender_stub UL_ResetTopicBase_stub - libs += UL_ResetTopicBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_SenderEC.cpp - } - - Header_Files { - UL_ResetTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - UL_ResetTopic_SenderEC.inl - } -} - -project (UL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { - after += UL_ResetTopicSender_idl_gen UL_ResetTopicBase_stub UL_ResetTopicConnector_stub - libs += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_SenderC.cpp - } - - Header_Files { - UL_ResetTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - UL_ResetTopic_SenderC.inl - } -} - -project (UL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += UL_ResetTopicSender_lem_stub UL_ResetTopicSender_stub \ - UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub UL_ResetTopicBase_stub \ - UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_Sender_exec.cpp - } - - Header_Files { - UL_ResetTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += UL_ResetTopicBase_stub UL_ResetTopicSender_lem_stub UL_ResetTopicConnector_stub \ - UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UL_ResetTopic_SenderS.cpp - UL_ResetTopic_Sender_svnt.cpp - } - - Header_Files { - UL_ResetTopic_SenderS.h - UL_ResetTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - -project (UL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = SenderDriver - after += UL_ResetTopicSender_stub UL_ResetTopicConnector_stub - libs += Sender_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - SenderDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp deleted file mode 100644 index f3fea603736..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp +++ /dev/null @@ -1,333 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UL_ResetTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_UL_ResetTopic_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.start_event_test (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - , topic_name_ ("TopicI") - , old_topic_name_ ("TopicI") - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->to_handler_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void Sender_exec_i::create_samples (void) - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, _guard, - this->keys_lock_); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - UL_ResetTopicTest *new_key = new UL_ResetTopicTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - this->tests_[key] = new_key; - - ::UL_ResetTopic::UL_ResetTopicTestConnector::Updater_var updater = - this->ciao_context_->get_connection_info_update_data(); - - updater->create_one (*new_key); - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " - "Sample <%C> created\n", - key)); - } - this->last_key_ = this->tests_.begin (); - } - - void Sender_exec_i::set_new_topic (const char * topic_name) - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - - this->old_topic_name_ = this->topic_name_; - this->topic_name_ = topic_name; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " - "New topic name set <%C>\n", - topic_name)); - } - - void - Sender_exec_i::set_topic_name_updater (const char * topic_name) - { - try - { - if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " - "Setting topic to <%C>\n", - topic_name)); - this->old_topic_name_ = topic_name; - ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get updater interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = updater->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn = - ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - conn->topic_name (topic_name); - } - this->create_samples (); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - } - - void - Sender_exec_i::start_event_test (void) - { - // Set the topic name on the connector first. Therefor we need to - // get to the connector first. - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); - try - { - if (this->last_key_ != this->tests_.end ()) - { - try - { - this->set_topic_name_updater (this->topic_name_.c_str ()); - ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater = - this->ciao_context_->get_connection_info_update_data (); - - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) - ++this->last_key_->second->iteration; - updater->update_one (this->last_key_->second, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updated key <%C> with <%d>\n"), - this->last_key_->first.c_str (), - this->last_key_->second->iteration)); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n", - this->last_key_->first.c_str ())); - } - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) - ++this->last_key_; - } - } - else - { - // Onto the next iteration - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) - this->last_key_ = this->tests_.begin (); - while (this->last_key_ != this->tests_.end ()) - { - if (this->last_key_->second->iteration == this->iterations_) - { - ++this->last_key_; - } - else - { - break; - } - } - } - } - } - catch (const ::CORBA::Exception & ex) - { - ex._tao_print_exception("ERROR:"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UL_ResetTopic::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->create_samples (); - - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (2, 0), - ACE_Time_Value (0, 500000)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->to_handler_); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UL_ResetTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h deleted file mode 100644 index ed846ae064d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h +++ /dev/null @@ -1,146 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "UL_ResetTopic_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_UL_ResetTopic_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void set_new_topic (const char * topic_name); - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void set_topic_name_updater (const char * topic_name); - void start_event_test (void); - //@} - - private: - ::UL_ResetTopic::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - ACE_CString topic_name_, old_topic_name_; - - TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; - TAO_SYNCH_RECURSIVE_MUTEX keys_lock_; - - typedef std::map Sample_Table; - - Sample_Table tests_; - Sample_Table::iterator last_key_; - - //@} - - //@{ - /** User defined private operations. */ - void create_samples (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UL_ResetTopic_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp deleted file mode 100644 index 0098998a7b1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp +++ /dev/null @@ -1,407 +0,0 @@ - - - - ResetTopic_Depl_1 - - - ReceiverComponentImplementation - - - - - component factory - - - tk_string - - - create_UL_ResetTopic_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UL_ResetTopic_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ResetTopic_StateConnectorImplementation - - - - - component factory - - - tk_string - - - create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UL_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UL_ResetTopic_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_UL_ResetTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UL_ResetTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - ResetTopic_SenderStateConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - ResetTopic_ReceiverStateConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - SenderComponent - SenderNode - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - state_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_state_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - - state_reader_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_state_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - - state_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_state_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - UL_ResetTopic_Connector_exec - - - UL_ResetTopicConnector_exec - - - UL_ResetTopic_Connector_svnt - - - UL_ResetTopicConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl deleted file mode 100755 index e5226a3129f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl +++ /dev/null @@ -1,280 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode", "SenderNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds before changing topic name\n"; -sleep (10); - -$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII"); -$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before changing topic name\n"; -sleep (10); - -$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII"); -$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before stopping\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl deleted file mode 100644 index 45311782947..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file WL_ResetTopic_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WL_RESETTOPIC_BASE_IDL -#define WL_RESETTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/WL_ResetTopic_BaseSupport.h" -#pragma opendds typesupport "Base/WL_ResetTopic_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "WL_ResetTopicTest" -#pragma DCPS_DATA_KEY "WL_ResetTopicTest key" - -struct WL_ResetTopicTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WL_ResetTopicTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc deleted file mode 100644 index 6ab7e88772c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (WL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = WL_ResetTopicBase_stub - dynamicflags += WL_RESETTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WL_RESETTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - WL_ResetTopic_Base.idl - } - - opendds_ts_flags += --export=WL_RESETTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - WL_ResetTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl deleted file mode 100644 index 83381d74410..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file WL_ResetTopic_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WL_RESETTOPIC_CONNECTOR_IDL_ -#define WL_RESETTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/WL_ResetTopic_Base.idl" - -#pragma ciao lem "Connector/WL_ResetTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/WL_ResetTopic_BaseTypeSupport.idl" -#endif - -module WL_ResetTopic -{ - module ::CCM_DDS::Typed < ::WL_ResetTopicTest, ::WL_ResetTopicTestSeq> WL_ResetTopicTestConnector; -}; - -#endif /* WL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc deleted file mode 100644 index dfaa2301b8e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector" - -project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen WL_ResetTopicBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=WL_RESETTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - WL_ResetTopic_Connector.idl - } -} - -project (WL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += WL_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=WL_ResetTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - WL_ResetTopic_ConnectorE.idl - } -} - -project (WL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += WL_ResetTopicConnector_lem_gen WL_ResetTopicConnector_stub \ - WL_ResetTopicBase_stub - libs += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = WL_ResetTopicConnector_lem_stub - dynamicflags += WL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ConnectorEC.cpp - } - - Header_Files { - WL_ResetTopic_ConnectorEC.h - WL_ResetTopic_Connector_lem_stub_export.h - } - - Inline_Files { - WL_ResetTopic_ConnectorEC.inl - } -} - -project (WL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { - after += WL_ResetTopicConnector_idl_gen WL_ResetTopicBase_stub - libs += WL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = WL_ResetTopicConnector_stub - dynamicflags += WL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ConnectorC.cpp - } - - Header_Files { - WL_ResetTopic_ConnectorC.h - WL_ResetTopic_Connector_stub_export.h - } - - Inline_Files { - WL_ResetTopic_ConnectorC.inl - } -} - -project (WL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { - after += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub \ - WL_ResetTopicBase_stub - sharedname = WL_ResetTopicConnector_exec - libs += WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub \ - WL_ResetTopicBase_stub WL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_Connector_conn.cpp - } - - Header_Files { - WL_ResetTopic_Connector_conn.h - WL_ResetTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { - after += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_exec \ - WL_ResetTopicConnector_stub - sharedname = WL_ResetTopicConnector_svnt - libs += WL_ResetTopicConnector_stub \ - WL_ResetTopicConnector_lem_stub \ - WL_ResetTopicBase_stub \ - WL_ResetTopicConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ConnectorS.cpp - WL_ResetTopic_Connector_svnt.cpp - } - - Header_Files { - WL_ResetTopic_ConnectorS.h - WL_ResetTopic_Connector_svnt.h - WL_ResetTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp deleted file mode 100644 index de62aa77ca1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * @file ReceiverDriver.cpp - * - * @author Marcel Smit - */ - - -#include "WL_ResetTopic_ReceiverC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - receiver_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Receiver.ior)\n" - "-n \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var receiver_obj = - orb->string_to_object (receiver_ior); - - // downcast the object reference to the appropriate type - ::WL_ResetTopic::Receiver_var receiver = - ::WL_ResetTopic::Receiver::_narrow (receiver_obj.in ()); - - if (CORBA::is_nil (receiver.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Receiver' objref\n"), - -1); - } - receiver->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl deleted file mode 100644 index 0fe968e46ea..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/WL_ResetTopic_Connector.idl" - -module WL_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Receiver supports ChangeTopicInterface - { - port WL_ResetTopicTestConnector::DDS_Listen info_out_event; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc deleted file mode 100644 index e23097f342f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc +++ /dev/null @@ -1,160 +0,0 @@ -project (WL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += WL_ResetTopicConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - IDL_Files { - WL_ResetTopic_Receiver.idl - } -} - -project (WL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += WL_ResetTopicReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - WL_ResetTopic_ReceiverE.idl - } -} - -project (WL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += WL_ResetTopicReceiver_lem_gen WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub - libs += Receiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ReceiverEC.cpp - } - - Header_Files { - WL_ResetTopic_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - WL_ResetTopic_ReceiverEC.inl - } -} - -project (WL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { - after += WL_ResetTopicReceiver_idl_gen WL_ResetTopicConnector_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_lem_gen - libs += WL_ResetTopicConnector_stub WL_ResetTopicBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ReceiverC.cpp - } - - Header_Files { - WL_ResetTopic_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - WL_ResetTopic_ReceiverC.inl - } -} - -project (WL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += WL_ResetTopicReceiver_lem_stub WL_ResetTopicReceiver_stub \ - WL_ResetTopicBase_stub WL_ResetTopicConnector_stub \ - WL_ResetTopicConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub \ - WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_Receiver_exec.cpp - } - - Header_Files { - WL_ResetTopic_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += WL_ResetTopicReceiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicReceiver_exec WL_ResetTopicConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt Receiver_exec WL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_ReceiverS.cpp - WL_ResetTopic_Receiver_svnt.cpp - } - - Header_Files { - WL_ResetTopic_ReceiverS.h - WL_ResetTopic_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - -project (WL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = ReceiverDriver - after += WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub - libs += Receiver_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - ReceiverDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp deleted file mode 100644 index 58eb1380560..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp +++ /dev/null @@ -1,307 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "WL_ResetTopic_Receiver_exec.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO_WL_ResetTopic_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_event_data_listener_exec_i - */ - - info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i ( - ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &samples_received) - : ciao_context_ ( - ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - , samples_received_(samples_received) - { - } - - info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void) - { - } - - // Operations from ::WL_ResetTopic::WL_ResetTopicTestConnector::Listener - - void - info_out_event_data_listener_exec_i::on_one_data (const ::WL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - this->samples_received_ = true; - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("info_out_event_data_listener_exec_i::on_one_data - ") - ACE_TEXT ("received data for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); - } - - void - info_out_event_data_listener_exec_i::on_many_data (const ::WL_ResetTopicTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - ACE_ERROR ((LM_ERROR, "info_out_event_data_listener_exec_i::on_many_data : " - "Error: No callback to this method expected.\n")); - } - - /** - * Facet Executor Implementation Class: info_out_event_status_exec_i - */ - - info_out_event_status_exec_i::info_out_event_status_exec_i ( - ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_event_status_exec_i::~info_out_event_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (0) - , samples_received_(0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - void - Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp, - const char * topic_name) - { - if (::CORBA::is_nil (cmp)) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn = - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - conn->topic_name (topic_name); - -// ::CCM_DDS::DataListenerControl_var dlc = -// this->ciao_context_->get_connection_info_out_event_data_control (); -// dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::set_new_topic (const char * topic_name) - { - - if (this->samples_received_.value()) - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "OK, samples received during last run\n")); - else - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - " - "ERROR: No samples received during last run\n")); - - this->samples_received_ = false; - - ::CORBA::Object_var cmp; - try - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "Setting topic to <%C>\n", - topic_name)); - //First listener - ::WL_ResetTopic::WL_ResetTopicTestConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_event_data(); - - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - " - "ciao_info_out_event_data_listener_ seems nil\n")); - throw ::CORBA::INTERNAL (); - } - cmp = reader->_get_component (); - this->set_new_topic (cmp.in (), topic_name); - - //next listener - if (::CORBA::is_nil (this->ciao_info_out_event_status_.in ())) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " - "ciao_info_out_event_status_ seems nil\n")); - } - else - { - cmp = this->ciao_info_out_event_status_->_get_component (); - this->set_new_topic (cmp.in (), topic_name); - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - } - - // Component attributes and port operations. - - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_event_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ())) - { - info_out_event_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_event_data_listener_exec_i ( - this->ciao_context_.in (), - this->samples_received_), - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_event_data_listener_ = tmp; - } - - return - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_event_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_event_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ())) - { - info_out_event_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_event_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_event_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_event_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::WL_ResetTopic::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_out_event_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_.value()) - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - " - "OK, samples received during last run\n")); - else - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " - "ERROR: No samples received during last run\n")); - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WL_ResetTopic_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h deleted file mode 100644 index c56d34e8355..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_ -#define CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_ - -#include /**/ "ace/pre.h" - -#include "WL_ResetTopic_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_WL_ResetTopic_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - /** - * Provider Executor Implementation Class: info_out_event_data_listener_exec_i - */ - - class info_out_event_data_listener_exec_i - : public virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_event_data_listener_exec_i ( - ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx, - Atomic_Boolean &samples_received); - virtual ~info_out_event_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from WL_ResetTopic::WL_ResetTopicTestConnector::Listener. */ - - virtual - void on_one_data (const ::WL_ResetTopicTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::WL_ResetTopicTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - Atomic_Boolean &samples_received_; - }; - - /** - * Provider Executor Implementation Class: info_out_event_status_exec_i - */ - - class info_out_event_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_event_status_exec_i ( - ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_event_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void set_new_topic (const char * topic_name); - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr - get_info_out_event_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_event_status (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_; - - ::CORBA::UShort iterations_; - //@} - - //@{ - /** User defined members. */ - Atomic_Boolean samples_received_; - - //@} - - //@{ - /** User defined private operations. */ - void set_new_topic (::CORBA::Object_ptr cmp, - const char * topic_name); - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WL_ResetTopic_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp deleted file mode 100644 index b55e57cb764..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * @file SenderDriver.cpp - * - * @author Marcel Smit - */ - - -#include "WL_ResetTopic_SenderC.h" -#include "ace/streams.h" -#include "ace/Get_Opt.h" - -const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); -const ACE_TCHAR *topic_name = ACE_TEXT (""); - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); - int c; - - while ((c = get_opts ()) != -1) - { - switch (c) - { - case 'k': - sender_ior = get_opts.opt_arg (); - break; - - case 'n': - topic_name = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k (default is file://Sender.ior)\n" - "-n \n" - "\n", - argv [0]), - -1); - } - } - - return 0; -} - - -int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) -{ - try - { - // initialize the ORB - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - if (parse_args (argc, argv) != 0) - { - return -1; - } - - // create the factory object reference, - CORBA::Object_var sender_obj = - orb->string_to_object (sender_ior); - - // downcast the object reference to the appropriate type - ::WL_ResetTopic::Sender_var sender = - ::WL_ResetTopic::Sender::_narrow (sender_obj.in ()); - - if (CORBA::is_nil (sender.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to acquire 'Sender' objref\n"), - -1); - } - sender->set_new_topic (topic_name); - - orb->destroy (); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); - ACE_ERROR_RETURN ((LM_ERROR, - "Uncaught CORBA exception\n"), - 1); - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl deleted file mode 100644 index 171dbbea554..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WL_RESETTOPIC_SENDER_IDL -#define WL_RESETTOPIC_SENDER_IDL - -#include "Connector/WL_ResetTopic_Connector.idl" - -module WL_ResetTopic -{ - interface ChangeTopicInterface - { - void set_new_topic (in string topic_name); - }; - - component Sender supports ChangeTopicInterface - { - port WL_ResetTopicTestConnector::DDS_Write info_write; - - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc deleted file mode 100644 index 717058be581..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc +++ /dev/null @@ -1,164 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project (WL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { - after += WL_ResetTopicConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - WL_ResetTopic_Sender.idl - } -} - -project (WL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += WL_ResetTopicSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - WL_ResetTopic_SenderE.idl - } -} - -project (WL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += WL_ResetTopicSender_lem_gen WL_ResetTopicSender_stub WL_ResetTopicBase_stub - libs += WL_ResetTopicBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_SenderEC.cpp - } - - Header_Files { - WL_ResetTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - WL_ResetTopic_SenderEC.inl - } -} - -project (WL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { - after += WL_ResetTopicSender_idl_gen WL_ResetTopicBase_stub WL_ResetTopicConnector_stub - libs += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_SenderC.cpp - } - - Header_Files { - WL_ResetTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - WL_ResetTopic_SenderC.inl - } -} - -project (WL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += WL_ResetTopicSender_lem_stub WL_ResetTopicSender_stub \ - WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub WL_ResetTopicBase_stub \ - WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_Sender_exec.cpp - } - - Header_Files { - WL_ResetTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += WL_ResetTopicBase_stub WL_ResetTopicSender_lem_stub WL_ResetTopicConnector_stub \ - WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - WL_ResetTopic_SenderS.cpp - WL_ResetTopic_Sender_svnt.cpp - } - - Header_Files { - WL_ResetTopic_SenderS.h - WL_ResetTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - -project (WL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { - exename = SenderDriver - after += WL_ResetTopicSender_stub WL_ResetTopicConnector_stub - libs += Sender_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub - - includes += .. - libpaths += ../lib - - exeout = ../lib - IDL_Files { - } - - Source_Files { - SenderDriver.cpp - } - - Header_Files { - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp deleted file mode 100644 index 5e189c86fce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp +++ /dev/null @@ -1,281 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "WL_ResetTopic_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_WL_ResetTopic_Sender_Impl -{ - - /** - * Timeout_Handler - */ - - Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->callback_.start_event_test (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : iterations_ (0) - , keys_ (0) - , to_handler_ (0) - , topic_name_ ("TopicI") - , old_topic_name_ ("TopicI") - { - ACE_NEW_THROW_EX (this->to_handler_, - Timeout_Handler (*this), - ::CORBA::INTERNAL ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->to_handler_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void Sender_exec_i::set_new_topic (const char * topic_name) - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - - this->old_topic_name_ = this->topic_name_; - this->topic_name_ = topic_name; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " - "New topic name set <%C>\n", - topic_name)); - } - - void - Sender_exec_i::set_topic_name_writer (const char * topic_name) - { - try - { - if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " - "Setting topic to <%C>\n", - topic_name)); - this->old_topic_name_ = topic_name; - ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get writer interface\n")); - throw ::CORBA::INTERNAL (); - } - ::CORBA::Object_var cmp = writer->_get_component (); - if (::CORBA::is_nil (cmp.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to get component interface\n")); - throw ::CORBA::INTERNAL (); - } - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn = - ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); - if (::CORBA::is_nil (conn.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Unable to narrow connector interface\n")); - throw ::CORBA::INTERNAL (); - } - { - ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); - conn->topic_name (topic_name); - } - } - } - catch (const ::CCM_DDS::NonChangeable &) - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } - } - - void - Sender_exec_i::start_event_test (void) - { - // Set the topic name on the connector first. Therefor we need to - // get to the connector first. - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); - try - { - for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) - { - WL_ResetTopicTest sample; - char tmp[7]; - ACE_OS::sprintf (tmp, "KEY_%d", key); - sample.key = CORBA::string_dup(tmp); - - for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) - { - this->set_topic_name_writer (this->topic_name_.c_str ()); - ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - sample.iteration = iter; - writer->write_one (sample, ::DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " - "Sample for topic <%C> written : key <%C> - iteration <%d>\n", - this->topic_name_.c_str (), tmp, iter)); - - ACE_Time_Value tv (0, 50000); - ACE_OS::sleep (tv); - } - } - } - catch (const ::CORBA::Exception & ex) - { - ex._tao_print_exception("ERROR:"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " - "ERROR: Unexpected and unknown exception caught.\n")); - } - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::WL_ResetTopic::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - if (this->reactor ()->schedule_timer ( - this->to_handler_, - 0, - ACE_Time_Value (5, 0), - ACE_Time_Value (5, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->reactor()->cancel_timer(this->to_handler_); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WL_ResetTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h deleted file mode 100644 index f7669e80f33..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ -#define CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ - -#include /**/ "ace/pre.h" - -#include "WL_ResetTopic_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_WL_ResetTopic_Sender_Impl -{ - class Sender_exec_i; - - /** - * Timeout_Handler - */ - class Timeout_Handler : - public ACE_Event_Handler - { - public: - Timeout_Handler (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - virtual void set_new_topic (const char * topic_name); - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void set_topic_name_writer (const char * topic_name); - void start_event_test (void); - //@} - - private: - ::WL_ResetTopic::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Timeout_Handler *to_handler_; - ACE_CString topic_name_, old_topic_name_; - - TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_WL_ResetTopic_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp deleted file mode 100644 index 392974a1999..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp +++ /dev/null @@ -1,407 +0,0 @@ - - - - ResetTopic_Depl_1 - - - ReceiverComponentImplementation - - - - - component factory - - - tk_string - - - create_WL_ResetTopic_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WL_ResetTopic_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - ResetTopic_EventConnectorImplementation - - - - - component factory - - - tk_string - - - create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - WL_ResetTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - WL_ResetTopic_Connector_exec - - - - - - - SenderComponentImplementation - - - - - component factory - - - tk_string - - - create_WL_ResetTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_WL_ResetTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Receiver.ior - - - - - - - ResetTopic_SenderEventConnectorInstance - SenderNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - ResetTopic_ReceiverEventConnectorInstance - ReceiverNode - - - - topic_name - - - tk_string - - - TopicI - - - - - - - SenderComponent - SenderNode - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - edu.vanderbilt.dre.DAnCE.InstanceIOR - - - tk_string - - - Sender.ior - - - - - - - event_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_event_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - event_reader_listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_event_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - event_datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_event_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - WL_ResetTopic_Connector_exec - - - WL_ResetTopicConnector_exec - - - WL_ResetTopic_Connector_svnt - - - WL_ResetTopicConnector_svnt - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl deleted file mode 100755 index e5226a3129f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl +++ /dev/null @@ -1,280 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" ); -@iorfiles = 0; -@nodenames = ( "ReceiverNode", "SenderNode" ); - -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds before changing topic name\n"; -sleep (10); - -$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII"); -$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before changing topic name\n"; -sleep (10); - -$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII"); -$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); -$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); -if ($driver_status != 0) { - print STDERR "ERROR: unable to launch driver\n"; - kill_open_processes (); - exit 1; -} - -print "Sleeping 10 seconds before stopping\n"; -sleep (10); - -# 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\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/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore b/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl deleted file mode 100644 index 61d37f5f4e4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file SL_Disabled_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_DISABLED_BASE_IDL -#define SL_DISABLED_BASE_IDL - -#pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h" -#pragma opendds typesupport "Base/SL_Disabled_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc deleted file mode 100644 index 4a1f4bb1c09..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SL_Disabled_Base_stub - dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \ - -Wb,stub_export_include=SL_Disabled_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - SL_Disabled_Base.idl - } - - opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export - - DDSGenerator_Files { - SL_Disabled_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl deleted file mode 100644 index 5db5f544e3e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file SL_Disabled_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_DISABLED_CONNECTOR_IDL_ -#define SL_DISABLED_CONNECTOR_IDL_ - -#include -#include - -#include "Base/SL_Disabled_Base.idl" - -#pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/SL_Disabled_BaseTypeSupport.idl" -#endif - -module SL_Disabled -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector; -}; - -#endif /* SL_Disabled_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc deleted file mode 100644 index a3d3a95c921..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector" - -project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SL_Disabled_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=SL_Disabled_Connector_stub_export.h \ - -Wb,skel_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=SL_Disabled_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=SL_Disabled_Connector_svnt_export.h \ - -Wb,conn_export_macro=SL_DISABLED_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=SL_Disabled_Connector_conn_export.h \ - -I .. - - IDL_Files { - SL_Disabled_Connector.idl - } -} - -project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_OC_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=SL_Disabled_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - SL_Disabled_ConnectorE.idl - } -} - -project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub - libs += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_OC_Connector_lem_stub - dynamicflags += SL_DISABLED_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ConnectorEC.cpp - } - - Header_Files { - SL_Disabled_ConnectorEC.h - SL_Disabled_Connector_lem_stub_export.h - } - - Inline_Files { - SL_Disabled_ConnectorEC.inl - } -} - -project(DDS_SL_Disabled_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_OC_Connector_idl_gen DDS_SL_Disabled_Base_stub - libs += DDS_SL_Disabled_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_Disabled_Connector_stub - dynamicflags += SL_DISABLED_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ConnectorC.cpp - } - - Header_Files { - SL_Disabled_ConnectorC.h - SL_Disabled_Connector_stub_export.h - } - - Inline_Files { - SL_Disabled_ConnectorC.inl - } -} - -project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub - sharedname = DDS_SL_Disabled_Connector_exec - libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_DISABLED_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_Connector_conn.cpp - } - - Header_Files { - SL_Disabled_Connector_conn.h - SL_Disabled_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub - sharedname = DDS_SL_Disabled_Connector_svnt - libs += DDS_SL_Disabled_Connector_stub \ - DDS_SL_OC_Connector_lem_stub \ - DDS_SL_Disabled_Base_stub \ - DDS_SL_Disabled_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_DISABLED_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ConnectorS.cpp - SL_Disabled_Connector_svnt.cpp - } - - Header_Files { - SL_Disabled_ConnectorS.h - SL_Disabled_Connector_svnt.h - SL_Disabled_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl deleted file mode 100644 index 4863c6e2d01..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/SL_Disabled_Connector.idl" - -module SL_Disabled -{ - component Receiver - { - port SL_DisabledConnector::DDS_StateListen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc deleted file mode 100644 index 18d20c311a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_OC_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - SL_Disabled_Receiver.idl - } -} - -project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_Disabled_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - SL_Disabled_ReceiverE.idl - } -} - -project(DDS_SL_OC_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_Disabled_Receiver_lem_gen DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub - libs += Receiver_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ReceiverEC.cpp - } - - Header_Files { - SL_Disabled_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - SL_Disabled_ReceiverEC.inl - } -} - -project(DDS_SL_Disabled_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_Disabled_Receiver_idl_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_gen - libs += DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ReceiverC.cpp - } - - Header_Files { - SL_Disabled_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - SL_Disabled_ReceiverC.inl - } -} - -project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_Receiver_exec.cpp - } - - Header_Files { - SL_Disabled_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_ReceiverS.cpp - SL_Disabled_Receiver_svnt.cpp - } - - Header_Files { - SL_Disabled_ReceiverS.h - SL_Disabled_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp deleted file mode 100644 index 0143a7785e9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp +++ /dev/null @@ -1,247 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "SL_Disabled_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/TimeUtilities.h" - -#define SAMPLES_EXPECTED 3 - -namespace CIAO_SL_Disabled_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::SL_Disabled::CCM_Receiver_Context_ptr ctx, - Atomic_Long & no_operation) - : ciao_context_ ( - ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx)) - , no_operation_ (no_operation) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::SL_Disabled::SL_DisabledConnector::StateListener - - void - info_out_data_listener_exec_i::on_creation (const ::TestTopic & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->no_operation_; - } - - void - info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->no_operation_; - } - - void - info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - ++this->no_operation_; - } - - void - info_out_data_listener_exec_i::on_deletion (const ::TestTopic & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->no_operation_; - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::SL_Disabled::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : no_operation_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - // Component attributes and port operations. - - ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->no_operation_), - ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_Disabled::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::StateListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - - lc->mode (::CCM_DDS::NOT_ENABLED); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->no_operation_.value () > 0) - { - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Received an unexpected ") - ACE_TEXT (" operation. StateListener doesn't work in Receiver\n") - )); - } - - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK : Haven't received an unexpected ") - ACE_TEXT (" operation from StateListener in Receiver\n") - )); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_Disabled_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h deleted file mode 100644 index d6020151dea..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h +++ /dev/null @@ -1,181 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_ -#define CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_ - -#include /**/ "ace/pre.h" - -#include "SL_Disabled_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_Disabled_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - - class Receiver_exec_i; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::SL_Disabled::CCM_Receiver_Context_ptr ctx, - Atomic_Long &); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from SL_Disabled::SL_DisabledConnector::StateListener. */ - - virtual - void on_creation (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::SL_Disabled::CCM_Receiver_Context_var ciao_context_; - Atomic_Long & no_operation_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::SL_Disabled::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::SL_Disabled::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - //@} - - private: - ::SL_Disabled::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - Atomic_Long no_operation_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_Disabled_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl deleted file mode 100644 index 3bf7d29b082..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_SL_DISABLED_SENDER_IDL -#define DDS_SL_DISABLED_SENDER_IDL - -#include "Connector/SL_Disabled_Connector.idl" - -module SL_Disabled -{ - component Sender - { - port SL_DisabledConnector::DDS_Update test_topic_update; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc deleted file mode 100644 index 21c0c44ec43..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SL_OC_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - SL_Disabled_Sender.idl - } -} - -project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_Disabled_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - SL_Disabled_SenderE.idl - } -} - -project(DDS_SL_Disabled_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_Disabled_Sender_lem_gen DDS_SL_Disabled_Sender_stub DDS_SL_Disabled_Base_stub - libs += DDS_SL_Disabled_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_SenderEC.cpp - } - - Header_Files { - SL_Disabled_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - SL_Disabled_SenderEC.inl - } -} - -project(DDS_SL_Disabled_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_Disabled_Sender_idl_gen DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub - libs += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_SenderC.cpp - } - - Header_Files { - SL_Disabled_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - SL_Disabled_SenderC.inl - } -} - -project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Sender_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_Sender_exec.cpp - } - - Header_Files { - SL_Disabled_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_SenderS.cpp - SL_Disabled_Sender_svnt.cpp - } - - Header_Files { - SL_Disabled_SenderS.h - SL_Disabled_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp deleted file mode 100644 index e783f301425..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp +++ /dev/null @@ -1,513 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "SL_Disabled_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_SL_Disabled_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE) - , test_ok_(true) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - ::CORBA::Boolean - Sender_exec_i::create_one (void) - { - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->create_one(i); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_Disabled: create_one with instance key <%C>\n"), - i.key.in())); - } - catch (const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"), - i.key.in())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"), - i.key.in())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::update_one (void) - { - //update already created instance with handle nil - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->update_one(i, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in())); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"), - i.key.in())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::delete_one (void) - { - //delete registered instance with DDS::HANDLE_NIL - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in())); - updater->delete_one(i, DDS::HANDLE_NIL); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"), - i.key.in())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::create_many (void) - { - //create many with no exception - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->create_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::update_many (void) - { - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->update_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_seq_many_.length ())); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::delete_many (void) - { - try - { - ::SL_Disabled::SL_DisabledConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->delete_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - - return true; - } - - void - Sender_exec_i::add_instances_of_topic (void) - { - CORBA::UShort total = 3; - this->topic_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "many_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick (void) - { - if(this->test_ok_.value()) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_ONE; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one(); - this->test_nr_ = DELETE_ONE; - break; - case DELETE_ONE: - this->test_ok_ = this->delete_one(); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many(); - this->test_nr_ = DELETE_MANY; - break; - case DELETE_MANY: - this->test_ok_ = this->delete_many(); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - } - - void - Sender_exec_i::get_started (void) - { - this->add_instances_of_topic (); - this->start (); - } - - void - Sender_exec_i::start (void) - { - long sec = 1L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_Disabled::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_Disabled_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h deleted file mode 100644 index b131f0fa51c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h +++ /dev/null @@ -1,185 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_ -#define CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_ - -#include /**/ "ace/pre.h" - -#include "SL_Disabled_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_Disabled_Sender_Impl -{ - - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - enum UPDATER_TEST { - UPDATE_CREATE, - UPDATE_ONE, - DELETE_ONE, - CREATE_MANY, - UPDATE_MANY, - DELETE_MANY, - END_TEST - }; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Write action generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void get_started (void); - //@} - - private: - ::SL_Disabled::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - UPDATER_TEST test_nr_; - Atomic_Boolean test_ok_; - - TestTopicSeq topic_seq_one_; - TestTopicSeq topic_seq_many_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - void add_instances_of_topic (void); - - ::CORBA::Boolean create_one (void); - ::CORBA::Boolean update_one (void); - ::CORBA::Boolean delete_one (void); - ::CORBA::Boolean create_many (void); - ::CORBA::Boolean update_many (void); - ::CORBA::Boolean delete_many (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_Disabled_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp deleted file mode 100644 index 6295f7a7efd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp +++ /dev/null @@ -1,386 +0,0 @@ - - - - SL_Disabled_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_Disabled_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_Disabled_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - SL_Disabled_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_Disabled_SL_DisabledConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_Disabled_SL_DisabledConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - SL_Disabled_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - SL_Disabled_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_Disabled_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_Disabled_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - SL_Disabled_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - - SL_Disabled_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - _statelistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - SL_Disabled_Connector_exec - - - DDS_SL_Disabled_Connector_exec - - - SL_Disabled_Connector_svnt - - - DDS_SL_Disabled_Connector_svnt - - - SL_Disabled_Connector_stub - - - DDS_SL_Disabled_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl deleted file mode 100755 index 2b535b3e697..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl deleted file mode 100644 index 6723cc83f06..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file SL_ManyByMany_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_MANYBYMANY_BASE_IDL -#define SL_MANYBYMANY_BASE_IDL - -#pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h" -#pragma opendds typesupport "Base/SL_ManyByMany_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc deleted file mode 100644 index f530b760e3c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SL_ManyByMany_Base_stub - dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \ - -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - SL_ManyByMany_Base.idl - } - - opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export - - DDSGenerator_Files { - SL_ManyByMany_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl deleted file mode 100644 index a5204526af8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file SL_ManyByMany_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_MANYBYMANY_CONNECTOR_IDL_ -#define SL_MANYBYMANY_CONNECTOR_IDL_ - -#include -#include -#include "Base/SL_ManyByMany_Base.idl" - -#pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/SL_ManyByMany_BaseTypeSupport.idl" -#endif - -module SL_ManyByMany -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SLManyByManyConnector; -}; - -#endif /* SL_ManyByMany_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc deleted file mode 100644 index 78de5f326c2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector" - -project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SL_ManyByMany_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=SL_ManyByMany_Connector_stub_export.h \ - -Wb,skel_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=SL_ManyByMany_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=SL_ManyByMany_Connector_svnt_export.h \ - -Wb,conn_export_macro=SL_MANYBYMANY_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=SL_ManyByMany_Connector_conn_export.h \ - -I .. - - IDL_Files { - SL_ManyByMany_Connector.idl - } -} - -project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_MBM_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=SL_ManyByMany_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - SL_ManyByMany_ConnectorE.idl - } -} - -project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub - libs += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_MBM_Connector_lem_stub - dynamicflags += SL_MANYBYMANY_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ConnectorEC.cpp - } - - Header_Files { - SL_ManyByMany_ConnectorEC.h - SL_ManyByMany_Connector_lem_stub_export.h - } - - Inline_Files { - SL_ManyByMany_ConnectorEC.inl - } -} - -project(DDS_SL_ManyByMany_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_MBM_Connector_idl_gen DDS_SL_ManyByMany_Base_stub - libs += DDS_SL_ManyByMany_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_ManyByMany_Connector_stub - dynamicflags += SL_MANYBYMANY_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ConnectorC.cpp - } - - Header_Files { - SL_ManyByMany_ConnectorC.h - SL_ManyByMany_Connector_stub_export.h - } - - Inline_Files { - SL_ManyByMany_ConnectorC.inl - } -} - -project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub - sharedname = DDS_SL_ManyByMany_Connector_exec - libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_MANYBYMANY_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_Connector_conn.cpp - } - - Header_Files { - SL_ManyByMany_Connector_conn.h - SL_ManyByMany_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub - sharedname = DDS_SL_ManyByMany_Connector_svnt - libs += DDS_SL_ManyByMany_Connector_stub \ - DDS_SL_MBM_Connector_lem_stub \ - DDS_SL_ManyByMany_Base_stub \ - DDS_SL_ManyByMany_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_MANYBYMANY_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ConnectorS.cpp - SL_ManyByMany_Connector_svnt.cpp - } - - Header_Files { - SL_ManyByMany_ConnectorS.h - SL_ManyByMany_Connector_svnt.h - SL_ManyByMany_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README b/CIAO/connectors/dds4ccm/tests/SLManyByMany/README deleted file mode 100644 index 622b15df743..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README +++ /dev/null @@ -1,26 +0,0 @@ - - -This is a test for the StateListener when the StateListenerControl is in the MANY_BY_MANY mode. - -The test uses the Updater to sent samples. -With a create_one ( 1 sample) and create_many (3 samples) of the Updater, -the on_creation must be triggered ( 4 times 1 sample). - -With a delete_one ( 1 sample) and a delete_many (3 samples) of the Updater, - the on_deletion must betriggered( 4 times 1 sample). - -With update_one ( 1 sample) and update_many (3 samples) of the Updater, - the on_many_updates must ideal be triggered 2 times (1 and 3 samples), -but it is possible through timing problems that the 3 samples are nor received at one time. - -Because of the MANY_BY_MANY mode, the on_one_update must not be triggered, -even if the Updater does a update_one. - -In on_deletion, the returning dataum.key is tested . The key shouldn't be empty, but have a valid value -because of the and settings in the QoS . - - -Beccause the StateListener performs a get, a read_all of a Reader shouldn't receive any samples -after the Statelistener has received his triggers. - - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl deleted file mode 100644 index f80d7e5ab1c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/SL_ManyByMany_Connector.idl" - -module SL_ManyByMany -{ - component Receiver - { - port SLManyByManyConnector::DDS_StateListen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc deleted file mode 100644 index 8b0fb7a0ef8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_MBM_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - SL_ManyByMany_Receiver.idl - } -} - -project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_ManyByMany_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - SL_ManyByMany_ReceiverE.idl - } -} - -project(DDS_SL_MBM_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_ManyByMany_Receiver_lem_gen DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub - libs += Receiver_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ReceiverEC.cpp - } - - Header_Files { - SL_ManyByMany_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - SL_ManyByMany_ReceiverEC.inl - } -} - -project(DDS_SL_ManyByMany_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_ManyByMany_Receiver_idl_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_gen - libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ReceiverC.cpp - } - - Header_Files { - SL_ManyByMany_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - SL_ManyByMany_ReceiverC.inl - } -} - -project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_Receiver_exec.cpp - } - - Header_Files { - SL_ManyByMany_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_ReceiverS.cpp - SL_ManyByMany_Receiver_svnt.cpp - } - - Header_Files { - SL_ManyByMany_ReceiverS.h - SL_ManyByMany_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp deleted file mode 100644 index 938b46a013e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp +++ /dev/null @@ -1,612 +0,0 @@ -// -*- C++ -*- -#include "SL_ManyByMany_Receiver_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#include "dds4ccm/impl/TimeUtilities.h" - -#define ON_CREATION_EXPECTED 4 -#define ON_MANY_EXPECTED 4 -#define ON_MANY_TRIGGERED 2 -#define ON_DELETION_EXPECTED 4 -#define ON_READER_EXPECTED 0 - -namespace CIAO_SL_ManyByMany_Receiver_Impl -{ - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - read_action_Generator::read_action_Generator (Receiver_exec_i &callback) - : pulse_callback_ (callback) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.read_all(); - return 0; - } - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx, - Atomic_Long &no_operation, - Atomic_Long &on_creation, - Atomic_Long &on_many_update, - Atomic_Long &on_many_upd_trigger, - Atomic_Long &on_deletion, - Atomic_Bool &create_data, - Atomic_Bool &update_data, - Atomic_Long &samples_read) - : ciao_context_ ( - ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx)) - , no_operation_ (no_operation) - , on_creation_ (on_creation) - , on_many_update_ (on_many_update) - , on_many_upd_trigger_ (on_many_upd_trigger) - , on_deletion_ (on_deletion) - , create_data_ (create_data) - , update_data_ (update_data) - , samples_read_ (samples_read) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::SL_ManyByMany::SLManyByManyConnector::StateListener - - void - info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - ++this->on_creation_; - ACE_Time_Value tv; - tv <<= info.source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_creation ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_creation : ") - ACE_TEXT ("Received datum for <%C> at %u\n"), - datum.key.in (), - datum.x)); - // One of the data must have the key 'KEY_1' with x == 1 - if (ACE_OS::strcmp (datum.key.in(), "KEY_1") == 0 && datum.x == 1L) - { - this->create_data_ = true; - } - } - - void - info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->no_operation_; - } - - void - info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_update triggered,") - ACE_TEXT (" received sequence of ") - ACE_TEXT ("<%u> samples\n"), - infos.length())); - //number of times this is triggered - this->on_many_upd_trigger_ ++; - - //number of total samples received - this->on_many_update_ += infos.length(); - for(CORBA::ULong i = 0; i < infos.length(); ++i) - { - if (infos[i].instance_status != CCM_DDS::INSTANCE_UPDATED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("info.instance_status ") - ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ") - ACE_TEXT ("with operation 'on_many_updates' ") - ACE_TEXT ("from StateListener in Receiver\n") - )); - - } - ACE_Time_Value tv; - tv <<= infos[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); - } - for (CORBA::ULong i = 0; i < data.length(); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates info : Number <%d> :") - ACE_TEXT (" received TestTopic_info ") - ACE_TEXT ("for <%C> at %u\n"), - i, - data[i].key.in (), - data[i].x)); - // one of the data must have the key 'KEY_1' with x == 2 - if (ACE_OS::strcmp(data[i].key,"KEY_1") == 0 && data[i].x == 2L) - { - this->update_data_ = true; - } - } - - // When we have received all updates, check if there is - // something left in the cache - if(this->on_many_update_.value () == ON_MANY_EXPECTED) - { - try - { - SL_ManyByMany::SLManyByManyConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_many_updates - " - "ERROR: Reader seems nil\n")); - } - ::TestTopicSeq seq; - ::CCM_DDS::ReadInfoSeq infos; - reader->read_all (seq, infos); - this->samples_read_ += seq.length (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_many_updates - ") - ACE_TEXT ("Read <%u> samples\n"), - seq.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - } - - void - info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - if (info.instance_status != CCM_DDS::INSTANCE_DELETED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("info.instance_status ") - ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' with operation ") - ACE_TEXT ("'on_deletion' from StateListener in Receiver\n") - )); - - } - else - { - // Because of the settings and - // in the QoS , we expect - // an existing datum.key - // Since these are RTI DDS specific QOS settings, we only need to test - // this in case RTI DDS -#if (CIAO_DDS4CCM_NDDS==1) - if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0 ) || - (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0 )) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ") - ACE_TEXT ("Received datum for <%C> \n"), - datum.key.in ())); - ++this->on_deletion_; - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR Statelistener:on_deletion : did not ") - ACE_TEXT ("receive the expected datum, received <%C>") - ACE_TEXT (", expected or \n"), - datum.key.in ())); - } -#else - ++this->on_deletion_; - ACE_UNUSED_ARG (datum); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ") - ACE_TEXT ("Received on_deletion event\n"))); - -#endif - } - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : no_operation_ (0) - , on_creation_ (0) - , on_many_update_ (0) - , on_many_upd_trigger_ (0) - , on_deletion_ (0) - , create_data_ (false) - , update_data_ (false) - , reader_data_ (0) - , samples_read_ (0) - { - ACE_NEW_THROW_EX (this->ticker_, - read_action_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Receiver_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Receiver_exec_i::read_all (void) - { - ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - - if ( ::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " - "Reader seems nil\n")); - return; - } - try - { - TestTopicSeq TestTopic_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - reader->read_all (TestTopic_infos, readinfoseq); - this->reader_data_ += TestTopic_infos.length (); - for (CORBA::ULong i = 0; i < readinfoseq.length (); ++i) - { - ACE_Time_Value tv; - tv <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); - } - for (CORBA::ULong i = 0; i < TestTopic_infos.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL info : ") - ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"), - i, - TestTopic_infos[i].key.in (), - TestTopic_infos[i].x)); - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - " - "internal error or no data\n")); - } - } - // Component attributes and port operations. - - ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->no_operation_, - this->on_creation_, - this->on_many_update_, - this->on_many_upd_trigger_, - this->on_deletion_, - this->create_data_, - this->update_data_, - this->samples_read_), - ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_ManyByMany::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::StateListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - " - "ERROR: Listener control receptacle is null!\n")); - throw ::CORBA::INTERNAL (); - } - - lc->mode (::CCM_DDS::MANY_BY_MANY); - if (this->reactor ()->schedule_timer (this->ticker_, - 0, - ACE_Time_Value(18, 0), - ACE_Time_Value(1, 0)) == -1) - // ACE_Time_Value(1, 0), - // ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - " - "ERROR: Unable to schedule timer!\n")); - } - } - - void - Receiver_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->no_operation_.value () > 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive an unexpected ") - ACE_TEXT ("operation 'on_one_update' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did not receive an unexpected ") - ACE_TEXT ("operation 'on_one_update' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - - if (this->on_creation_.value () != ON_CREATION_EXPECTED) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("number of 'on_creation' calls: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_CREATION_EXPECTED, - this->on_creation_.value () - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ") - ACE_TEXT ("number of 'on_creation' calls: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_CREATION_EXPECTED, - this->on_creation_.value () - )); - } - - if (!this->create_data_ .value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("sample in 'on_creation' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ") - ACE_TEXT ("sample in 'on_creation' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - - if(this->on_many_upd_trigger_.value () < ON_MANY_TRIGGERED) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't trigger the expected ") - ACE_TEXT ("number of 'on_many_update': ") - ACE_TEXT ("expected minimum <%d> - received <%d>\n"), - ON_MANY_TRIGGERED, - this->on_many_upd_trigger_.value () - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did trigger the minimum expected ") - ACE_TEXT ("number of 'on_many_update': ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_MANY_TRIGGERED, - this->on_many_upd_trigger_.value () - )); - } - if(this->on_many_update_.value () != ON_MANY_EXPECTED) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("number of 'on_many_update' samples: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_MANY_EXPECTED, - this->on_many_update_.value () - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ") - ACE_TEXT ("number of 'on_many_update' samples: ") - ACE_TEXT ("expected <%d> - received <%d>, ") - ACE_TEXT ("on_many_update triggered at <%d> times.\n"), - ON_MANY_EXPECTED, - this->on_many_update_.value (), - ON_MANY_TRIGGERED - )); - } - - if (!this->update_data_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR:didn't receive the expected ") - ACE_TEXT (" data with 'on_many_updates' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ") - ACE_TEXT ("sample in 'on_many_updates' from ") - ACE_TEXT ("StateListener in Receiver\n") - )); - } - - if (this->on_deletion_.value () != ON_DELETION_EXPECTED) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("number of 'on_deletion' calls: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_DELETION_EXPECTED, - this->on_deletion_.value () - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ") - ACE_TEXT ("number of 'on_deletion' calls: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_DELETION_EXPECTED, - this->on_deletion_.value () - )); - } - - if (this->reader_data_.value () != ON_READER_EXPECTED) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't read the expected ") - ACE_TEXT ("number of samples: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_READER_EXPECTED, - this->reader_data_.value () - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read the expected ") - ACE_TEXT ("number of samples: ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_READER_EXPECTED, - this->reader_data_.value () - )); - } - if (this->samples_read_.value () == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"), - this->samples_read_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_ManyByMany_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h deleted file mode 100644 index 03cb9f7ed7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h +++ /dev/null @@ -1,208 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_ -#define CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_ - -#include /**/ "ace/pre.h" - -#include "SL_ManyByMany_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_ManyByMany_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - typedef ACE_Atomic_Op Atomic_Bool; - - class Receiver_exec_i; - - /** - * Read action generator - */ - - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback); - - ~read_action_Generator (); - - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - private: - /// Maintains a handle that actually process the event - Receiver_exec_i &pulse_callback_; - - }; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx, - Atomic_Long &no_operation, - Atomic_Long &on_creation, - Atomic_Long &on_many_update, - Atomic_Long &on_many_upd_trigger, - Atomic_Long &on_deletion, - Atomic_Bool &create_data, - Atomic_Bool &update_data, - Atomic_Long &samples_read); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from SL_ManyByMany::SLManyByManyConnector::StateListener. */ - - virtual - void on_creation (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_; - Atomic_Long &no_operation_; - Atomic_Long &on_creation_; - Atomic_Long &on_many_update_; - Atomic_Long &on_many_upd_trigger_; - Atomic_Long &on_deletion_; - Atomic_Bool &create_data_; - Atomic_Bool &update_data_; - Atomic_Long &samples_read_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void read_all(void); - - //@} - - private: - ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - read_action_Generator * ticker_; - - Atomic_Long no_operation_; - Atomic_Long on_creation_; - Atomic_Long on_many_update_; - Atomic_Long on_many_upd_trigger_; - Atomic_Long on_deletion_; - Atomic_Bool create_data_; - Atomic_Bool update_data_; - Atomic_Long reader_data_; - Atomic_Long samples_read_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_ManyByMany_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl deleted file mode 100644 index b823417508f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_SL_MANYBYMANY_SENDER_IDL -#define DDS_SL_MANYBYMANY_SENDER_IDL - -#include "Connector/SL_ManyByMany_Connector.idl" - -module SL_ManyByMany -{ - component Sender - { - port ::SL_ManyByMany::SLManyByManyConnector::DDS_Update test_topic_update; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc deleted file mode 100644 index 4b24d1979fe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SL_MBM_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - SL_ManyByMany_Sender.idl - } -} - -project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_ManyByMany_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - SL_ManyByMany_SenderE.idl - } -} - -project(DDS_SL_ManyByMany_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_ManyByMany_Sender_lem_gen DDS_SL_ManyByMany_Sender_stub DDS_SL_ManyByMany_Base_stub - libs += DDS_SL_ManyByMany_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_SenderEC.cpp - } - - Header_Files { - SL_ManyByMany_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - SL_ManyByMany_SenderEC.inl - } -} - -project(DDS_SL_ManyByMany_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_ManyByMany_Sender_idl_gen DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub - libs += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_SenderC.cpp - } - - Header_Files { - SL_ManyByMany_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - SL_ManyByMany_SenderC.inl - } -} - -project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Sender_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_Sender_exec.cpp - } - - Header_Files { - SL_ManyByMany_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_SenderS.cpp - SL_ManyByMany_Sender_svnt.cpp - } - - Header_Files { - SL_ManyByMany_SenderS.h - SL_ManyByMany_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp deleted file mode 100644 index 95900c0c10e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp +++ /dev/null @@ -1,544 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "SL_ManyByMany_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_SL_ManyByMany_Sender_Impl -{ - /** - * Write action generator - */ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - /** - * ConnectorStatusListener_exec_i - */ - - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->callback_.get_started (); - } - } - - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE) - , test_ok_(true) - , started_ (false) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CORBA::Boolean - Sender_exec_i::create_one (void) - { - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->create_one (i); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("SL_ManyByMany: create_one with instance key ") - ACE_TEXT (" <%C>\n"), - i.key.in ())); - } - catch (const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated ") - ACE_TEXT ("with test updater create_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while create_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::update_one (void) - { - //update already created instance with handle nil - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - " - "ERROR: Updater seems nil\n")); - return false; - } - i.x++; - updater->update_one (i, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Updater: update_one with already existing ") - ACE_TEXT ("instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in ())); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ") - ACE_TEXT ("with test updater update_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::delete_one (void) - { - //delete registered instance with DDS::HANDLE_NIL - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered ") - ACE_TEXT ("instance with DDS::HANDLE_NIL, ") - ACE_TEXT ("key <%C>\n"), - i.key.in ())); - updater->delete_one(i, DDS::HANDLE_NIL); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ") - ACE_TEXT ("with test updater delete_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::create_many (void) - { - //create many with no exception - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->create_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: ") - ACE_TEXT ("NonExistent with test updater create_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::update_many (void) - { - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - " - "ERROR: Updater seems nil\n")); - return false; - } - for(CORBA::ULong i = 0; i < this->topic_seq_many_.length(); i++) - { - this->topic_seq_many_[i].x= i+ 10; - } - updater->update_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->is_coherent_write (false); - - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - return true; - } - - ::CORBA::Boolean - Sender_exec_i::delete_many (void) - { - try - { - ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->delete_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ") - ACE_TEXT ("with test updater delete_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with test updater delete_many:") - ACE_TEXT ("index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - - return true; - } - - void - Sender_exec_i::add_instances_of_topic (void) - { - CORBA::UShort total = 3; - this->topic_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "many_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick (void) - { - if (this->test_ok_.value ()) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one (); - if(this->test_ok_.value ()) - { - this->test_nr_ = UPDATE_ONE; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one (); - this->test_nr_ = DELETE_ONE; - break; - case DELETE_ONE: - this->test_ok_ = this->delete_one (); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many (); - if(this->test_ok_.value ()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many (); - this->test_nr_ = DELETE_MANY; - break; - case DELETE_MANY: - this->test_ok_ = this->delete_many (); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - } - - void - Sender_exec_i::get_started (void) - { - this->started_ = true; - this->add_instances_of_topic (); - this->start (); - } - - void - Sender_exec_i::start (void) - { - long sec = 2L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_ManyByMany::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - - if (!this->started_) - { - ACE_ERROR ((LM_ERROR, - "Sender_exec_i::ccm_passivate - " - "ERROR: No publication matched received. " - "Test didn't run\n")); - } - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_ManyByMany_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h deleted file mode 100644 index 0c5b23f1ad4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h +++ /dev/null @@ -1,187 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_ -#define CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_ - -#include /**/ "ace/pre.h" - -#include "SL_ManyByMany_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_ManyByMany_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - enum UPDATER_TEST { - UPDATE_CREATE, - UPDATE_ONE, - DELETE_ONE, - CREATE_MANY, - UPDATE_MANY, - DELETE_MANY, - END_TEST - }; - - /** - * Write action generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * ConnectorStatusListener_exec_i - */ - - class ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void get_started (void); - void tick (void); - //@} - - private: - ::SL_ManyByMany::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - UPDATER_TEST test_nr_; - Atomic_Boolean test_ok_; - - TestTopicSeq topic_seq_one_; - TestTopicSeq topic_seq_many_; - - bool started_; - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - void add_instances_of_topic (void); - - ::CORBA::Boolean create_one (void); - ::CORBA::Boolean update_one (void); - ::CORBA::Boolean delete_one (void); - ::CORBA::Boolean create_many (void); - ::CORBA::Boolean update_many (void); - ::CORBA::Boolean delete_many (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_ManyByMany_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp deleted file mode 100644 index 8ec10347d57..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp +++ /dev/null @@ -1,407 +0,0 @@ - - - - SL_ManyByMany_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_ManyByMany_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_ManyByMany_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - SL_ManyByMany_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - SL_ManyByMany_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - SL_ManyByMany_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_ManyByMany_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_ManyByMany_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - SL_ManyByMany_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - SlMbM_Library#SlMbMProfile - - - - - - SL_ManyByMany_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - SlMbM_Library#SlMbMProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - _statelistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - SL_ManyByMany_Connector_exec - - - DDS_SL_ManyByMany_Connector_exec - - - SL_ManyByMany_Connector_svnt - - - DDS_SL_ManyByMany_Connector_svnt - - - SL_ManyByMany_Connector_stub - - - DDS_SL_ManyByMany_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml deleted file mode 100644 index 2080a71ca1e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index ab40e123e60..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - 10 - - BOOLEAN_TRUE - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - BOOLEAN_TRUE - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl deleted file mode 100755 index c5b1964e047..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl deleted file mode 100644 index 551272ab7ec..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file SL_OneByOne_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_ONEBYONE_BASE_IDL -#define SL_ONEBYONE_BASE_IDL - -#pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h" -#pragma opendds typesupport "Base/SL_OneByOne_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc deleted file mode 100644 index 2e9e3dc6f6c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SL_OneByOne_Base_stub - dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \ - -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - SL_OneByOne_Base.idl - } - - opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export - - DDSGenerator_Files { - SL_OneByOne_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc deleted file mode 100644 index b135115a86b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector" - -project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SL_OneByOne_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=SL_OneByOne_Connector_stub_export.h \ - -Wb,skel_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=SL_OneByOne_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=SL_OneByOne_Connector_svnt_export.h \ - -Wb,conn_export_macro=SL_ONEBYONE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=SL_OneByOne_Connector_conn_export.h \ - -I .. - - IDL_Files { - SL_OneByOne_Connector.idl - } -} - -project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_OBO_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=SL_OneByOne_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - SL_OneByOne_ConnectorE.idl - } -} - -project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub - libs += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_OBO_Connector_lem_stub - dynamicflags += SL_ONEBYONE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ConnectorEC.cpp - } - - Header_Files { - SL_OneByOne_ConnectorEC.h - SL_OneByOne_Connector_lem_stub_export.h - } - - Inline_Files { - SL_OneByOne_ConnectorEC.inl - } -} - -project(DDS_SL_OneByOne_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_OBO_Connector_idl_gen DDS_SL_OneByOne_Base_stub - libs += DDS_SL_OneByOne_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SL_OneByOne_Connector_stub - dynamicflags += SL_ONEBYONE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ConnectorC.cpp - } - - Header_Files { - SL_OneByOne_ConnectorC.h - SL_OneByOne_Connector_stub_export.h - } - - Inline_Files { - SL_OneByOne_ConnectorC.inl - } -} - -project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub - sharedname = DDS_SL_OneByOne_Connector_exec - libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_ONEBYONE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_Connector_conn.cpp - } - - Header_Files { - SL_OneByOne_Connector_conn.h - SL_OneByOne_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub - sharedname = DDS_SL_OneByOne_Connector_svnt - libs += DDS_SL_OneByOne_Connector_stub \ - DDS_SL_OBO_Connector_lem_stub \ - DDS_SL_OneByOne_Base_stub \ - DDS_SL_OneByOne_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SL_ONEBYONE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ConnectorS.cpp - SL_OneByOne_Connector_svnt.cpp - } - - Header_Files { - SL_OneByOne_ConnectorS.h - SL_OneByOne_Connector_svnt.h - SL_OneByOne_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl deleted file mode 100644 index 3c00070f29c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file SL_OneByOne_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef SL_ONEBYONE_CONNECTOR_IDL_ -#define SL_ONEBYONE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/SL_OneByOne_Base.idl" - -#pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/SL_OneByOne_BaseTypeSupport.idl" -#endif - -module SL_OneByOne -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_OneByOneConnector; -}; - -#endif /* SL_OneByOne_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl deleted file mode 100644 index 60bb6a4d68d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/SL_OneByOne_Connector.idl" - -module SL_OneByOne -{ - component Receiver - { - port SL_OneByOneConnector::DDS_StateListen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc deleted file mode 100644 index ca67a723ed7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SL_OBO_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - SL_OneByOne_Receiver.idl - } -} - -project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_OneByOne_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - SL_OneByOne_ReceiverE.idl - } -} - -project(DDS_SL_OBO_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_OneByOne_Receiver_lem_gen DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub - libs += Receiver_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ReceiverEC.cpp - } - - Header_Files { - SL_OneByOne_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - SL_OneByOne_ReceiverEC.inl - } -} - -project(DDS_SL_OneByOne_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_OneByOne_Receiver_idl_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_gen - libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ReceiverC.cpp - } - - Header_Files { - SL_OneByOne_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - SL_OneByOne_ReceiverC.inl - } -} - -project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_Receiver_exec.cpp - } - - Header_Files { - SL_OneByOne_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_ReceiverS.cpp - SL_OneByOne_Receiver_svnt.cpp - } - - Header_Files { - SL_OneByOne_ReceiverS.h - SL_OneByOne_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp deleted file mode 100644 index 76c657248b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp +++ /dev/null @@ -1,455 +0,0 @@ -// -*- C++ -*- -#include "SL_OneByOne_Receiver_exec.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -#define ON_CREATION_EXPECTED 4 -#define ON_ONE_UPDATE_EXPECTED 4 -#define ON_DELETION_EXPECTED 4 - -namespace CIAO_SL_OneByOne_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::SL_OneByOne::CCM_Receiver_Context_ptr ctx, - Atomic_Long &on_many_updates, - Atomic_Long &on_creation, - Atomic_Long &on_one_update, - Atomic_Long &on_deletion, - Atomic_Long &samples_read, - ACE_Thread_ID &thread_id) - : ciao_context_ ( - ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx)) - , on_many_updates_ (on_many_updates) - , on_creation_ (on_creation) - , on_one_update_ (on_one_update) - , on_deletion_ (on_deletion) - , samples_read_ (samples_read) - , thread_id_ (thread_id) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::SL_OneByOne::SL_OneByOneConnector::StateListener - - void - info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - if (!datum.key.in() == 0 && - info.instance_status == CCM_DDS::INSTANCE_CREATED) - { - ++this->on_creation_; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_creation - ") - ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"), - datum.key.in (), - datum.x)); - } - - void - info_out_data_listener_exec_i::on_one_update (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - if (info.instance_status != CCM_DDS::INSTANCE_UPDATED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: did not receive the expected info.status ") - ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ") - ACE_TEXT ("with operation 'on_one_update' ") - ACE_TEXT ("from StateListener in Receiver\n"))); - - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ") - ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"), - datum.key.in (), - datum.x)); - - if (!datum.key.in() == 0 && - info.instance_status == CCM_DDS::INSTANCE_UPDATED) - { - ++this->on_one_update_; - } - - // When we have received all updates, check if there is something - // left in the cache - if (this->on_one_update_.value () == ON_ONE_UPDATE_EXPECTED) - { - try - { - ::SL_OneByOne::SL_OneByOneConnector::Reader_var reader = - this->ciao_context_->get_connection_info_out_data (); - if (::CORBA::is_nil (reader.in ())) - { - ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_one_update - " - "ERROR: Reader seems nil\n")); - } - ::TestTopicSeq seq; - ::CCM_DDS::ReadInfoSeq infos; - reader->read_all (seq, infos); - this->samples_read_ += seq.length (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ") - ACE_TEXT ("Read <%u> samples\n"), - seq.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - } - } - - void - info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & infos) - { - this->on_many_updates_ += infos.length (); - } - - void - info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - if (info.instance_status != CCM_DDS::INSTANCE_DELETED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: did not receive the expected info.status ") - ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' ") - ACE_TEXT ("with operation 'on_deletion' ") - ACE_TEXT ("from StateListener in Receiver\n"))); - - } - else - { - // Because of the settings and - // in the QoS , we expect - // an existing datum.key - // Since these are RTI DDS specific QOS settings, we only need to test - // this in case RTI DDS -#if (CIAO_DDS4CCM_NDDS==1) - if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0 ) || - (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0 )) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ") - ACE_TEXT ("Received datum for <%C> \n"), - datum.key.in ())); - ++this->on_deletion_; - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR Statelistener:on_deletion : did not ") - ACE_TEXT ("receive the expected datum, received <%C>") - ACE_TEXT (", expected or \n"), - datum.key.in ())); - } -#else - ACE_UNUSED_ARG (datum); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ") - ACE_TEXT ("Received on_deletion event\n"))); - ++this->on_deletion_; -#endif - } - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::SL_OneByOne::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : on_many_updates_ (0), - updater_data_ (0), - on_creation_ (0), - on_one_update_ (0), - on_deletion_ (0), - samples_read_ (0), - thread_id_listener_ (0, 0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->on_many_updates_, - this->on_creation_, - this->on_one_update_, - this->on_deletion_, - this->samples_read_, - this->thread_id_listener_), - ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_OneByOne::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::StateListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->on_many_updates_.value () != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Received an unexpected ") - ACE_TEXT ("number of samples on 'on_many_updates' ") - ACE_TEXT ("expected <0> - received <%d>\n"), - this->on_many_updates_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK: Received the expected ") - ACE_TEXT ("number of samples on 'on_many_updates' ") - ACE_TEXT ("expected <0> - received <%d>\n"), - this->on_many_updates_.value ())); - } - if (this->on_creation_.value () != ON_CREATION_EXPECTED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT (" number of samples on 'on_creation' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_CREATION_EXPECTED, - this->on_creation_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK: Received the expected ") - ACE_TEXT ("number of samples on 'on_creation' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_CREATION_EXPECTED, - this->on_creation_.value ())); - } - - if (this->on_one_update_.value () != ON_ONE_UPDATE_EXPECTED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT (" number of samples on 'on_one_update' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_ONE_UPDATE_EXPECTED, - this->on_one_update_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK: Received the expected ") - ACE_TEXT ("number of samples on 'on_one_update' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_ONE_UPDATE_EXPECTED, - this->on_one_update_.value ())); - } - - if (this->on_deletion_.value () != ON_DELETION_EXPECTED) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("number of samples on 'on_deletion' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_DELETION_EXPECTED, - this->on_deletion_.value ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("OK: Received the expected ") - ACE_TEXT ("number of samples on 'on_deletion' ") - ACE_TEXT ("expected <%d> - received <%d>\n"), - ON_DELETION_EXPECTED, - this->on_deletion_.value ())); - } - if (this->samples_read_.value () == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"), - this->samples_read_.value ())); - } - - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string (list_buf); - - - if (this->thread_id_listener_.id () == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for StatusListener not set!\n")); - } - #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "OK: " - "Thread switch for StatusListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread switch for StatusListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: StatusListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: StatusListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_OneByOne_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h deleted file mode 100644 index d86034c23bd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_ -#define CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_ - -#include /**/ "ace/pre.h" - -#include "SL_OneByOne_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_OneByOne_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Long; - - class Receiver_exec_i; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::SL_OneByOne::CCM_Receiver_Context_ptr ctx, - Atomic_Long &, - Atomic_Long &, - Atomic_Long &, - Atomic_Long &, - Atomic_Long &, - ACE_Thread_ID &); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from SL_OneByOne::SL_OneByOneConnector::StateListener. */ - - virtual - void on_creation (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_one_update (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_updates (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - - virtual - void on_deletion (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - //@} - - private: - ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_; - Atomic_Long &on_many_updates_; - Atomic_Long &on_creation_; - Atomic_Long &on_one_update_; - Atomic_Long &on_deletion_; - Atomic_Long &samples_read_; - ACE_Thread_ID &thread_id_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::SL_OneByOne::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_; - Atomic_Long on_many_updates_; - Atomic_Long updater_data_; - Atomic_Long on_creation_; - Atomic_Long on_one_update_; - Atomic_Long on_deletion_; - ACE_Thread_ID thread_id_listener_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - Atomic_Long on_many_updates_; - Atomic_Long updater_data_; - Atomic_Long on_creation_; - Atomic_Long on_one_update_; - Atomic_Long on_deletion_; - Atomic_Long samples_read_; - ACE_Thread_ID thread_id_listener_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_OneByOne_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl deleted file mode 100644 index 523b6d61086..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_SL_ONEBYONE_SENDER_IDL -#define DDS_SL_ONEBYONE_SENDER_IDL - -#include "Connector/SL_OneByOne_Connector.idl" - -module SL_OneByOne -{ - component Sender - { - port SL_OneByOneConnector::DDS_Update test_topic_update; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc deleted file mode 100644 index e3710cc20e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SL_OBO_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - SL_OneByOne_Sender.idl - } -} - -project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SL_OneByOne_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - SL_OneByOne_SenderE.idl - } -} - -project(DDS_SL_OneByOne_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_OneByOne_Sender_lem_gen DDS_SL_OneByOne_Sender_stub DDS_SL_OneByOne_Base_stub - libs += DDS_SL_OneByOne_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_SenderEC.cpp - } - - Header_Files { - SL_OneByOne_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - SL_OneByOne_SenderEC.inl - } -} - -project(DDS_SL_OneByOne_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_SL_OneByOne_Sender_idl_gen DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub - libs += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_SenderC.cpp - } - - Header_Files { - SL_OneByOne_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - SL_OneByOne_SenderC.inl - } -} - -project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Sender_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_Sender_exec.cpp - } - - Header_Files { - SL_OneByOne_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_SenderS.cpp - SL_OneByOne_Sender_svnt.cpp - } - - Header_Files { - SL_OneByOne_SenderS.h - SL_OneByOne_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp deleted file mode 100644 index 408858409d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp +++ /dev/null @@ -1,482 +0,0 @@ -// -*- C++ -*- -#include "SL_OneByOne_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_SL_OneByOne_Sender_Impl -{ - /** - * Write action generator - */ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * ConnectorStatusListener_exec_i - */ - - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->callback_.start (); - } - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE), - test_ok_(true) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - CORBA::Boolean - Sender_exec_i::create_one (void) - { - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->create_one (i); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_OneByOne: create_one with instance key <%C>\n"), - i.key.in ())); - } - catch (const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while create_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::update_one (void) - { - //update already created instance with handle nil - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->update_one (i, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in ())); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::delete_one (void) - { - //delete registered instance with DDS::HANDLE_NIL - TestTopic i = this->topic_seq_one_[0]; - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in ())); - updater->delete_one (i, DDS::HANDLE_NIL); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::create_many (void) - { - //create many with no exception - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->create_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - - } - return true; - } - - CORBA::Boolean - Sender_exec_i::update_many (void) - { - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - " - "ERROR: Updater seems nil\n")); - return false; - } - updater->update_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_seq_many_.length ())); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::delete_many (void) - { - try - { - ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (::CORBA::is_nil (updater.in ())) - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - " - "ERROR: Updater seems nil\n")); - return false; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->delete_many (this->topic_seq_many_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - - return true; - } - - void - Sender_exec_i::add_instances_of_topic () - { - CORBA::UShort total = 3; - this->topic_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "many_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick () - { - if(this->test_ok_.value()) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_ONE; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one(); - this->test_nr_ = DELETE_ONE; - break; - case DELETE_ONE: - this->test_ok_ = this->delete_one(); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many(); - this->test_nr_ = DELETE_MANY; - break; - case DELETE_MANY: - this->test_ok_ = this->delete_many(); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - } - void - Sender_exec_i::start (void) - { - long sec = 1L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::SL_OneByOne::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - this->add_instances_of_topic (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_OneByOne_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h deleted file mode 100644 index 3fc8c6f80c7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h +++ /dev/null @@ -1,160 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_ -#define CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_ - -#include /**/ "ace/pre.h" - -#include "SL_OneByOne_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_SL_OneByOne_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - enum UPDATER_TEST { - UPDATE_CREATE, - UPDATE_ONE, - DELETE_ONE, - CREATE_MANY, - UPDATE_MANY, - DELETE_MANY, - END_TEST - }; - - /** - * Write action generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * ConnectorStatusListener_exec_i - */ - - class ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void start (void); - //@} - - private: - ::SL_OneByOne::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - UPDATER_TEST test_nr_; - Atomic_Boolean test_ok_; - TestTopicSeq topic_seq_one_; - TestTopicSeq topic_seq_many_; - - //@} - - //@{ - /** User defined private operations. */ - void stop (void); - void add_instances_of_topic (void); - CORBA::Boolean create_one (void); - CORBA::Boolean update_one (void); - CORBA::Boolean delete_one (void); - CORBA::Boolean create_many (void); - CORBA::Boolean update_many (void); - CORBA::Boolean delete_many (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SL_OneByOne_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp deleted file mode 100644 index fa41bb138c5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp +++ /dev/null @@ -1,407 +0,0 @@ - - - - SL_OneByOne_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_OneByOne_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_OneByOne_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - SL_OneByOne_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - SL_OneByOne_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - SL_OneByOne_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_SL_OneByOne_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SL_OneByOne_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - SL_OneByOne_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - SlObO_Library#SlObOProfile - - - - - - SL_OneByOne_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - qos_profile - - - tk_string - - - SlObO_Library#SlObOProfile - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - _statelistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - SL_OneByOne_Connector_exec - - - DDS_SL_OneByOne_Connector_exec - - - SL_OneByOne_Connector_svnt - - - DDS_SL_OneByOne_Connector_svnt - - - SL_OneByOne_Connector_stub - - - DDS_SL_OneByOne_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml deleted file mode 100644 index cb7c60bad56..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index f246058c89d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - - 10 - - BOOLEAN_TRUE - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 4 - 4 - 25 - 10 - 5 - - - BOOLEAN_TRUE - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl deleted file mode 100755 index e83fc426475..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 20 seconds to allow task to complete\n"; -sleep (20); - -# 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\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/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl deleted file mode 100644 index 05209b3e2a5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file SetConnectorAttribute_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SETCONNECTORATTRIBUTE_BASE_IDL -#define SETCONNECTORATTRIBUTE_BASE_IDL - -#pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h" -#pragma opendds typesupport "Base/SetConnectorAttribute_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "SetConnectorAttributeTest" - -struct SetConnectorAttributeTest { - string key; - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SetConnectorAttributeTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc deleted file mode 100644 index fff9c36f8b5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SCABase_stub - dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \ - -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - SetConnectorAttribute_Base.idl - } - - opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export - - DDSGenerator_Files { - SetConnectorAttribute_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore deleted file mode 100644 index fb87effb565..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Component_exec_export.h -/Component_lem_stub_export.h -/Component_stub_export.h -/Component_svnt_export.h -/SetConnectorAttribute_ComponentE.idl diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl deleted file mode 100644 index 1a8a3b78706..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file SetConnectorAttribute_Component.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/SetConnectorAttribute_Connector.idl" - -module SetConnectorAttribute -{ - component SetConnectorAttributeComponent - { - port SetConnectorAttributeTestConnector::DDS_Write info_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc deleted file mode 100644 index 9decee0420d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(SetAttribute_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SCAConnector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - SetConnectorAttribute_Component.idl - } -} - -project(SetAttribute_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += SetAttribute_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - SetConnectorAttribute_ComponentE.idl - } -} - -project(SetAttribute_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += SetAttribute_Component_lem_gen SetAttribute_Component_stub \ - DDS_SCAConnector_stub DDS_SCABase_stub - libs += Component_stub DDS_SCAConnector_stub \ - DDS_SCABase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ComponentEC.cpp - } - - Header_Files { - SetConnectorAttribute_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - SetAttribute_ComponentEC.inl - } -} - -project(SetAttribute_Component_stub) : ccm_stub, dds4ccm_base { - after += SetAttribute_Component_idl_gen DDS_SCAConnector_stub \ - DDS_SCABase_stub DDS_SCAConnector_lem_gen - libs += DDS_SCAConnector_stub DDS_SCABase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ComponentC.cpp - } - - Header_Files { - SetConnectorAttribute_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - SetConnectorAttribute_ComponentC.inl - } -} - -project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_impl { - after += SetAttribute_Component_lem_stub SetAttribute_Component_stub \ - DDS_SCABase_stub DDS_SCAConnector_stub \ - DDS_SCAConnector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub DDS_SCABase_stub \ - DDS_SCAConnector_stub DDS_SCAConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_Component_exec.cpp - } - - Header_Files { - SetConnectorAttribute_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += SetAttribute_Component_lem_stub DDS_SCABase_stub \ - DDS_SCAConnector_stub DDS_SCAConnector_svnt \ - SetAttribute_Component_exec DDS_SCAConnector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub DDS_SCABase_stub \ - DDS_SCAConnector_stub DDS_SCAConnector_svnt \ - Component_exec DDS_SCAConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ComponentS.cpp - SetConnectorAttribute_Component_svnt.cpp - } - - Header_Files { - SetConnectorAttribute_ComponentS.h - SetConnectorAttribute_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp deleted file mode 100644 index 35a19a25c41..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp +++ /dev/null @@ -1,203 +0,0 @@ -// -*- C++ -*- -#include "SetConnectorAttribute_Component_exec.h" -#include "Connector/SetConnectorAttribute_Connector_conn.h" - -#include "dds4ccm/impl/Utils.h" -#if (CIAO_DDS4CCM_NDDS == 1) -#include "dds4ccm/impl/ndds/DataWriter_T.h" -#include "Base/SetConnectorAttribute_BaseSupport.h" -#endif - -#define DOMAIN_ID_IN_DP 56 -#define TOPIC_NAME_IN_DP "SetConnectorAttribute" - -#define DW_MAX_BLOCKING_TIME_SEC 11 -#define DW_MAX_BLOCKING_TIME_NSEC 200 - -namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - void - Component_exec_i::check_topic_name (DDSTopic * tp) - { -#if (CIAO_DDS4CCM_NDDS == 1) - if (ACE_OS::strcmp (tp->get_name (), TOPIC_NAME_IN_DP) == 0) - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_topic_name - " - "Topic name set properly.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_topic_name - " - "Topic name not properly set: " - "expected <%C> - retrieved <%C>\n", - TOPIC_NAME_IN_DP, - tp->get_name ())); - } -#else - ACE_UNUSED_ARG (tp); -#endif - } - - void - Component_exec_i::check_domain_id (DDSPublisher * pub) - { -#if (CIAO_DDS4CCM_NDDS == 1) - DDSDomainParticipant * part = pub->get_participant (); - if (part->get_domain_id () != DOMAIN_ID_IN_DP) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_domain_id - " - "ERROR: Domain ID not set properly: " - "expected <%u> - retrieved <%u>\n", - DOMAIN_ID_IN_DP, - part->get_domain_id ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_domain_id - " - "Domain ID set properly.\n")); - } -#else - ACE_UNUSED_ARG (pub); -#endif - } - - void - Component_exec_i::check_attributes (DDSDataWriter * dw) - { -#if (CIAO_DDS4CCM_NDDS == 1) - // Check topic name - DDSTopic * tp = dw->get_topic (); - if (!tp) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - " - "Unable to retrieve topic.\n")); - } - else - { - this->check_topic_name (tp); - } - //check domain id - ::DDSPublisher * pub = dw->get_publisher (); - if (!pub) - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - " - "Unable to retrieve Publisher.\n")); - } - else - { - this->check_domain_id (pub); - this->check_profile (pub); - } -#else - ACE_UNUSED_ARG (dw); -#endif - } - - void - Component_exec_i::check_profile (DDSPublisher * pub) - { -#if (CIAO_DDS4CCM_NDDS == 1) - DDS_DataWriterQos dw_qos; - pub->get_default_datawriter_qos (dw_qos); - if (dw_qos.reliability.max_blocking_time.sec == DW_MAX_BLOCKING_TIME_SEC && - dw_qos.reliability.max_blocking_time.nanosec == DW_MAX_BLOCKING_TIME_NSEC) - { - } - else - { - ACE_ERROR ((LM_ERROR, "Component_exec_i::check_profile - " - "ERROR: Profile not set properly: " - "expected sec <%u> - retrieved sec <%u> and " - "expected nanosec <%u> - retrieved nanosec <%u>\n", - dw_qos.reliability.max_blocking_time.sec, - DW_MAX_BLOCKING_TIME_SEC, - dw_qos.reliability.max_blocking_time.nanosec, - DW_MAX_BLOCKING_TIME_NSEC)); - } -#else - ACE_UNUSED_ARG (pub); -#endif - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { -#if (CIAO_DDS4CCM_NDDS == 1) - //check the settings on the connector - DDS::DataWriter_var dds_dw = - this->context_->get_connection_info_write_dds_entity (); - - typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; - DataWriter_type * ccm_dds_dw = dynamic_cast (dds_dw.in ()); - if (!ccm_dds_dw) - { - ACE_DEBUG ((LM_DEBUG, "ERROR: Component_exec_i::ccm_activate - " - "Unable to cast\n")); - return; - } - DDSDataWriter * dw = ccm_dds_dw->get_rti_entity (); - if (dw) - { - this->check_attributes (dw); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - " - "Unable to retrieve DDSDataWriter.\n")); - } -#endif - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SetConnectorAttribute_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h deleted file mode 100644 index 1b1cd59e460..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h +++ /dev/null @@ -1,61 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "SetConnectorAttribute_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -class DDSDataWriter; -class DDSPublisher; -class DDSTopic; - -namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual SetConnectorAttributeComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context_var context_; - - void check_attributes (DDSDataWriter * dw); - - void check_profile (DDSPublisher * pub); - - void check_topic_name (DDSTopic * tp); - - void check_domain_id (DDSPublisher * pub); - - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_SetConnectorAttribute_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl deleted file mode 100644 index a478d5e2387..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file SetConnectorAttribute_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SETCONNECTORATTRIBUTE_CONNECTOR_IDL_ -#define SETCONNECTORATTRIBUTE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/SetConnectorAttribute_Base.idl" - -#pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/SetConnectorAttribute_BaseTypeSupport.idl" -#endif - -module SetConnectorAttribute -{ - module ::CCM_DDS::Typed - < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq> - SetConnectorAttributeTestConnector; -}; - -#endif /* SetConnectorAttribute_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc deleted file mode 100644 index 2fe6f6b22dd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector" - -project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SCABase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=SetConnectorAttribute_Connector_stub_export.h \ - -Wb,skel_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=SetConnectorAttribute_Connector_svnt_export.h \ - -Wb,svnt_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=SetConnectorAttribute_Connector_svnt_export.h \ - -Wb,conn_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=SetConnectorAttribute_Connector_conn_export.h \ - -I .. - - IDL_Files { - SetConnectorAttribute_Connector.idl - } -} - -project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SCAConnector_idl_gen - idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=SetConnectorAttribute_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - SetConnectorAttribute_ConnectorE.idl - } -} - -project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub - libs += DDS_SCABase_stub DDS_SCAConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SCAConnector_lem_stub - dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ConnectorEC.cpp - } - - Header_Files { - SetConnectorAttribute_ConnectorEC.h - SetConnectorAttribute_Connector_lem_stub_export.h - } - - Inline_Files { - SetConnectorAttribute_ConnectorEC.inl - } -} - -project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SCAConnector_idl_gen DDS_SCABase_stub - libs += DDS_SCABase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SCAConnector_stub - dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ConnectorC.cpp - } - - Header_Files { - SetConnectorAttribute_ConnectorC.h - SetConnectorAttribute_Connector_stub_export.h - } - - Inline_Files { - SetConnectorAttribute_ConnectorC.inl - } -} - -project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS_SCABase_stub - sharedname = DDS_SCAConnector_exec - libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS_SCABase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_Connector_conn.cpp - } - - Header_Files { - SetConnectorAttribute_Connector_conn.h - SetConnectorAttribute_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub - sharedname = DDS_SCAConnector_svnt - libs += DDS_SCAConnector_stub \ - DDS_SCAConnector_lem_stub \ - DDS_SCABase_stub \ - DDS_SCAConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_ConnectorS.cpp - SetConnectorAttribute_Connector_svnt.cpp - } - - Header_Files { - SetConnectorAttribute_ConnectorS.h - SetConnectorAttribute_Connector_svnt.h - SetConnectorAttribute_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README deleted file mode 100644 index ac5e8d56583..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README +++ /dev/null @@ -1,15 +0,0 @@ - - -Tests whether the connector attribute are -properly set by the D&C framework. -The following connector attributes are defined in -the deployment plan: - * key_fields - * domain_id - * qos_profile - * topic_name - -On ccm_activate in the connector, these values -are checked. - -An error is reported for every mismatch. diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp deleted file mode 100644 index a71bb9d136f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp +++ /dev/null @@ -1,209 +0,0 @@ - - - - SetConnectorAttributeAttribute_Depl_1 - - - SetConnectorAttributeComponentmplementation - - - - - - component factory - - - tk_string - - - create_SetConnectorAttribute_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SetConnectorAttribute_SetConnectorAttributeComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - SetConnectorAttributeConnectorImplementation - - - - - - component factory - - - tk_string - - - create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - SetConnectorAttributeConnector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - SetConnectorAttributeConnector_exec - - - - - - - SetConnectorAttributeComponentInstance - ComponentNode - - - - - - - SetConnectorAttributeConnectorInstance - ComponentNode - - - - - topic_name - - - tk_string - - - SetConnectorAttribute - - - - - domain_id - - - tk_long - - - 56 - - - - - - - info_write_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - SetConnectorAttributeConnector_exec - - - DDS_SCAConnector_exec - - - SetConnectorAttributeConnector_svnt - - - DDS_SCAConnector_svnt - - - SetConnectorAttributeConnector_stub - - - DDS_SCAConnector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl deleted file mode 100755 index 445ce8b9d56..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode"); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 5 seconds to allow task to complete\n"; -sleep (5); - -# 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\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/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl deleted file mode 100644 index e40a2ddecf6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef BASE_IDL -#define BASE_IDL - -#pragma ndds typesupport "Base/BaseSupport.h" -#pragma opendds typesupport "Base/BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "SharedDPTest1" -#pragma DCPS_DATA_KEY "SharedDPTest1 key1" - -#pragma DCPS_DATA_TYPE "SharedDPTest2" -#pragma DCPS_DATA_KEY "SharedDPTest2 key2" - -#pragma DCPS_DATA_TYPE "SharedDPTest3" -#pragma DCPS_DATA_KEY "SharedDPTest3 key3" - -struct SharedDPTest1 { - string key1; - long iteration1; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest1Seq; -#endif - -struct SharedDPTest2 { - string key2; - long iteration2; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest2Seq; -#endif - -struct SharedDPTest3 { - string key3; - long iteration3; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest3Seq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc deleted file mode 100644 index 5b485527e6a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SharedDP_DDBase_stub - dynamicflags += BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=BASE_STUB_Export \ - -Wb,stub_export_include=Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Base.idl - } - - opendds_ts_flags += --export=BASE_STUB_Export - - DDSGenerator_Files { - Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl deleted file mode 100644 index b045aab8549..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_SHARED_DP_COMPONENT_IDL -#define DDS_SHARED_DP_COMPONENT_IDL - -#include "Connector1/Connector1.idl" -#include "Connector2/Connector2.idl" -#include "Connector3/Connector3.idl" - -module SharedDP -{ - component SharedDPComponent - { - port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1; - port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2; - port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc deleted file mode 100644 index a46e26c1bab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc +++ /dev/null @@ -1,152 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component" - -project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_Connector2_idl_gen \ - DDS_SharedDP_Connector3_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h \ - -I .. - - IDL_Files { - Component.idl - } -} - -project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SharedDP_DDComponent_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - ComponentE.idl - } -} - -project(DDS_SharedDP_DDComponent_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDP_DDComponent_lem_gen DDS_SharedDP_DDComponent_stub DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub Component_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentEC.cpp - } - - Header_Files { - ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - ComponentEC.inl - } -} - -project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDP_DDComponent_idl_gen DDS_SharedDP_DDBase_stub \ - DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector3_stub \ - DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector3_lem_gen - libs += DDS_SharedDP_DDBase_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentC.cpp - } - - Header_Files { - ComponentC.h - Component_stub_export.h - } - - Inline_Files { - ComponentC.inl - } -} - -project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \ - DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \ - DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \ - DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub DDS_SharedDP_DDBase_stub \ - DDS_Connector1_lem_stub DDS_Connector1_stub \ - DDS_Connector2_lem_stub DDS_Connector2_stub \ - DDS_Connector3_lem_stub DDS_Connector3_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Component_exec.cpp - } - - Header_Files { - Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - -project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SharedDP_DDBase_stub DDS_SharedDP_DDComponent_lem_stub \ - DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt DDS_SharedDP_Connector1_lem_stub \ - DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector2_svnt DDS_SharedDP_Connector2_lem_stub \ - DDS_SharedDP_Connector3_stub DDS_SharedDP_Connector3_svnt DDS_SharedDP_Connector3_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub \ - DDS_SharedDP_DDBase_stub \ - DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \ - DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \ - DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentS.cpp - Component_svnt.cpp - } - - Header_Files { - ComponentS.h - Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp deleted file mode 100644 index de9cd29dc28..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp +++ /dev/null @@ -1,317 +0,0 @@ -// -*- C++ -*- -#include "Component_exec.h" -#include "ace/Log_Msg.h" - -#include "Connector1/Connector1_conn.h" -#include "Connector2/Connector2_conn.h" -#include "Connector3/Connector3_conn.h" - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - //============================================================ - // Component Executor Implementation Class: Component_exec_i - //============================================================ - - Component_exec_i::Component_exec_i (void) - : dp1_hnd_ (DDS::HANDLE_NIL) - , dp2_hnd_ (DDS::HANDLE_NIL) - , dp3_hnd_ (DDS::HANDLE_NIL) - , dp1_ptr_ (DDS::DomainParticipant::_nil ()) - , dp2_ptr_ (DDS::DomainParticipant::_nil ()) - , dp3_ptr_ (DDS::DomainParticipant::_nil ()) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - void - Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - try - { - ::DDS::DataWriter_var dw1 = - this->context_->get_connection_write1_dds_entity (); - - if (::CORBA::is_nil (dw1.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 1 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ()); - - if (ccm_dw1) - { - ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp1_hnd_ = dp->get_instance_handle (); - this->dp1_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to CCM DataWriter 1\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n")); - } - - try - { - ::DDS::DataWriter_var dw2 = - this->context_->get_connection_write2_dds_entity (); - - if (::CORBA::is_nil (dw2.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 2 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ()); - - if (ccm_dw2) - { - ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp2_hnd_ = dp->get_instance_handle (); - this->dp2_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to CCM DataWriter 2\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n")); - } - - try - { - ::DDS::DataWriter_var dw3 = - this->context_->get_connection_write3_dds_entity (); - - if (::CORBA::is_nil (dw3.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 3 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ()); - - if (ccm_dw3) - { - ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - this->dp3_hnd_ = dp->get_instance_handle (); - this->dp3_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to CCM DataWriter 3\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n")); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - if (this->dp1_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 1 seems to be NIL\n")); - if (this->dp2_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 2 seems to be NIL\n")); - if (this->dp3_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 3 seems to be NIL\n")); - - if ((this->dp1_hnd_ != this->dp2_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ != this->dp2_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp1_hnd_ == this->dp3_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ == this->dp3_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to " - "share the same DomainParticipant\n")); - } - - if ((this->dp2_hnd_ == this->dp3_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp2_ptr_ == this->dp3_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 seems to " - "share the same DomainParticipant\n")); - } - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h deleted file mode 100644 index dfcc1d903e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - - -#include "ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -class DDSDomainParticipant; - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - class Component_exec_i - : public virtual SharedDPComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_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: - ::SharedDP::CCM_SharedDPComponent_Context_var context_; - - ::DDS::InstanceHandle_t dp1_hnd_; - ::DDS::InstanceHandle_t dp2_hnd_; - ::DDS::InstanceHandle_t dp3_hnd_; - ::DDS::DomainParticipant_ptr dp1_ptr_; - ::DDS::DomainParticipant_ptr dp2_ptr_; - ::DDS::DomainParticipant_ptr dp3_ptr_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl deleted file mode 100644 index 4afe620e7f1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file Connector1.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR1_IDL_ -#define SHARED_DP_CONNECTOR1_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector1/Connector1E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector1 -{ - module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector; -}; - - - -#endif /* SHARED_DP_CONNECTOR1_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc deleted file mode 100644 index d1e19f07670..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \ - -Wb,stub_export_include=Connector1_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \ - -Wb,skel_export_include=Connector1_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \ - -Wb,svnt_export_include=Connector1_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \ - -Wb,conn_export_include=Connector1_conn_export.h \ - -I .. - - IDL_Files { - Connector1.idl - } -} - -project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SharedDP_Connector1_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \ - -Wb,stub_export_include=Connector1_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector1E.idl - } -} - -project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector1_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector1_lem_stub - dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1EC.cpp - } - - Header_Files { - Connector1EC.h - Connector1_lem_stub_export.h - } - - Inline_Files { - Connector1EC.inl - } -} - -project(DDS_SharedDP_Connector1_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector1_stub - dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1C.cpp - } - - Header_Files { - Connector1C.h - Connector1_stub_export.h - } - - Inline_Files { - Connector1C.inl - } -} - -project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub - sharedname = DDS_Connector1_exec - libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1_conn.cpp - } - - Header_Files { - Connector1_conn.h - Connector1_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub - sharedname = DDS_Connector1_svnt - libs += DDS_Connector1_stub \ - DDS_Connector1_lem_stub \ - DDS_SharedDP_DDBase_stub \ - DDS_Connector1_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1S.cpp - Connector1_svnt.cpp - } - - Header_Files { - Connector1S.h - Connector1_svnt.h - Connector1_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl deleted file mode 100644 index f38a634b931..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Connector2.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR2_IDL_ -#define SHARED_DP_CONNECTOR2_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector2/Connector2E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector2 -{ - module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector; -}; - -#endif /* SHARED_DP_CONNECTOR2_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc deleted file mode 100644 index f3cff4041ac..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \ - -Wb,stub_export_include=Connector2_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \ - -Wb,skel_export_include=Connector2_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \ - -Wb,svnt_export_include=Connector2_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \ - -Wb,conn_export_include=Connector2_conn_export.h \ - -I .. - - IDL_Files { - Connector2.idl - } -} - -project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SharedDP_Connector2_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \ - -Wb,stub_export_include=Connector2_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector2E.idl - } -} - -project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector2_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector2_lem_stub - dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2EC.cpp - } - - Header_Files { - Connector2EC.h - Connector2_lem_stub_export.h - } - - Inline_Files { - Connector2EC.inl - } -} - -project(DDS_SharedDP_Connector2_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDP_Connector2_idl_gen DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector2_stub - dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2C.cpp - } - - Header_Files { - Connector2C.h - Connector2_stub_export.h - } - - Inline_Files { - Connector2C.inl - } -} - -project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub - sharedname = DDS_Connector2_exec - libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2_conn.cpp - } - - Header_Files { - Connector2_conn.h - Connector2_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub - sharedname = DDS_Connector2_svnt - libs += DDS_Connector2_stub \ - DDS_Connector2_lem_stub \ - DDS_SharedDP_DDBase_stub \ - DDS_Connector2_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2S.cpp - Connector2_svnt.cpp - } - - Header_Files { - Connector2S.h - Connector2_svnt.h - Connector2_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl deleted file mode 100644 index 19984701e26..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Connector3.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR3_IDL_ -#define SHARED_DP_CONNECTOR3_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector3/Connector3E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector3 -{ - module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector; -}; - -#endif /* SHARED_DP_CONNECTOR3_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc deleted file mode 100644 index 2edb65e3de2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \ - -Wb,stub_export_include=Connector3_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \ - -Wb,skel_export_include=Connector3_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \ - -Wb,svnt_export_include=Connector3_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \ - -Wb,conn_export_include=Connector3_conn_export.h \ - -I .. - - IDL_Files { - Connector3.idl - } -} - -project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SharedDP_Connector3_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \ - -Wb,stub_export_include=Connector3_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector3E.idl - } -} - -project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector3_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector3_lem_stub - dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3EC.cpp - } - - Header_Files { - Connector3EC.h - Connector3_lem_stub_export.h - } - - Inline_Files { - Connector3EC.inl - } -} - -project(DDS_SharedDP_Connector3_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDP_Connector3_idl_gen DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector3_stub - dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3C.cpp - } - - Header_Files { - Connector3C.h - Connector3_stub_export.h - } - - Inline_Files { - Connector3C.inl - } -} - -project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub - sharedname = DDS_Connector3_exec - libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3_conn.cpp - } - - Header_Files { - Connector3_conn.h - Connector3_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub - sharedname = DDS_Connector3_svnt - libs += DDS_Connector3_stub \ - DDS_Connector3_lem_stub \ - DDS_SharedDP_DDBase_stub \ - DDS_Connector3_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3S.cpp - Connector3_svnt.cpp - } - - Header_Files { - Connector3S.h - Connector3_svnt.h - Connector3_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp deleted file mode 100644 index 03b9a8a9b3d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp +++ /dev/null @@ -1,445 +0,0 @@ - - - - SharedDPTest_Depl_1 - - - Connector1Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector1_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector1_exec - - - - - - - Connector2Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector2_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector2_exec - - - - - - - Connector3Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector3_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector3_exec - - - - - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - Connector1Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector2Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP2 - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector3Instance - ComponentNode - - - - topic_name - - - tk_string - - - StandaloneDP - - - - - qos_profile - - - tk_string - - - Standalone_Library#StandaloneProfile - - - - - - - Component - ComponentNode - - - - - - writer_connection1 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write1_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write2_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection3 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write3_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - - - DDS_Connector1_exec - - - DDS_Connector1_exec - - - DDS_Connector1_svnt - - - DDS_Connector1_svnt - - - DDS_Connector1_stub - - - DDS_Connector1_stub - - - - DDS_Connector2_exec - - - DDS_Connector2_exec - - - DDS_Connector2_svnt - - - DDS_Connector2_svnt - - - DDS_Connector2_stub - - - DDS_Connector2_stub - - - - DDS_Connector3_exec - - - DDS_Connector3_exec - - - DDS_Connector3_svnt - - - DDS_Connector3_svnt - - - DDS_Connector3_stub - - - DDS_Connector3_stub - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml deleted file mode 100644 index 5424a2e910a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml deleted file mode 100644 index 63e213c18d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index f1018e84958..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl deleted file mode 100755 index c319b291048..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl +++ /dev/null @@ -1,237 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 1 seconds to allow task to complete\n"; -sleep (1); - -# 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 -s\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl deleted file mode 100644 index 0f28a5b3e74..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @file Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef BASE_IDL -#define BASE_IDL - -#pragma ndds typesupport "Base/BaseSupport.h" -#pragma opendds typesupport "Base/BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "SharedDPTest1" -#pragma DCPS_DATA_KEY "SharedDPTest1 key1" - -#pragma DCPS_DATA_TYPE "SharedDPTest2" -#pragma DCPS_DATA_KEY "SharedDPTest2 key2" - -#pragma DCPS_DATA_TYPE "SharedDPTest3" -#pragma DCPS_DATA_KEY "SharedDPTest3 key3" - -struct SharedDPTest1 { - string key1; - long iteration1; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest1Seq; -#endif - -struct SharedDPTest2 { - string key2; - long iteration2; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest2Seq; -#endif - -struct SharedDPTest3 { - string key3; - long iteration3; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTest3Seq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc deleted file mode 100644 index d67aff8cde6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (SharedDP_Diff_ID_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = SharedDP_Diff_ID_Base_stub - dynamicflags += BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=BASE_STUB_Export \ - -Wb,stub_export_include=Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Base.idl - } - - opendds_ts_flags += --export=BASE_STUB_Export - - DDSGenerator_Files { - Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl deleted file mode 100644 index b045aab8549..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_SHARED_DP_COMPONENT_IDL -#define DDS_SHARED_DP_COMPONENT_IDL - -#include "Connector1/Connector1.idl" -#include "Connector2/Connector2.idl" -#include "Connector3/Connector3.idl" - -module SharedDP -{ - component SharedDPComponent - { - port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1; - port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2; - port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc deleted file mode 100644 index e6a9418413f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc +++ /dev/null @@ -1,152 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component" - -project(SharedDP_Diff_ID_Component_idl_gen) : componentidldefaults, dds4ccm { - after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Connector2_idl_gen \ - SharedDP_Diff_ID_Connector3_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h \ - -I .. - - IDL_Files { - Component.idl - } -} - -project(SharedDP_Diff_ID_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += SharedDP_Diff_ID_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - ComponentE.idl - } -} - -project(SharedDP_Diff_ID_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += SharedDP_Diff_ID_Component_lem_gen SharedDP_Diff_ID_Component_stub SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub Component_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentEC.cpp - } - - Header_Files { - ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - ComponentEC.inl - } -} - -project(SharedDP_Diff_ID_Component_stub) : ccm_stub, dds4ccm_base { - after += SharedDP_Diff_ID_Component_idl_gen SharedDP_Diff_ID_Base_stub \ - SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector3_stub \ - SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector3_lem_gen - libs += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentC.cpp - } - - Header_Files { - ComponentC.h - Component_stub_export.h - } - - Inline_Files { - ComponentC.inl - } -} - -project(SharedDP_Diff_ID_Component_exec) : ciao_executor, dds4ccm_impl { - after += SharedDP_Diff_ID_Component_lem_stub SharedDP_Diff_ID_Component_stub \ - SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub \ - SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub \ - SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub SharedDP_Diff_ID_Base_stub \ - DDS_Connector1_lem_stub DDS_Connector1_stub \ - DDS_Connector2_lem_stub DDS_Connector2_stub \ - DDS_Connector3_lem_stub DDS_Connector3_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Component_exec.cpp - } - - Header_Files { - Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - -project(SharedDP_Diff_ID_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Component_lem_stub \ - SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector1_svnt SharedDP_Diff_ID_Connector1_lem_stub \ - SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector2_svnt SharedDP_Diff_ID_Connector2_lem_stub \ - SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Connector3_svnt SharedDP_Diff_ID_Connector3_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub \ - SharedDP_Diff_ID_Base_stub \ - DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \ - DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \ - DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentS.cpp - Component_svnt.cpp - } - - Header_Files { - ComponentS.h - Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp deleted file mode 100644 index 8f4b7274dee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp +++ /dev/null @@ -1,316 +0,0 @@ -// -*- C++ -*- -#include "Component_exec.h" -#include "ace/Log_Msg.h" - -#include "Connector1/Connector1_conn.h" -#include "Connector2/Connector2_conn.h" -#include "Connector3/Connector3_conn.h" - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - //============================================================ - // Component Executor Implementation Class: Component_exec_i - //============================================================ - - Component_exec_i::Component_exec_i (void) - : dp1_hnd_ (DDS::HANDLE_NIL) - , dp2_hnd_ (DDS::HANDLE_NIL) - , dp3_hnd_ (DDS::HANDLE_NIL) - , dp1_ptr_ (DDS::DomainParticipant::_nil ()) - , dp2_ptr_ (DDS::DomainParticipant::_nil ()) - , dp3_ptr_ (DDS::DomainParticipant::_nil ()) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - void - Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - try - { - ::DDS::DataWriter_var dw1 = - this->context_->get_connection_write1_dds_entity (); - - if (::CORBA::is_nil (dw1.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 1 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ()); - - if (ccm_dw1) - { - ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp1_hnd_ = dp->get_instance_handle (); - this->dp1_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to CCM DataWriter 1\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n")); - } - - try - { - ::DDS::DataWriter_var dw2 = - this->context_->get_connection_write2_dds_entity (); - - if (::CORBA::is_nil (dw2.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 2 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ()); - - if (ccm_dw2) - { - ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp2_hnd_ = dp->get_instance_handle (); - this->dp2_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to CCM DataWriter 2\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n")); - } - - try - { - ::DDS::DataWriter_var dw3 = - this->context_->get_connection_write3_dds_entity (); - - if (::CORBA::is_nil (dw3.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 3 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ()); - - if (ccm_dw3) - { - ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - this->dp3_hnd_ = dp->get_instance_handle (); - this->dp3_ptr_ = dp.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to CCM DataWriter 3\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n")); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - if (this->dp1_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 1 seems to be NIL\n")); - if (this->dp2_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 2 seems to be NIL\n")); - if (this->dp3_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 3 seems to be NIL\n")); - } - - void - Component_exec_i::ccm_remove (void) - { - if ((this->dp1_hnd_ == this->dp2_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ == this->dp2_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 seem to " - "share the same DomainParticipant. Based on the domain_id the " - "domain participants should be different\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 don't seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp1_hnd_ == this->dp3_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ == this->dp3_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 don't seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp2_hnd_ == this->dp3_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp2_ptr_ == this->dp3_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 don't seems to " - "share the same DomainParticipant\n")); - } - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h deleted file mode 100644 index dfcc1d903e7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - - -#include "ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -class DDSDomainParticipant; - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - class Component_exec_i - : public virtual SharedDPComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_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: - ::SharedDP::CCM_SharedDPComponent_Context_var context_; - - ::DDS::InstanceHandle_t dp1_hnd_; - ::DDS::InstanceHandle_t dp2_hnd_; - ::DDS::InstanceHandle_t dp3_hnd_; - ::DDS::DomainParticipant_ptr dp1_ptr_; - ::DDS::DomainParticipant_ptr dp2_ptr_; - ::DDS::DomainParticipant_ptr dp3_ptr_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl deleted file mode 100644 index 4afe620e7f1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file Connector1.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR1_IDL_ -#define SHARED_DP_CONNECTOR1_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector1/Connector1E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector1 -{ - module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector; -}; - - - -#endif /* SHARED_DP_CONNECTOR1_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc deleted file mode 100644 index 15b4e4419bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(SharedDP_Diff_ID_Connector1_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \ - -Wb,stub_export_include=Connector1_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \ - -Wb,skel_export_include=Connector1_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \ - -Wb,svnt_export_include=Connector1_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \ - -Wb,conn_export_include=Connector1_conn_export.h \ - -I .. - - IDL_Files { - Connector1.idl - } -} - -project(SharedDP_Diff_ID_Connector1_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += SharedDP_Diff_ID_Connector1_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \ - -Wb,stub_export_include=Connector1_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector1E.idl - } -} - -project(SharedDP_Diff_ID_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector1_lem_stub - dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1EC.cpp - } - - Header_Files { - Connector1EC.h - Connector1_lem_stub_export.h - } - - Inline_Files { - Connector1EC.inl - } -} - -project(SharedDP_Diff_ID_Connector1_stub) : ccm_stub, dds4ccm_base { - after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector1_stub - dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1C.cpp - } - - Header_Files { - Connector1C.h - Connector1_stub_export.h - } - - Inline_Files { - Connector1C.inl - } -} - -project(SharedDP_Diff_ID_Connector1_exec) : ciao_executor, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub - sharedname = DDS_Connector1_exec - libs += DDS_Connector1_stub DDS_Connector1_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1_conn.cpp - } - - Header_Files { - Connector1_conn.h - Connector1_conn_export.h - } - - Inline_Files { - } -} - - -project(SharedDP_Diff_ID_Connector1_svnt) : ciao_servant, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_exec SharedDP_Diff_ID_Connector1_stub - sharedname = DDS_Connector1_svnt - libs += DDS_Connector1_stub \ - DDS_Connector1_lem_stub \ - SharedDP_Diff_ID_Base_stub \ - DDS_Connector1_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector1S.cpp - Connector1_svnt.cpp - } - - Header_Files { - Connector1S.h - Connector1_svnt.h - Connector1_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl deleted file mode 100644 index f38a634b931..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Connector2.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR2_IDL_ -#define SHARED_DP_CONNECTOR2_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector2/Connector2E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector2 -{ - module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector; -}; - -#endif /* SHARED_DP_CONNECTOR2_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc deleted file mode 100644 index b1059bca0ca..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(SharedDP_Diff_ID_Connector2_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \ - -Wb,stub_export_include=Connector2_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \ - -Wb,skel_export_include=Connector2_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \ - -Wb,svnt_export_include=Connector2_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \ - -Wb,conn_export_include=Connector2_conn_export.h \ - -I .. - - IDL_Files { - Connector2.idl - } -} - -project(SharedDP_Diff_ID_Connector2_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += SharedDP_Diff_ID_Connector2_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \ - -Wb,stub_export_include=Connector2_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector2E.idl - } -} - -project(SharedDP_Diff_ID_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub DDS_Connector2_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector2_lem_stub - dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2EC.cpp - } - - Header_Files { - Connector2EC.h - Connector2_lem_stub_export.h - } - - Inline_Files { - Connector2EC.inl - } -} - -project(SharedDP_Diff_ID_Connector2_stub) : ccm_stub, dds4ccm_base { - after += SharedDP_Diff_ID_Connector2_idl_gen SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector2_stub - dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2C.cpp - } - - Header_Files { - Connector2C.h - Connector2_stub_export.h - } - - Inline_Files { - Connector2C.inl - } -} - -project(SharedDP_Diff_ID_Connector2_exec) : ciao_executor, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub - sharedname = DDS_Connector2_exec - libs += DDS_Connector2_stub DDS_Connector2_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2_conn.cpp - } - - Header_Files { - Connector2_conn.h - Connector2_conn_export.h - } - - Inline_Files { - } -} - - -project(SharedDP_Diff_ID_Connector2_svnt) : ciao_servant, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_exec SharedDP_Diff_ID_Connector2_stub - sharedname = DDS_Connector2_svnt - libs += DDS_Connector2_stub \ - DDS_Connector2_lem_stub \ - SharedDP_Diff_ID_Base_stub \ - DDS_Connector2_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector2S.cpp - Connector2_svnt.cpp - } - - Header_Files { - Connector2S.h - Connector2_svnt.h - Connector2_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl deleted file mode 100644 index 19984701e26..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Connector3.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR3_IDL_ -#define SHARED_DP_CONNECTOR3_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector3/Connector3E.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP_Connector3 -{ - module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector; -}; - -#endif /* SHARED_DP_CONNECTOR3_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc deleted file mode 100644 index f5c705f13a6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(SharedDP_Diff_ID_Connector3_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \ - -Wb,stub_export_include=Connector3_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \ - -Wb,skel_export_include=Connector3_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \ - -Wb,svnt_export_include=Connector3_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \ - -Wb,conn_export_include=Connector3_conn_export.h \ - -I .. - - IDL_Files { - Connector3.idl - } -} - -project(SharedDP_Diff_ID_Connector3_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += SharedDP_Diff_ID_Connector3_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \ - -Wb,stub_export_include=Connector3_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Connector3E.idl - } -} - -project(SharedDP_Diff_ID_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += SharedDP_Diff_ID_Connector3_lem_gen SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub DDS_Connector3_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector3_lem_stub - dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3EC.cpp - } - - Header_Files { - Connector3EC.h - Connector3_lem_stub_export.h - } - - Inline_Files { - Connector3EC.inl - } -} - -project(SharedDP_Diff_ID_Connector3_stub) : ccm_stub, dds4ccm_base { - after += SharedDP_Diff_ID_Connector3_idl_gen SharedDP_Diff_ID_Base_stub - libs += SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector3_stub - dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3C.cpp - } - - Header_Files { - Connector3C.h - Connector3_stub_export.h - } - - Inline_Files { - Connector3C.inl - } -} - -project(SharedDP_Diff_ID_Connector3_exec) : ciao_executor, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub - sharedname = DDS_Connector3_exec - libs += DDS_Connector3_stub DDS_Connector3_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3_conn.cpp - } - - Header_Files { - Connector3_conn.h - Connector3_conn_export.h - } - - Inline_Files { - } -} - - -project(SharedDP_Diff_ID_Connector3_svnt) : ciao_servant, dds4ccm_impl { - after += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_exec SharedDP_Diff_ID_Connector3_stub - sharedname = DDS_Connector3_svnt - libs += DDS_Connector3_stub \ - DDS_Connector3_lem_stub \ - SharedDP_Diff_ID_Base_stub \ - DDS_Connector3_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector3S.cpp - Connector3_svnt.cpp - } - - Header_Files { - Connector3S.h - Connector3_svnt.h - Connector3_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp deleted file mode 100644 index 1a86d6da026..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp +++ /dev/null @@ -1,478 +0,0 @@ - - - - SharedDPTest_Depl_1 - - - Connector1Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector1_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector1_exec - - - - - - - Connector2Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector2_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector2_exec - - - - - - - Connector3Implementation - - - - - component factory - - - tk_string - - - create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector3_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector3_exec - - - - - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - Connector1Instance - ComponentNode - - - - domain_id - - - tk_long - - - 97 - - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector2Instance - ComponentNode - - - - domain_id - - - tk_long - - - 98 - - - - - topic_name - - - tk_string - - - SharedDP2 - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector3Instance - ComponentNode - - - - domain_id - - - tk_long - - - 99 - - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Component - ComponentNode - - - - - - writer_connection1 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write1_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write2_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection3 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write3_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - - - DDS_Connector1_exec - - - DDS_Connector1_exec - - - DDS_Connector1_svnt - - - DDS_Connector1_svnt - - - DDS_Connector1_stub - - - DDS_Connector1_stub - - - - DDS_Connector2_exec - - - DDS_Connector2_exec - - - DDS_Connector2_svnt - - - DDS_Connector2_svnt - - - DDS_Connector2_stub - - - DDS_Connector2_stub - - - - DDS_Connector3_exec - - - DDS_Connector3_exec - - - DDS_Connector3_svnt - - - DDS_Connector3_svnt - - - DDS_Connector3_stub - - - DDS_Connector3_stub - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml deleted file mode 100644 index 5424a2e910a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml deleted file mode 100644 index 63e213c18d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index f1018e84958..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl deleted file mode 100755 index 91749ec0bf3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl +++ /dev/null @@ -1,241 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -BEGIN { - undef $ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}; -} - -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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 1 seconds to allow task to complete\n"; -sleep (1); - -# 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 -s\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README deleted file mode 100644 index 6aaae0f6f81..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README +++ /dev/null @@ -1,11 +0,0 @@ - - -To save resources, every subsequent connector with the same -library name and profile name, should get the same domain- -participant. - -There're three connectors. Two (Connector1 and Connector2) -with the same library/profile name. -One (Connector3) with a different library/profile name. - -The component checks the pointers of the domainparticipants. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl deleted file mode 100644 index b0c773f58de..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef BASE_IDL -#define BASE_IDL - -#pragma ndds typesupport "Base/BaseSupport.h" -#pragma opendds typesupport "Base/BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "SharedDPTest" -#pragma DCPS_DATA_KEY "SharedDPTest key" - -struct SharedDPTest { - string key; - long iteration; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence SharedDPTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc deleted file mode 100644 index 17ee2d5f8cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SharedDPBase_stub - dynamicflags += BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=BASE_STUB_Export \ - -Wb,stub_export_include=Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Base.idl - } - - opendds_ts_flags += --export=BASE_STUB_Export - - DDSGenerator_Files { - Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl deleted file mode 100644 index a4023fa461c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_SHARED_DP_COMPONENT_IDL -#define DDS_SHARED_DP_COMPONENT_IDL - -#include "Connector/Connector.idl" - -module SharedDP -{ - component SharedDPComponent - { - port SharedDPTestConnector::DDS_Write write1; - port SharedDPTestConnector::DDS_Write write2; - port SharedDPTestConnector::DDS_Write write3; - port SharedDPTestConnector::DDS_Write write4; - - attribute boolean perform_test; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc deleted file mode 100644 index ad292a53373..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc +++ /dev/null @@ -1,144 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component" - -project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SharedDP_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h \ - -I .. - - IDL_Files { - Component.idl - } -} - -project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SharedDPComponent_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - ComponentE.idl - } -} - -project(DDS_SharedDPComponent_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDPComponent_lem_gen DDS_SharedDPComponent_stub DDS_SharedDPBase_stub - libs += DDS_SharedDPBase_stub Component_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentEC.cpp - } - - Header_Files { - ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - ComponentEC.inl - } -} - -project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDPComponent_idl_gen DDS_SharedDPBase_stub \ - DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub - libs += DDS_SharedDPBase_stub DDS_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentC.cpp - } - - Header_Files { - ComponentC.h - Component_stub_export.h - } - - Inline_Files { - ComponentC.inl - } -} - -project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \ - DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub DDS_SharedDPBase_stub \ - DDS_Connector_lem_stub DDS_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Component_exec.cpp - } - - Header_Files { - Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SharedDPBase_stub DDS_SharedDPComponent_lem_stub \ - DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \ - DDS_SharedDP_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub \ - DDS_SharedDPBase_stub \ - DDS_Connector_stub DDS_Connector_svnt DDS_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ComponentS.cpp - Component_svnt.cpp - } - - Header_Files { - ComponentS.h - Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp deleted file mode 100644 index 2f5bcdd7492..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp +++ /dev/null @@ -1,586 +0,0 @@ -// -*- C++ -*- -// Test whether Connector 1,2 and 3 are sharing the same DomainParticipant. -// Connector 4 should have a different DomainParticipant. -// Also test whether Connector 1 and 2 share the same topic. - -#include "Component_exec.h" -#include "ace/Log_Msg.h" - -#include "Connector/Connector_conn.h" - -const char * tp_name_conn_1_ = "SharedDP"; -const char * tp_name_conn_2_ = "SharedDP"; -const char * tp_name_conn_3_ = "SharedDP1"; -const char * tp_name_conn_4_ = "StandaloneDP"; - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - //============================================================ - // Component Executor Implementation Class: Component_exec_i - //============================================================ - - Component_exec_i::Component_exec_i (void) - : perform_test_ (false) - , dp1_hnd_ (DDS::HANDLE_NIL) - , dp2_hnd_ (DDS::HANDLE_NIL) - , dp3_hnd_ (DDS::HANDLE_NIL) - , dp4_hnd_ (DDS::HANDLE_NIL) - , dp1_ptr_ (DDS::DomainParticipant::_nil ()) - , dp2_ptr_ (DDS::DomainParticipant::_nil ()) - , dp3_ptr_ (DDS::DomainParticipant::_nil ()) - , dp4_ptr_ (DDS::DomainParticipant::_nil ()) - , tp1_hnd_ (DDS::HANDLE_NIL) - , tp2_hnd_ (DDS::HANDLE_NIL) - , tp3_hnd_ (DDS::HANDLE_NIL) - , tp4_hnd_ (DDS::HANDLE_NIL) - , tp1_ptr_ (DDS::Topic::_nil ()) - , tp2_ptr_ (DDS::Topic::_nil ()) - , tp3_ptr_ (DDS::Topic::_nil ()) - , tp4_ptr_ (DDS::Topic::_nil ()) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - void - Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - CORBA::Boolean - Component_exec_i::perform_test (void) - { - return this->perform_test_; - } - - void - Component_exec_i::perform_test (CORBA::Boolean perform_test) - { - this->perform_test_ = perform_test; - } - - void - Component_exec_i::ccm_activate (void) - { - try - { - ::DDS::DataWriter_var dw1 = - this->context_->get_connection_write1_dds_entity (); - - if (::CORBA::is_nil (dw1.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 1 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ()); - - if (ccm_dw1) - { - ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp1_hnd_ = dp->get_instance_handle (); - this->dp1_ptr_ = dp.ptr(); - - ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_1_); - - if (! ::CORBA::is_nil (tpd.in ())) - { - ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ()); - if (! ::CORBA::is_nil (topic.in ())) - { - this->tp1_hnd_ = topic->get_instance_handle (); - this->tp1_ptr_ = topic.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error narrowing TopicDescription 1 to Topic 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting TopicDescription 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 1.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to CCM DataWriter 1\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n")); - } - - try - { - ::DDS::DataWriter_var dw2 = - this->context_->get_connection_write2_dds_entity (); - - if (::CORBA::is_nil (dw2.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 2 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ()); - - if (ccm_dw2) - { - ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp2_hnd_ = dp->get_instance_handle (); - this->dp2_ptr_ = dp.ptr(); - - ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_2_); - - if (! ::CORBA::is_nil (tpd.in ())) - { - ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ()); - if (! ::CORBA::is_nil (topic.in ())) - { - this->tp2_hnd_ = topic->get_instance_handle (); - this->tp2_ptr_ = topic.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error narrowing TopicDescription 2 to Topic 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting TopicDescription 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 2.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to CCM DataWriter 2\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n")); - } - - try - { - ::DDS::DataWriter_var dw3 = - this->context_->get_connection_write3_dds_entity (); - - if (::CORBA::is_nil (dw3.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 3 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ()); - - if (ccm_dw3) - { - ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp3_hnd_ = dp->get_instance_handle (); - this->dp3_ptr_ = dp.ptr(); - - ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_3_); - - if (! ::CORBA::is_nil (tpd.in ())) - { - ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ()); - if (! ::CORBA::is_nil (topic.in ())) - { - this->tp3_hnd_ = topic->get_instance_handle (); - this->tp3_ptr_ = topic.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error narrowing TopicDescription 3 to Topic 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting TopicDescription 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 3.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to CCM DataWriter 3\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n")); - } - try - { - ::DDS::DataWriter_var dw4 = - this->context_->get_connection_write4_dds_entity (); - - if (::CORBA::is_nil (dw4.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Datawriter 4 connection is NIL.\n")); - throw ::CORBA::INTERNAL (); - } - - ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw4 = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw4.in ()); - - if (ccm_dw4) - { - ::DDS::DataWriter_var tmp = ccm_dw4->get_dds_entity (); - if (! ::CORBA::is_nil (tmp.in ())) - { - ::DDS::Publisher_var publisher = tmp->get_publisher (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - ::DDS::DomainParticipant_var dp = publisher->get_participant (); - - if (! ::CORBA::is_nil (publisher.in ())) - { - - this->dp4_hnd_ = dp->get_instance_handle (); - this->dp4_ptr_ = dp.ptr(); - - if (this->perform_test_) - { - - ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_4_); - - if (! ::CORBA::is_nil (tpd.in ())) - { - ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ()); - if (! ::CORBA::is_nil (topic.in ())) - { - this->tp4_hnd_ = topic->get_instance_handle (); - this->tp4_ptr_ = topic.ptr (); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error narrowing TopicDescription 4 to Topic 4.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting TopicDescription 4.\n")); - throw ::CORBA::INTERNAL (); - } - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DomainParticipant 4.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting Publisher 4.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " - "Error getting DDS DataWriter 4.\n")); - throw ::CORBA::INTERNAL (); - } - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 4 to CCM DataWriter 4\n")); - throw ::CORBA::INTERNAL (); - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer4\n")); - } - } - - void - Component_exec_i::ccm_passivate (void) - { - if (this->perform_test_) - { - if (this->dp1_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 1 seems to be NIL\n")); - if (this->dp2_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 2 seems to be NIL\n")); - if (this->dp3_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 3 seems to be NIL\n")); - if (this->dp4_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 4 seems to be NIL\n")); - - if (this->tp1_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 1 seems to be NIL\n")); - if (this->tp2_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 2 seems to be NIL\n")); - if (this->tp3_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 3 seems to be NIL\n")); - if (this->tp4_hnd_ == DDS::HANDLE_NIL) - ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 4 seems to be NIL\n")); - - //check shared DomainParticipants - if ((this->dp1_hnd_ != this->dp2_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ == this->dp2_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp1_hnd_ == this->dp4_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp1_ptr_ == this->dp4_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp2_hnd_ == this->dp4_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp2_ptr_ == this->dp4_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 4 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 4 seems to " - "share the same DomainParticipant\n")); - } - if ((this->dp3_hnd_ == this->dp4_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->dp3_ptr_ == this->dp4_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 3 and 4 seem to " - "share the same DomainParticipant\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 3 and 4 seems to " - "share the same DomainParticipant\n")); - } - - //check shared Topics - if ((this->tp1_hnd_ != this->tp2_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->tp1_ptr_ == this->tp2_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to " - "share the same Topic\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to " - "share the same Topic\n")); - } - if ((this->tp1_hnd_ == this->tp3_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->tp1_ptr_ == this->tp3_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to " - "share the same Topic\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to " - "share the same Topic\n")); - } - if ((this->tp1_hnd_ == this->tp4_hnd_) -#if (CIAO_DDS4CCM_OPENDDS==1) - && (this->tp1_ptr_ == this->tp4_ptr_) -#endif - ) - { - ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to " - "share the same Topic\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to " - "share the same Topic\n")); - } - } - } - - void - Component_exec_i::ccm_remove (void) - { - if (!this->perform_test_) - { - ACE_DEBUG ((LM_DEBUG, "Don't test this component. It's used for compilation errors.\n")); - } - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h deleted file mode 100644 index a7df9676a94..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h +++ /dev/null @@ -1,69 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - - -#include "ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -class DDSDomainParticipant; -class DDSTopic; - -namespace CIAO_SharedDP_SharedDPComponent_Impl -{ - class Component_exec_i - : public virtual SharedDPComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - CORBA::Boolean perform_test (void); - void perform_test (CORBA::Boolean perform_test); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::SharedDP::CCM_SharedDPComponent_Context_var context_; - - CORBA::Boolean perform_test_; - - ::DDS::InstanceHandle_t dp1_hnd_; - ::DDS::InstanceHandle_t dp2_hnd_; - ::DDS::InstanceHandle_t dp3_hnd_; - ::DDS::InstanceHandle_t dp4_hnd_; - ::DDS::DomainParticipant_ptr dp1_ptr_; - ::DDS::DomainParticipant_ptr dp2_ptr_; - ::DDS::DomainParticipant_ptr dp3_ptr_; - ::DDS::DomainParticipant_ptr dp4_ptr_; - - ::DDS::InstanceHandle_t tp1_hnd_; - ::DDS::InstanceHandle_t tp2_hnd_; - ::DDS::InstanceHandle_t tp3_hnd_; - ::DDS::InstanceHandle_t tp4_hnd_; - ::DDS::Topic_ptr tp1_ptr_; - ::DDS::Topic_ptr tp2_ptr_; - ::DDS::Topic_ptr tp3_ptr_; - ::DDS::Topic_ptr tp4_ptr_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Component_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl deleted file mode 100644 index 8de1b7b7406..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef SHARED_DP_CONNECTOR_IDL_ -#define SHARED_DP_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Base.idl" - -#pragma ciao lem "Connector/ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/BaseTypeSupport.idl" -#endif - -module SharedDP -{ - module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector; -}; - -#endif /* SHARED_DP_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc deleted file mode 100644 index 796bc84afab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc +++ /dev/null @@ -1,138 +0,0 @@ -project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SharedDPBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Connector_stub_export.h \ - -Wb,skel_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Connector_svnt_export.h \ - -Wb,svnt_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Connector_svnt_export.h \ - -Wb,conn_export_macro=SHAREDDP_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Connector_conn_export.h \ - -I .. - - IDL_Files { - Connector.idl - } -} - -project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SharedDP_Connector_idl_gen - idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - ConnectorE.idl - } -} - -project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub - libs += DDS_SharedDPBase_stub DDS_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector_lem_stub - dynamicflags += SHAREDDP_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorEC.cpp - } - - Header_Files { - ConnectorEC.h - Connector_lem_stub_export.h - } - - Inline_Files { - ConnectorEC.inl - } -} - -project(DDS_SharedDP_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SharedDP_Connector_idl_gen DDS_SharedDPBase_stub - libs += DDS_SharedDPBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector_stub - dynamicflags += SHAREDDP_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorC.cpp - } - - Header_Files { - ConnectorC.h - Connector_stub_export.h - } - - Inline_Files { - ConnectorC.inl - } -} - -project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub - sharedname = DDS_Connector_exec - libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS_SharedDPBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector_conn.cpp - } - - Header_Files { - Connector_conn.h - Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub - sharedname = DDS_Connector_svnt - libs += DDS_Connector_stub \ - DDS_Connector_lem_stub \ - DDS_SharedDPBase_stub \ - DDS_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SHAREDDP_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorS.cpp - Connector_svnt.cpp - } - - Header_Files { - ConnectorS.h - Connector_svnt.h - Connector_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp deleted file mode 100644 index 2da2dc43a17..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp +++ /dev/null @@ -1,321 +0,0 @@ - - - - SharedDPTest_Depl - - - ConnectorImplementation - - - - - component factory - - - tk_string - - - create_SharedDP_SharedDPTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector_exec - - - - - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - Connector1Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - - - Connector2Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - - - Connector3Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP1 - - - - - - - Connector4Instance - ComponentNode - - - - topic_name - - - tk_string - - - StandaloneDP - - - - - qos_profile - - - tk_string - - - Standalone_Library#StandaloneProfile - - - - - - - Component - ComponentNode - - - - - - writer_connection1 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write1_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write2_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection3 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write3_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection4 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write4_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - - - DDS_Connector_exec - - - DDS_Connector_exec - - - DDS_Connector_svnt - - - DDS_Connector_svnt - - - DDS_Connector_stub - - - DDS_Connector_stub - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp deleted file mode 100644 index a05085cb5c7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp +++ /dev/null @@ -1,496 +0,0 @@ - - - - SharedDPTest_Depl - - - ConnectorImplementation - - - - - component factory - - - tk_string - - - create_SharedDP_SharedDPTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - DDS_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - DDS_Connector_exec - - - - - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_Component_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_SharedDP_SharedDPComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - - Connector0Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector1Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector2Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector3Instance - ComponentNode - - - - topic_name - - - tk_string - - - SharedDP1 - - - - - qos_profile - - - tk_string - - - Shared_Library#SharedProfile - - - - - - - Connector4Instance - ComponentNode - - - - topic_name - - - tk_string - - - StandaloneDP - - - - - qos_profile - - - tk_string - - - Standalone_Library#StandaloneProfile - - - - - - - Component - ComponentNode - - - - perform_test - - - tk_boolean - - - true - - - - - - - - Component0 - ComponentNode - - - - perform_test - - - tk_boolean - - - false - - - - - - - writer_connection01 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write1_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection02 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write2_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection03 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write3_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection04 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write4_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection1 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write1_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection2 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write2_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection3 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write3_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - writer_connection4 - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - write4_dds_entity - false - SimplexReceptacle - - - - supplier_dds_entity - true - Facet - - - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - - Component_stub - - - Component_stub - - - - DDS_Connector_exec - - - DDS_Connector_exec - - - DDS_Connector_svnt - - - DDS_Connector_svnt - - - DDS_Connector_stub - - - DDS_Connector_stub - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml deleted file mode 100644 index 5424a2e910a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml deleted file mode 100644 index 63e213c18d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index f1018e84958..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - - 10 - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_LAST_HISTORY_QOS - 20 - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl deleted file mode 100755 index da0f21d086e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 1 seconds to allow task to complete\n"; -sleep (1); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl deleted file mode 100755 index f92d7ff050d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 = "DefaultQoS.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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); - -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl deleted file mode 100644 index 2bf9df0aa8a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file State_Connection_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef STATE_CONNECTION_TEST_BASE_IDL -#define STATE_CONNECTION_TEST_BASE_IDL - -#pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h" -#pragma opendds typesupport "Base/State_Connection_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "State_ConnectionTest" -#pragma DCPS_DATA_KEY "State_ConnectionTest key" - -struct State_ConnectionTest { - string key; //@key - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence State_ConnectionTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc deleted file mode 100644 index 41b42c4fa91..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_SCT_Base_stub - dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - State_Connection_Test_Base.idl - } - - opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export - - DDSGenerator_Files { - State_Connection_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl deleted file mode 100644 index 5193d1a639b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file State_Connection_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef KEYED_TEST_CONNECTOR_IDL_ -#define KEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/State_Connection_Test_Base.idl" - -#pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/State_Connection_Test_BaseTypeSupport.idl" -#endif - -module State_Connection_Test -{ - module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTestConnector; -}; - -#endif /* State_Connection_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc deleted file mode 100644 index 66c6ad49e7a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector" - -project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_SCT_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=State_Connection_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=State_Connection_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=State_Connection_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=STATE_CONNECTION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=State_Connection_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - State_Connection_Test_Connector.idl - } -} - -project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SCT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=State_Connection_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - State_Connection_Test_ConnectorE.idl - } -} - -project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub - libs += DDS_SCT_Base_stub DDS_SCT_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SCT_Connector_lem_stub - dynamicflags += STATE_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ConnectorEC.cpp - } - - Header_Files { - State_Connection_Test_ConnectorEC.h - State_Connection_Test_Connector_lem_stub_export.h - } - - Inline_Files { - State_Connection_Test_ConnectorEC.inl - } -} - -project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_SCT_Connector_idl_gen DDS_SCT_Base_stub - libs += DDS_SCT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_SCT_Connector_stub - dynamicflags += STATE_CONNECTION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ConnectorC.cpp - } - - Header_Files { - State_Connection_Test_ConnectorC.h - State_Connection_Test_Connector_stub_export.h - } - - Inline_Files { - State_Connection_Test_ConnectorC.inl - } -} - -project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub - sharedname = DDS_SCT_Connector_exec - libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS_SCT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += STATE_CONNECTION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_Connector_conn.cpp - } - - Header_Files { - State_Connection_Test_Connector_conn.h - State_Connection_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub - sharedname = DDS_SCT_Connector_svnt - libs += DDS_SCT_Connector_stub \ - DDS_SCT_Connector_lem_stub \ - DDS_SCT_Base_stub \ - DDS_SCT_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += STATE_CONNECTION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ConnectorS.cpp - State_Connection_Test_Connector_svnt.cpp - } - - Header_Files { - State_Connection_Test_ConnectorS.h - State_Connection_Test_Connector_svnt.h - State_Connection_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README deleted file mode 100644 index c51b76151fb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README +++ /dev/null @@ -1,35 +0,0 @@ - - -This test tests all possible connections between -a Sender and a DDS State connector and a Receiver and a -DDS State connector. -The Sender requests the following connections: - * An updater - * A DDS updater - -The Receiver expects the following listeners to be created: - * A DataListenerControl for the DDS_Listen port - * A 'normal' listener for the DDS_Listen port - * A StateListener for the DDS_StateListen port - * A PortStatusListener for the DDS_Get port - * A PortStatusListener for the DDS_Read port - * A PortStatusListener for the DDS_Listen port - * A PortStatusListener for the DDS_StateLisen port - -The Receiver requests the following connections: - * A reader for the DDS_Read port - * A DDS reader for the DDS_Read port - * A reader for the DDS_Get port - * A getter for the DDS_Get port - * A DDS reader for the DDS_Read port - * A reader for the DDS_Listen port - * A DataControlListener for the DDS_Listen port - * A DDS reader for the DDS_Listen port - * A reader for the DDS_StateListen port - * A StateListener for the DDS_StateListen port - * A DDS reader for the DDS_StateListen port - -This test tests every single connection and reports an error when -a connections couldn't be esthablished. - -No actual read/write/listen operations are performed. diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore deleted file mode 100644 index ef8daae3a9e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/State_Connection_Test_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl deleted file mode 100644 index 794d300cd01..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/State_Connection_Test_Connector.idl" - -module State_Connection_Test -{ - component Receiver - { - 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; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc deleted file mode 100644 index b814225cca5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc +++ /dev/null @@ -1,135 +0,0 @@ -project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_SCT_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - State_Connection_Test_Receiver.idl - } -} - -project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SCT_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - State_Connection_Test_ReceiverE.idl - } -} - -project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SCT_Receiver_lem_gen DDS_SCT_Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub - libs += Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ReceiverEC.cpp - } - - Header_Files { - State_Connection_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - State_Connection_Test_ReceiverEC.inl - } -} - -project(DDS_SCT_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_SCT_Receiver_idl_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_gen - libs += DDS_SCT_Connector_stub DDS_SCT_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ReceiverC.cpp - } - - Header_Files { - State_Connection_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - State_Connection_Test_ReceiverC.inl - } -} - -project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_Receiver_exec.cpp - } - - Header_Files { - State_Connection_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_ReceiverS.cpp - State_Connection_Test_Receiver_svnt.cpp - } - - Header_Files { - State_Connection_Test_ReceiverS.h - State_Connection_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp deleted file mode 100644 index 9600a7f9bf2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp +++ /dev/null @@ -1,374 +0,0 @@ -// -*- C++ -*- -#include "State_Connection_Test_Receiver_exec.h" -#include "ace/Log_Msg.h" - - -namespace CIAO_State_Connection_Test_Receiver_Impl -{ - //============================================================ - // Component Executor Implementation Class: Receiver_exec_i - //============================================================ - - Receiver_exec_i::Receiver_exec_i (void) - : //DDS_Read - reader_data_ok_ (false), - reader_dds_entity_ok_ (false), - reader_filter_config_ok_ (false), - //DDS_Get - getter_data_ok_ (false), - getter_fresh_data_ok_ (false), - getter_dds_entity_ok_ (false), - getter_filter_config_ok_ (false), - //DDS_Listen - listen_data_ok_ (false), - listen_data_control_ok_ (false), - listen_dds_entity_ok_ (false), - listen_filter_config_ok_ (false), - //DDS_StateListen - statelisten_data_ok_ (false), - statelisten_data_control_ok_ (false), - statelisten_dds_entity_ok_ (false), - statelisten_filter_config_ok_ (false), - //Provides for DDS_Read - reader_port_status_created_ (false), - //Provides for DDS_Get - getter_port_status_created_ (false), - //Provides for DDS_Listen - listen_data_listener_created_ (false), - listen_port_status_created_ (false), - //Provides for DDS_StateListen - statelisten_data_listener_created_ (false), - statelisten_port_status_created_ (false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_read_status (void) - { - this->reader_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - //Provides for DDS_Get - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - this->getter_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - //Provides for DDS_Listen - ::State_Connection_Test::State_ConnectionTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_listen_data_listener () - { - this->listen_data_listener_created_ = true; - return ::State_Connection_Test - ::State_ConnectionTestConnector - ::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_listen_status (void) - { - this->listen_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - //Provides for DDS_StateListen - ::State_Connection_Test::State_ConnectionTestConnector::CCM_StateListener_ptr - Receiver_exec_i::get_info_statelisten_data_listener (void) - { - this->statelisten_data_listener_created_ = true; - return ::State_Connection_Test - ::State_ConnectionTestConnector - ::CCM_StateListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_statelisten_status (void) - { - this->statelisten_port_status_created_ = true; - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::State_Connection_Test::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - //DDS_Read - ::State_Connection_Test::State_ConnectionTestConnector::Reader_var reader_data = - this->context_->get_connection_info_read_data (); - this->reader_data_ok_ = ! ::CORBA::is_nil (reader_data); - - ::DDS::DataReader_var reader_dds_entity = - this->context_->get_connection_info_read_dds_entity (); - this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (reader_dds_entity); - ::CCM_DDS::ContentFilterSetting_var reader_filter_config = - this->context_->get_connection_info_read_filter_config (); - this->reader_filter_config_ok_ = ! ::CORBA::is_nil (reader_filter_config); - - //DDS_Get - ::State_Connection_Test::State_ConnectionTestConnector::Reader_var getter_data = - this->context_->get_connection_info_get_data (); - this->getter_data_ok_ = ! ::CORBA::is_nil (getter_data); - ::State_Connection_Test::State_ConnectionTestConnector::Getter_var getter_fresh_data = - this->context_->get_connection_info_get_fresh_data (); - this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (getter_fresh_data); - ::DDS::DataReader_var getter_dds_entity = - this->context_->get_connection_info_get_dds_entity (); - this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (getter_dds_entity); - ::CCM_DDS::ContentFilterSetting_var getter_filter_config = - this->context_->get_connection_info_get_filter_config (); - this->getter_filter_config_ok_ = ! ::CORBA::is_nil (getter_filter_config); - - //DDS_Listen - ::State_Connection_Test::State_ConnectionTestConnector::Reader_var listen_data = - this->context_->get_connection_info_listen_data (); - this->listen_data_ok_ = ! ::CORBA::is_nil (listen_data); - ::CCM_DDS::DataListenerControl_var listen_data_control = - this->context_->get_connection_info_listen_data_control (); - this->listen_data_control_ok_ = ! ::CORBA::is_nil (listen_data_control); - ::DDS::DataReader_var listen_dds_entity = - this->context_->get_connection_info_listen_dds_entity (); - this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (listen_dds_entity); - ::CCM_DDS::ContentFilterSetting_var listen_filter_config = - this->context_->get_connection_info_listen_filter_config (); - this->listen_filter_config_ok_ = ! ::CORBA::is_nil (listen_filter_config); - - //DDS_StateListen - ::State_Connection_Test::State_ConnectionTestConnector::Reader_var statelisten_data = - this->context_->get_connection_info_statelisten_data (); - this->statelisten_data_ok_ = ! ::CORBA::is_nil (statelisten_data); - ::CCM_DDS::StateListenerControl_var statelisten_data_control = - this->context_->get_connection_info_statelisten_data_control (); - this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (statelisten_data_control); - ::DDS::DataReader_var statelisten_dds_entity = - this->context_->get_connection_info_statelisten_dds_entity (); - this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (statelisten_dds_entity); - ::CCM_DDS::ContentFilterSetting_var statelisten_filter_config = - this->context_->get_connection_info_statelisten_filter_config (); - this->statelisten_filter_config_ok_ = ! ::CORBA::is_nil (statelisten_filter_config); - } - - void - Receiver_exec_i::ccm_activate (void) - { - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - //DDS_Read - if (!this->reader_data_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Read failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Read passed\n"))); - } - if (!this->reader_dds_entity_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Read failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Read passed\n"))); - } - if (!this->reader_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Read failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Read passed\n"))); - } - //DDS_Get - if (!this->getter_data_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n"))); - } - - if (!this->getter_fresh_data_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter of DDS_Get passed\n"))); - } - if (!this->getter_dds_entity_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n"))); - } - if (!this->getter_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n"))); - } - //DDS_Listen - if (!this->listen_data_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n"))); - } - if (!this->listen_data_control_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_Listen passed\n"))); - } - if (!this->listen_dds_entity_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Listen passed\n"))); - } - if (!this->listen_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n"))); - } - //DDS_StateListen - if (!this->statelisten_data_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_StateListen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_StateListen passed\n"))); - } - if (!this->statelisten_data_control_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_StateListen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_StateListen passed\n"))); - } - if (!this->statelisten_dds_entity_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_StateListen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_StateListen passed\n"))); - } - if (!this->statelisten_filter_config_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_StateListen failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_StateListen passed\n"))); - } - //Provides for DDS_Read - if (!this->reader_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Read not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Read was created\n"))); - } - //Provides for DDS_Get - if (!this->getter_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n"))); - } - //Provides for DDS_Listen - if (!this->listen_data_listener_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_Listen not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_Listen was created\n"))); - } - if (!this->listen_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n"))); - } - //Provides for DDS_StateListen - if (!this->statelisten_data_listener_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_StateListen not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_StateListen was created\n"))); - } - if (!this->statelisten_port_status_created_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_StateListen not created\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_StateListen was created\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_State_Connection_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h deleted file mode 100644 index d4a731ebfce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h +++ /dev/null @@ -1,112 +0,0 @@ -// -*- C++ -*- -#ifndef STATE_CONNECTION_RECEIVER_EXEC_H_ -#define STATE_CONNECTION_RECEIVER_EXEC_H_ - -#include "State_Connection_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - - - -namespace CIAO_State_Connection_Test_Receiver_Impl -{ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - //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 ::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 ::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); - - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::State_Connection_Test::CCM_Receiver_Context_var context_; - - //DDS_Read - bool reader_data_ok_; - bool reader_dds_entity_ok_; - bool reader_filter_config_ok_; - - //DDS_Get - bool getter_data_ok_; - bool getter_fresh_data_ok_; - bool getter_dds_entity_ok_; - bool getter_filter_config_ok_; - - //DDS_Listen - bool listen_data_ok_; - bool listen_data_control_ok_; - bool listen_dds_entity_ok_; - bool listen_filter_config_ok_; - - //DDS_StateListen - bool statelisten_data_ok_; - bool statelisten_data_control_ok_; - bool statelisten_dds_entity_ok_; - bool statelisten_filter_config_ok_; - - //Provides for DDS_Read - bool reader_port_status_created_; - - //Provides for DDS_Get - bool getter_port_status_created_; - - //Provides for DDS_Listen - bool listen_data_listener_created_; - bool listen_port_status_created_; - - //Provides for DDS_StateListen - bool statelisten_data_listener_created_; - bool statelisten_port_status_created_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_State_Connection_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore deleted file mode 100644 index f4e05f574a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/State_Connection_Test_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl deleted file mode 100644 index c340f79e086..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_STATE_CONNECTION_TEST_SENDER_IDL -#define DDS_STATE_CONNECTION_TEST_SENDER_IDL - -#include "Connector/State_Connection_Test_Connector.idl" - -module State_Connection_Test -{ - component Sender - { - port State_ConnectionTestConnector::DDS_Update info_update; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc deleted file mode 100644 index bb2842d2a97..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_SCT_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - State_Connection_Test_Sender.idl - } -} - -project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_SCT_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - State_Connection_Test_SenderE.idl - } -} - -project(DDS_SCT_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SCT_Sender_lem_gen DDS_SCT_Sender_stub DDS_SCT_Base_stub - libs += DDS_SCT_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_SenderEC.cpp - } - - Header_Files { - State_Connection_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - State_Connection_Test_SenderEC.inl - } -} - -project(DDS_SCT_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_SCT_Sender_idl_gen DDS_SCT_Base_stub DDS_SCT_Connector_stub - libs += DDS_SCT_Base_stub DDS_SCT_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_SenderC.cpp - } - - Header_Files { - State_Connection_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - State_Connection_Test_SenderC.inl - } -} - -project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_SCT_Sender_lem_stub DDS_SCT_Sender_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_Sender_exec.cpp - } - - Header_Files { - State_Connection_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_SCT_Base_stub DDS_SCT_Sender_lem_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_SenderS.cpp - State_Connection_Test_Sender_svnt.cpp - } - - Header_Files { - State_Connection_Test_SenderS.h - State_Connection_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp deleted file mode 100644 index 51c54ac5dad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// -*- C++ -*- -#include "State_Connection_Test_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" - - - -namespace CIAO_State_Connection_Test_Sender_Impl -{ - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : updater_ok_ (false), - updater_dds_datawriter_ok_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::State_Connection_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - ::State_Connection_Test::State_ConnectionTestConnector::Updater_var updater = - this->context_->get_connection_info_update_data (); - if (! ::CORBA::is_nil (updater.in ())) - { - this->updater_ok_ = true; - } - ::DDS::DataWriter_var updater_dds_datawriter = - this->context_->get_connection_info_update_dds_entity (); - if (! ::CORBA::is_nil (updater_dds_datawriter.in ())) - { - this->updater_dds_datawriter_ok_ = true; - } - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->updater_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get updater failed\n"))); - } - else - { - ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Sender : Get updater passed\n"))); - } - if (!this->updater_dds_datawriter_ok_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : Get dds writer for DDS_Updater failed\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer for DDS_Updater passed\n"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_State_Connection_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h deleted file mode 100644 index 69d50c4c5d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h +++ /dev/null @@ -1,45 +0,0 @@ -// -*- C++ -*- -#ifndef STATE_CONNECTION_SENDER_EXEC_H_ -#define STATE_CONNECTION_SENDER_EXEC_H_ - -#include "State_Connection_Test_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_State_Connection_Test_Sender_Impl -{ - 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: - ::State_Connection_Test::CCM_Sender_Context_var context_; - - bool updater_ok_; - bool updater_dds_datawriter_ok_; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_State_Connection_Test_Sender_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp deleted file mode 100644 index f9b124f4260..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp +++ /dev/null @@ -1,721 +0,0 @@ - - - - State_Connection_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_Connection_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_Connection_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - State_Connection_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - State_Connection_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - State_Connection_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_State_Connection_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_State_Connection_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - State_Connection_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - State_Connection_Test - - - - - - State_Connection_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - State_Connection_Test - - - - - - SenderComponent - SenderNode - - - - - - - - update_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - update_dds_entity - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_update_dds_entity - false - SimplexReceptacle - - - - observable_dds_entity - true - Facet - - - - - - - - get_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_data - false - SimplexReceptacle - - - - pull_observer_data - true - Facet - - - - - get_fresh_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_fresh_data - false - SimplexReceptacle - - - - pull_observer_fresh_data - true - Facet - - - - - get_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_dds_entity - false - SimplexReceptacle - - - - pull_observer_dds_entity - true - Facet - - - - - get_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_filter_config - false - SimplexReceptacle - - - - pull_observer_filter_config - true - Facet - - - - - - get_status_mirrorport - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_get_status - true - Facet - - - - pull_observer_status - false - SimplexReceptacle - - - - - - - read_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_data - false - SimplexReceptacle - - - - passive_observer_data - true - Facet - - - - - read_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_dds_entity - false - SimplexReceptacle - - - - passive_observer_dds_entity - true - Facet - - - - - read_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_filter_config - false - SimplexReceptacle - - - - passive_observer_filter_config - true - Facet - - - - - - read_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_read_status - true - Facet - - - - passive_observer_status - false - SimplexReceptacle - - - - - - - listen_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - listen_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_control - false - SimplexReceptacle - - - - push_observer_data_control - true - Facet - - - - - listen_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_dds_entity - false - SimplexReceptacle - - - - push_observer_dds_entity - true - Facet - - - - - listen_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_filter_config - false - SimplexReceptacle - - - - push_observer_filter_config - true - Facet - - - - - - listen_data_listener_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_data_listener - true - Facet - - - - push_observer_data_listener - false - SimplexReceptacle - - - - - listen_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_listen_status - true - Facet - - - - push_observer_status - false - SimplexReceptacle - - - - - - - statelisten_data_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - statelisten_data_control_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data_control - false - SimplexReceptacle - - - - push_state_observer_data_control - true - Facet - - - - - statelisten_dds_entity_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_dds_entity - false - SimplexReceptacle - - - - push_state_observer_dds_entity - true - Facet - - - - - statelisten_filter_config_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_filter_config - false - SimplexReceptacle - - - - push_state_observer_filter_config - true - Facet - - - - - - statelisten_data_listener_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_data_listener - true - Facet - - - - push_state_observer_data_listener - false - SimplexReceptacle - - - - - statelisten_status_port - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_statelisten_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - State_Connection_Test_Connector_exec - - - DDS_SCT_Connector_exec - - - State_Connection_Test_Connector_svnt - - - DDS_SCT_Connector_svnt - - - State_Connection_Test_Connector_stub - - - DDS_SCT_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl deleted file mode 100755 index 174721086cd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore b/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore deleted file mode 100644 index e7dd623f96a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/TimeConversion diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc deleted file mode 100644 index bdddf653517..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc +++ /dev/null @@ -1,7 +0,0 @@ -project(DDS_TimeConversion) : taoexe, dds4ccm_base { - includes += $(CIAO_ROOT) - exename = TimeConversion - Source_Files { - time_conversion.cpp - } -} diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl b/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl deleted file mode 100755 index c8901833b9c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl +++ /dev/null @@ -1,27 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; - -$PROG = $program->CreateProcess ("TimeConversion", ""); -$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval()); - -if ($program_status != 0) { - print STDERR "ERROR: TimeConversion returned $program_status\n"; - exit 1; -} - -$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval()); - -if ($exit_status != 0) { - print STDERR "ERROR: TimeConversion returned $server_status\n"; - $status = 1; -} - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp deleted file mode 100644 index be4218bfc2c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "dds4ccm/impl/TimeUtilities.h" -#include "ace/OS_NS_sys_time.h" - -int -ACE_TMAIN(int , ACE_TCHAR **) -{ - try - { - ::DDS::Time_t dds_time; - ACE_Time_Value ace_time = ACE_OS::gettimeofday (); - - dds_time <<= ace_time; - if (dds_time.sec != ace_time.sec ()) - { - ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from " - "ACE_Time_Value to DDS::Time_t " - "seconds expected <%u> - seconds found <%u>\n", - ace_time.sec (), dds_time.sec)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from " - "ACE_Time_Value to DDS::Time_t " - "regarding seconds succeeded\n")); - } - if (dds_time.nanosec / 1000 != static_cast (ace_time.usec ())) - { - ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from " - "ACE_Time_Value to DDS::Time_t " - "micro seconds expected <%u> - micro seconds found <%u>\n", - ace_time.usec (), dds_time.nanosec/1000)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from " - "ACE_Time_Value to DDS::Time_t " - "regarding micro seconds succeeded\n")); - } - - ::DDS::Time_t dds_now; - ACE_Time_Value ace_now = ACE_OS::gettimeofday (); - dds_now <<= ace_now; - //create real nanoseconds. - dds_now.nanosec = 1234567890; - ace_time <<= dds_now; - - if (ace_time.sec () != dds_now.sec) - { - ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from " - "DDS::Time_t to ACE_Time_Value " - "seconds expected <%u> - seconds found <%u>\n", - dds_now.sec, ace_time.sec ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from " - "DDS::Time_t to ACE_Time_Value " - "regarding seconds succeeded\n")); - } - // The resolution of an ACE_Time_Value is less than the resolution of a - // DDS::Time_T. Therefor don't multiply ace_time.usec by 1000 but devide - // dds_time.nanosec by 1000. - if (static_cast(ace_time.usec ()) != dds_now.nanosec/1000) - { - ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from " - "DDS::Time_t to ACE_Time_Value " - "nano seconds expected <%u> - nano seconds found <%u>\n", - dds_now.nanosec/1000, ace_time.usec ())); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from " - "DDS::Time_t to ACE_Time_Value " - "regarding nano seconds succeeded\n")); - } - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - return 1; - } - - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl deleted file mode 100644 index 836bd2dc353..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file TopicName_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TOPICNAME_TEST_BASE_IDL -#define TOPICNAME_TEST_BASE_IDL - -#pragma ndds typesupport "Base/TopicName_Test_BaseSupport.h" -#pragma opendds typesupport "Base/TopicName_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TopicNameTest" -#pragma DCPS_DATA_KEY "TopicNameTest symbol" - -struct TopicNameTest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicNameTestSeq; -#endif - -#endif /* TOPICNAME_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc deleted file mode 100644 index 4fc0879f9f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (TopicName_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = TopicName_Test_Base_stub - dynamicflags += TOPICNAME_EVENT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=TopicName_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - TopicName_Test_Base.idl - } - - opendds_ts_flags += --export=TOPICNAME_EVENT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - TopicName_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl deleted file mode 100644 index 06c92dda676..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/TopicName_Test_Connector.idl" - -module TopicName_Test -{ - component TopicNameTestComponent - { - port TopicNameTestConnector::DDS_Write info_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc deleted file mode 100644 index 5a9be8f05a4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(TopicName_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += TopicName_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h -I.. - - IDL_Files { - TopicName_Test_Component.idl - } -} - -project(TopicName_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += TopicName_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - TopicName_Test_ComponentE.idl - } -} - -project(TopicName_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += TopicName_Test_Component_lem_gen TopicName_Test_Component_stub \ - TopicName_Test_Connector_stub TopicName_Test_Base_stub - libs += Component_stub TopicName_Test_Connector_stub \ - TopicName_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ComponentEC.cpp - } - - Header_Files { - TopicName_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - TopicName_Test_ComponentEC.inl - } -} - -project(TopicName_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += TopicName_Test_Component_idl_gen TopicName_Test_Connector_stub \ - TopicName_Test_Base_stub TopicName_Test_Connector_lem_gen - libs += TopicName_Test_Connector_stub TopicName_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ComponentC.cpp - } - - Header_Files { - TopicName_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - TopicName_Test_ComponentC.inl - } -} - -project(TopicName_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += TopicName_Test_Component_lem_stub TopicName_Test_Component_stub \ - TopicName_Test_Base_stub TopicName_Test_Connector_stub \ - TopicName_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub TopicName_Test_Base_stub \ - TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_Component_exec.cpp - } - - Header_Files { - TopicName_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(TopicName_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += TopicName_Test_Component_lem_stub TopicName_Test_Base_stub \ - TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \ - TopicName_Test_Component_exec TopicName_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub TopicName_Test_Base_stub \ - TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \ - Component_exec TopicName_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ComponentS.cpp - TopicName_Test_Component_svnt.cpp - } - - Header_Files { - TopicName_Test_ComponentS.h - TopicName_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp deleted file mode 100644 index ad22e8c9db6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// -*- C++ -*- -#include "TopicName_Test_Component_exec.h" - -namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - Component_exec_i::Component_exec_i (void) - { - } - - Component_exec_i::~Component_exec_i (void) - { - } - - // Operations from Components::SessionComponent. - void - Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::TopicName_Test::CCM_TopicNameTestComponent_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Component_exec_i::configuration_complete (void) - { - } - - void - Component_exec_i::ccm_activate (void) - { - } - - void - Component_exec_i::ccm_passivate (void) - { - } - - void - Component_exec_i::ccm_remove (void) - { - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TopicName_Test_TopicNameTestComponent_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Component_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h deleted file mode 100644 index d89956045a0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_COMPONENT_EXEC_H_ -#define CIAO_COMPONENT_EXEC_H_ - -#include "TopicName_Test_ComponentEC.h" - -#include /**/ "Component_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl -{ - //============================================================ - // Component_exec_i - //============================================================ - class COMPONENT_EXEC_Export Component_exec_i - : public virtual TopicNameTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - Component_exec_i (void); - virtual ~Component_exec_i (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::TopicName_Test::CCM_TopicNameTestComponent_Context_var context_; - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_TopicName_Test_TopicNameTestComponent_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl deleted file mode 100644 index 5eff93b266e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file TopicName_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ -#define TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/TopicName_Test_Base.idl" - -#pragma ciao lem "Connector/TopicName_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/TopicName_Test_BaseTypeSupport.idl" -#endif - -module ::CCM_DDS::Typed < ::TopicNameTest, ::TopicNameTestSeq> TopicNameTestConnector; - -#endif /* TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc deleted file mode 100644 index 7856bf5cb00..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p TopicName_Test_Base -l .. -o ../lib -u DDS TopicName_Test_Connector" - -project(TopicName_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen TopicName_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=TopicName_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=TopicName_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=TopicName_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=TopicName_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - TopicName_Test_Connector.idl - } -} - -project(TopicName_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += TopicName_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=TopicName_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - TopicName_Test_ConnectorE.idl - } -} - -project(TopicName_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += TopicName_Test_Connector_lem_gen TopicName_Test_Connector_stub TopicName_Test_Base_stub - libs += TopicName_Test_Base_stub TopicName_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TopicName_Test_Connector_lem_stub - dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ConnectorEC.cpp - } - - Header_Files { - TopicName_Test_ConnectorEC.h - TopicName_Test_Connector_lem_stub_export.h - } - - Inline_Files { - TopicName_Test_ConnectorEC.inl - } -} - -project(TopicName_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += TopicName_Test_Connector_idl_gen TopicName_Test_Base_stub - libs += TopicName_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = TopicName_Test_Connector_stub - dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ConnectorC.cpp - } - - Header_Files { - TopicName_Test_ConnectorC.h - TopicName_Test_Connector_stub_export.h - } - - Inline_Files { - TopicName_Test_ConnectorC.inl - } -} - -project(TopicName_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_stub TopicName_Test_Base_stub - sharedname = TopicName_Test_Connector_exec - libs += TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub TopicName_Test_Base_stub TopicName_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_Connector_conn.cpp - } - - Header_Files { - TopicName_Test_Connector_conn.h - TopicName_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(TopicName_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_exec TopicName_Test_Connector_stub - sharedname = TopicName_Test_Connector_svnt - libs += TopicName_Test_Connector_stub \ - TopicName_Test_Connector_lem_stub \ - TopicName_Test_Base_stub \ - TopicName_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TopicName_Test_ConnectorS.cpp - TopicName_Test_Connector_svnt.cpp - } - - Header_Files { - TopicName_Test_ConnectorS.h - TopicName_Test_Connector_svnt.h - TopicName_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp deleted file mode 100644 index 523de92374b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp +++ /dev/null @@ -1,191 +0,0 @@ - - - - TopicNameEventTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_TopicName_Test_TopicNameTestComponent_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TopicName_Test_TopicNameTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - TopicName_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_TopicNameTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_TopicNameTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - TopicName_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - TopicName_Test_Connector_exec - - - - - - - Component - ComponentNode - - - - - - TopicName_Test_Connector - ComponentNode - - - - topic_name - - - tk_string - - - ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 - - - - - - - write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - - TopicName_Test_Connector_exec - - - TopicName_Test_Connector_exec - - - TopicName_Test_Connector_svnt - - - TopicName_Test_Connector_svnt - - - TopicName_Test_Connector_stub - - - TopicName_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl deleted file mode 100755 index 76a52f3bea5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl +++ /dev/null @@ -1,231 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# 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; - -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 daemon $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 ('dance_locality_manager'); -} - - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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 node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "*********** Starting test for deployment $file ***********\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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"; - -open (OLDOUT, ">&STDOUT"); -open (STDOUT, ">" . File::Spec->devnull()); -open (OLDERR, ">&STDERR"); -open (STDERR, ">&STDOUT"); - - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); - $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - -open (STDOUT, ">&OLDOUT"); -open (STDERR, ">&OLDERR"); - - if ($pl_status == 0) { - print STDERR "ERROR: plan_launcher didn't return errors.\n"; - - print "Sleeping 5 seconds to allow task to complete\n"; - sleep (5); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); - $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Executor finished.\n"; - } - else { - print "OK. plan_launcher returned an expected value.\n"; - } - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore deleted file mode 100644 index 95522399761..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/TwoTopics_Base.cxx -/TwoTopics_Base.h -/TwoTopics_BasePlugin.cxx -/TwoTopics_BasePlugin.h -/TwoTopics_BaseSupport.cxx -/TwoTopics_BaseSupport.h -/TwoTopics_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl deleted file mode 100644 index 3e182f08d90..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file TwoTopics_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TWOTOPICS_BASE_IDL -#define TWOTOPICS_BASE_IDL - -#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h" -#pragma opendds typesupport "Base/TwoTopics_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "HelloTopic" -#pragma DCPS_DATA_KEY "HelloTopic hello" - -struct HelloTopic { - string hello; //@key - long iteration; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence HelloTopicSeq; -#endif - -#pragma DCPS_DATA_TYPE "GoodbyeTopic" -#pragma DCPS_DATA_KEY "GoodbyeTopic goodbye" - -struct GoodbyeTopic { - string goodbye; //@key - long iteration; -}; -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence GoodbyeTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc deleted file mode 100644 index 06e4dace8ab..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_TwoTopics_Base_stub - dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=TwoTopics_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - TwoTopics_Base.idl - } - - opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export - - DDSGenerator_Files { - TwoTopics_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore deleted file mode 100644 index 1586c6072eb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/TwoTopics_ConnectorE.idl -/TwoTopics_Connector_conn.cpp -/TwoTopics_Connector_conn.h -/TwoTopics_Connector_conn_export.h -/TwoTopics_Connector_lem_stub_export.h -/TwoTopics_Connector_stub_export.h -/TwoTopics_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl deleted file mode 100644 index 493f113abb8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file TwoTopics_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef TWOTOPICS_CONNECTOR_IDL_ -#define TWOTOPICS_CONNECTOR_IDL_ - -#include -#include - -#include "Base/TwoTopics_Base.idl" - -#pragma ciao lem "Connector/TwoTopics_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/TwoTopics_BaseTypeSupport.idl" -#endif - -module TT_Connector -{ - module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector; - module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConnector; -}; - -#endif /* TWOTOPICS_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc deleted file mode 100644 index 1f9f23770fc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector" - -project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_TwoTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \ - -Wb,skel_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=TwoTopics_Connector_svnt_export.h \ - -Wb,svnt_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=TwoTopics_Connector_svnt_export.h \ - -Wb,conn_export_macro=TWOTOPICS_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=TwoTopics_Connector_conn_export.h \ - -I .. - - IDL_Files { - TwoTopics_Connector.idl - } -} - -project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_TwoTopics_Connector_idl_gen - idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - TwoTopics_ConnectorE.idl - } -} - -project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub - libs += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_TwoTopics_Connector_lem_stub - dynamicflags += TWOTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TwoTopics_ConnectorEC.cpp - } - - Header_Files { - TwoTopics_ConnectorEC.h - TwoTopics_Connector_lem_stub_export.h - } - - Inline_Files { - TwoTopics_ConnectorEC.inl - } -} - -project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_TwoTopics_Connector_idl_gen DDS_TwoTopics_Base_stub - libs += DDS_TwoTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_TwoTopics_Connector_stub - dynamicflags += TWOTOPICS_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TwoTopics_ConnectorC.cpp - } - - Header_Files { - TwoTopics_ConnectorC.h - TwoTopics_Connector_stub_export.h - } - - Inline_Files { - TwoTopics_ConnectorC.inl - } -} - -project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub - sharedname = DDS_TwoTopics_Connector_exec - libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS_TwoTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TWOTOPICS_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TwoTopics_Connector_conn.cpp - } - - Header_Files { - TwoTopics_Connector_conn.h - TwoTopics_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub - sharedname = DDS_TwoTopics_Connector_svnt - libs += DDS_TwoTopics_Connector_stub \ - DDS_TwoTopics_Connector_lem_stub \ - DDS_TwoTopics_Base_stub \ - DDS_TwoTopics_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TWOTOPICS_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TwoTopics_ConnectorS.cpp - TwoTopics_Connector_svnt.cpp - } - - Header_Files { - TwoTopics_ConnectorS.h - TwoTopics_Connector_svnt.h - TwoTopics_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl deleted file mode 100644 index 665e3346f76..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef CONNECTOR_IDL_ -#define CONNECTOR_IDL_ - -#include -#include -#include "Hello/HelloGoodbye.idl" -#include "Goodbye/HelloGoodbye.idl" - -#pragma ciao lem "Connector/ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Hello/HelloGoodbyeTypeSupport.idl" -# include "Goodbye/HelloGoodbyeTypeSupport.idl" -#endif - -module Hello -{ - // Hello connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConnector; -}; - -module Goodbye -{ - // Goodbye connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConnector; -}; - -module HelloGoodbye -{ - // Hello connector - module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; - - // Goodbye connector - module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; -}; - -// Hello connector -module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; - -// Goodbye connector -module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; - -#endif /* CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc deleted file mode 100644 index 1e547bc965b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc +++ /dev/null @@ -1,145 +0,0 @@ -project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Hello_Namespace_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Connector_stub_export.h \ - -Wb,skel_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Connector_svnt_export.h \ - -Wb,svnt_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Connector_svnt_export.h \ - -Wb,conn_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Connector_conn_export.h \ - -I .. - - IDL_Files { - Connector.idl - } -} - -project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_TTDN_Connector_idl_gen - idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - ConnectorE.idl - } -} - -project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libs += DDS_Connector_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector_lem_stub - dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorEC.cpp - } - - Header_Files { - ConnectorEC.h - Connector_lem_stub_export.h - } - - Inline_Files { - ConnectorEC.inl - } -} - -project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_TTDN_Connector_idl_gen \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libs += DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Connector_stub - dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorC.cpp - } - - Header_Files { - ConnectorC.h - Connector_stub_export.h - } - - Inline_Files { - ConnectorC.inl - } -} - -project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libs += DDS_Connector_stub DDS_Connector_lem_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - sharedname = DDS_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Connector_conn.cpp - } - - Header_Files { - Connector_conn.h - Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS_TTDN_Connector_stub - libs += DDS_Connector_stub \ - DDS_Connector_lem_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS_Connector_exec - sharedname = DDS_Connector_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorS.cpp - Connector_svnt.cpp - } - - Header_Files { - ConnectorS.h - Connector_svnt.h - Connector_svnt_export.h - } - - Inline_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore deleted file mode 100644 index b33d6bb17e2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Goodbye_stub_export.h -/HelloGoodbye.cxx -/HelloGoodbye.h -/HelloGoodbyePlugin.cxx -/HelloGoodbyePlugin.h -/HelloGoodbyeSupport.cxx -/HelloGoodbyeSupport.h diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl deleted file mode 100644 index 80e27a75c0a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file HelloGoodbye.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef GOODBYE_IDL_ -#define GOODBYE_IDL_ - -#pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h" -#pragma opendds typesupport "Goodbye/HelloGoodbyeTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "Goodbye::HelloGoodbye" -#pragma DCPS_DATA_KEY "Goodbye::HelloGoodbye goodbye" - -module Goodbye -{ - struct HelloGoodbye { - string goodbye; //@key - long iteration; - }; - #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence HelloGoodbyeSeq; -#endif -}; - -#endif /* GOODBYE_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc deleted file mode 100644 index 77f20e7d0c9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Goodbye_Namespace_Base_stub - dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=GOODBYE_NAMESPACE_STUB_Export \ - -Wb,stub_export_include=Goodbye_stub_export.h - - IDL_Files { - idlflags += -Gxhst - HelloGoodbye.idl - } - - opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export - - DDSGenerator_Files { - HelloGoodbye.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore deleted file mode 100644 index 6c770338040..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/HelloGoodbye.cxx -/HelloGoodbye.h -/HelloGoodbyePlugin.cxx -/HelloGoodbyePlugin.h -/HelloGoodbyeSupport.cxx -/HelloGoodbyeSupport.h -/Hello_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl deleted file mode 100644 index d18f059326d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file HelloGoodbye.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef HELLO_IDL_ -#define HELLO_IDL_ - -#pragma ndds typesupport "Hello/HelloGoodbyeSupport.h" -#pragma opendds typesupport "Hello/HelloGoodbyeTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "Hello::HelloGoodbye" -#pragma DCPS_DATA_KEY "Hello::HelloGoodbye hello" - -module Hello -{ - struct HelloGoodbye { - string hello; //@key - long iteration; - }; - #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence HelloGoodbyeSeq; -#endif -}; - - -#endif /* HELLO_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc deleted file mode 100644 index ac23ad4c2ee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Hello_Namespace_Base_stub - dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=HELLO_NAMESPACE_STUB_Export \ - -Wb,stub_export_include=Hello_stub_export.h - - IDL_Files { - idlflags += -Gxhst - HelloGoodbye.idl - } - - opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export - - DDSGenerator_Files { - HelloGoodbye.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc b/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc deleted file mode 100644 index a193af51005..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc +++ /dev/null @@ -1,8 +0,0 @@ -project(DDS_TypeSupport_Test) : taoexe, typecode, dds4ccm_base { - includes += $(CIAO_ROOT) - exename = typesupport_test - - Source_Files { - main.cpp - } -} \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp deleted file mode 100644 index 7128ce31414..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp +++ /dev/null @@ -1,297 +0,0 @@ -#include "ace/OS_main.h" -#include "ace/Log_Msg.h" -#include "ace/Env_Value_T.h" - -#if (CIAO_DDS4CCM_NDDS == 1) - -#include "dds4ccm/impl/ndds/TypeSupport.h" -#include "dds4ccm/impl/ndds/DomainParticipant.h" -#include "dds4ccm/impl/ndds/DomainParticipantFactory.h" - -typedef ::CIAO::NDDS::DDS_DomainParticipantFactory_i - DomainParticipantFactory; - -class TestTypeFactory : public ::CIAO::NDDS::DDS_TypeFactory_i -{ - virtual DDS::DataWriter_ptr create_datawriter (DDSDataWriter* , - ::DDS::DomainParticipant_ptr , - ::DDS::Publisher_ptr ) - { - return ::DDS::DataWriter::_nil (); - } - - virtual DDS::DataReader_ptr create_datareader (DDSDataReader* , - ::DDS::DomainParticipant_ptr , - ::DDS::Subscriber_ptr ) - { - return ::DDS::DataReader::_nil (); - } -}; -#endif - -int -ACE_TMAIN (int , ACE_TCHAR **) -{ -#if (CIAO_DDS4CCM_NDDS == 1) - // first turn on or off tracing - ACE_Env_Value trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0); - if (trace) - { - DDS4CCM_ENABLE_TRACE (); - } - else - { - DDS4CCM_DISABLE_TRACE (); - } - DDS4CCM_debug_level = 0; - - int ret = 0; - - try - { - int domain_id = 0; - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); - domain_id = id; - - DomainParticipantFactory pf; - - ::DDS::DomainParticipantQos qos; - ::DDS::DomainParticipant_var dp1 = pf.create_participant ( - domain_id, - qos, - ::DDS::DomainParticipantListener::_nil (), - 0); - - ::DDS::DomainParticipant_var dp2 = pf.create_participant ( - domain_id, - qos, - ::DDS::DomainParticipantListener::_nil (), - 0); - - const char * type1 = "DataType1"; - const char * type2 = "DataType2"; - const char * type3 = "DataType3"; - - TestTypeFactory * f1 = 0; - TestTypeFactory * f2 = 0; - TestTypeFactory * f3 = 0; - - ACE_NEW_THROW_EX (f1, - TestTypeFactory (), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (f2, - TestTypeFactory (), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (f3, - TestTypeFactory (), - ::CORBA::NO_MEMORY ()); - - /// Register type 1 with f1 - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1)) - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n", - type1, f1)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type1, f1)); - ++ret; - } - /// DP1 should now contain one type-factory combination - - /// Register the same factory again - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1)) - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could be registered\n", - type1, f1)); - ++ret; - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type1, f1)); - } - /// DP1 should now contain one type-factory combination - - /// Register the same factory again but with another name - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f1)) - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could be registered\n", - type2, f1)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type2, f1)); - ++ret; - } - /// DP1 should now contain two type-factory combinations - - /// Register the same type with another factory - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f2)) - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could be registered\n", - type2, f2)); - ++ret; - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type2, f2)); - } - /// DP1 should now contain two type-factory combinations - - /// Just register type 3 with f3 - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3)) - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n", - type3, f3)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type3, f3)); - ++ret; - } - /// DP1 should now contain three type-factory combinations - - /// Unregister an unused factory by using an unused domain participant - bool tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp2.in(), type1); - - if (tmp) - { - ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP2 could be unregistered\n", - type1)); - ++ret; - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP2 could not be unregistered\n", - type1)); - } - - /// Unregister a registered type by using a used domain participant - tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1); - - if (tmp) - { - ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n", - type1)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n", - type1)); - ++ret; - } - /// DP1 should now contain two type-factory combinations - - /// Unregister the same type and domain participant again - tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1); - - if (tmp) - { - ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n", - type1)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n", - type1)); - ++ret; - } - /// DP1 should now contain two type-factory combinations - - /// Call Close on TypeSupport. This should remove the last remaining entries. - ::CIAO::NDDS::DDS_TypeSupport_i::close(); - - /// Unregister the type and domain participant which should be removed by 'close' - tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type2); - - if (tmp) - { - ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n", - type2)); - ++ret; - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n", - type2)); - } - - /// Unregister the type and domain participant which should be removed by 'close' - tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type3); - - if (tmp) - { - ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n", - type3)); - ++ret; - } - else - { - ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n", - type3)); - } - - /// Since we've invoked ::close f3 has been deleted. Therefor we need to create it again. - ACE_NEW_THROW_EX (f3, - TestTypeFactory (), - ::CORBA::NO_MEMORY ()); - - - /// We should now be able to register type 3 again - if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3)) - { - ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n", - type3, f3)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n", - type3, f3)); - ++ret; - } - /// DP1 should now contain one type-factory combination - - /// Call Close on TypeSupport. This should remove the last remaining entries. - ::CIAO::NDDS::DDS_TypeSupport_i::close(); - - /// No need to delete f1, f2, and f3 since ::close will delete them. - pf.delete_participant(dp1); - pf.delete_participant(dp2); - -#if (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipantFactory::finalize_instance (); -#endif - - } - catch (const ::CORBA::Exception& e) - { - e._tao_print_exception ("ACE_TMAIN - Caught unexpected " - "CORBA exception\n"); - return 1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ACE_TMAIN - ERROR: Caught unexpected " - "exception\n")); - return 1; - } - if (ret == 0) - { - ACE_DEBUG ((LM_DEBUG, "Test passed !\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "%d errors found during test. \n", - ret)); - } - return ret; -#else - ACE_DEBUG ((LM_DEBUG, "NDDS only test\n")); - return 0; -#endif -} diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl b/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl deleted file mode 100755 index 07573f42369..00000000000 --- a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl +++ /dev/null @@ -1,27 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; - -$PROG = $program->CreateProcess ("typesupport_test", ""); -$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval()); - -if ($program_status != 0) { - print STDERR "ERROR: typesupport_test returned $program_status\n"; - exit 1; -} - -$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval()); - -if ($exit_status != 0) { - print STDERR "ERROR: typesupport_test returned $server_status\n"; - $status = 1; -} - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl deleted file mode 100644 index 42a3dad6ae0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file Unkeyed_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UNKEYED_TEST_BASE_IDL -#define UNKEYED_TEST_BASE_IDL - -#pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Unkeyed_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "UnkeyedTest" - -struct UnkeyedTest { - string key; - long iteration; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence UnkeyedTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc deleted file mode 100644 index a82c8c37555..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Unkeyed_Test_Base_stub - dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Unkeyed_Test_Base.idl - } - - opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export - - DDSGenerator_Files { - Unkeyed_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore deleted file mode 100644 index 1d95bf64721..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Unkeyed_Test_ConnectorE.idl -/Unkeyed_Test_Connector_conn.cpp -/Unkeyed_Test_Connector_conn.h -/Unkeyed_Test_Connector_conn_export.h -/Unkeyed_Test_Connector_lem_stub_export.h -/Unkeyed_Test_Connector_stub_export.h -/Unkeyed_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl deleted file mode 100644 index 807df77e543..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Unkeyed_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UNKEYED_TEST_CONNECTOR_IDL_ -#define UNKEYED_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Unkeyed_Test_Base.idl" - -#pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Unkeyed_Test_BaseTypeSupport.idl" -#endif - -module Unkeyed_Test -{ - module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector; -}; - -#endif /* Unkeyed_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc deleted file mode 100644 index 3a7a7dc1310..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector" - -project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Unkeyed_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Unkeyed_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Unkeyed_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Unkeyed_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=UNKEYED_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Unkeyed_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - Unkeyed_Test_Connector.idl - } -} - -project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Unkeyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Unkeyed_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Unkeyed_Test_ConnectorE.idl - } -} - -project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_Unkeyed_Test_Connector_lem_gen DDS_Unkeyed_Test_Connector_stub \ - DDS_Unkeyed_Test_Base_stub - libs += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Unkeyed_Test_Connector_lem_stub - dynamicflags += UNKEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ConnectorEC.cpp - } - - Header_Files { - Unkeyed_Test_ConnectorEC.h - Unkeyed_Test_Connector_lem_stub_export.h - } - - Inline_Files { - Unkeyed_Test_ConnectorEC.inl - } -} - -project(DDS_Unkeyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_Unkeyed_Test_Connector_idl_gen DDS_Unkeyed_Test_Base_stub - libs += DDS_Unkeyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Unkeyed_Test_Connector_stub - dynamicflags += UNKEYED_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ConnectorC.cpp - } - - Header_Files { - Unkeyed_Test_ConnectorC.h - Unkeyed_Test_Connector_stub_export.h - } - - Inline_Files { - Unkeyed_Test_ConnectorC.inl - } -} - -project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub \ - DDS_Unkeyed_Test_Base_stub - sharedname = DDS_Unkeyed_Test_Connector_exec - libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub \ - DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UNKEYED_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_Connector_conn.cpp - } - - Header_Files { - Unkeyed_Test_Connector_conn.h - Unkeyed_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_exec \ - DDS_Unkeyed_Test_Connector_stub - sharedname = DDS_Unkeyed_Test_Connector_svnt - libs += DDS_Unkeyed_Test_Connector_stub \ - DDS_Unkeyed_Test_Connector_lem_stub \ - DDS_Unkeyed_Test_Base_stub \ - DDS_Unkeyed_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UNKEYED_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ConnectorS.cpp - Unkeyed_Test_Connector_svnt.cpp - } - - Header_Files { - Unkeyed_Test_ConnectorS.h - Unkeyed_Test_Connector_svnt.h - Unkeyed_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README deleted file mode 100644 index 8a26966f186..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README +++ /dev/null @@ -1,6 +0,0 @@ - - -UnkeyedSamples consists of a Sender and a Receiver. -The Sender writes samples unkeyed; the Receiver should -receive the same number of samples. An error is printed -when this isn't the case. \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore deleted file mode 100644 index 4829caba63b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/Unkeyed_Test_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl deleted file mode 100644 index 45c30460219..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Unkeyed_Test_Connector.idl" - -module Unkeyed_Test -{ - component Receiver - { - port UnkeyedTestConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener info_out_connector_status; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc deleted file mode 100644 index 8afc8d0bf79..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_Unkeyed_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Unkeyed_Test_Receiver.idl - } -} - -project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Unkeyed_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Unkeyed_Test_ReceiverE.idl - } -} - -project(DDS_Unkeyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Unkeyed_Test_Receiver_lem_gen DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub - libs += Receiver_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ReceiverEC.cpp - } - - Header_Files { - Unkeyed_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Unkeyed_Test_ReceiverEC.inl - } -} - -project(DDS_Unkeyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Unkeyed_Test_Receiver_idl_gen DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_gen - libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ReceiverC.cpp - } - - Header_Files { - Unkeyed_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Unkeyed_Test_ReceiverC.inl - } -} - -project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_Receiver_exec.cpp - } - - Header_Files { - Unkeyed_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_ReceiverS.cpp - Unkeyed_Test_Receiver_svnt.cpp - } - - Header_Files { - Unkeyed_Test_ReceiverS.h - Unkeyed_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp deleted file mode 100644 index e5c788e651b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ /dev/null @@ -1,370 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Unkeyed_Test_Receiver_exec.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Unkeyed_Test_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &received) - : ciao_context_ ( - ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx)) - , received_ (received) - , handle_ (DDS::HANDLE_NIL) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Unkeyed_Test::UnkeyedTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::UnkeyedTest & datum, - const ::CCM_DDS::ReadInfo & info) - { - // From the first sample store the instance handle, the handle should be - // nil (RTI DDS) or stay the same (OpenDDS) - if (this->received_ == 0) - { - this->handle_ = info.instance_handle; - } - ++this->received_; - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UnkeyedTest_Listener: ") - ACE_TEXT ("received keyed_test_info for <%C> at iteration <%u> for handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT ("\n"), - datum.key.in (), - datum.iteration, - DDS_INSTANCE_HANDLE_LOG (info.instance_handle))); - if ((info.instance_handle != ::DDS::HANDLE_NIL) && - (this->handle_.value () != info.instance_handle)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ") - ACE_TEXT ("received instance handle ") - DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER - ACE_TEXT (" should be nil or stay the same ") - ACE_TEXT ("for unkeyed data ") - ACE_TEXT ("key <%C> - iteration <%u>\n"), - DDS_INSTANCE_HANDLE_LOG (info.instance_handle), - datum.key.in (), - datum.iteration)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: UnkeyedTest_Listener::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.iteration)); - } - } - - void - info_out_data_listener_exec_i::on_many_data (const ::UnkeyedTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_connector_status_exec_i - */ - - info_out_connector_status_exec_i::info_out_connector_status_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - - void - info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */, - const ::DDS::InconsistentTopicStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleRejectedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */, - const ::DDS::OfferedIncompatibleQosStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */, - ::DDS::StatusKind /* status_kind */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (10) - , keys_ (3) - , received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->received_), - ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_info_out_connector_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ())) - { - info_out_connector_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_connector_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_ConnectorStatusListener::_nil ()); - - this->ciao_info_out_connector_status_ = tmp; - } - - return - ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate ( - this->ciao_info_out_connector_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Unkeyed_Test::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - ::CORBA::ULong expected = this->keys_ * this->iterations_; - ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u>\n", - this->received_.value ())); - - if (this->received_.value () != expected) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " - "ERROR: Unexpected number of samples received: " - "expected <%u> - received <%u>\n", - expected, - this->received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Unkeyed_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h deleted file mode 100644 index f238945030d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h +++ /dev/null @@ -1,234 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_ -#define CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_ - -#include /**/ "ace/pre.h" - -#include "Unkeyed_Test_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Unkeyed_Test_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Handle; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx, - Atomic_ULong &); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Unkeyed_Test::UnkeyedTestConnector::Listener. */ - - virtual - void on_one_data (const ::UnkeyedTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::UnkeyedTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_; - Atomic_ULong &received_; - Atomic_Handle handle_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Provider Executor Implementation Class: info_out_connector_status_exec_i - */ - - class info_out_connector_status_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_connector_status_exec_i ( - ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_connector_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual - 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); - //@} - - private: - ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_info_out_connector_status (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Atomic_ULong received_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Unkeyed_Test_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore deleted file mode 100644 index d02ac4819e3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/Unkeyed_Test_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl deleted file mode 100644 index aa31f073a0f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_KEYED_TEST_SENDER_IDL -#define DDS_KEYED_TEST_SENDER_IDL - -#include "Connector/Unkeyed_Test_Connector.idl" - -module Unkeyed_Test -{ - component Sender - { - port UnkeyedTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; - attribute unsigned short rate; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc deleted file mode 100644 index 413980d9e47..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_Unkeyed_Test_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Unkeyed_Test_Sender.idl - } -} - -project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Unkeyed_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Unkeyed_Test_SenderE.idl - } -} - -project(DDS_Unkeyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Unkeyed_Test_Sender_lem_gen DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Base_stub - libs += DDS_Unkeyed_Test_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_SenderEC.cpp - } - - Header_Files { - Unkeyed_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Unkeyed_Test_SenderEC.inl - } -} - -project(DDS_Unkeyed_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Unkeyed_Test_Sender_idl_gen DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub - libs += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_SenderC.cpp - } - - Header_Files { - Unkeyed_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Unkeyed_Test_SenderC.inl - } -} - -project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_Sender_exec.cpp - } - - Header_Files { - Unkeyed_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_SenderS.cpp - Unkeyed_Test_Sender_svnt.cpp - } - - Header_Files { - Unkeyed_Test_SenderS.h - Unkeyed_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp deleted file mode 100644 index fd7ac4b155e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp +++ /dev/null @@ -1,324 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Unkeyed_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Unkeyed_Test_Sender_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->callback_.start (); - } - } - - /** - * Write action generator - */ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1) - , iterations_ (10) - , keys_ (3) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Sender_exec_i::tick () - { - ::Unkeyed_Test::UnkeyedTestConnector::Writer_var writer - = this->ciao_context_->get_connection_info_write_data (); - - if (this->last_key != this->ktests_.end ()) - { - try - { - ++this->last_key->second->iteration; - writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - this->last_key->first.c_str (), - this->last_key->second->iteration)); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Key info for <%C> not updated: <%C> didn't exist.\n"), - this->last_key->first.c_str (), this->last_key->first.c_str ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error while updating key info for <%C>.\n"), - this->last_key->first.c_str ())); - } - ++this->last_key; - } - else - { - // onto the next iteration - this->last_key = this->ktests_.begin (); - while (this->last_key != this->ktests_.end ()) - { - if (this->last_key->second->iteration == this->iterations_) - { - //next key - ++this->last_key; - } - else - { - break; - } - } - } - } - - void - Sender_exec_i::start (void) - { - // Calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::UShort rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_test_topic_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Unkeyed_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - UnkeyedTest *new_key = new UnkeyedTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 0; - - this->ktests_[key] = new_key; - } - this->last_key = this->ktests_.begin (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Unkeyed_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h deleted file mode 100644 index ef9ae64ec62..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h +++ /dev/null @@ -1,184 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_ -#define CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_ - -#include /**/ "ace/pre.h" - -#include "Unkeyed_Test_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_Unkeyed_Test_Sender_Impl -{ - - class Sender_exec_i; - - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Write action generator - */ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - - virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); - - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::CORBA::UShort rate (void); - - virtual void rate (::CORBA::UShort rate); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_test_topic_connector_status(void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void start (void); - //@} - - private: - ::Unkeyed_Test::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort rate_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Unkeyed_Test_Table; - Unkeyed_Test_Table ktests_; - Unkeyed_Test_Table::iterator last_key; - - //@} - - //@{ - /** User defined private operations. */ - void stop (void); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Unkeyed_Test_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp deleted file mode 100644 index 6c5731e08f8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp +++ /dev/null @@ -1,424 +0,0 @@ - - - - Unkeyed_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Unkeyed_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Unkeyed_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Unkeyed_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Unkeyed_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Unkeyed_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Unkeyed_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Unkeyed_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - iterations - - - tk_ushort - - - 10 - - - - - keys - - - tk_ushort - - - 3 - - - - - - Unkeyed_Test_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Unkeyed_Test - - - - - - Unkeyed_Test_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Unkeyed_Test - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ushort - - - 1 - - - - - iterations - - - tk_ushort - - - 10 - - - - - keys - - - tk_ushort - - - 3 - - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - _datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - info_out_connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - test_topic_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Unkeyed_Test_Connector_exec - - - DDS_Unkeyed_Test_Connector_exec - - - Unkeyed_Test_Connector_svnt - - - DDS_Unkeyed_Test_Connector_svnt - - - Unkeyed_Test_Connector_stub - - - DDS_Unkeyed_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl deleted file mode 100755 index 87984594507..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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\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/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl deleted file mode 100644 index 1b569f4b6d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file Writer_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_BASE_IDL -#define WRITER_BASE_IDL - -#pragma ndds typesupport "Base/Writer_BaseSupport.h" -#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" - -typedef sequence OctetSeq; - -#pragma DCPS_DATA_TYPE "WriterTest" - -struct WriterTest { - string key; - long iteration; - OctetSeq data; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence WriterTestSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc deleted file mode 100644 index 7805092c82a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_UnkeyedWriterBase_stub - dynamicflags += WRITER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ - -Wb,stub_export_include=Writer_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Writer_Base.idl - } - - opendds_ts_flags += --export=WRITER_BASE_STUB_Export - - DDSGenerator_Files { - Writer_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl deleted file mode 100644 index 5969c7d1176..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Writer_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef WRITER_CONNECTOR_IDL_ -#define WRITER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Writer_Base.idl" - -#pragma ciao lem "Connector/Writer_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Writer_BaseTypeSupport.idl" -#endif - -module Writer -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; -}; - -#endif /* Writer_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc deleted file mode 100644 index c4fe5d76d38..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc +++ /dev/null @@ -1,146 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector" - -project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_UnkeyedWriterBase_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_stub_export.h \ - -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Writer_Connector_svnt_export.h \ - -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Writer_Connector_svnt_export.h \ - -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Writer_Connector_conn_export.h \ - -I .. - - IDL_Files { - Writer_Connector.idl - } -} - -project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_UnkeyedWriterConnector_idl_gen - idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Writer_ConnectorE.idl - } -} - -project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_UnkeyedWriterConnector_lem_gen DDS_UnkeyedWriterConnector_stub \ - DDS_UnkeyedWriterBase_stub - libs += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_UnkeyedWriterConnector_lem_stub - dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorEC.cpp - } - - Header_Files { - Writer_ConnectorEC.h - Writer_Connector_lem_stub_export.h - } - - Inline_Files { - Writer_ConnectorEC.inl - } -} - -project(DDS_UnkeyedWriterConnector_stub) : ccm_stub, dds4ccm_base { - after += DDS_UnkeyedWriterConnector_idl_gen DDS_UnkeyedWriterBase_stub - libs += DDS_UnkeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_UnkeyedWriterConnector_stub - dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorC.cpp - } - - Header_Files { - Writer_ConnectorC.h - Writer_Connector_stub_export.h - } - - Inline_Files { - Writer_ConnectorC.inl - } -} - -project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub \ - DDS_UnkeyedWriterBase_stub - sharedname = DDS_UnkeyedWriterConnector_exec - libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub \ - DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Connector_conn.cpp - } - - Header_Files { - Writer_Connector_conn.h - Writer_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_exec \ - DDS_UnkeyedWriterConnector_stub - sharedname = DDS_UnkeyedWriterConnector_svnt - libs += DDS_UnkeyedWriterConnector_stub \ - DDS_UnkeyedWriterConnector_lem_stub \ - DDS_UnkeyedWriterBase_stub \ - DDS_UnkeyedWriterConnector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ConnectorS.cpp - Writer_Connector_svnt.cpp - } - - Header_Files { - Writer_ConnectorS.h - Writer_Connector_svnt.h - Writer_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl deleted file mode 100644 index 2d720fba655..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Receiver - { - port WriterTestConnector::DDS_Listen info_out; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc deleted file mode 100644 index 92d6d3c513d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_UnkeyedWriterConnector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Writer_Receiver.idl - } -} - -project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_UnkeyedWriterReceiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Writer_ReceiverE.idl - } -} - -project(DDS_UnkeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_UnkeyedWriterReceiver_lem_gen DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub - libs += Receiver_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverEC.cpp - } - - Header_Files { - Writer_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Writer_ReceiverEC.inl - } -} - -project(DDS_UnkeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_UnkeyedWriterReceiver_idl_gen DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_gen - libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverC.cpp - } - - Header_Files { - Writer_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Writer_ReceiverC.inl - } -} - -project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Receiver_exec.cpp - } - - Header_Files { - Writer_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_ReceiverS.cpp - Writer_Receiver_svnt.cpp - } - - Header_Files { - Writer_ReceiverS.h - Writer_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp deleted file mode 100644 index dd94ab6a7d9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ /dev/null @@ -1,267 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Receiver_exec.h" - -namespace CIAO_Writer_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort iterations, - Atomic_ULong &samples_received) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - , iterations_ (iterations) - , samples_received_ (samples_received) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Writer::WriterTestConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ++this->samples_received_; - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WriterTest_Listener::on_one_data ") - ACE_TEXT ("received writer info for <%C> at %u\n"), - datum.key.in (), - datum.iteration)); - if (datum.iteration > this->iterations_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ") - ACE_TEXT ("greater than expected : ") - ACE_TEXT ("expected <%u> - received <%u>\n"), - this->iterations_, datum.iteration)); - } - if (datum.iteration == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ") - ACE_TEXT ("is zero\n"))); - } - } - - void - info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ") - ACE_TEXT ("on_many_data has been called.\n"))); - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Writer::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (10) - , keys_ (5) - , samples_received_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Writer::WriterTestConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->iterations () * this->keys (), - this->samples_received_), - ::Writer::WriterTestConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Writer::WriterTestConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::keys (void) - { - return this->keys_; - } - - void - Receiver_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->samples_received_ != 2 * this->keys_ * this->iterations_) - { - ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " - "ERROR: Did not receive the expected number of samples: " - "expected <%u> - received <%u>\n", - 2 * this->keys_ * this->iterations_, - this->samples_received_.value ())); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h deleted file mode 100644 index 263b91d30cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h +++ /dev/null @@ -1,185 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_ -#define CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Writer_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_ULong; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Writer::WriterTestConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx, - const ::CORBA::UShort iterations, - Atomic_ULong &samples_received); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Writer::WriterTestConnector::Listener. */ - - virtual - void on_one_data (const ::WriterTest & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::WriterTestSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - const ::CORBA::UShort iterations_; - Atomic_ULong &samples_received_; - - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Writer::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Writer::WriterTestConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Writer::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Writer::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - Atomic_ULong samples_received_; - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl deleted file mode 100644 index 64984e084f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef DDS_KEYED_TEST_SENDER_IDL -#define DDS_KEYED_TEST_SENDER_IDL - -#include "Connector/Writer_Connector.idl" - -module Writer -{ - component Sender - { - port WriterTestConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - - attribute unsigned short rate; - attribute unsigned short iterations; - attribute unsigned short keys; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc deleted file mode 100644 index 34c6a6563d3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_UnkeyedWriterConnector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - Writer_Sender.idl - } -} - -project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_UnkeyedWriterSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Writer_SenderE.idl - } -} - -project(DDS_UnkeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_UnkeyedWriterSender_lem_gen DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterBase_stub - libs += DDS_UnkeyedWriterBase_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderEC.cpp - } - - Header_Files { - Writer_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Writer_SenderEC.inl - } -} - -project(DDS_UnkeyedWriterSender_stub) : ccm_stub, dds4ccm_base { - after += DDS_UnkeyedWriterSender_idl_gen DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub - libs += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderC.cpp - } - - Header_Files { - Writer_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Writer_SenderC.inl - } -} - -project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_Sender_exec.cpp - } - - Header_Files { - Writer_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_SenderS.cpp - Writer_Sender_svnt.cpp - } - - Header_Files { - Writer_SenderS.h - Writer_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp deleted file mode 100644 index 0b7d48b8c3a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp +++ /dev/null @@ -1,465 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Writer_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_Writer_Sender_Impl -{ - /** - * ConnectorStatusListener_exec_i - */ - - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Pulse Generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : rate_ (1) - , iterations_ (15) - , keys_ (5) - , assignment_ (WRITE_UNKEYED) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - void - Sender_exec_i::reset_iterations () - { - for (Writer_Table::iterator i = this->ktests_.begin (); - i != this->ktests_.end (); - ++i) - { - i->second->iteration = 0; - } - } - - void - Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment) - { - this->last_key = this->ktests_.begin (); - this->assignment_ = assignment; - reset_iterations (); - } - - void - Sender_exec_i::write_unkeyed () - { - if (this->last_key != this->ktests_.end ()) - { - try - { - ::Writer::WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - ++this->last_key->second->iteration; - OctetSeq_var reply_mesg = new OctetSeq (1); - reply_mesg->length (1); - this->last_key->second->data = reply_mesg; - writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d>\n"), - this->last_key->first.c_str (), - this->last_key->second->iteration)); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%C>.\n"), - this->last_key->first.c_str ())); - } - ++this->last_key; - } - else - { - //onto the next iteration - this->last_key = this->ktests_.begin (); - while (this->last_key != this->ktests_.end ()) - { - if (this->last_key->second->iteration == this->iterations_) - { - //next key - ++this->last_key; - } - else - { - break; - } - } - if (this->last_key == this->ktests_.end ()) - { - start_new_assignment (WRITE_MULTI); - } - } - } - - void - Sender_exec_i::write_many () - { - CORBA::ULong nr_samples = this->keys_ * this->iterations_; - WriterTestSeq write_many_no_excep; - write_many_no_excep.length (nr_samples); - //write with no exception - for (CORBA::ULong i = 1; i < nr_samples + 1; ++i) - { - WriterTest new_key; - new_key.key = CORBA::string_dup("KEY_1"); - new_key.iteration = i; - OctetSeq_var reply_mesg = new OctetSeq (1); - reply_mesg->length (1); - new_key.data = reply_mesg; - write_many_no_excep[i-1] = new_key; - } - try - { - ::Writer::WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - writer->write_many (write_many_no_excep); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"), - write_many_no_excep.length ())); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - start_new_assignment (TEST_EXCEPTION); - } - - void - Sender_exec_i::test_exception () - { - if (this->last_key != this->ktests_.end ()) - { - try - { - ::Writer::WriterTestConnector::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - - ++this->last_key->second->iteration; - long const length = 100000; - OctetSeq_var reply_mesg = new OctetSeq (length); - reply_mesg->length (length); - this->last_key->second->data = reply_mesg; - writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL); -#if (CIAO_DDS4CCM_NDDS==1) - // Sending large amount of data fails with RTI DDS - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No InternalError ") - ACE_TEXT ("caught while writing a large amount of data.\n"))); -#endif - } - catch (const CCM_DDS::InternalError& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::test_exception: ") - ACE_TEXT ("OK: Expected InternalErr received\n"))); - } - ++this->last_key; - } - else - { - //onto the next iteration - this->last_key = this->ktests_.begin (); - while (this->last_key != this->ktests_.end ()) - { - if (this->last_key->second->iteration == this->iterations_) - { - //next key - ++this->last_key; - } - else - { - break; - } - } - } - if (this->last_key == this->ktests_.end ()) - { - start_new_assignment (WRITE_NONE); - } - } - - void - Sender_exec_i::tick () - { - switch (this->assignment_) - { - case WRITE_UNKEYED: - write_unkeyed (); - break; - case WRITE_MULTI: - write_many (); - break; - case TEST_EXCEPTION: - test_exception (); - break; - default: - break; - } - } - - void - Sender_exec_i::get_started (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->mutex_, CORBA::INTERNAL ()); - - for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) - { - char key[7]; - WriterTest *new_key = new WriterTest; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->key = CORBA::string_dup(key); - new_key->iteration = 1; - - this->ktests_[key] = new_key; - } - this->start (); - this->last_key = this->ktests_.begin (); - reset_iterations (); - } - - void - Sender_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - // Component attributes and port operations. - - ::CORBA::UShort - Sender_exec_i::rate (void) - { - return this->rate_; - } - - void - Sender_exec_i::rate ( - const ::CORBA::UShort rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations ( - const ::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Sender_exec_i::keys (void) - { - return this->keys_; - } - - void - Sender_exec_i::keys ( - const ::CORBA::UShort keys) - { - this->keys_ = keys; - } - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Writer::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h deleted file mode 100644 index 33d61634ba2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h +++ /dev/null @@ -1,199 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_ -#define CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_ - -#include /**/ "ace/pre.h" - -#include "Writer_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" -#include - -namespace CIAO_Writer_Sender_Impl -{ - class Sender_exec_i; - - enum WRITER_ASSIGNMENT { - WRITE_NONE, - WRITE_UNKEYED, - WRITE_MULTI, - TEST_EXCEPTION - }; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Pulse Generator - */ - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CORBA::UShort rate (void); - - virtual void rate (::CORBA::UShort rate); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CORBA::UShort keys (void); - - virtual void keys (::CORBA::UShort keys); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void get_started (void); - //@} - - private: - ::Writer::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - - ::CORBA::UShort rate_; - - ::CORBA::UShort iterations_; - - ::CORBA::UShort keys_; - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - WRITER_ASSIGNMENT assignment_; - - TAO_SYNCH_MUTEX mutex_; - typedef std::map Writer_Table; - Writer_Table ktests_; - - Writer_Table::iterator last_key; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - - void reset_iterations (); - void start_new_assignment ( - WRITER_ASSIGNMENT assignment); - void write_unkeyed (); - void write_many (); - void test_exception (); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Writer_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp deleted file mode 100644 index be1f4f951d4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp +++ /dev/null @@ -1,430 +0,0 @@ - - - - UnkeyedWriter_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Writer_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_WriterTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_WriterTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Writer_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Writer_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Writer_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Writer_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - iterations - - - tk_ushort - - - - 10 - - - - - keys - - - tk_ushort - - - - 5 - - - - - - Writer_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - UnkeyedWriter - - - - - qos_profile - - - tk_string - - - UnkeyedWriter_Library#UnkeyedWriterProfile - - - - - - Writer_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - UnkeyedWriter - - - - - qos_profile - - - tk_string - - - UnkeyedWriter_Library#UnkeyedWriterProfile - - - - - - SenderComponent - SenderNode - - - - - rate - - - tk_ushort - - - 15 - - - - - keys - - - tk_ushort - - - 5 - - - - - iterations - - - tk_ushort - - - 10 - - - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - _datacontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Writer_Connector_exec - - - DDS_UnkeyedWriterConnector_exec - - - Writer_Connector_svnt - - - DDS_UnkeyedWriterConnector_svnt - - - Writer_Connector_stub - - - DDS_UnkeyedWriterConnector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 64605acaa45..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml deleted file mode 100644 index ef8ae685b98..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl deleted file mode 100755 index 0667f786cde..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (70); - -# 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\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/CIAO/connectors/dds4ccm/tests/Updater/.gitignore b/CIAO/connectors/dds4ccm/tests/Updater/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl deleted file mode 100644 index e22773564d7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file Updater_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UPDATER_BASE_IDL -#define UPDATER_BASE_IDL - -#pragma ndds typesupport "Base/Updater_BaseSupport.h" -#pragma opendds typesupport "Base/Updater_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -struct TestTopic { - string key; //@key - long x; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc deleted file mode 100644 index bc2dbfa7185..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = DDS_Updater_Base_stub - dynamicflags += UPDATER_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \ - -Wb,stub_export_include=Updater_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - Updater_Base.idl - } - - opendds_ts_flags += --export=UPDATER_BASE_STUB_Export - - DDSGenerator_Files { - Updater_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl deleted file mode 100644 index 16452237af8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Updater_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef UPDATER_CONNECTOR_IDL_ -#define UPDATER_CONNECTOR_IDL_ - -#include -#include - -#include "Base/Updater_Base.idl" - -#pragma ciao lem "Connector/Updater_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/Updater_BaseTypeSupport.idl" -#endif - -module Updater -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector; -}; - -#endif /* UPDATER_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc deleted file mode 100644 index 825b96d2719..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector" - -project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_Updater_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Updater_Connector_stub_export.h \ - -Wb,skel_export_macro=UPDATER_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Updater_Connector_svnt_export.h \ - -Wb,svnt_export_macro=UPDATER_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Updater_Connector_svnt_export.h \ - -Wb,conn_export_macro=UPDATER_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Updater_Connector_conn_export.h \ - -I .. - - IDL_Files { - Updater_Connector.idl - } -} - -project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_UPDATER_Connector_idl_gen - idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Updater_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - Updater_ConnectorE.idl - } -} - -project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub - libs += DDS_Updater_Base_stub DDS_Updater_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_UPDATER_Connector_lem_stub - dynamicflags += UPDATER_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ConnectorEC.cpp - } - - Header_Files { - Updater_ConnectorEC.h - Updater_Connector_lem_stub_export.h - } - - Inline_Files { - Updater_ConnectorEC.inl - } -} - -project(DDS_Updater_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_UPDATER_Connector_idl_gen DDS_Updater_Base_stub - libs += DDS_Updater_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_Updater_Connector_stub - dynamicflags += UPDATER_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ConnectorC.cpp - } - - Header_Files { - Updater_ConnectorC.h - Updater_Connector_stub_export.h - } - - Inline_Files { - Updater_ConnectorC.inl - } -} - -project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub - sharedname = DDS_Updater_Connector_exec - libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS_Updater_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UPDATER_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_Connector_conn.cpp - } - - Header_Files { - Updater_Connector_conn.h - Updater_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub - sharedname = DDS_Updater_Connector_svnt - libs += DDS_Updater_Connector_stub \ - DDS_UPDATER_Connector_lem_stub \ - DDS_Updater_Base_stub \ - DDS_Updater_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += UPDATER_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ConnectorS.cpp - Updater_Connector_svnt.cpp - } - - Header_Files { - Updater_ConnectorS.h - Updater_Connector_svnt.h - Updater_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl deleted file mode 100644 index 36538eada05..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/Updater_Connector.idl" - -module Updater -{ - component Receiver - { - port UpdaterConnector::DDS_Listen info_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc deleted file mode 100644 index ee8c5815437..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc +++ /dev/null @@ -1,136 +0,0 @@ -project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_UPDATER_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I.. - - IDL_Files { - Updater_Receiver.idl - } -} - -project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Updater_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Updater_ReceiverE.idl - } -} - -project(DDS_UPDATER_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Updater_Receiver_lem_gen DDS_Updater_Receiver_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub - libs += Receiver_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ReceiverEC.cpp - } - - Header_Files { - Updater_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - Updater_ReceiverEC.inl - } -} - -project(DDS_Updater_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_Updater_Receiver_idl_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_gen - libs += DDS_Updater_Connector_stub DDS_Updater_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ReceiverC.cpp - } - - Header_Files { - Updater_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - Updater_ReceiverC.inl - } -} - -project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Receiver_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_Receiver_exec.cpp - } - - Header_Files { - Updater_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_ReceiverS.cpp - Updater_Receiver_svnt.cpp - } - - Header_Files { - Updater_ReceiverS.h - Updater_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp deleted file mode 100644 index 4ccbc02a680..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Updater_Receiver_exec.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Updater_Receiver_Impl -{ - - /** - * Facet Executor Implementation Class: info_out_data_listener_exec_i - */ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Updater::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &thread_id) - : ciao_context_ ( - ::Updater::CCM_Receiver_Context::_duplicate (ctx)) - , thread_id_ (thread_id) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Updater::UpdaterConnector::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info) - { - ACE_Thread_ID t_id; - this->thread_id_ = t_id; - - ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.x)); - if (::DDS::HANDLE_NIL == info.instance_handle) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.x)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - datum.key.in (), - datum.x)); - } - } - - void - info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - /** - * Facet Executor Implementation Class: info_out_status_exec_i - */ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Updater::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::Updater::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - Receiver_exec_i::Receiver_exec_i (void) - : thread_id_listener_ (0, 0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Updater::UpdaterConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in (), - this->thread_id_listener_), - ::Updater::UpdaterConnector::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Updater::UpdaterConnector::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Updater::CCM_Receiver_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var dlc = - this->ciao_context_->get_connection_info_out_data_control (); - dlc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_exec_i::ccm_remove (void) - { - char ccm_buf [65]; - ACE_Thread_ID ccm_thread_id; - ccm_thread_id.to_string (ccm_buf); - - char list_buf [65]; - this->thread_id_listener_.to_string(list_buf); - if (this->thread_id_listener_.id() == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: " - "Thread ID for ReaderListener not set!\n")); - } -#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: " - "Thread switch for ReaderListener seems OK. " - "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: " - "Thread switch for ReaderListener " - "doesn't seem to work! " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #else - else if (this->thread_id_listener_ == ccm_thread_id) - { - ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: " - "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: " - "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_buf, - ccm_buf)); - } - #endif - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Updater_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h deleted file mode 100644 index a96430fb0ed..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h +++ /dev/null @@ -1,173 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_ -#define CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_ - -#include /**/ "ace/pre.h" - -#include "Updater_ReceiverEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Receiver_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Updater_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - /** - * Provider Executor Implementation Class: info_out_data_listener_exec_i - */ - - class info_out_data_listener_exec_i - : public virtual ::Updater::UpdaterConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - info_out_data_listener_exec_i ( - ::Updater::CCM_Receiver_Context_ptr ctx, - ACE_Thread_ID &); - virtual ~info_out_data_listener_exec_i (void); - - //@{ - /** Operations and attributes from Updater::UpdaterConnector::Listener. */ - - virtual - void on_one_data (const ::TestTopic & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data (const ::TestTopicSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - ::Updater::CCM_Receiver_Context_var ciao_context_; - ACE_Thread_ID &thread_id_; - }; - - /** - * Provider Executor Implementation Class: info_out_status_exec_i - */ - - class info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - info_out_status_exec_i ( - ::Updater::CCM_Receiver_Context_ptr ctx); - virtual ~info_out_status_exec_i (void); - - //@{ - /** Operations and attributes from CCM_DDS::PortStatusListener. */ - - virtual - void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost (::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - ::Updater::CCM_Receiver_Context_var ciao_context_; - }; - - /** - * Component Executor Implementation Class: Receiver_exec_i - */ - - class Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - virtual ::Updater::UpdaterConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - - //@} - - private: - ::Updater::CCM_Receiver_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - ::Updater::UpdaterConnector::CCM_Listener_var ciao_info_out_data_listener_; - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - //@{ - /** User defined members. */ - ACE_Thread_ID thread_id_listener_; - - //@} - - //@{ - /** User defined private operations. */ - - //@} - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Updater_Receiver_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl deleted file mode 100644 index 8ae5f432194..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_UPDATER_SENDER_IDL -#define DDS_UPDATER_SENDER_IDL - -#include "Connector/Updater_Connector.idl" - -module Updater -{ - component Sender - { - port UpdaterConnector::DDS_Update test_topic_update; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc deleted file mode 100644 index 83da223de82..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_UPDATER_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I.. - - IDL_Files { - Updater_Sender.idl - } -} - -project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Updater_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - Updater_SenderE.idl - } -} - -project(DDS_Updater_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Updater_Sender_lem_gen DDS_Updater_Sender_stub DDS_Updater_Base_stub - libs += DDS_Updater_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_SenderEC.cpp - } - - Header_Files { - Updater_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - Updater_SenderEC.inl - } -} - -project(DDS_Updater_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_Updater_Sender_idl_gen DDS_Updater_Base_stub DDS_Updater_Connector_stub - libs += DDS_Updater_Base_stub DDS_Updater_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_SenderC.cpp - } - - Header_Files { - Updater_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - Updater_SenderC.inl - } -} - -project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Updater_Sender_lem_stub DDS_Updater_Sender_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_Sender_exec.cpp - } - - Header_Files { - Updater_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Updater_Base_stub DDS_Updater_Sender_lem_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_SenderS.cpp - Updater_Sender_svnt.cpp - } - - Header_Files { - Updater_SenderS.h - Updater_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp deleted file mode 100644 index c127816dfdd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp +++ /dev/null @@ -1,773 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "Updater_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_Updater_Sender_Impl -{ - - /** - * ConnectorStatusListener_exec_i - */ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Sender_exec_i &callback) - : callback_ (callback) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr /*the_entity*/, - ::DDS::StatusKind status_kind) - { - if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - " - "Publication matched received: starting the test\n")); - - this->callback_.get_started (); - } - } - - /** - * Write action generator - */ - - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE), - test_ok_(true) - { - ACE_NEW_THROW_EX (this->ticker_, - pulse_Generator (*this), - ::CORBA::NO_MEMORY ()); - } - - Sender_exec_i::~Sender_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (*this); - } - - CORBA::Boolean - Sender_exec_i::create_one ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - TestTopic i = this->topic_seq_one_[0]; - try - { - if (! ::CORBA::is_nil (updater) ) - { - updater->create_one(i); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with instance key <%C>\n"), - i.key.in ())); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil"))); - return false; - } - } - catch(const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"), - i.key.in ())); - return false;; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::create_one_already_exist ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - TestTopic i = this->topic_seq_one_[0]; - //try to create same instance again, this should erase an AlreadyCreated exception - try - { - updater->create_one (i); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with already existing instance key <%Cs>\n"), - i.key.in ())); - } - catch(const CCM_DDS::AlreadyCreated &) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_one.\n"))); - return true; - } - catch (const CCM_DDS::InternalError &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"), - i.key.in ())); - } - return false; - } - - CORBA::Boolean - Sender_exec_i::update_one ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - //update already created instance with handle nil - TestTopic i = this->topic_seq_one_[0]; - try - { - updater->update_one(i, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in ())); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::update_one_not_registered ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - //update a not yet registered instance, expect a NonExistent exception - //use second instance of table - TestTopic i = this->topic_seq_one_[1]; - try - { - updater->update_one(i, DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with unregistered instance, key <%C>\n"), - i.key.in ())); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater updater_one.\n"))); - return true; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in ())); - } - return false; - } - - CORBA::Boolean - Sender_exec_i::delete_one ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - //delete registered instance with DDS::HANDLE_NIL - TestTopic i = this->topic_seq_one_[0]; - try - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"), - i.key.in ())); - updater->delete_one(i, DDS::HANDLE_NIL); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::delete_one_not_registered ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - //delete non-existing instance, expect NonExistent exception - TestTopic i = this->topic_seq_one_[1]; - try - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with not registered instance, key <%C>\n"), - i.key.in ())); - updater->delete_one(i, DDS::HANDLE_NIL); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_one.\n"))); - return true; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in ())); - } - return false; - } - - CORBA::Boolean - Sender_exec_i::update_and_delete_one_after_register ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - // Update an instance after registering first, using a handle - TestTopic i = this->topic_seq_one_[2]; - // Take third instance of table - DDS::InstanceHandle_t const hnd = updater->register_instance(i); - try - { - if (hnd != ::DDS::HANDLE_NIL) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new instance after registering instance, key <%C>\n"), - i.key.in ())); - updater->update_one(i, hnd); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error, invalid handle for <%C>.\n"), - i.key.in ())); - return false; - } - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one using handle <%C>.\n"), - i.key.in ())); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"), - i.key.in ())); - return false; - } - //update an instance with an instance_handler belonging to an other instance - try - { - TestTopic y = this->topic_seq_one_[0]; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update an instance with an instance_handler belonging to an other instance\n"))); - updater->update_one(y, hnd); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one with incompatible datum and handle.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Expected : Exception InternalE. test updater update_one with incompatible datum and handle. ex %d\n"),ex.error_code)); - return true; - } - - try - { - i = this->topic_seq_one_[2]; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete a instance with handle, key <%C>\n"), - i.key.in ())); - updater->delete_one(i, hnd); - } - catch (const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delett_one with valid handler.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"), - i.key.in ())); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::create_many ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - //create many with no exception - try - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - updater->create_many (this->topic_seq_many_); - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - //test create_many with AlreadyCreated exception - - try - { - updater->create_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many which are already created : <%u> samples\n"), - this->topic_seq_many_.length ())); - - } - catch (const CCM_DDS::NonExistent & ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected Error ") - ACE_TEXT ("in create_many , already created.\n"))); - return false; - } - catch (const CCM_DDS::AlreadyCreated & ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_many.\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("in test create_many,already created: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - return true; - } - - CORBA::Boolean - Sender_exec_i::update_many ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - try - { - updater->update_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_seq_many_.length ())); - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n"))); - return false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - //update with exception - // make from the second and third instances a unregistered instance , see above - char key[7]; - TestTopic test_key; - ACE_OS::sprintf (key, "XXX_%d",2); - test_key.key = CORBA::string_dup(key); - test_key.x = 2; - this->topic_seq_many_[1] = test_key; - ACE_OS::sprintf (key, "YYY_%d",3); - test_key.key = CORBA::string_dup(key); - test_key.x = 3; - this->topic_seq_many_[2] = test_key; - try - { - updater->update_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - } - catch (const CCM_DDS::NonExistent & ex) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater update_many.\n"), - ACE_TEXT ("index length expected = 2 and value = %d, expected index[0] = 1 and value = %d.\n"), - ex.indexes.length(),ex.indexes[0])); - - if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("create_many:expected exception: NonExistent gives wrong indexes.\n"))); - return false; - } - else - { - return true; - } - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("test update_many with not registered instances\n"))); - } - catch (const CCM_DDS::AlreadyCreated & ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test update_many with not registered instances.\n"))); - } - return false; - } - - CORBA::Boolean - Sender_exec_i::delete_many ( - ::Updater::UpdaterConnector::Updater_ptr updater) - { - // delete_many with exception - // make from the second and third instances a unregistered instance - try - { - updater->delete_many (this->topic_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"), - this->topic_seq_many_.length ())); - } - catch (const CCM_DDS::NonExistent & ex) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_many.\n"), - ACE_TEXT ("index length expected = 2 and value = %d, expected index[0] = 1 and value = %d.\n"), - ex.indexes.length(),ex.indexes[0])); - - if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("delete_many:expected exception: NonExistent gives wrong indices.\n"))); - return false; - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("test updater delete_many with inregistered instances, info: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - return false; - } - catch (const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater delete_many.\n"))); - return false; - } - - // Delete many with no exception - // reset instances to original values - for (int i = 1; i < 4; i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "many_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_many_[i-1] = new_key; - } - try - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"), - this->topic_seq_many_.length ())); - - updater->delete_many (this->topic_seq_many_); - return true; - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - } - return false; - } - - void - Sender_exec_i::add_instances_of_topic (void) - { - //make 2 sequences of instances as testdata - CORBA::UShort total = 3; - this->topic_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[7]; - TestTopic new_key; - ACE_OS::sprintf (key, "many_%d", i); - new_key.key = CORBA::string_dup(key); - new_key.x = i; - this->topic_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick (void) - { - if (this->test_ok_.value()) - { - ::Updater::UpdaterConnector::Updater_var updater = - this->ciao_context_->get_connection_test_topic_update_data (); - if (!::CORBA::is_nil (updater.in ())) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one (updater.in ()); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_CREATE_ALREADY_EXIST; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_CREATE_ALREADY_EXIST: - this->test_ok_ = this->create_one_already_exist (updater.in ()); - this->test_nr_ = UPDATE_ONE; - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one (updater.in ()); - this->test_nr_ = UPDATE_ONE_NOT_REGISTERED; - break; - case UPDATE_ONE_NOT_REGISTERED: - this->test_ok_ = this->update_one_not_registered (updater.in ()); - this->test_nr_ = DELETE_ONE; - break; - case DELETE_ONE: - this->test_ok_ = this->delete_one (updater.in ()); - this->test_nr_ = DELETE_ONE_NOT_REGISTERED; - break; - case DELETE_ONE_NOT_REGISTERED: - this->test_ok_ = this->delete_one_not_registered (updater.in ()); - this->test_nr_ = UPDATE_DELETE_REGISTER; - break; - case UPDATE_DELETE_REGISTER: - this->test_ok_ = this->update_and_delete_one_after_register (updater.in ()); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many (updater.in ()); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many (updater.in ()); - this->test_nr_ = DELETE_MANY; - break; - case DELETE_MANY: - this->test_ok_ = this->delete_many (updater.in ()); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - else - { - ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - " - "ERROR: Updater seems nil.\n")); - this->test_ok_ = false; - } - } - } - - void - Sender_exec_i::get_started (void) - { - this->add_instances_of_topic (); - this->start (); - } - - void - Sender_exec_i::start (void) - { - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (3, 0), - ACE_Time_Value (3, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - } - - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Updater::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_exec_i::ccm_activate (void) - { - - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - if (!this->test_ok_.value()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Error in Updater in Sender"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Updater_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h deleted file mode 100644 index 63fe557151d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h +++ /dev/null @@ -1,201 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UPDATER_SENDER_EXEC_QTARYT_H_ -#define CIAO_UPDATER_SENDER_EXEC_QTARYT_H_ - -#include /**/ "ace/pre.h" - -#include "Updater_SenderEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Sender_exec_export.h" -#include "tao/LocalObject.h" - -namespace CIAO_Updater_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - enum UPDATER_TEST { - UPDATE_CREATE, - UPDATE_CREATE_ALREADY_EXIST, - UPDATE_ONE, - UPDATE_ONE_NOT_REGISTERED, - DELETE_ONE, - DELETE_ONE_NOT_REGISTERED, - UPDATE_DELETE_REGISTER, - CREATE_MANY, - UPDATE_MANY, - DELETE_MANY, - END_TEST - }; - - /** - * ConnectorStatusListener_exec_i - */ - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Sender_exec_i &callback); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Sender_exec_i &callback_; - }; - - /** - * Pulse generator - */ - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Sender_exec_i &pulse_callback_; - }; - - /** - * Component Executor Implementation Class: Sender_exec_i - */ - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void tick (void); - void get_started (void); - //@} - - private: - ::Updater::CCM_Sender_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - pulse_Generator * ticker_; - - UPDATER_TEST test_nr_; - Atomic_Boolean test_ok_; - TestTopicSeq topic_seq_one_; - TestTopicSeq topic_seq_many_; - - //@} - - //@{ - /** User defined private operations. */ - void start (void); - void stop (void); - void add_instances_of_topic (void); - - CORBA::Boolean create_one ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean create_one_already_exist ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean update_one ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean update_one_not_registered ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean delete_one ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean delete_one_not_registered ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean update_and_delete_one_after_register ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean create_many ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean update_many ( - ::Updater::UpdaterConnector::Updater_ptr updater); - CORBA::Boolean delete_many ( - ::Updater::UpdaterConnector::Updater_ptr updater); - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Updater_Sender_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp deleted file mode 100644 index 8a2f5e8114c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp +++ /dev/null @@ -1,390 +0,0 @@ - - - - Updater_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Updater_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Updater_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - Updater_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Updater_UpdaterConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Updater_UpdaterConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Updater_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Updater_Connector_exec - - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Updater_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Updater_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - Updater_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - - Updater_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestQoS - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_observer_data_control - true - Facet - - - - - _statelistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_observer_data_listener - false - SimplexReceptacle - - - - - _portstatuslistener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_status - true - Facet - - - - push_state_observer_status - false - SimplexReceptacle - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_state_observer_data - true - Facet - - - - - updater_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - test_topic_update_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - connector_status_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - error_listener - false - SimplexReceptacle - - - - connector_status - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - Updater_Connector_exec - - - DDS_Updater_Connector_exec - - - Updater_Connector_svnt - - - DDS_Updater_Connector_svnt - - - Updater_Connector_stub - - - DDS_Updater_Connector_stub - - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl deleted file mode 100755 index b87434bef7e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 60 seconds to allow task to complete\n"; -sleep (60); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore deleted file mode 100644 index 5b70c1e48f4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/UCC_Test_Base.cxx -/UCC_Test_Base.h -/UCC_Test_BasePlugin.cxx -/UCC_Test_BasePlugin.h -/UCC_Test_BaseSupport.cxx -/UCC_Test_BaseSupport.h -/UCC_Test_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl deleted file mode 100644 index 1d489688614..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file UCC_Test_Base.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef USERDATA_COPY_COUNT_TEST_BASE_IDL -#define USERDATA_COPY_COUNT_TEST_BASE_IDL - -#pragma ndds typesupport "Base/UCC_Test_BaseSupport.h" -#pragma opendds typesupport "Base/UCC_Test_BaseTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "UCCVariableSizedStructTest" -#pragma DCPS_DATA_KEY "UCCVariableSizedStructTest symbol" - -struct UCCVariableSizedStructTest { - string symbol; //@key - long x; - long y; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence UCCVariableSizedStructTestSeq; -#endif - -#pragma DCPS_DATA_TYPE "UCCFixedSizedStructTest" - -struct UCCFixedSizedStructTest { - long x; - long y; - long z; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence UCCFixedSizedStructTestSeq; -#endif - -#endif /* USERDATA_COPY_COUNT_TEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc deleted file mode 100644 index af35527d256..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc +++ /dev/null @@ -1,24 +0,0 @@ -project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { - sharedname = UCC_Test_Base_stub - dynamicflags += USERDATA_COPY_COUNT_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=UCC_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - UCC_Test_Base.idl - } - - opendds_ts_flags += --export=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export - - DDSGenerator_Files { - UCC_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore deleted file mode 100644 index 24bc50d2249..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Component_exec_export.h -/Component_lem_stub_export.h -/Component_stub_export.h -/Component_svnt_export.h -/UCC_Test_ComponentE.idl diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl deleted file mode 100644 index 3ec41b3c515..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef COMPONENT_IDL -#define COMPONENT_IDL - -#include "Connector/UCC_Test_Connector.idl" - -module UCC_Test -{ - component UCCTestComponent - { - port UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::DDS_Write var_size_write; - port UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::DDS_Write fixed_size_write; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc deleted file mode 100644 index 5577d943f76..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc +++ /dev/null @@ -1,146 +0,0 @@ -project(UCC_Test_Component_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += UCC_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \ - -Wb,stub_export_include=Component_stub_export.h \ - -Wb,skel_export_macro=COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Component_svnt_export.h \ - -Wb,svnt_export_macro=COMPONENT_SVNT_Export \ - -Wb,svnt_export_include=Component_svnt_export.h \ - -Wb,exec_export_macro=COMPONENT_EXEC_Export \ - -Wb,exec_export_include=Component_exec_export.h \ - -I.. - - IDL_Files { - UCC_Test_Component.idl - } -} - -project(UCC_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm { - after += UCC_Test_Component_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \ - -Wb,stub_export_include=Component_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - UCC_Test_ComponentE.idl - } -} - -project(UCC_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base { - after += UCC_Test_Component_lem_gen UCC_Test_Component_stub \ - UCC_Test_Connector_stub UCC_Test_Base_stub - libs += Component_stub UCC_Test_Connector_stub \ - UCC_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_lem_stub - dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ComponentEC.cpp - } - - Header_Files { - UCC_Test_ComponentEC.h - Component_lem_stub_export.h - } - - Inline_Files { - UCC_Test_ComponentEC.inl - } -} - -project(UCC_Test_Component_stub) : ccm_stub, dds4ccm_base { - after += UCC_Test_Component_idl_gen UCC_Test_Connector_stub \ - UCC_Test_Base_stub UCC_Test_Connector_lem_gen - libs += UCC_Test_Connector_stub UCC_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Component_stub - dynamicflags += COMPONENT_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ComponentC.cpp - } - - Header_Files { - UCC_Test_ComponentC.h - Component_stub_export.h - } - - Inline_Files { - UCC_Test_ComponentC.inl - } -} - -project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { - after += UCC_Test_Component_lem_stub UCC_Test_Component_stub \ - UCC_Test_Base_stub UCC_Test_Connector_stub \ - UCC_Test_Connector_lem_stub - sharedname = Component_exec - libs += Component_stub Component_lem_stub UCC_Test_Base_stub \ - UCC_Test_Connector_stub UCC_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_Component_exec.cpp - } - - Header_Files { - UCC_Test_Component_exec.h - Component_exec_export.h - } - - Inline_Files { - } -} - - -project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += UCC_Test_Component_lem_stub UCC_Test_Base_stub \ - UCC_Test_Connector_stub UCC_Test_Connector_svnt \ - UCC_Test_Component_exec UCC_Test_Connector_lem_stub - sharedname = Component_svnt - libs += Component_stub Component_lem_stub UCC_Test_Base_stub \ - UCC_Test_Connector_stub UCC_Test_Connector_svnt \ - Component_exec UCC_Test_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += COMPONENT_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ComponentS.cpp - UCC_Test_Component_svnt.cpp - } - - Header_Files { - UCC_Test_ComponentS.h - UCC_Test_Component_svnt.h - Component_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp deleted file mode 100644 index 8b2d5ea2849..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp +++ /dev/null @@ -1,322 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ - -#include "UCC_Test_Component_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -#define NR_OF_KEYS 10 - -namespace CIAO_UCC_Test_UCCTestComponent_Impl -{ - size_t UCCVariableSizedStructTest_i::count_ = 0; - size_t UCCVariableSizedStructTest_i::max_count_ = 0; - size_t UCCFixedSizedStructTest_i::count_ = 0; - size_t UCCFixedSizedStructTest_i::max_count_ = 0; - - /** - * WriteVariableHandler - */ - - WriteVariableHandler::WriteVariableHandler (UCCTestComponent_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteVariableHandler::handle_timeout (const ACE_Time_Value &, const void *) - { - this->callback_.write_variable (); - return 0; - } - - /** - * WriteFixedHandler - */ - - WriteFixedHandler::WriteFixedHandler (UCCTestComponent_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteFixedHandler::handle_timeout (const ACE_Time_Value &, const void *) - { - this->callback_.write_fixed (); - return 0; - } - - /** - * Component Executor Implementation Class: UCCTestComponent_exec_i - */ - - UCCTestComponent_exec_i::UCCTestComponent_exec_i (void) - { - ACE_NEW_THROW_EX (this->var_rh_, - WriteVariableHandler (*this), - ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->fixed_rh_, - WriteFixedHandler (*this), - ::CORBA::NO_MEMORY ()); - } - - UCCTestComponent_exec_i::~UCCTestComponent_exec_i (void) - { - delete this->var_rh_; - delete this->fixed_rh_; - } - - // Supported operations and attributes. - ACE_Reactor* - UCCTestComponent_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - UCCTestComponent_exec_i::write_fixed (void) - { - ::UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::Writer_var fixed_writer - = this->ciao_context_->get_connection_fixed_size_write_data (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->fixed_mutex_, CORBA::INTERNAL ()); - { - for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - ACE_DEBUG ((LM_DEBUG, "Write fixed %i\n", i)); - fixed_writer->write_one (*(this->fixed_samples_[i]), ::DDS::HANDLE_NIL); - } - } - } - - void - UCCTestComponent_exec_i::write_variable (void) - { - ::UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::Writer_var var_writer - = this->ciao_context_->get_connection_var_size_write_data (); - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->var_mutex_, CORBA::INTERNAL ()); - { - for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - ACE_DEBUG ((LM_DEBUG, "Write variable %C\n", this->var_samples_[i]->symbol.in ())); - var_writer->write_one (*(this->var_samples_[i]), ::DDS::HANDLE_NIL); - } - } - } - - void - UCCTestComponent_exec_i::create_fixed_sized_samples (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->fixed_mutex_, CORBA::INTERNAL ()); - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_fixed_sized_samples - " - "Create fixed sized samples.\n")); - for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - UCCFixedSizedStructTest_i* new_key = new UCCFixedSizedStructTest_i; - new_key->x = i; - new_key->y = new_key->x; - new_key->z = 2*i; - - this->fixed_samples_[i] = new_key; - } - } - - void - UCCTestComponent_exec_i::create_variable_sized_samples (void) - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->var_mutex_, CORBA::INTERNAL ()); - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_variable_sized_samples - " - "Create variable sized samples\n")); - for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - UCCVariableSizedStructTest_i* new_key = new UCCVariableSizedStructTest_i; - char key[7]; - ACE_OS::sprintf (key, "KEY_%d", i); - new_key->symbol = CORBA::string_dup (key); - new_key->x = i; - new_key->y = new_key->x; - this->var_samples_[i] = new_key; - } - } - // Component attributes and port operations. - - // Operations from Components::SessionComponent. - - void - UCCTestComponent_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::UCC_Test::CCM_UCCTestComponent_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - UCCTestComponent_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - UCCTestComponent_exec_i::ccm_activate (void) - { - ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - " - "Create samples.\n")); - this->create_fixed_sized_samples (); - this->create_variable_sized_samples (); - - if (this->reactor ()->schedule_timer ( - this->var_rh_, - 0, - ACE_Time_Value (2, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ") - ACE_TEXT ("Error scheduling timer for variable sized struct.\n"))); - } - - if (this->reactor ()->schedule_timer ( - this->fixed_rh_, - 0, - ACE_Time_Value (2, 0), - ACE_Time_Value (1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ") - ACE_TEXT ("Error scheduling timer for fixed sized struct.\n"))); - } - } - - void - UCCTestComponent_exec_i::ccm_passivate (void) - { - this->reactor ()->cancel_timer (this->var_rh_); - this->reactor ()->cancel_timer (this->fixed_rh_); - } - - void - UCCTestComponent_exec_i::ccm_remove (void) - { - for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - UCCVariableSizedStructTest_i* stype =this->var_samples_[i]; - delete stype; - } - - for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i) - { - UCCFixedSizedStructTest_i* stype =this->fixed_samples_[i]; - delete stype; - } - - this->var_samples_.clear (); - this->fixed_samples_.clear (); - - // Check count_ - if (UCCFixedSizedStructTest_i::count_ != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Reference count for fixed sized " - "samples is not 0. expected <0> - found <%d>\n", - UCCFixedSizedStructTest_i::count_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Reference count for fixed sized " - "samples is 0\n")); - } - if (UCCVariableSizedStructTest_i::count_ != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: Reference count for variable sized " - "samples is not 0. expected <0> - found <%d>\n", - UCCVariableSizedStructTest_i::count_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Reference count for variable sized " - "samples is 0\n")); - } - - // Check max_count_, for each sample we allocated an instance so we - // expect a count of 10 - if (UCCFixedSizedStructTest_i::max_count_ != 10) - { - ACE_ERROR ((LM_ERROR, "ERROR: Maximum refence count for fixed sized " - "samples is not ok, expected <10> - found <%d>\n", - UCCFixedSizedStructTest_i::max_count_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Maximum reference count for fixed sized " - "samples is 10\n")); - } - if (UCCVariableSizedStructTest_i::max_count_ != 10) - { - ACE_ERROR ((LM_ERROR, "ERROR: Maximum reference count for variable sized " - "samples is not ok, expected <10> - found <%d>\n", - UCCVariableSizedStructTest_i::max_count_)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Maximum reference count for variable sized " - "samples is 10\n")); - } - } - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UCC_Test_UCCTestComponent_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - UCCTestComponent_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h deleted file mode 100644 index 906a83c7cfd..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h +++ /dev/null @@ -1,202 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_ -#define CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_ - -#include /**/ "ace/pre.h" - -#include "UCC_Test_ComponentEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Component_exec_export.h" -#include "tao/LocalObject.h" - -#include - -namespace CIAO_UCC_Test_UCCTestComponent_Impl -{ - struct UCCVariableSizedStructTest_i : UCCVariableSizedStructTest - { - static size_t count_; - static size_t max_count_; - - UCCVariableSizedStructTest_i () - { - ++count_; - if (count_ > max_count_) - { - max_count_ = count_; - } - } - - ~UCCVariableSizedStructTest_i () - { - --count_; - } - private: - UCCVariableSizedStructTest_i (const UCCVariableSizedStructTest_i &); - UCCVariableSizedStructTest_i operator = (const UCCVariableSizedStructTest_i &); - - }; - - struct UCCFixedSizedStructTest_i : UCCFixedSizedStructTest - { - static size_t count_; - static size_t max_count_; - - UCCFixedSizedStructTest_i () - { - ++count_; - if (count_ > max_count_) - { - max_count_ = count_; - } - } - - ~UCCFixedSizedStructTest_i () - { - --count_; - } - private: - UCCFixedSizedStructTest_i (const UCCFixedSizedStructTest_i &); - UCCFixedSizedStructTest_i operator = (const UCCFixedSizedStructTest_i &); - - }; - - class UCCTestComponent_exec_i; - - //============================================================ - // WriteVariableHandler - //============================================================ - class WriteVariableHandler : - public ACE_Event_Handler - { - public: - WriteVariableHandler (UCCTestComponent_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - UCCTestComponent_exec_i &callback_; - }; - - //============================================================ - // WriteFixedHandler - //============================================================ - class WriteFixedHandler : - public ACE_Event_Handler - { - public: - WriteFixedHandler (UCCTestComponent_exec_i &callback); - int handle_timeout (const ACE_Time_Value &, const void *); - private: - UCCTestComponent_exec_i &callback_; - }; - - /** - * Component Executor Implementation Class: UCCTestComponent_exec_i - */ - - class UCCTestComponent_exec_i - : public virtual UCCTestComponent_Exec, - public virtual ::CORBA::LocalObject - { - public: - UCCTestComponent_exec_i (void); - virtual ~UCCTestComponent_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - //@} - - //@{ - /** Operations from Components::SessionComponent. */ - virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - //@} - - //@{ - /** User defined public operations. */ - void write_variable (void); - void write_fixed (void); - - //@} - - private: - ::UCC_Test::CCM_UCCTestComponent_Context_var ciao_context_; - - //@{ - /** Component attributes. */ - //@} - - //@{ - /** User defined members. */ - /// Variable sized struct - WriteVariableHandler *var_rh_; - - TAO_SYNCH_MUTEX var_mutex_; - typedef std::map< ::CORBA::UShort, UCCVariableSizedStructTest_i* > UCCVarSized_Table; - UCCVarSized_Table var_samples_; - - /// Fixed sized struct - WriteFixedHandler *fixed_rh_; - - TAO_SYNCH_MUTEX fixed_mutex_; - typedef std::map< ::CORBA::UShort, UCCFixedSizedStructTest_i* > UCCFixedSized_Table; - UCCFixedSized_Table fixed_samples_; - - //@} - - //@{ - /** User defined private operations. */ - - /// Variable sized struct - void create_variable_sized_samples (void); - - /// Fixed sized struct - void create_fixed_sized_samples (void); - - //@} - - /// Get the ACE_Reactor - ACE_Reactor* reactor (void); - }; - - extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr - create_UCC_Test_UCCTestComponent_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore deleted file mode 100644 index 4cc50acd285..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/UCC_Test_ConnectorE.idl -/UCC_Test_Connector_conn.cpp -/UCC_Test_Connector_conn.h -/UCC_Test_Connector_conn_export.h -/UCC_Test_Connector_lem_stub_export.h -/UCC_Test_Connector_stub_export.h -/UCC_Test_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl deleted file mode 100644 index e058fb2f905..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file UCC_Test_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ -#define USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ - -#include -#include - -#include "Base/UCC_Test_Base.idl" - -#pragma ciao lem "Connector/UCC_Test_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/UCC_Test_BaseTypeSupport.idl" -#endif - -module UCCVariableSizedStruct_Test -{ - module ::CCM_DDS::Typed < ::UCCVariableSizedStructTest, ::UCCVariableSizedStructTestSeq> UCCVariableSizedStructTestConnector; -}; - -module UCCFixedSizeStruct_Test -{ - module ::CCM_DDS::Typed < ::UCCFixedSizedStructTest, ::UCCFixedSizedStructTestSeq> UCCFixedSizedStructTestConnector; -}; - -#endif /* USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc deleted file mode 100644 index ecb293b6ccc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p UCC_Test_Base -l .. -o ../lib -u DDS UCC_Test_Connector" - -project(UCC_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen UCC_Test_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=UCC_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=UCC_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=UCC_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=UCC_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - UCC_Test_Connector.idl - } -} - -project(UCC_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += UCC_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=UCC_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - UCC_Test_ConnectorE.idl - } -} - -project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub - libs += UCC_Test_Base_stub UCC_Test_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = UCC_Test_Connector_lem_stub - dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ConnectorEC.cpp - } - - Header_Files { - UCC_Test_ConnectorEC.h - UCC_Test_Connector_lem_stub_export.h - } - - Inline_Files { - UCC_Test_ConnectorEC.inl - } -} - -project(UCC_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += UCC_Test_Connector_idl_gen UCC_Test_Base_stub - libs += UCC_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = UCC_Test_Connector_stub - dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ConnectorC.cpp - } - - Header_Files { - UCC_Test_ConnectorC.h - UCC_Test_Connector_stub_export.h - } - - Inline_Files { - UCC_Test_ConnectorC.inl - } -} - -project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += UCC_Test_Connector_lem_stub UCC_Test_Connector_stub UCC_Test_Base_stub - sharedname = UCC_Test_Connector_exec - libs += UCC_Test_Connector_stub UCC_Test_Connector_lem_stub UCC_Test_Base_stub UCC_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_Connector_conn.cpp - } - - Header_Files { - UCC_Test_Connector_conn.h - UCC_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub - sharedname = UCC_Test_Connector_svnt - libs += UCC_Test_Connector_stub \ - UCC_Test_Connector_lem_stub \ - UCC_Test_Base_stub \ - UCC_Test_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - UCC_Test_ConnectorS.cpp - UCC_Test_Connector_svnt.cpp - } - - Header_Files { - UCC_Test_ConnectorS.h - UCC_Test_Connector_svnt.h - UCC_Test_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp deleted file mode 100644 index a2b2d93ec0b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp +++ /dev/null @@ -1,283 +0,0 @@ - - - - UCCTest_Depl - - - ComponentImplementation - - - - - - component factory - - - tk_string - - - create_UCC_Test_UCCTestComponent_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UCC_Test_UCCTestComponent_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Component_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Component_exec - - - - - - - TwoDim_UCC_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UCC_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UCC_Test_Connector_exec - - - - - - - ThreeDim_UCC_Test_ConnectorImplementation - - - - - - component factory - - - tk_string - - - create_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - UCC_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - UCC_Test_Connector_exec - - - - - - - Component - ComponentNode - - - - - - - TwoDim_UCC_Test_Connector - ComponentNode - - - - - topic_name - - - tk_string - - - TwoDimensionalTopic - - - - - - - ThreeDim_UCC_Test_Connector - ComponentNode - - - - - topic_name - - - tk_string - - - ThreeDimensionalTopic - - - - - - - var_size_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - var_size_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - fixed_size_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - fixed_size_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - UCC_Test_Connector_exec - - - UCC_Test_Connector_exec - - - UCC_Test_Connector_svnt - - - UCC_Test_Connector_svnt - - - UCC_Test_Connector_stub - - - UCC_Test_Connector_stub - - - - Component_exec - - - Component_exec - - - Component_svnt - - - Component_svnt - - diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl deleted file mode 100755 index dbe5a142f2b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 1; -@ports = ( 60001 ); -@iorbases = ( "Component.ior" ); -@iorfiles = 0; -@nodenames = ( "ComponentNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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 -s\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/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore deleted file mode 100644 index 9fb033fd01c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VTopic_Base.cxx -/VTopic_Base.h -/VTopic_BasePlugin.cxx -/VTopic_BasePlugin.h -/VTopic_BaseSupport.cxx -/VTopic_BaseSupport.h -/VTopic_Base_stub_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl deleted file mode 100644 index 851ed0ad11e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @file VTopic_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTOPIC_BASE_IDL -#define VTOPIC_BASE_IDL - -#pragma ndds typesupport "Base/VTopic_BaseSupport.h" -#pragma opendds typesupport "Base/VTopic_BaseTypeSupportImpl.h" - -typedef octet octet_array[5]; - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -// Plain topic -struct TestTopic { - string key; //@key - long x; -}; - -#pragma DCPS_DATA_TYPE "TopicString" -#pragma DCPS_DATA_KEY "TopicString key" - -// String -struct TopicString { - string key; //@key - string x_str; -}; - -#pragma DCPS_DATA_TYPE "TopicArray" -#pragma DCPS_DATA_KEY "TopicArray key" - -// Arrays -struct TopicArray { - string key; //@key - octet_array x_array; - }; - -// Unions -union X_Union switch (short) { - case 0: - string x_test; - case 1: - long x_long; -}; - -#pragma DCPS_DATA_TYPE "TopicUnion" -#pragma DCPS_DATA_KEY "TopicUnion key" - -struct TopicUnion { - string key; //@key - X_Union x_uni; -}; - -// Sequence -struct test { - short x_test; - string x_teststr; -}; - -typedef sequence testSeq; - -#pragma DCPS_DATA_TYPE "TopicSeq" -#pragma DCPS_DATA_KEY "TopicSeq key" - -struct TopicSeq { - string key; //@key - testSeq x_seq; -}; - -// ValueType -valuetype X_Valuetype { - public string type; - public long x_long; -}; - -#if !defined (CIAO_DDS4CCM_OPENDDS) -// OpenDDS doesn't support valuetype as topic member -#pragma DCPS_DATA_TYPE "TopicValuetype" -#pragma DCPS_DATA_KEY "TopicValuetype key" - -struct TopicValuetype { - string key; //@key - X_Valuetype x_vt; -}; -#endif - -// Sequences -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicStringSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicArraySeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicUnionSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence X_UnionSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicSeqSeq; -#endif -#if !defined (CIAO_DDS4CCM_OPENDDS) -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicValuetypeSeq; -#endif -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence X_ValuetypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc deleted file mode 100644 index 1aa5f52cfda..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc +++ /dev/null @@ -1,25 +0,0 @@ -project (DDS_VTopic_Base_stub) : taoidldefaults, \ - dds4ccm_ts_default, valuetype { - sharedname = DDS_VTopic_Base_stub - dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS \ - -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \ - -Wb,stub_export_include=VTopic_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - VTopic_Base.idl - } - - opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export - - DDSGenerator_Files { - VTopic_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore deleted file mode 100644 index f6f1b6886a7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VT_Array_ConnectorE.idl -/VT_Array_Connector_conn.cpp -/VT_Array_Connector_conn.h -/VT_Array_Connector_conn_export.h -/VT_Array_Connector_lem_stub_export.h -/VT_Array_Connector_stub_export.h -/VT_Array_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl deleted file mode 100644 index 7bde349812c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VT_Array_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VT_ARRAY_CONNECTOR_IDL_ -#define VT_ARRAY_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Conn_Array/VT_Array_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector; -}; - -#endif /* VT_ARRAY_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc deleted file mode 100644 index b1b95129172..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector" - -project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopic_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VT_Array_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VT_Array_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VT_Array_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_ARRAY_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VT_Array_Connector_conn_export.h \ - -I .. - - IDL_Files { - VT_Array_Connector.idl - } -} - -project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VT_ARRAY_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VT_Array_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VT_Array_ConnectorE.idl - } -} - -project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_ARRAY_Connector_lem_stub - dynamicflags += VT_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Array_ConnectorEC.cpp - } - - Header_Files { - VT_Array_ConnectorEC.h - VT_Array_Connector_lem_stub_export.h - } - - Inline_Files { - VT_Array_ConnectorEC.inl - } -} - -project(DDS_VT_Array_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VT_ARRAY_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_Array_Connector_stub - dynamicflags += VT_ARRAY_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Array_ConnectorC.cpp - } - - Header_Files { - VT_Array_ConnectorC.h - VT_Array_Connector_stub_export.h - } - - Inline_Files { - VT_Array_ConnectorC.inl - } -} - -project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VT_Array_Connector_exec - libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_ARRAY_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Array_Connector_conn.cpp - } - - Header_Files { - VT_Array_Connector_conn.h - VT_Array_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub - sharedname = DDS_VT_Array_Connector_svnt - libs += DDS_VT_Array_Connector_stub \ - DDS_VT_ARRAY_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VT_Array_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_ARRAY_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Array_ConnectorS.cpp - VT_Array_Connector_svnt.cpp - } - - Header_Files { - VT_Array_ConnectorS.h - VT_Array_Connector_svnt.h - VT_Array_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore deleted file mode 100644 index 18235baa020..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VT_Seq_ConnectorE.idl -/VT_Seq_Connector_conn.cpp -/VT_Seq_Connector_conn.h -/VT_Seq_Connector_conn_export.h -/VT_Seq_Connector_lem_stub_export.h -/VT_Seq_Connector_stub_export.h -/VT_Seq_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl deleted file mode 100644 index 89067ebe269..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VT_Seq_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VT_SEQ_CONNECTOR_IDL_ -#define VT_SEQ_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Conn_Seq/VT_Seq_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector; -}; - -#endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc deleted file mode 100644 index 8eba6b3a2ad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector" - -project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopic_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VT_Seq_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VT_Seq_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VT_Seq_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_SEQ_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VT_Seq_Connector_conn_export.h \ - -I .. - - IDL_Files { - VT_Seq_Connector.idl - } -} - -project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VT_SEQ_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VT_Seq_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VT_Seq_ConnectorE.idl - } -} - -project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_SEQ_Connector_lem_stub - dynamicflags += VT_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Seq_ConnectorEC.cpp - } - - Header_Files { - VT_Seq_ConnectorEC.h - VT_Seq_Connector_lem_stub_export.h - } - - Inline_Files { - VT_Seq_ConnectorEC.inl - } -} - -project(DDS_VT_Seq_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VT_SEQ_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_Seq_Connector_stub - dynamicflags += VT_SEQ_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Seq_ConnectorC.cpp - } - - Header_Files { - VT_Seq_ConnectorC.h - VT_Seq_Connector_stub_export.h - } - - Inline_Files { - VT_Seq_ConnectorC.inl - } -} - -project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VT_Seq_Connector_exec - libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_SEQ_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Seq_Connector_conn.cpp - } - - Header_Files { - VT_Seq_Connector_conn.h - VT_Seq_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub - sharedname = DDS_VT_Seq_Connector_svnt - libs += DDS_VT_Seq_Connector_stub \ - DDS_VT_SEQ_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VT_Seq_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_SEQ_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Seq_ConnectorS.cpp - VT_Seq_Connector_svnt.cpp - } - - Header_Files { - VT_Seq_ConnectorS.h - VT_Seq_Connector_svnt.h - VT_Seq_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore deleted file mode 100644 index 3b0c72dc76e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VT_String_ConnectorE.idl -/VT_String_Connector_conn.cpp -/VT_String_Connector_conn.h -/VT_String_Connector_conn_export.h -/VT_String_Connector_lem_stub_export.h -/VT_String_Connector_stub_export.h -/VT_String_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl deleted file mode 100644 index 77638199e2d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VT_String_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VT_STRING_CONNECTOR_IDL_ -#define VT_STRING_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Conn_String/VT_String_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector; -}; - -#endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc deleted file mode 100644 index 480834a3807..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector" - -project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopic_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VT_String_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_STRING_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VT_String_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_STRING_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VT_String_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_STRING_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VT_String_Connector_conn_export.h \ - -I .. - - IDL_Files { - VT_String_Connector.idl - } -} - -project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VT_STRING_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VT_String_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VT_String_ConnectorE.idl - } -} - -project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_STRING_Connector_lem_stub - dynamicflags += VT_STRING_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_String_ConnectorEC.cpp - } - - Header_Files { - VT_String_ConnectorEC.h - VT_String_Connector_lem_stub_export.h - } - - Inline_Files { - VT_String_ConnectorEC.inl - } -} - -project(DDS_VT_String_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VT_STRING_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_String_Connector_stub - dynamicflags += VT_STRING_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_String_ConnectorC.cpp - } - - Header_Files { - VT_String_ConnectorC.h - VT_String_Connector_stub_export.h - } - - Inline_Files { - VT_String_ConnectorC.inl - } -} - -project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VT_String_Connector_exec - libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_STRING_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_String_Connector_conn.cpp - } - - Header_Files { - VT_String_Connector_conn.h - VT_String_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub - sharedname = DDS_VT_String_Connector_svnt - libs += DDS_VT_String_Connector_stub \ - DDS_VT_STRING_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VT_String_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_STRING_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_String_ConnectorS.cpp - VT_String_Connector_svnt.cpp - } - - Header_Files { - VT_String_ConnectorS.h - VT_String_Connector_svnt.h - VT_String_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore deleted file mode 100644 index f31e62c9ad2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VT_Union_ConnectorE.idl -/VT_Union_Connector_conn.cpp -/VT_Union_Connector_conn.h -/VT_Union_Connector_conn_export.h -/VT_Union_Connector_lem_stub_export.h -/VT_Union_Connector_stub_export.h -/VT_Union_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl deleted file mode 100644 index f24b37413ee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file VT_Union_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef VT_UNION_CONNECTOR_IDL_ -#define VT_UNION_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Conn_Union/VT_Union_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector; -#if !defined (CIAO_DDS4CCM_OPENDDS) - module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector; -#else - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector; -#endif -}; - -#endif /* VT_UNION_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc deleted file mode 100644 index c517a48c0c4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_VT_UNION_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopic_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VT_Union_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VT_Union_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VT_Union_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VT_Union_Connector_conn_export.h \ - -I .. - - IDL_Files { - VT_Union_Connector.idl - } -} - -project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VT_UNION_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VT_Union_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VT_Union_ConnectorE.idl - } -} - -project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_UNION_Connector_lem_stub - dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Union_ConnectorEC.cpp - } - - Header_Files { - VT_Union_ConnectorEC.h - VT_Union_Connector_lem_stub_export.h - } - - Inline_Files { - VT_Union_ConnectorEC.inl - } -} - -project(DDS_VT_Union_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VT_UNION_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_Union_Connector_stub - dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Union_ConnectorC.cpp - } - - Header_Files { - VT_Union_ConnectorC.h - VT_Union_Connector_stub_export.h - } - - Inline_Files { - VT_Union_ConnectorC.inl - } -} - -project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VT_Union_Connector_exec - libs += DDS_VT_Union_Connector_stub DDS_VT_UNION_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Union_Connector_conn.cpp - } - - Header_Files { - VT_Union_Connector_conn.h - VT_Union_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_exec \ - DDS_VT_Union_Connector_stub - sharedname = DDS_VT_Union_Connector_svnt - libs += DDS_VT_Union_Connector_stub \ - DDS_VT_UNION_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VT_Union_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Union_ConnectorS.cpp - VT_Union_Connector_svnt.cpp - } - - Header_Files { - VT_Union_ConnectorS.h - VT_Union_Connector_svnt.h - VT_Union_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore deleted file mode 100644 index b4c58344475..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VT_Valuetype_ConnectorE.idl -/VT_Valuetype_Connector_conn.cpp -/VT_Valuetype_Connector_conn.h -/VT_Valuetype_Connector_conn_export.h -/VT_Valuetype_Connector_lem_stub_export.h -/VT_Valuetype_Connector_stub_export.h -/VT_Valuetype_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl deleted file mode 100644 index d77be1c18e3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file VT_Valuetype_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef VT_VALUETYPE_CONNECTOR_IDL_ -#define VT_VALUETYPE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Conn_Valuetype/VT_Valuetype_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ -#if !defined (CIAO_DDS4CCM_OPENDDS) - module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector; -#else - // Just use another topic, that way we get a connector - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector; -#endif -}; - -#endif /* VT_VALUETYPE_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc deleted file mode 100644 index 41549b931ce..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_VT_VALUETYPE_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VT_Valuetype_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VT_Valuetype_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VT_Valuetype_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_VALUETYPE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VT_Valuetype_Connector_conn_export.h \ - -I .. - - IDL_Files { - VT_Valuetype_Connector.idl - } -} - -project(DDS_VT_VALUETYPE_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VT_VALUETYPE_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VT_Valuetype_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VT_Valuetype_ConnectorE.idl - } -} - -project(DDS_VT_VALUETYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VT_VALUETYPE_Connector_lem_gen DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VT_Valuetype_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_VALUETYPE_Connector_lem_stub - dynamicflags += VT_VALUETYPE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Valuetype_ConnectorEC.cpp - } - - Header_Files { - VT_Valuetype_ConnectorEC.h - VT_Valuetype_Connector_lem_stub_export.h - } - - Inline_Files { - VT_Valuetype_ConnectorEC.inl - } -} - -project(DDS_VT_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VT_VALUETYPE_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VT_Valuetype_Connector_stub - dynamicflags += VT_VALUETYPE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Valuetype_ConnectorC.cpp - } - - Header_Files { - VT_Valuetype_ConnectorC.h - VT_Valuetype_Connector_stub_export.h - } - - Inline_Files { - VT_Valuetype_ConnectorC.inl - } -} - -project(DDS_VT_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VT_Valuetype_Connector_exec - libs += DDS_VT_Valuetype_Connector_stub DDS_VT_VALUETYPE_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_VALUETYPE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Valuetype_Connector_conn.cpp - } - - Header_Files { - VT_Valuetype_Connector_conn.h - VT_Valuetype_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_exec \ - DDS_VT_Valuetype_Connector_stub - sharedname = DDS_VT_Valuetype_Connector_svnt - libs += DDS_VT_Valuetype_Connector_stub \ - DDS_VT_VALUETYPE_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VT_Valuetype_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_VALUETYPE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VT_Valuetype_ConnectorS.cpp - VT_Valuetype_Connector_svnt.cpp - } - - Header_Files { - VT_Valuetype_ConnectorS.h - VT_Valuetype_Connector_svnt.h - VT_Valuetype_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore deleted file mode 100644 index 87fede18822..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/VTopic_ConnectorE.idl -/VTopic_Connector_conn.cpp -/VTopic_Connector_conn.h -/VTopic_Connector_conn_export.h -/VTopic_Connector_lem_stub_export.h -/VTopic_Connector_stub_export.h -/VTopic_Connector_svnt_export.h diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl deleted file mode 100644 index 5fb041c38ba..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VTopic_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTOPIC_CONNECTOR_IDL_ -#define VTOPIC_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopic_Base.idl" - -#pragma ciao lem "Connector/VTopic_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopic_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector; -}; - -#endif /* VTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc deleted file mode 100644 index f453a351a0b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector" - -project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopic_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTopic_Connector_stub_export.h \ - -Wb,skel_export_macro=VTOPIC_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTopic_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTOPIC_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTopic_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTOPIC_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTopic_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTopic_Connector.idl - } -} - -project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTopic_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTopic_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTopic_ConnectorE.idl - } -} - -project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTopic_Connector_lem_stub - dynamicflags += VTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ConnectorEC.cpp - } - - Header_Files { - VTopic_ConnectorEC.h - VTopic_Connector_lem_stub_export.h - } - - Inline_Files { - VTopic_ConnectorEC.inl - } -} - -project(DDS_VTopic_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopic_Connector_idl_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTopic_Connector_stub - dynamicflags += VTOPIC_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ConnectorC.cpp - } - - Header_Files { - VTopic_ConnectorC.h - VTopic_Connector_stub_export.h - } - - Inline_Files { - VTopic_ConnectorC.inl - } -} - -project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VTopic_Base_stub - sharedname = DDS_VTopic_Connector_exec - libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTOPIC_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_Connector_conn.cpp - } - - Header_Files { - VTopic_Connector_conn.h - VTopic_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub - sharedname = DDS_VTopic_Connector_svnt - libs += DDS_VTopic_Connector_stub \ - DDS_VTopic_Connector_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTOPIC_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ConnectorS.cpp - VTopic_Connector_svnt.cpp - } - - Header_Files { - VTopic_ConnectorS.h - VTopic_Connector_svnt.h - VTopic_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore deleted file mode 100644 index d15d8965d3e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Receiver_exec_export.h -/Receiver_lem_stub_export.h -/Receiver_stub_export.h -/Receiver_svnt_export.h -/VTopic_ReceiverE.idl diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl deleted file mode 100644 index 596e652a286..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/VTopic_Connector.idl" - -module VTopic -{ - component Receiver - { - port TestTopicConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc deleted file mode 100644 index 096d14bb5f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc +++ /dev/null @@ -1,166 +0,0 @@ -project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_VTopic_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ - -I .. - - IDL_Files { - VTopic_Receiver.idl - } -} - -project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_VTopic_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - VTopic_ReceiverE.idl - } -} - -project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopic_Receiver_lem_gen DDS_VTopic_Receiver_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub Receiver_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ReceiverEC.cpp - } - - Header_Files { - VTopic_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - VTopic_ReceiverEC.inl - } -} - -project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopic_Receiver_idl_gen DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ - DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ - DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ - DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub - libs += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \ - DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ReceiverC.cpp - } - - Header_Files { - VTopic_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - VTopic_ReceiverC.inl - } -} - -project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub \ - DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub\ - DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ - DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ - DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub \ - DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_Receiver_exec.cpp - } - - Header_Files { - VTopic_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_VTopic_Base_stub DDS_VTopic_Receiver_lem_stub \ - DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \ - DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub\ - DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \ - DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \ - DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \ - DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \ - DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \ - DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \ - DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_ReceiverS.cpp - VTopic_Receiver_svnt.cpp - } - - Header_Files { - VTopic_ReceiverS.h - VTopic_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp deleted file mode 100644 index 532551382f1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// -*- C++ -*- -//Test for different topictypes with DDS_Event connector, look for 'SUBSCRIPTION_MATCHED_STATUS - -#include "VTopic_Receiver_exec.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_VTopic_Receiver_Impl -{ -//============================================================ - // Facet Executor Implementation Class: ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &subscription_matched) - : subscription_matched_ (subscription_matched) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (! ::CORBA::is_nil (the_entity) && - status_kind == ::DDS::SUBSCRIPTION_MATCHED_STATUS) - { - this->subscription_matched_ = true; - } - } - - //============================================================ - // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i (); - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : subscription_matched_ (false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - // Port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->subscription_matched_); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::VTopic::TestTopicConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - return ::VTopic::TestTopicConnector::CCM_Listener::_nil (); - } - - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::VTopic::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) - { - if(!this->subscription_matched_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("states 'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n") - )); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopic_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h deleted file mode 100644 index 2358cf76e53..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "VTopic_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - - - -namespace CIAO_VTopic_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - - private: - Atomic_Boolean &subscription_matched_; - }; - - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Supported operations and attributes. - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::VTopic::TestTopicConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::VTopic::CCM_Receiver_Context_var context_; - Atomic_Boolean subscription_matched_; -}; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopic_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore deleted file mode 100644 index abf3e87655b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Sender_exec_export.h -/Sender_lem_stub_export.h -/Sender_stub_export.h -/Sender_svnt_export.h -/VTopic_SenderE.idl diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl deleted file mode 100644 index 1f865a9eee5..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_VTOPIC_SENDER_IDL -#define DDS_VTOPIC_SENDER_IDL - -#include "Connector/VTopic_Connector.idl" - -module VTopic -{ - component Sender - { - port TestTopicConnector::DDS_Write info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc deleted file mode 100644 index 875462836f2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc +++ /dev/null @@ -1,169 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_VTopic_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - VTopic_Sender.idl - } -} - -project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_VTopic_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - VTopic_SenderE.idl - } -} - -project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopic_Sender_lem_gen DDS_VTopic_Sender_stub DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_SenderEC.cpp - } - - Header_Files { - VTopic_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - VTopic_SenderEC.inl - } -} - -project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopic_Sender_idl_gen DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ - DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ - DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ - DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub - libs += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub \ - DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \ - DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_SenderC.cpp - } - - Header_Files { - VTopic_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - VTopic_SenderC.inl - } -} - -project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub \ - DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ - DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ - DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ - DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ - DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \ - DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_Sender_exec.cpp - } - - Header_Files { - VTopic_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_VTopic_Base_stub DDS_VTopic_Sender_lem_stub \ - DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub \ - DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \ - DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \ - DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \ - DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \ - DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \ - DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \ - DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt \ - DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \ - DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_SenderS.cpp - VTopic_Sender_svnt.cpp - } - - Header_Files { - VTopic_SenderS.h - VTopic_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp deleted file mode 100644 index 9bfe71d10d6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// -*- C++ -*- - -//Test different topic types, with DDS_EVENT connectors, look for 'PUBLICATION_MATCHED_STATUS -#include "VTopic_Sender_exec.h" -#include "ace/Log_Msg.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_VTopic_Sender_Impl -{ - //============================================================ - // Facet Executor Implementation Class: ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &publication_matched) - : publication_matched_ (publication_matched) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (! ::CORBA::is_nil (the_entity) && - status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) - { - this->publication_matched_ = true; - } - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : publication_matched_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - - { - return new ConnectorStatusListener_exec_i (this->publication_matched_); - } - - // Supported operations and attributes. - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = ::VTopic::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) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if(!this->publication_matched_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' in Sender\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ") - ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' in Sender\n") - )); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopic_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h deleted file mode 100644 index 501bb50c7f8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h +++ /dev/null @@ -1,81 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - -#include "VTopic_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_VTopic_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &publication_matched_; - }; - - 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); - - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status(void); - - private: - ::VTopic::CCM_Sender_Context_var context_; - - Atomic_Boolean publication_matched_; -}; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopic_Sender_Impl (void); - -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp deleted file mode 100644 index a224e9d2671..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp +++ /dev/null @@ -1,1247 +0,0 @@ - - - - VTopic_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - VTopic_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TestTopicConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TestTopicConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTopic_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTopic_Connector_exec - - - - - - - VT_String_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicStringConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicStringConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_String_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_String_Connector_exec - - - - - - - VT_Array_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicArrayConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicArrayConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_Array_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_Array_Connector_exec - - - - - - - VT_Valuetype_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicValuetypeConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicValuetypeConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_Valuetype_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_Valuetype_Connector_exec - - - - - - - VT_Union_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicUnionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicUnionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_Union_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_Union_Connector_exec - - - - - - - VT_X_Union_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_X_UnionConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_X_UnionConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_Union_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_Union_Connector_exec - - - - - - - VT_Seq_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicSeqConnector_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicSeqConnector_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VT_Seq_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VT_Seq_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - VTopic_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestUS - - - - - - VTopic_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestUS - - - - - - - VT_String_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestString - - - - - - VT_String_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestString - - - - - - - VT_Array_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestArray - - - - - - VT_Array_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestArray - - - - - - - VT_Valuetype_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestValuetype - - - - - - VT_Valuetype_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestValuetype - - - - - - - VT_Union_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestUnion - - - - - - VT_Union_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestUnion - - - - - - - VT_X_Union_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Test_X_Union - - - - - - VT_X_Union_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Test_X_Union - - - - - - - VT_Seq_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestSeq - - - - - - VT_Seq_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestSeq - - - - - - - SenderComponent - SenderNode - - - - - - - - connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - test_topic_info_write - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - test_topic_info_out - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - - connector_status_receiver_string - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_string - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_array - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_array - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_valuetype - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_valuetype - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - connector_status_receiver_x_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_x_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_seq - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_seq - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - VTopic_Connector_exec - - - DDS_VTopic_Connector_exec - - - VTopic_Connector_svnt - - - DDS_VTopic_Connector_svnt - - - VTopic_Connector_stub - - - DDS_VTopic_Connector_stub - - - - VT_String_Connector_exec - - - DDS_VT_String_Connector_exec - - - VT_String_Connector_svnt - - - DDS_VT_String_Connector_svnt - - - VT_String_Connector_stub - - - DDSVT_String_Connector_stub - - - - VT_Array_Connector_exec - - - DDS_VT_Array_Connector_exec - - - VT_Array_Connector_svnt - - - DDS_VT_Array_Connector_svnt - - - VT_Array_Connector_stub - - - DDS_VT_Array_Connector_stub - - - - VT_Valuetype_Connector_exec - - - DDS_VT_Valuetype_Connector_exec - - - VT_Valuetype_Connector_svnt - - - DDS_VT_Valuetype_Connector_svnt - - - VT_Valuetype_Connector_stub - - - DDS_VT_Valuetype_Connector_stub - - - - VT_Union_Connector_exec - - - DDS_VT_Union_Connector_exec - - - VT_Union_Connector_svnt - - - DDS_VT_Union_Connector_svnt - - - VT_Union_Connector_stub - - - DDS_VT_Union_Connector_stub - - - - VT_Seq_Connector_exec - - - DDS_VT_Seq_Connector_exec - - - VT_Seq_Connector_svnt - - - DDS_VT_Seq_Connector_svnt - - - VT_Seq_Connector_stub - - - DDS_VT_Seq_Connector_stub - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl deleted file mode 100755 index 7badf0431b3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (4 * $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/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore deleted file mode 100644 index 502167fa0b8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lib diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl deleted file mode 100644 index 0d4e8b46db4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @file VTopics_Base.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTOPICS_BASE_IDL -#define VTOPICS_BASE_IDL - -#pragma ndds typesupport "Base/VTopics_BaseSupport.h" -#pragma opendds typesupport "Base/VTopics_BaseTypeSupportImpl.h" - -typedef octet octet_array[5]; - -#pragma DCPS_DATA_TYPE "TestTopic" -#pragma DCPS_DATA_KEY "TestTopic key" - -// Plain Topic -struct TestTopic { - string key; //@key - long x; -}; - -#pragma DCPS_DATA_TYPE "TopicString" -#pragma DCPS_DATA_KEY "TopicString key" - -// String -struct TopicString { - string key; //@key - string x_str; -}; - -#pragma DCPS_DATA_TYPE "TopicArray" -#pragma DCPS_DATA_KEY "TopicArray key" - -// Arrays -struct TopicArray { - string key; //@key - octet_array x_array; -}; - -// Unions -union X_Union switch (short) { - case 0: - string x_test; - case 1: - long x_long; -}; - -#pragma DCPS_DATA_TYPE "TopicUnion" -#pragma DCPS_DATA_KEY "TopicUnion key" - -struct TopicUnion { - string key; //@key - X_Union x_uni; -}; - -// Sequence -struct test { - short x_test; - string x_teststr; -}; - -typedef sequence testSeq; - -#pragma DCPS_DATA_TYPE "TopicSeq" -#pragma DCPS_DATA_KEY "TopicSeq key" - -struct TopicSeq { - string key; //@key - testSeq x_seq; -}; - - // ValueType -valuetype X_Valuetype { - public string type; - public long x_long; -}; - -#if !defined (CIAO_DDS4CCM_OPENDDS) -// OpenDDS doesn't support valuetype as topic member -#pragma DCPS_DATA_TYPE "TopicValuetype" -#pragma DCPS_DATA_KEY "TopicValuetype key" - -struct TopicValuetype { - string key; //@key - X_Valuetype x_vt; -}; -#endif - -// Sequences -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TestTopicSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicStringSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicArraySeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicUnionSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence X_UnionSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicSeqSeq; -#endif -#if !defined (CIAO_DDS4CCM_OPENDDS) -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence TopicValuetypeSeq; -#endif -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence X_ValuetypeSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc deleted file mode 100644 index 93338d3676d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc +++ /dev/null @@ -1,25 +0,0 @@ -project (DDS_VTopics_Base_stub) : taoidldefaults, \ - dds4ccm_ts_default, valuetype { - sharedname = DDS_VTopics_Base_stub - dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS \ - -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \ - -Wb,stub_export_include=VTopics_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - VTopics_Base.idl - } - - opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export - - DDSGenerator_Files { - VTopics_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl deleted file mode 100644 index ec502e9d437..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VTS_Array_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTS_ARRAY_CONNECTOR_IDL_ -#define VTS_ARRAY_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Conn_Array/VTS_Array_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopics -{ - module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector; -}; - -#endif /* VTS_Array_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc deleted file mode 100644 index c522762166e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector" - -project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTS_Array_Connector_stub_export.h \ - -Wb,skel_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTS_Array_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTS_Array_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTS_ARRAY_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTS_Array_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTS_Array_Connector.idl - } -} - -project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTS_ARRAY_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTS_Array_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTS_Array_ConnectorE.idl - } -} - -project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_ARRAY_Connector_lem_stub - dynamicflags += VTS_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Array_ConnectorEC.cpp - } - - Header_Files { - VTS_Array_ConnectorEC.h - VTS_Array_Connector_lem_stub_export.h - } - - Inline_Files { - VTS_Array_ConnectorEC.inl - } -} - -project(DDS_VTS_Array_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTS_ARRAY_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_Array_Connector_stub - dynamicflags += VTS_ARRAY_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Array_ConnectorC.cpp - } - - Header_Files { - VTS_Array_ConnectorC.h - VTS_Array_Connector_stub_export.h - } - - Inline_Files { - VTS_Array_ConnectorC.inl - } -} - -project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub - sharedname = DDS_VTS_Array_Connector_exec - libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_ARRAY_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Array_Connector_conn.cpp - } - - Header_Files { - VTS_Array_Connector_conn.h - VTS_Array_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub - sharedname = DDS_VTS_Array_Connector_svnt - libs += DDS_VTS_Array_Connector_stub \ - DDS_VTS_ARRAY_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTS_Array_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_ARRAY_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Array_ConnectorS.cpp - VTS_Array_Connector_svnt.cpp - } - - Header_Files { - VTS_Array_ConnectorS.h - VTS_Array_Connector_svnt.h - VTS_Array_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl deleted file mode 100644 index 4dfa1f811e8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VTS_Seq_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTS_SEQ_CONNECTOR_IDL_ -#define VTS_SEQ_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopics -{ - module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector; -}; - -#endif /* VTS_SEQ_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc deleted file mode 100644 index 757e94922d2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc +++ /dev/null @@ -1,141 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector" - -project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTS_Seq_Connector_stub_export.h \ - -Wb,skel_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTS_Seq_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTS_Seq_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTS_SEQ_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTS_Seq_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTS_Seq_Connector.idl - } -} - -project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTS_SEQ_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTS_Seq_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTS_Seq_ConnectorE.idl - } -} - -project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_SEQ_Connector_lem_stub - dynamicflags += VTS_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Seq_ConnectorEC.cpp - } - - Header_Files { - VTS_Seq_ConnectorEC.h - VTS_Seq_Connector_lem_stub_export.h - } - - Inline_Files { - VTS_Seq_ConnectorEC.inl - } -} - -project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTS_SEQ_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_Seq_Connector_stub - dynamicflags += VTS_SEQ_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Seq_ConnectorC.cpp - } - - Header_Files { - VTS_Seq_ConnectorC.h - VTS_Seq_Connector_stub_export.h - } - - Inline_Files { - VTS_Seq_ConnectorC.inl - } -} - -project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub - sharedname = DDS_VTS_Seq_Connector_exec - libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_SEQ_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Seq_Connector_conn.cpp - } - - Header_Files { - VTS_Seq_Connector_conn.h - VTS_Seq_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub - sharedname = DDS_VTS_Seq_Connector_svnt - libs += DDS_VTS_Seq_Connector_stub \ - DDS_VTS_SEQ_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTS_Seq_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_SEQ_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Seq_ConnectorS.cpp - VTS_Seq_Connector_svnt.cpp - } - - Header_Files { - VTS_Seq_ConnectorS.h - VTS_Seq_Connector_svnt.h - VTS_Seq_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl deleted file mode 100644 index d224a66f793..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VTS_String_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTS_STRING_CONNECTOR_IDL_ -#define VTS_STRING_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Conn_String/VTS_String_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopics -{ - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector; -}; - -#endif /* VTS_STRING_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc deleted file mode 100644 index 58edb6b9ad4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector" - -project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTS_String_Connector_stub_export.h \ - -Wb,skel_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTS_String_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTS_String_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTS_STRING_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTS_String_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTS_String_Connector.idl - } -} - -project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTS_STRING_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTS_String_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTS_String_ConnectorE.idl - } -} - -project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_STRING_Connector_lem_stub - dynamicflags += VTS_STRING_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_String_ConnectorEC.cpp - } - - Header_Files { - VTS_String_ConnectorEC.h - VTS_String_Connector_lem_stub_export.h - } - - Inline_Files { - VTS_String_ConnectorEC.inl - } -} - -project(DDS_VTS_String_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTS_STRING_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_String_Connector_stub - dynamicflags += VTS_STRING_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_String_ConnectorC.cpp - } - - Header_Files { - VTS_String_ConnectorC.h - VTS_String_Connector_stub_export.h - } - - Inline_Files { - VTS_String_ConnectorC.inl - } -} - -project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub - sharedname = DDS_VTS_String_Connector_exec - libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_STRING_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_String_Connector_conn.cpp - } - - Header_Files { - VTS_String_Connector_conn.h - VTS_String_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub - sharedname = DDS_VTS_String_Connector_svnt - libs += DDS_VTS_String_Connector_stub \ - DDS_VTS_STRING_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTS_String_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_STRING_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_String_ConnectorS.cpp - VTS_String_Connector_svnt.cpp - } - - Header_Files { - VTS_String_ConnectorS.h - VTS_String_Connector_svnt.h - VTS_String_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl deleted file mode 100644 index f728c9d2cdc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file VTS_Union_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef VT_UNION_CONNECTOR_IDL_ -#define VT_UNION_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Conn_Union/VTS_Union_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopic -{ - module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector; -#if !defined (CIAO_DDS4CCM_OPENDDS) - module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector; -#else - // Just use another topic, that way we get a connector - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector; -#endif -}; - -#endif /* VT_UNION_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc deleted file mode 100644 index 104300fd1bc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc +++ /dev/null @@ -1,140 +0,0 @@ -project(DDS_VTS_Union_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTS_Union_Connector_stub_export.h \ - -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTS_Union_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTS_Union_Connector_svnt_export.h \ - -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTS_Union_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTS_Union_Connector.idl - } -} - -project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTS_Union_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTS_Union_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTS_Union_ConnectorE.idl - } -} - -project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_Union_Connector_lem_stub - dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Union_ConnectorEC.cpp - } - - Header_Files { - VTS_Union_ConnectorEC.h - VTS_Union_Connector_lem_stub_export.h - } - - Inline_Files { - VTS_Union_ConnectorEC.inl - } -} - -project(DDS_VTS_Union_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTS_Union_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_Union_Connector_stub - dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Union_ConnectorC.cpp - } - - Header_Files { - VTS_Union_ConnectorC.h - VTS_Union_Connector_stub_export.h - } - - Inline_Files { - VTS_Union_ConnectorC.inl - } -} - -project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub - sharedname = DDS_VTS_Union_Connector_exec - libs += DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Union_Connector_conn.cpp - } - - Header_Files { - VTS_Union_Connector_conn.h - VTS_Union_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_exec \ - DDS_VTS_Union_Connector_stub - sharedname = DDS_VTS_Union_Connector_svnt - libs += DDS_VTS_Union_Connector_stub \ - DDS_VTS_Union_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTS_Union_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Union_ConnectorS.cpp - VTS_Union_Connector_svnt.cpp - } - - Header_Files { - VTS_Union_ConnectorS.h - VTS_Union_Connector_svnt.h - VTS_Union_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl deleted file mode 100644 index fc61e9b9eea..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file VTS_Valuetype_Connector.idl - * @author Marcel Smit (msmit@remedy.nl) - */ - -#ifndef VTS_VALUE_TYPE_CONNECTOR_IDL_ -#define VTS_VALUE_TYPE_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Conn_Valuetype/VTS_Valuetype_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopics -{ -#if !defined (CIAO_DDS4CCM_OPENDDS) - module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector; -#else - // Just use another topic, that way we get a connector - module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector; -#endif -}; - -#endif /* VTS_VALUE_TYPE_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc deleted file mode 100644 index a46ce3bfc4d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc +++ /dev/null @@ -1,143 +0,0 @@ -project(DDS_VTS_Valuetype_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTS_Valuetype_Connector_stub_export.h \ - -Wb,skel_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTS_Valuetype_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTS_Valuetype_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTS_VALUE_TYPE_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTS_Valuetype_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTS_Valuetype_Connector.idl - } -} - -project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTS_Valuetype_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTS_Valuetype_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTS_Valuetype_ConnectorE.idl - } -} - -project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTS_Valuetype_Connector_lem_gen DDS_VTS_Valuetype_Connector_stub \ - DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_VALUE_TYPE_Connector_lem_stub - dynamicflags += VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Valuetype_ConnectorEC.cpp - } - - Header_Files { - VTS_Valuetype_ConnectorEC.h - VTS_Valuetype_Connector_lem_stub_export.h - } - - Inline_Files { - VTS_Valuetype_ConnectorEC.inl - } -} - -project(DDS_VTS_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTS_Valuetype_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTS_Valuetype_Connector_stub - dynamicflags += VTS_VALUE_TYPE_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Valuetype_ConnectorC.cpp - } - - Header_Files { - VTS_Valuetype_ConnectorC.h - VTS_Valuetype_Connector_stub_export.h - } - - Inline_Files { - VTS_Valuetype_ConnectorC.inl - } -} - -project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \ - DDS_VTopics_Base_stub - sharedname = DDS_VTS_Valuetype_Connector_exec - libs += DDS_VTS_Valuetype_Connector_stub DDS_VTS_VALUE_TYPE_Connector_lem_stub \ - DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_VALUE_TYPE_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Valuetype_Connector_conn.cpp - } - - Header_Files { - VTS_Valuetype_Connector_conn.h - VTS_Valuetype_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_exec\ - DDS_VTS_Valuetype_Connector_stub - sharedname = DDS_VTS_Valuetype_Connector_svnt - libs += DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_VALUE_TYPE_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTS_Valuetype_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTS_VALUE_TYPE_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTS_Valuetype_ConnectorS.cpp - VTS_Valuetype_Connector_svnt.cpp - } - - Header_Files { - VTS_Valuetype_ConnectorS.h - VTS_Valuetype_Connector_svnt.h - VTS_Valuetype_Connector_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl deleted file mode 100644 index 8e454b7fe4a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file VTopics_Connector.idl - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef VTOPICS_CONNECTOR_IDL_ -#define VTOPICS_CONNECTOR_IDL_ - -#include -#include - -#include "Base/VTopics_Base.idl" - -#pragma ciao lem "Connector/VTopics_ConnectorE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -# include "Base/VTopics_BaseTypeSupport.idl" -#endif - -module VTopics -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector; -}; - -#endif /* VTopics_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc deleted file mode 100644 index 0b49ebf7e6e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc +++ /dev/null @@ -1,142 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector" - -project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen DDS_VTopics_Base_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=VTopics_Connector_stub_export.h \ - -Wb,skel_export_macro=VTOPICS_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=VTopics_Connector_svnt_export.h \ - -Wb,svnt_export_macro=VTOPICS_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=VTopics_Connector_svnt_export.h \ - -Wb,conn_export_macro=VTOPICS_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=VTopics_Connector_conn_export.h \ - -I .. - - IDL_Files { - VTopics_Connector.idl - } -} - -project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTopics_Connector_idl_gen - idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=VTopics_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - VTopics_ConnectorE.idl - } -} - -project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTopics_Connector_lem_stub - dynamicflags += VTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ConnectorEC.cpp - } - - Header_Files { - VTopics_ConnectorEC.h - VTopics_Connector_lem_stub_export.h - } - - Inline_Files { - VTopics_ConnectorEC.inl - } -} - -project(DDS_VTopics_Connector_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopics_Connector_idl_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_VTopics_Connector_stub - dynamicflags += VTOPICS_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ConnectorC.cpp - } - - Header_Files { - VTopics_ConnectorC.h - VTopics_Connector_stub_export.h - } - - Inline_Files { - VTopics_ConnectorC.inl - } -} - -project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTopics_Base_stub - sharedname = DDS_VTopics_Connector_exec - libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTOPICS_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_Connector_conn.cpp - } - - Header_Files { - VTopics_Connector_conn.h - VTopics_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub - sharedname = DDS_VTopics_Connector_svnt - libs += DDS_VTopics_Connector_stub \ - DDS_VTopics_Connector_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += VTOPICS_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ConnectorS.cpp - VTopics_Connector_svnt.cpp - } - - Header_Files { - VTopics_ConnectorS.h - VTopics_Connector_svnt.h - VTopics_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl deleted file mode 100644 index c90d09b525e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/VTopics_Connector.idl" - -module VTopics -{ - component Receiver - { - port TestTopicConnector::DDS_Listen info_out; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc deleted file mode 100644 index 6e2ffd342cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc +++ /dev/null @@ -1,170 +0,0 @@ -project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += DDS_VTopics_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - VTopics_Receiver.idl - } -} - -project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_VTopics_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - VTopics_ReceiverE.idl - } -} - -project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopics_Receiver_lem_gen DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub - libs += Receiver_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ReceiverEC.cpp - } - - Header_Files { - VTopics_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - VTopics_ReceiverEC.inl - } -} - -project(DDS_VTopics_Receiver_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopics_Receiver_idl_gen DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_gen \ - DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_gen \ - DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_gen \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_gen \ - DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_gen \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_gen - libs += DDS_VTopics_Connector_stub DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \ - DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTopics_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ReceiverC.cpp - } - - Header_Files { - VTopics_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - VTopics_ReceiverC.inl - } -} - -project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_stub \ - DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTopics_Connector_lem_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_Receiver_exec.cpp - } - - Header_Files { - VTopics_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Receiver_exec \ - DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \ - DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt \ - DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_stub \ - Receiver_exec DDS_VTopics_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_ReceiverS.cpp - VTopics_Receiver_svnt.cpp - } - - Header_Files { - VTopics_ReceiverS.h - VTopics_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp deleted file mode 100644 index 72da2d96393..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// -*- C++ -*- -//Test for different topic types , with DDS_STATE connector, look for 'SUBSCRIPTION_MATCHED_STATUS - -#include "VTopics_Receiver_exec.h" -#include "dds4ccm/impl/Utils.h" - - -namespace CIAO_VTopics_Receiver_Impl -{ -//============================================================ - // Facet Executor Implementation Class: ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &subscription_matched) - : subscription_matched_ (subscription_matched) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ConnectorStatusListener - void ConnectorStatusListener_exec_i::on_inconsistent_topic ( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (! ::CORBA::is_nil(the_entity) && - status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) - { - this->subscription_matched_ = true; - } - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : subscription_matched_ (false) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Port operations. - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Receiver_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->subscription_matched_); - } - - ::VTopics::TestTopicConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - return ::VTopics::TestTopicConnector::CCM_Listener::_nil (); - } - - CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::VTopics::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) - { - if(!this->subscription_matched_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("status 'SUBSCRIPTION_MATCHED_STATUS' ") - ACE_TEXT ("in Receiver\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' ") - ACE_TEXT ("in Receiver\n") - )); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopics_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h deleted file mode 100644 index 9e15ddc171a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h +++ /dev/null @@ -1,90 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "VTopics_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_VTopics_Receiver_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Receiver_exec_i; - - class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - - private: - Atomic_Boolean &subscription_matched_; - }; - - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Supported operations and attributes. - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - virtual ::VTopics::TestTopicConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::VTopics::CCM_Receiver_Context_var context_; - Atomic_Boolean subscription_matched_; -}; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopics_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl deleted file mode 100644 index 3236c47642c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_VTOPICS_SENDER_IDL -#define DDS_VTOPICS_SENDER_IDL - -#include "Connector/VTopics_Connector.idl" - -module VTopics -{ - component Sender - { - port TestTopicConnector::DDS_Update info_write; - provides CCM_DDS::ConnectorStatusListener connector_status; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc deleted file mode 100644 index b0467e6d7c3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc +++ /dev/null @@ -1,166 +0,0 @@ -// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += DDS_VTopics_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - VTopics_Sender.idl - } -} - -project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_VTopics_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - VTopics_SenderE.idl - } -} - -project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopics_Sender_lem_gen DDS_VTopics_Sender_stub DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_SenderEC.cpp - } - - Header_Files { - VTopics_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - VTopics_SenderEC.inl - } -} - -project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base { - after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub - libs += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_Union_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_SenderC.cpp - } - - Header_Files { - VTopics_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - VTopics_SenderC.inl - } -} - -project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub \ - DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \ - DDS_VTS_String_Connector_lem_stub DDS_VTS_String_Connector_stub \ - DDS_VTS_Array_Connector_lem_stub DDS_VTS_Array_Connector_stub \ - DDS_VTS_Valuetype_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \ - DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub \ - DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTS_Union_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_Sender_exec.cpp - } - - Header_Files { - VTopics_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_VTopics_Base_stub DDS_VTopics_Sender_lem_stub \ - DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \ - DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \ - DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \ - DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt \ - DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt \ - DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt \ - DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt \ - DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_SenderS.cpp - VTopics_Sender_svnt.cpp - } - - Header_Files { - VTopics_SenderS.h - VTopics_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp deleted file mode 100644 index be057adabaf..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp +++ /dev/null @@ -1,138 +0,0 @@ -// -*- C++ -*- - -//Test different topic types, with DDS_STATE connector, look for 'PUBLICATION_MATCHED_STATUS -#include "VTopics_Sender_exec.h" -#include "dds4ccm/impl/Utils.h" - -namespace CIAO_VTopics_Sender_Impl -{ - //============================================================ - // ConnectorStatusListener_exec_i - //============================================================ - ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &publication_matched) - : publication_matched_ (publication_matched) - { - } - - ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) - { - } - - void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr /*the_topic*/, - const DDS::InconsistentTopicStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::RequestedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_sample_rejected ( - ::DDS::DataReader_ptr /*the_reader*/, - const DDS::SampleRejectedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedIncompatibleQosStatus & /*status*/) - { - } - - void ConnectorStatusListener_exec_i::on_unexpected_status ( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) - { - if (! ::CORBA::is_nil (the_entity) && - status_kind == DDS::PUBLICATION_MATCHED_STATUS) - { - this->publication_matched_ = true; - } - } - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - - Sender_exec_i::Sender_exec_i (void) - : publication_matched_ (false) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - ::CCM_DDS::CCM_ConnectorStatusListener_ptr - Sender_exec_i::get_connector_status (void) - { - return new ConnectorStatusListener_exec_i (this->publication_matched_); - } - - // Supported operations and attributes. - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = ::VTopics::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) - { - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - if(!this->publication_matched_.value ()) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ") - ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' ") - ACE_TEXT ("in Sender\n") - )); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ") - ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' ") - ACE_TEXT ("in Sender\n") - )); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopics_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h deleted file mode 100644 index 38404213210..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h +++ /dev/null @@ -1,82 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - - -#include "VTopics_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_VTopics_Sender_Impl -{ - typedef ACE_Atomic_Op Atomic_Boolean; - - class Sender_exec_i; - - class SENDER_EXEC_Export ConnectorStatusListener_exec_i - : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, - public virtual ::CORBA::LocalObject - { - public: - ConnectorStatusListener_exec_i (Atomic_Boolean &); - virtual ~ConnectorStatusListener_exec_i (void); - - virtual - void on_inconsistent_topic (::DDS::Topic_ptr the_topic, - 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); - virtual - void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status); - virtual - 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); - private: - Atomic_Boolean &publication_matched_; - }; - - 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); - - // Port operations. - virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr - get_connector_status (void); - - private: - ::VTopics::CCM_Sender_Context_var context_; - - Atomic_Boolean publication_matched_; -}; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_VTopics_Sender_Impl (void); - -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp deleted file mode 100644 index 61d6b37adcc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp +++ /dev/null @@ -1,1095 +0,0 @@ - - - - VTopics_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - VTopics_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_TestTopicConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_TestTopicConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTopics_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTopics_Connector_exec - - - - - - - VTS_String_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_TopicStringConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_TopicStringConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTS_String_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTS_String_Connector_exec - - - - - - - VTS_Array_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_TopicArrayConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_TopicArrayConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTS_Array_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTS_Array_Connector_exec - - - - - - - VTS_Seq_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_TopicSeqConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_TopicSeqConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTS_Seq_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTS_Seq_Connector_exec - - - - - - - VTS_Union_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_TopicUnionConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_TopicUnionConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTS_Union_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTS_Union_Connector_exec - - - - - - - VT_X_Union_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopic_X_UnionConnector_DDS_State_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopic_X_UnionConnector_DDS_State_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - VTS_Union_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - VTS_Union_Connector_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_VTopics_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_VTopics_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - - - VTopics_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestUS - - - - - - VTopics_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestUS - - - - - - - VTS_String_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestString - - - - - - VTS_String_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestString - - - - - - - VTS_Array_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestArray - - - - - - VTS_Array_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestArray - - - - - - - VTS_Seq_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestSeq - - - - - - VTS_Seq_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestSeq - - - - - - - VTS_Union_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - TestUnion - - - - - - VTS_Union_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - TestUnion - - - - - - - VT_X_Union_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Test_X_Union - - - - - - VT_X_Union_ConnectorComponent2 - ReceiverNode - - - - - topic_name - - - tk_string - - - Test_X_Union - - - - - - - SenderComponent - SenderNode - - - - - - - - connector_status_receiver - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - info_write_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - observable_data - true - Facet - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_observer_data - true - Facet - - - - - - - connector_status_receiver_string - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_string - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_array - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_array - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_seq - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_seq - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - - connector_status_receiver_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - connector_status_receiver_x_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - connector_status_sender_x_union - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - VTopics_Connector_exec - - - DDS_VTopics_Connector_exec - - - VTopics_Connector_svnt - - - DDS_VTopics_Connector_svnt - - - VTopics_Connector_stub - - - DDS_VTopics_Connector_stub - - - - VTS_String_Connector_exec - - - DDS_VTS_String_Connector_exec - - - VTS_String_Connector_svnt - - - DDS_VTS_String_Connector_svnt - - - VTS_String_Connector_stub - - - DDSVTS_String_Connector_stub - - - - VTS_Array_Connector_exec - - - DDS_VTS_Array_Connector_exec - - - VTS_Array_Connector_svnt - - - DDS_VTS_Array_Connector_svnt - - - VTS_Array_Connector_stub - - - DDS_VTS_Array_Connector_stub - - - - VTS_Seq_Connector_exec - - - DDS_VTS_Seq_Connector_exec - - - VTS_Seq_Connector_svnt - - - DDS_VTS_Seq_Connector_svnt - - - VTS_Seq_Connector_stub - - - DDS_VTS_Seq_Connector_stub - - - - VTS_Union_Connector_exec - - - DDS_VTS_Union_Connector_exec - - - VTS_Union_Connector_svnt - - - DDS_VTS_Union_Connector_svnt - - - VTS_Union_Connector_stub - - - DDS_VTS_Union_Connector_stub - - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl deleted file mode 100755 index 460cd1064d0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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 10 seconds to allow task to complete\n"; -sleep (10); - -# 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\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (2 * $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/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp deleted file mode 100644 index dd5eec3f2fc..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp +++ /dev/null @@ -1,498 +0,0 @@ - - - - Shapes_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Receiver_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Receiver_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Receiver_comp_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Receiver_comp_exec - - - - - - - ControlComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Control_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Control_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Control_comp_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Control_comp_exec - - - - - - - Shapes_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_ShapeType_conn_DDS_Event_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_ShapeType_conn_DDS_Event_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_ShapeType_conn_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_ShapeType_conn_exec - - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_Shapes_Sender_comp_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_Shapes_Sender_comp_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Shapes_Sender_comp_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Shapes_Sender_comp_exec - - - - - - - ReceiverComponent - ReceiverNode - - - - - - - ControlComponent - ControlNode - - - - - rate - - - tk_ulong - - - 10 - - - - - max_x - - - tk_ushort - - - 225 - - - - - max_y - - - tk_ushort - - - 250 - - - - - max_size - - - tk_ushort - - - 25 - - - - - resize_shape - - - tk_boolean - - - true - - - - - - - Shapes_ConnectorComponent - SenderNode - - - - - topic_name - - - tk_string - - - Square - - - - - domain_id - - - tk_long - - - 0 - - - - - - - Shapes_ReceiverConnectorInstance - ReceiverNode - - - - - topic_name - - - tk_string - - - Square - - - - - domain_id - - - tk_long - - - 0 - - - - - - - SenderComponent - SenderNode - - - - - - - _listenercontrol - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_control - false - SimplexReceptacle - - - - push_consumer_data_control - true - Facet - - - - - _listener - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data_listener - true - Facet - - - - push_consumer_data_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - control_connection - - control - false - SimplexReceptacle - - - - control - true - Facet - - - - - - Shapes_Sender_comp_exec - - - Shapes_Sender_comp_exec - - - Shapes_Sender_comp_svnt - - - Shapes_Sender_comp_svnt - - - Sender_stub - - - Sender_stub - - - Shapes_ShapeType_conn_exec - - - Shapes_ShapeType_conn_exec - - - Shapes_ShapeType_conn_svnt - - - Shapes_ShapeType_conn_svnt - - - Shapes_Receiver_comp_exec - - - Shapes_Receiver_comp_exec - - - Shapes_Receiver_comp_svnt - - - Shapes_Receiver_comp_svnt - - - Receiver_stub - - - Receiver_stub - - - Shapes_Control_comp_exec - - - Shapes_Control_comp_exec - - - Shapes_Control_comp_svnt - - - Shapes_Control_comp_svnt - - - Control_stub - - - Control_stub - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl deleted file mode 100755 index c26991213af..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl +++ /dev/null @@ -1,242 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = ( 60001, 60002, 60004 ); -@iorbases = ( "Sender.ior", "Receiver.ior", "Controller.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode", "ControlNode" ); - -# 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 = "../descriptors/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 daemon $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 ('dance_locality_manager'); -} - -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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; - - $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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 (2 * $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\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/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl deleted file mode 100644 index 8598a8786b8..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.idl +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef SHAPES_CONTROL_COMP_IDL_ -#define SHAPES_CONTROL_COMP_IDL_ - -#include "Shapes_Control_obj.idl" - -#include - -module Shapes -{ - component Control_comp - { - uses Shapes::Control_obj control; - - attribute unsigned long rate; - attribute unsigned short max_x; - attribute unsigned short max_y; - attribute unsigned short max_size; - attribute boolean resize_shape; - }; -}; - -#endif /* SHAPES_CONTROL_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc deleted file mode 100644 index e7ffebbd33f..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc +++ /dev/null @@ -1,177 +0,0 @@ -project(Shapes_Control_idl_gen) : componentidldefaults { - after += Shapes_Control_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \ - -Wb,stub_export_include=Shapes_Control_comp_stub_export.h \ - -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Control_comp_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Control_comp_exec_export.h \ - -I../ports \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - Shapes_Control_comp.idl - gendir = GeneratedCode - } -} - -project(Shapes_Control_executor_gen) : componentidldefaults { - requires += dummy_label - custom_only = 1 - idlflags += -Gexr -SS -Sci \ - -I../ports \ - -I../../ports \ - -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Control_comp_exec_export.h \ - -o ../../../Tutorial/Code/Shapes_Control_comp - - IDL_Files { - Shapes_Control_comp.idl - } -} - -project(Shapes_Control_lem_gen) : ciaoidldefaults { - after += Shapes_Control_idl_gen Shapes_Control_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Control_comp_lem_stub_export.h \ - -SS -Gxhst \ - -I../ports \ - -I../../ports/GeneratedCode \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/Shapes_Control_compE.idl - gendir = GeneratedCode - } -} - -project(Shapes_Control_comp_lem_stub) : ccm_svnt { - after += Shapes_Control_lem_gen Shapes_Control_comp_stub Shapes_ShapeType_msg_stub \ - Shapes_Control_obj_stub - - libs += Shapes_ShapeType_msg_stub Shapes_Control_comp_stub Shapes_Control_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../ports/GeneratedCode - - sharedname = Shapes_Control_comp_lem_stub - dynamicflags += SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_compEC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_compEC.h - GeneratedCode/Shapes_Control_comp_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Control_compEC.inl - } -} - -project(Shapes_Control_comp_stub) : ccm_stub { - after += Shapes_Control_idl_gen Shapes_ShapeType_msg_stub \ - Shapes_Control_obj_stub Shapes_Control_obj_lem_stub - - libs += Shapes_ShapeType_msg_stub Shapes_Control_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../ports/GeneratedCode - - sharedname = Shapes_Control_comp_stub - dynamicflags += SHAPES_CONTROL_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_compC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_compC.h - GeneratedCode/Shapes_Control_comp_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Control_compC.inl - } -} - -project(Shapes_Control_comp_exec) : ciao_executor { - after += Shapes_Control_comp_lem_stub Shapes_Control_comp_stub \ - Shapes_Control_obj_lem_stub - - libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_Control_obj_lem_stub Shapes_Control_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = Shapes_Control_comp_exec - dynamicflags += SHAPES_CONTROL_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Control_comp_exec.cpp - } - - Header_Files { - Shapes_Control_comp_exec.h - Shapes_Control_comp_exec_export.h - } - - Inline_Files { - } -} - - -project(Shapes_Control_comp_svnt) : ciao_servant { - after += Shapes_ShapeType_msg_stub Shapes_Control_comp_lem_stub \ - Shapes_Control_comp_stub Shapes_Control_obj_svnt \ - Shapes_Control_obj_lem_stub - - libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub \ - Shapes_ShapeType_msg_stub \ - Shapes_Control_obj_stub Shapes_Control_obj_svnt \ - Shapes_Control_obj_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = Shapes_Control_comp_svnt - dynamicflags += SHAPES_CONTROL_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_compS.cpp - GeneratedCode/Shapes_Control_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_compS.h - GeneratedCode/Shapes_Control_comp_svnt.h - GeneratedCode/Shapes_Control_comp_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp deleted file mode 100644 index cb003dee25f..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp +++ /dev/null @@ -1,297 +0,0 @@ -// -*- C++ -*- -#include "Shapes_Control_comp_exec.h" -#include "tao/ORB_Core.h" - -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "ace/Reactor.h" - -#define MIN_SIZE 5 - -namespace CIAO_Shapes_Control_comp_Impl -{ - //============================================================ - // pulse_Generator - //============================================================ - pulse_Generator::pulse_Generator (Control_comp_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Control_comp_exec_i - //============================================================ - - Control_comp_exec_i::Control_comp_exec_i (void) - : rate_ (0) - , max_x_ (100) - , max_y_ (100) - , max_size_ (25) - , resize_shape_ (false) - , x_increasing_ (false) - , y_increasing_ (false) - , size_increasing_ (false) - , current_size_ (ACE_OS::rand () % max_size_) - , current_x_ (ACE_OS::rand () % max_x_) - , current_y_ (ACE_OS::rand () % max_y_) - { - this->ticker_ = new pulse_Generator (*this); - } - - Control_comp_exec_i::~Control_comp_exec_i (void) - { - delete this->ticker_; - } - - // Supported operations and attributes. - ACE_Reactor* - Control_comp_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - - void - Control_comp_exec_i::tick () - { - if (this->x_increasing_) - { - ++this->current_x_; - this->x_increasing_ = this->current_x_ + 1 <= this->max_x_; - } - else - { - --this->current_x_; - this->x_increasing_ = this->current_x_ - 1 < 0; - } - if (this->y_increasing_) - { - ++this->current_y_; - this->y_increasing_ = this->current_y_ + 1 <= this->max_y_; - } - else - { - --this->current_y_; - this->y_increasing_ = this->current_y_ - 1 < 0; - } - if (resize_shape ()) - { - if (this->size_increasing_) - { - ++this->current_size_; - this->size_increasing_ = this->current_size_ + 1 <= this->max_size_; - } - else - { - if (this->current_size_ == MIN_SIZE) - { - this->size_increasing_ = true; - } - else - { - --this->current_size_; - this->size_increasing_ = this->current_size_ - 1 < 0; - } - } - } - ::Shapes::Control_obj_var control = - this->ciao_context_->get_connection_control (); - if (! ::CORBA::is_nil (control)) - { - if (control->setSize (this->current_size_) == ::Shapes::RETURN_ERROR) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::tick : ") - ACE_TEXT ("Setting shapes size\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_comp_exec_i::tick : ") - ACE_TEXT ("Size set to <%u>.\n"), - this->current_size_)); - } - if (control->setLocation (this->current_x_, - this->current_y_) == ::Shapes::RETURN_ERROR) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::tick : ") - ACE_TEXT ("Setting shapes location\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_comp_exec_i::tick : ") - ACE_TEXT ("Location set to <%u>, <%u>.\n"), - this->current_x_, - this->current_y_)); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to control shapes\n"))); - } - } - - void - Control_comp_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - - void - Control_comp_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - } - - // Component attributes and port operations. - - ::CORBA::ULong - Control_comp_exec_i::rate (void) - { - return this->rate_; - } - - void - Control_comp_exec_i::rate ( - const ::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Control_comp_exec_i::max_x (void) - { - return this->max_x_; - } - - void - Control_comp_exec_i::max_x ( - const ::CORBA::UShort max_x) - { - this->max_x_ = max_x; - } - - ::CORBA::UShort - Control_comp_exec_i::max_y (void) - { - return this->max_y_; - } - - void - Control_comp_exec_i::max_y ( - const ::CORBA::UShort max_y) - { - this->max_y_ = max_y; - } - - ::CORBA::UShort - Control_comp_exec_i::max_size (void) - { - return this->max_size_; - } - - void - Control_comp_exec_i::max_size ( - const ::CORBA::UShort max_size) - { - this->max_size_ = max_size; - } - - ::CORBA::Boolean - Control_comp_exec_i::resize_shape (void) - { - return this->resize_shape_; - } - - void - Control_comp_exec_i::resize_shape ( - const ::CORBA::Boolean resize_shape) - { - this->resize_shape_ = resize_shape; - } - - // Operations from Components::SessionComponent. - - void - Control_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Control_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Control_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Control_comp_exec_i::ccm_activate (void) - { - this->start (); - } - - void - Control_comp_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Control_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Control_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Control_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h deleted file mode 100644 index af65894f21e..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.h +++ /dev/null @@ -1,216 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_CONTROL_COMP_EXEC_WWONQX_H_ -#define CIAO_SHAPES_CONTROL_COMP_EXEC_WWONQX_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_Control_compEC.h" - -#include /**/ "Shapes_Control_comp_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -/// Namespace for implementation of Shapes::Control_comp component -namespace CIAO_Shapes_Control_comp_Impl -{ - class Control_comp_exec_i; - - //============================================================ - // pulse_Generator - //============================================================ - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Control_comp_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Control_comp_exec_i &pulse_callback_; - }; - - /// Component Executor Implementation Class: Control_comp_exec_i - class SHAPES_CONTROL_COMP_EXEC_Export Control_comp_exec_i - : public virtual Control_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - Control_comp_exec_i (void); - /// Destructor - virtual ~Control_comp_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - /// Getter for rate attribute - /// @return value of rate attribute - virtual ::CORBA::ULong rate ( - void); - - /// Setter for rate attribute - /// @param[in] rate - New value for rate attribute - virtual void rate ( - ::CORBA::ULong rate); - - /// Getter for max_x attribute - /// @return value of max_x attribute - virtual ::CORBA::UShort max_x ( - void); - - /// Setter for max_x attribute - /// @param[in] max_x - New value for max_x attribute - virtual void max_x ( - ::CORBA::UShort max_x); - - /// Getter for max_y attribute - /// @return value of max_y attribute - virtual ::CORBA::UShort max_y ( - void); - - /// Setter for max_y attribute - /// @param[in] max_y - New value for max_y attribute - virtual void max_y ( - ::CORBA::UShort max_y); - - /// Getter for max_size attribute - /// @return value of max_size attribute - virtual ::CORBA::UShort max_size ( - void); - - /// Setter for max_size attribute - /// @param[in] max_size - New value for max_size attribute - virtual void max_size ( - ::CORBA::UShort max_size); - - /// Getter for resize_shape attribute - /// @return value of resize_shape attribute - virtual ::CORBA::Boolean resize_shape ( - void); - - /// Setter for resize_shape attribute - /// @param[in] resize_shape - New value for resize_shape attribute - virtual void resize_shape ( - ::CORBA::Boolean resize_shape); - //@} - - /** @name Session component operations */ - //@{ - - /// Setter for container context for this component - /// @param[in] ctx - Container context - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - /// Component state change method to configuration_complete state - virtual void configuration_complete (void); - - /// Component state change method to activated state - virtual void ccm_activate (void); - - /// Component state change method to passivated state - virtual void ccm_passivate (void); - - /// Component state change method to removed state - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - void tick (void); - //@} - - private: - /// Context for component instance. Used for all middleware communication - ::Shapes::CCM_Control_comp_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - - /// Class member storing value of rate attribute - ::CORBA::ULong rate_; - - /// Class member storing value of max_x attribute - ::CORBA::UShort max_x_; - - /// Class member storing value of max_y attribute - ::CORBA::UShort max_y_; - - /// Class member storing value of max_size attribute - ::CORBA::UShort max_size_; - - /// Class member storing value of resize_shape attribute - ::CORBA::Boolean resize_shape_; - //@} - - /** @name Component facets. */ - //@{ - //@} - - /** @name User defined members. */ - //@{ - bool x_increasing_; - bool y_increasing_; - bool size_increasing_; - - ::CORBA::UShort current_size_; - ::CORBA::UShort current_x_; - ::CORBA::UShort current_y_; - - pulse_Generator * ticker_; - - //@} - - /** @name User defined private operations. */ - //@{ - void start (void); - void stop (void); - //@} - - /// Get the ACE_Reactor - /// @return non-owning pointer to reactor - ACE_Reactor* reactor (void); - }; - - /// Factory method and library entry point used by the middleware - /// @return new component instance - extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Control_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl deleted file mode 100644 index de2946a8d7f..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.idl +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef SHAPES_RECEIVER_COMP_IDL_ -#define SHAPES_RECEIVER_COMP_IDL_ - -#include "Shapes_ShapeType_conn.idl" - -module Shapes -{ - component Receiver_comp - { - port ShapeType_conn::DDS_Listen info_out; - }; -}; - -#endif /* SHAPES_RECEIVER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc deleted file mode 100644 index b7166aea155..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc +++ /dev/null @@ -1,173 +0,0 @@ -project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += Shapes_ShapeType_conn_idl_gen - idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \ - -Wb,stub_export_include=Shapes_Receiver_comp_stub_export.h \ - -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Receiver_comp_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - Shapes_Receiver_comp.idl - gendir = GeneratedCode - } -} - -project(Shapes_Receiver_executor_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - idlflags += -Gex -SS -Sci \ - -I../../ports \ - -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Receiver_comp_exec_export.h \ - -o ../../../Tutorial/Code/Shapes_Receiver_comp - - IDL_Files { - Shapes_Receiver_comp.idl - } -} - -project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += Shapes_Receiver_idl_gen Shapes_Sender_idl_lem_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Receiver_comp_lem_stub_export.h \ - -SS -Gxhst \ - -I../../ports \ - -I../../ports/GeneratedCode \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/Shapes_Receiver_compE.idl - gendir = GeneratedCode - } -} - -project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base { - after += Shapes_Receiver_lem_gen Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub \ - Shapes_ShapeType_msg_stub - - libs += Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Receiver_comp_lem_stub - dynamicflags += SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Receiver_compEC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Receiver_compEC.h - GeneratedCode/Shapes_Receiver_comp_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Receiver_compEC.inl - } -} - -project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base { - after += Shapes_Receiver_idl_gen Shapes_ShapeType_conn_stub \ - Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_lem_gen - - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Receiver_comp_stub - dynamicflags += SHAPES_RECEIVER_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Receiver_compC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Receiver_compC.h - GeneratedCode/Shapes_Receiver_comp_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Receiver_compC.inl - } -} - -project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_lem_stub { - after += Shapes_Receiver_comp_lem_stub Shapes_Receiver_comp_stub \ - Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub - libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Receiver_comp_exec - dynamicflags += SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Receiver_comp_exec.cpp - } - - Header_Files { - Shapes_Receiver_comp_exec.h - GeneratedCode/Shapes_Receiver_comp_exec_export.h - } - - Inline_Files { - } -} - - -project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ - Shapes_ShapeType_conn_lem_stub - - libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ - Shapes_ShapeType_conn_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Receiver_comp_svnt - dynamicflags += SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Receiver_compS.cpp - GeneratedCode/Shapes_Receiver_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/Shapes_Receiver_compS.h - GeneratedCode/Shapes_Receiver_comp_svnt.h - GeneratedCode/Shapes_Receiver_comp_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp deleted file mode 100644 index dbabbb9eaa9..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp +++ /dev/null @@ -1,188 +0,0 @@ -// -*- C++ -*- -#include "Shapes_Receiver_comp_exec.h" - -namespace CIAO_Shapes_Receiver_comp_Impl -{ - - //============================================================ - // Facet Executor Implementation Class: info_out_data_listener_exec_i - //============================================================ - - info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_comp_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) - { - } - - info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) - { - } - - // Operations from ::Shapes::ShapeType_conn::Listener - - void - info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - datum.color.in (), - datum.x, - datum.y, - datum.shapesize)); - } - - void - info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) - { - /* Your code here. */ - } - - //============================================================ - // Facet Executor Implementation Class: info_out_status_exec_i - //============================================================ - - info_out_status_exec_i::info_out_status_exec_i ( - ::Shapes::CCM_Receiver_comp_Context_ptr ctx) - : ciao_context_ ( - ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) - { - } - - info_out_status_exec_i::~info_out_status_exec_i (void) - { - } - - // Operations from ::CCM_DDS::PortStatusListener - - void - info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) - { - /* Your code here. */ - } - - void - info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) - { - /* Your code here. */ - } - - //============================================================ - // Component Executor Implementation Class: Receiver_comp_exec_i - //============================================================ - - Receiver_comp_exec_i::Receiver_comp_exec_i (void){ - } - - Receiver_comp_exec_i::~Receiver_comp_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::Shapes::ShapeType_conn::CCM_Listener_ptr - Receiver_comp_exec_i::get_info_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) - { - info_out_data_listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_data_listener_exec_i ( - this->ciao_context_.in ()), - ::Shapes::ShapeType_conn::CCM_Listener::_nil ()); - - this->ciao_info_out_data_listener_ = tmp; - } - - return - ::Shapes::ShapeType_conn::CCM_Listener::_duplicate ( - this->ciao_info_out_data_listener_.in ()); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_comp_exec_i::get_info_out_status (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) - { - info_out_status_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - info_out_status_exec_i ( - this->ciao_context_.in ()), - ::CCM_DDS::CCM_PortStatusListener::_nil ()); - - this->ciao_info_out_status_ = tmp; - } - - return - ::CCM_DDS::CCM_PortStatusListener::_duplicate ( - this->ciao_info_out_status_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Receiver_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->ciao_context_->get_connection_info_out_data_control (); - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw ::CORBA::INTERNAL (); - } - - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_comp_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Receiver_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h deleted file mode 100644 index 0e7b8082298..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h +++ /dev/null @@ -1,201 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_RECEIVER_COMP_EXEC_MNXIMZ_H_ -#define CIAO_SHAPES_RECEIVER_COMP_EXEC_MNXIMZ_H_ - - -#include /**/ "ace/pre.h" - -#include "Shapes_Receiver_compEC.h" - -#include /**/ "Shapes_Receiver_comp_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -/// Namespace for implementation of Shapes::Receiver_comp component -namespace CIAO_Shapes_Receiver_comp_Impl -{ - - /// Executor implementation class for info_out_data_listener facet - class SHAPES_RECEIVER_COMP_EXEC_Export info_out_data_listener_exec_i - : public virtual ::Shapes::ShapeType_conn::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - /// @param[in] ctx - Container context - info_out_data_listener_exec_i ( - ::Shapes::CCM_Receiver_comp_Context_ptr ctx); - /// Destructor - virtual ~info_out_data_listener_exec_i (void); - - /** @name Operations and attributes from Shapes::ShapeType_conn::Listener */ - //@{ - - virtual - void on_one_data ( - const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & info); - - virtual - void on_many_data ( - const ::ShapeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); - //@} - - private: - /// Context for component instance. Used for all middleware communication. - ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; - }; - - /// Executor implementation class for info_out_status facet - class SHAPES_RECEIVER_COMP_EXEC_Export info_out_status_exec_i - : public virtual ::CCM_DDS::CCM_PortStatusListener, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - /// @param[in] ctx - Container context - info_out_status_exec_i ( - ::Shapes::CCM_Receiver_comp_Context_ptr ctx); - /// Destructor - virtual ~info_out_status_exec_i (void); - - /** @name Operations and attributes from CCM_DDS::PortStatusListener */ - //@{ - - virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - //@} - - private: - /// Context for component instance. Used for all middleware communication. - ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; - }; - - /// Component Executor Implementation Class: Receiver_comp_exec_i - class SHAPES_RECEIVER_COMP_EXEC_Export Receiver_comp_exec_i - : public virtual Receiver_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - Receiver_comp_exec_i (void); - /// Destructor - virtual ~Receiver_comp_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - /// Factory method and getter for info_out_data_listener facet - /// @return existing instance of facet if one exists, else creates one - virtual ::Shapes::ShapeType_conn::CCM_Listener_ptr - get_info_out_data_listener (void); - - /// Factory method and getter for info_out_status facet - /// @return existing instance of facet if one exists, else creates one - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} - - /** @name Session component operations */ - //@{ - - /// Setter for container context for this component - /// @param[in] ctx - Container context - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - /// Component state change method to configuration_complete state - virtual void configuration_complete (void); - - /// Component state change method to activated state - virtual void ccm_activate (void); - - /// Component state change method to passivated state - virtual void ccm_passivate (void); - - /// Component state change method to removed state - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - - //@} - - private: - /// Context for component instance. Used for all middleware communication - ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - //@} - - /** @name Component facets. */ - //@{ - - /// Object reference to info_out_data_listener facet - ::Shapes::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_; - - /// Object reference to info_out_status facet - ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; - //@} - - /** @name User defined members. */ - //@{ - - //@} - - /** @name User defined private operations. */ - //@{ - - //@} - }; - - /// Factory method and library entry point used by the middleware - /// @return new component instance - extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_comp_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl deleted file mode 100644 index da2808eb22b..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.idl +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef SHAPES_SENDER_COMP_IDL_ -#define SHAPES_SENDER_COMP_IDL_ - -#include "Shapes_ShapeType_conn.idl" -#include "Shapes_Control_obj.idl" - -module Shapes -{ - component Sender_comp - { - port ShapeType_conn::DDS_Write info_write; - - provides Shapes::Control_obj control; - }; -}; - -#endif /* SHAPES_SENDER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc deleted file mode 100644 index 4b5d07c5924..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc +++ /dev/null @@ -1,181 +0,0 @@ -project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += Shapes_ShapeType_conn_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \ - -Wb,stub_export_include=Shapes_Sender_comp_stub_export.h \ - -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Sender_comp_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - Shapes_Sender_comp.idl - gendir = GeneratedCode - } -} - -project(Shapes_Sender_executor_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - idlflags += -Gex -SS -Sci \ - -I../ports \ - -I../../ports \ - -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \ - -Wb,exec_export_include=Shapes_Sender_comp_exec_export.h \ - -o ../../../Tutorial/Code/Shapes_Sender_comp - - IDL_Files { - Shapes_Sender_comp.idl - } -} - -project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += Shapes_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Sender_comp_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors \ - -I../../ports \ - -I../../ports/GeneratedCode \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/Shapes_Sender_compE.idl - gendir = GeneratedCode - } -} - -project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base { - after += Shapes_Sender_lem_gen Shapes_Sender_comp_stub Shapes_ShapeType_msg_stub - - libs += Shapes_ShapeType_msg_stub Shapes_Sender_comp_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Sender_comp_lem_stub - dynamicflags += SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Sender_compEC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Sender_compEC.h - GeneratedCode/Shapes_Sender_comp_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Sender_compEC.inl - } -} - -project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base { - after += Shapes_Sender_idl_gen Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_Control_obj_stub - - libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub \ - Shapes_Control_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Sender_comp_stub - dynamicflags += SHAPES_SENDER_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Sender_compC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Sender_compC.h - GeneratedCode/Shapes_Sender_comp_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Sender_compC.inl - } -} - -project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base { - after += Shapes_Sender_comp_lem_stub Shapes_Sender_comp_stub Shapes_ShapeType_conn_lem_stub \ - Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub Shapes_Control_obj_lem_stub \ - Shapes_defn_stub Shapes_Control_obj_stub - - libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub \ - Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Sender_comp_exec - dynamicflags += SHAPES_SENDER_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Shapes_Sender_comp_exec.cpp - } - - Header_Files { - Shapes_Sender_comp_exec.h - Shapes_Sender_comp_exec_export.h - } - - Inline_Files { - } -} - - -project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += Shapes_ShapeType_msg_stub Shapes_Sender_comp_lem_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ - Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ - Shapes_Control_obj_stub Shapes_Control_obj_svnt \ - Shapes_Control_obj_lem_stub - - libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub \ - Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ - Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ - Shapes_Control_obj_stub Shapes_Control_obj_svnt \ - Shapes_Control_obj_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode - - sharedname = Shapes_Sender_comp_svnt - dynamicflags += SHAPES_SENDER_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Sender_compS.cpp - GeneratedCode/Shapes_Sender_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/Shapes_Sender_compS.h - GeneratedCode/Shapes_Sender_comp_svnt.h - GeneratedCode/Shapes_Sender_comp_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp deleted file mode 100644 index 1388ed8c152..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp +++ /dev/null @@ -1,236 +0,0 @@ -// -*- C++ -*- -#include "Shapes_Sender_comp_exec.h" - -namespace CIAO_Shapes_Sender_comp_Impl -{ - - //============================================================ - // Facet Executor Implementation Class: control_exec_i - //============================================================ - - control_exec_i::control_exec_i ( - ::Shapes::CCM_Sender_comp_Context_ptr ctx, - Sender_comp_exec_i &callback) - : ciao_context_ ( - ::Shapes::CCM_Sender_comp_Context::_duplicate (ctx)), - callback_ (callback) - { - } - - control_exec_i::~control_exec_i (void) - { - } - - // Operations from ::Shapes::Control_obj - - ::Shapes::ReturnStatus - control_exec_i::setSize (::CORBA::UShort size) - { - return this->callback_.setSize (size); - } - - ::Shapes::ReturnStatus - control_exec_i::setLocation (::CORBA::UShort x, - ::CORBA::UShort y) - { - return this->callback_.setLocation (x, y); - } - - //============================================================ - // Component Executor Implementation Class: Sender_comp_exec_i - //============================================================ - - Sender_comp_exec_i::Sender_comp_exec_i (void) - : instance_handle_ (::DDS::HANDLE_NIL) - { - this->square_.x = 10; - this->square_.y = 10; - this->square_.shapesize = 1; - this->square_.color = CORBA::string_dup("GREEN"); - } - - Sender_comp_exec_i::~Sender_comp_exec_i (void) - { - } - - // Supported operations and attributes. - ::Shapes::ReturnStatus - Sender_comp_exec_i::setSize (::CORBA::UShort size) - { - this->square_.shapesize = size; - return this->update_square (); - } - - ::Shapes::ReturnStatus - Sender_comp_exec_i::setLocation (::CORBA::UShort x, - ::CORBA::UShort y) - { - this->square_.x = x; - this->square_.y = y; - return this->update_square (); - } - - ::Shapes::ReturnStatus - Sender_comp_exec_i::update_square () - { - ::Shapes::ShapeType_conn::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - return ::Shapes::RETURN_ERROR; - } - - try - { - writer->write_one (this->square_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), - this->square_.color.in (), - this->square_.x, - this->square_.y, - this->square_.shapesize)); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), - this->square_.color.in (), this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - return ::Shapes::RETURN_OK; - } - - // Component attributes and port operations. - - ::Shapes::CCM_Control_obj_ptr - Sender_comp_exec_i::get_control (void) - { - if ( ::CORBA::is_nil (this->ciao_control_.in ())) - { - control_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - control_exec_i ( - this->ciao_context_.in (), - *this), - ::Shapes::CCM_Control_obj::_nil ()); - - this->ciao_control_ = tmp; - } - - return - ::Shapes::CCM_Control_obj::_duplicate ( - this->ciao_control_.in ()); - } - - // Operations from Components::SessionComponent. - - void - Sender_comp_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::Shapes::CCM_Sender_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_comp_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Sender_comp_exec_i::ccm_activate (void) - { - ::Shapes::ShapeType_conn::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw ::CORBA::INTERNAL (); - } - - try - { - this->instance_handle_ = writer->register_instance (this->square_); - //Register shape with dds. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - this->square_.color.in (), - this->square_.x, - this->square_.y, - this->square_.shapesize)); - } - catch (const CCM_DDS::AlreadyCreated& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - } - - void - Sender_comp_exec_i::ccm_passivate (void) - { - ::Shapes::ShapeType_conn::Writer_var writer = - this->ciao_context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw ::CORBA::INTERNAL (); - } - - try - { - writer->unregister_instance (this->square_, - this->instance_handle_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - this->square_.color.in (), - this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - } - - void - Sender_comp_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_comp_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h deleted file mode 100644 index 98a2fdc5524..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.1 - * TAO and the TAO IDL Compiler have been developed by: - * Center for Distributed Object Computing - * Washington University - * St. Louis, MO - * USA - * http://www.cs.wustl.edu/~schmidt/doc-center.html - * and - * Distributed Object Computing Laboratory - * University of California at Irvine - * Irvine, CA - * USA - * and - * Institute for Software Integrated Systems - * Vanderbilt University - * Nashville, TN - * USA - * http://www.isis.vanderbilt.edu/ - * - * Information about TAO is available at: - * http://www.dre.vanderbilt.edu/~schmidt/TAO.html - **/ -#ifndef CIAO_SHAPES_SENDER_COMP_EXEC_IEMJ0O_H_ -#define CIAO_SHAPES_SENDER_COMP_EXEC_IEMJ0O_H_ - -#include /**/ "ace/pre.h" - -#include "Shapes_Sender_compEC.h" - -#include /**/ "Shapes_Sender_comp_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -/// Namespace for implementation of Shapes::Sender_comp component -namespace CIAO_Shapes_Sender_comp_Impl -{ - class Sender_comp_exec_i; - - /// Executor implementation class for control facet - class SHAPES_SENDER_COMP_EXEC_Export control_exec_i - : public virtual ::Shapes::CCM_Control_obj, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - /// @param[in] ctx - Container context - control_exec_i ( - ::Shapes::CCM_Sender_comp_Context_ptr ctx, - Sender_comp_exec_i &callback); - /// Destructor - virtual ~control_exec_i (void); - - /** @name Operations and attributes from Shapes::Control_obj */ - //@{ - - virtual - ::Shapes::ReturnStatus setSize ( - ::CORBA::UShort size); - - virtual - ::Shapes::ReturnStatus setLocation ( - ::CORBA::UShort x, - ::CORBA::UShort y); - //@} - - private: - /// Context for component instance. Used for all middleware communication. - ::Shapes::CCM_Sender_comp_Context_var ciao_context_; - Sender_comp_exec_i &callback_; - }; - - /// Component Executor Implementation Class: Sender_comp_exec_i - class SHAPES_SENDER_COMP_EXEC_Export Sender_comp_exec_i - : public virtual Sender_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - Sender_comp_exec_i (void); - /// Destructor - virtual ~Sender_comp_exec_i (void); - - /** @name Supported operations and attributes. */ - //@{ - - //@} - - /** @name Component attributes and port operations. */ - //@{ - - /// Factory method and getter for control facet - /// @return existing instance of facet if one exists, else creates one - virtual ::Shapes::CCM_Control_obj_ptr - get_control (void); - //@} - - /** @name Session component operations */ - //@{ - - /// Setter for container context for this component - /// @param[in] ctx - Container context - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - /// Component state change method to configuration_complete state - virtual void configuration_complete (void); - - /// Component state change method to activated state - virtual void ccm_activate (void); - - /// Component state change method to passivated state - virtual void ccm_passivate (void); - - /// Component state change method to removed state - virtual void ccm_remove (void); - //@} - - /** @name User defined public operations. */ - //@{ - ::Shapes::ReturnStatus setSize (::CORBA::UShort size); - - ::Shapes::ReturnStatus setLocation (::CORBA::UShort x, - ::CORBA::UShort y); - //@} - - private: - /// Context for component instance. Used for all middleware communication - ::Shapes::CCM_Sender_comp_Context_var ciao_context_; - - /** @name Component attributes. */ - //@{ - //@} - - /** @name Component facets. */ - //@{ - - /// Object reference to control facet - ::Shapes::CCM_Control_obj_var ciao_control_; - //@} - - /** @name User defined members. */ - //@{ - ::DDS::InstanceHandle_t instance_handle_; - ShapeType square_; - - //@} - - /** @name User defined private operations. */ - //@{ - ::Shapes::ReturnStatus update_square (void); - - //@} - - }; - - /// Factory method and library entry point used by the middleware - /// @return new component instance - extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_comp_Impl (void); -} - -#include /**/ "ace/post.h" -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb deleted file mode 100644 index 7451cb5a808..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes.mpb +++ /dev/null @@ -1,7 +0,0 @@ -feature (dds4ccm_ndds) { - dds_ts_flags += -d GeneratedCode -} - -feature (dds4ccm_opendds) { - dds_ts_flags += -o GeneratedCode -} \ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl deleted file mode 100644 index 05c8c85d842..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.idl +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef SHAPES_CONTROL_IDL_ -#define SHAPES_CONTROL_IDL_ - -#include "Shapes_defn.idl" - -#pragma ciao lem "Shapes_Control_objE.idl" - -module Shapes -{ - interface Control_obj - { - ReturnStatus setSize (in unsigned short size); - ReturnStatus setLocation (in unsigned short x, - in unsigned short y); - }; -}; - -#endif /* SHAPES_CONTROL_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc deleted file mode 100644 index 56b3a6be4c5..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc +++ /dev/null @@ -1,125 +0,0 @@ -project(Shapes_Control_obj_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \ - -Wb,stub_export_include=Shapes_Control_obj_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \ - -Wb,skel_export_include=Shapes_Control_obj_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \ - -Wb,svnt_export_include=Shapes_Control_obj_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \ - -Wb,exec_export_include=Shapes_Control_obj_exec_export.h \ - -o GeneratedCode - - IDL_Files { - Shapes_Control_obj.idl - gendir = GeneratedCode - } -} - -project(Shapes_Control_obj_lem_gen) : ciaoidldefaults { - after += Shapes_Control_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_Control_obj_lem_stub_export.h \ - -SS -Gxhst \ - -I ./GeneratedCode \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/Shapes_Control_objE.idl - gendir = GeneratedCode - } -} - -project(Shapes_Control_obj_lem_stub) : ccm_svnt { - after += Shapes_Control_obj_lem_gen Shapes_Control_obj_stub - - libs += Shapes_Control_obj_stub - libpaths += ../lib - libout = ../lib - - includes += ./GeneratedCode - - sharedname = Shapes_Control_obj_lem_stub - dynamicflags += SHAPES_CONTROL_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_objEC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_objEC.h - GeneratedCode/Shapes_Control_obj_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Control_objEC.inl - } -} - -project(Shapes_Control_obj_stub) : ccm_stub { - after += Shapes_Control_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub - - libs += Shapes_defn_stub - libpaths += ../lib - libout = ../lib - - includes += ./GeneratedCode - - sharedname = Shapes_Control_obj_stub - dynamicflags += SHAPES_CONTROL_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_objC.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_objC.h - GeneratedCode/Shapes_Control_obj_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_Control_objC.inl - } -} - - -project(Shapes_Control_obj_svnt) : ciao_servant { - after += Shapes_Control_obj_lem_stub Shapes_Control_obj_stub \ - Shapes_defn_idl_gen Shapes_defn_stub - - libs += Shapes_Control_obj_stub Shapes_Control_obj_lem_stub \ - Shapes_defn_stub - libpaths += ../lib - libout = ../lib - - includes += ./GeneratedCode - - sharedname = Shapes_Control_obj_svnt - dynamicflags += SHAPES_CONTROL_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_Control_objS.cpp - GeneratedCode/Shapes_Control_obj_svnt.cpp - } - - Header_Files { - GeneratedCode/Shapes_Control_objS.h - GeneratedCode/Shapes_Control_obj_svnt.h - GeneratedCode/Shapes_Control_obj_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl deleted file mode 100644 index 0938585b051..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef SHAPES_SHAPETYPE_CONN_IDL_ -#define SHAPES_SHAPETYPE_CONN_IDL_ - -#include -#include - -#include "Shapes_ShapeType_msg.idl" - -#pragma ciao lem "Shapes_ShapeType_connE.idl" - -#if (CIAO_DDS4CCM_OPENDDS==1) -#include "GeneratedCode/Shapes_ShapeType_msgTypeSupport.idl" -#endif - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence ShapeTypeSeq; -#endif - -module Shapes -{ - module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> ShapeType_conn; -}; - -#endif /* SHAPES_SHAPETYPE_CONN_IDL_ */ - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc deleted file mode 100644 index 2666434317d..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc +++ /dev/null @@ -1,152 +0,0 @@ -project(Shapes_ShapeType_conn_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen Shapes_ShapeType_msg_stub - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=Shapes_ShapeType_conn_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=Shapes_ShapeType_conn_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=Shapes_ShapeType_conn_svnt_export.h \ - -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=Shapes_ShapeType_conn_conn_export.h \ - -I .. -o GeneratedCode - - - IDL_Files { - Shapes_ShapeType_conn.idl - gendir = GeneratedCode - } -} - -project(Shapes_ShapeType_conn_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += Shapes_ShapeType_conn_idl_gen - idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=Shapes_ShapeType_conn_lem_stub_export.h \ - -SS -Gxhst \ - -I .. -o GeneratedCode - - IDL_Files { - GeneratedCode/Shapes_ShapeType_connE.idl - gendir = GeneratedCode - } -} - -project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub - - libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub - libpaths += ../lib - libout = ../lib - - includes += . - - sharedname = Shapes_ShapeType_conn_lem_stub - dynamicflags += SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_ShapeType_connEC.cpp - } - - Header_Files { - GeneratedCode/Shapes_ShapeType_connEC.h - GeneratedCode/Shapes_ShapeType_conn_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_ShapeType_connEC.inl - } -} - -project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base { - after += Shapes_ShapeType_conn_idl_gen Shapes_ShapeType_msg_stub - - libs += Shapes_ShapeType_msg_stub - libpaths += ../lib - libout = ../lib - - includes += . .. - - sharedname = Shapes_ShapeType_conn_stub - dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_ShapeType_connC.cpp - } - - Header_Files { - GeneratedCode/Shapes_ShapeType_connC.h - GeneratedCode/Shapes_ShapeType_conn_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_ShapeType_connC.inl - } -} - -project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl { - after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub - - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub - libpaths += ../lib - libout = ../lib - - includes += . - - sharedname = Shapes_ShapeType_conn_exec - dynamicflags += SHAPES_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_ShapeType_conn_conn.cpp - } - - Header_Files { - GeneratedCode/Shapes_ShapeType_conn_conn.h - GeneratedCode/Shapes_ShapeType_conn_conn_export.h - } - - Inline_Files { - } -} - - -project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl { - after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_exec Shapes_ShapeType_conn_stub - - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_exec - libpaths += ../lib - libout = ../lib - - includes += . - - sharedname = Shapes_ShapeType_conn_svnt - dynamicflags += SHAPES_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_ShapeType_connS.cpp - GeneratedCode/Shapes_ShapeType_conn_svnt.cpp - } - - Header_Files { - GeneratedCode/Shapes_ShapeType_connS.h - GeneratedCode/Shapes_ShapeType_conn_svnt.h - GeneratedCode/Shapes_ShapeType_conn_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl deleted file mode 100644 index 014bef4b7b4..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef SHAPES_SHAPETYPE_MSG_IDL_ -#define SHAPES_SHAPETYPE_MSG_IDL_ - -#pragma ndds typesupport "Shapes_ShapeType_msgSupport.h" -#pragma opendds typesupport "Shapes_ShapeType_msgTypeSupportImpl.h" - -#pragma DCPS_DATA_TYPE "ShapeType" -#pragma DCPS_DATA_KEY "ShapeType color" - - -typedef string<128> color_type; - -struct ShapeType { - color_type color; //@key - long x; - long y; - long shapesize; -}; - -#pragma keylist ShapeType color - -#endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc deleted file mode 100644 index 8d04e3bfb80..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc +++ /dev/null @@ -1,27 +0,0 @@ -project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes { - idlflags += -SS -Sci \ - -Wb,stub_export_macro=SHAPES_MSG_STUB_Export \ - -Wb,stub_export_include=Shapes_ShapeType_msg_stub_export.h \ - -o GeneratedCode - - libout = ../lib - - sharedname = Shapes_ShapeType_msg_stub - dynamicflags += SHAPES_MSG_STUB_BUILD_DLL - - IDL_Files { - idlflags += -Gxhst - gendir = GeneratedCode - Shapes_ShapeType_msg.idl - } - - opendds_ts_flags += --export=SHAPES_MSG_STUB_Export - - DDSGenerator_Files { - Shapes_ShapeType_msg.idl - gendir = GeneratedCode - } - - Source_Files { - } -} diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl deleted file mode 100644 index a1af31c4139..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef SHAPES_DEFN_IDL_ -#define SHAPES_DEFN_IDL_ - -module Shapes -{ - enum ReturnStatus - { - RETURN_OK, - RETURN_ERROR - }; -}; - -#endif /* SHAPES_DEFN_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc deleted file mode 100644 index 1baeefa1ad9..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.mpc +++ /dev/null @@ -1,41 +0,0 @@ -project(Shapes_defn_idl_gen) : taoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \ - -Wb,stub_export_include=Shapes_defn_stub_export.h \ - -SS -Gxhst \ - -o GeneratedCode - - IDL_Files { - Shapes_defn.idl - gendir = GeneratedCode - } -} - - -project(Shapes_defn_stub) : ccm_stub { - after += Shapes_defn_idl_gen - - libpaths += ../lib - libout = ../lib - - includes += ./GeneratedCode - - sharedname = Shapes_defn_stub - dynamicflags += SHAPES_CONTROL_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/Shapes_defnC.cpp - } - - Header_Files { - GeneratedCode/Shapes_defnC.h - GeneratedCode/Shapes_defn_stub_export.h - } - - Inline_Files { - GeneratedCode/Shapes_defnC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html deleted file mode 100644 index be4a3920885..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - DDS4CCM Tutorial Shapes - General - - - - - - - - - -
Next
-
- -

General

-

- This tutorial explains how to use a DDS4CCM connector in - combination with a CCM component.
-

- -

System

-

- The system consists of three components: -

    -
  • A sender component
    • -
  • A receiver component
    • -
  • A controller component
    • -
- In this tutorial RTI DDS is used to transfer data from the sender to the receiver. - Since the sender and receiver are separate components, each use a DDS4CCM connector.
- The exchanged data consists of a struct (ShapeType) with the following - members: -
    -
  • color : represents the color of the shape.
    • -
  • x : represents the location on the x-axis.
    • -
  • y : represents the location on the y-axis
    • -
  • shapesize : represents the size of the shape.
    • -
- Separate DDS Topics are used to represent different shapes, i.e., Circle, - Square, and Triangle.
- The color field is a DDS "key" value, which causes DDS to treat each color - as an unique "instance" of a shape.
- Each of these instances is registered with DDS and is independently - maintained in regards to Quality of Service (QoS).
- The controller controls the location and size of the registered shape.
- The sender registers a shape instance with DDS and transfers the data received - from the controller to DDS.
- The receiver listens to DDS and receives the updates regarding the shapes data. -

- -

- This tutorial works in conjuntion with the RTI Shapes demo - (available for download from http://www.rti.com/downloads/index.html). -

- -

Directory structure

-

- The following convention is used: -

    -
  • |--*_asm          - : Directory contains an assembly. -
    • -
  •     |--ports -        - : Directory contains common IDL code for the assembly. -
    • -
  •     |--*_comp    - : Directory contains an component. -
    • -
  •         |-- - ports   - : Directory contains common IDL code for the component. -
    • -
  •         |--   - src    - : Directory contains the IDL and *_exec-files for the component. -
    • -
-

- -

File naming convention

-

- The following convention is used: -

    -
  • *_defn.idl - These files will contain definitions, - like enumerations, constants and so on
    - Typically located in *_asm/ports. -
    • -
  • *_msg.idl - These files will contain the messages (data structure) - send by DDS.
    - Typically located in *_asm/ports. -
    • -
  • *_conn.idl - These files will contain the connector - declarations.
    - Typically located in *_asm/ports. -
    • -
  • *_obj.idl - These files will contain the interfaces between - components.
    - Typically located in *_asm/*_comp/ports. -
    • -
  • *_comp.idl - These files will contain the component declaration.
    - Typically located in *_asm/*_comp/src. -
    • -
-

- -

Additional conventions

-

-